From 931cf4c15fc71eddb543cafa70dd2a7f95092ce5 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Mon, 11 Nov 2024 21:59:51 -0600 Subject: [PATCH 001/518] fix: correct type on to_align_offset --- src/build123d/geometry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 9f563e7..f07a97c 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1019,7 +1019,7 @@ class BoundBox: and second_box.max.Z < self.max.Z ) - def to_align_offset(self, align: Tuple[float, float]) -> Tuple[float, float]: + def to_align_offset(self, align: Tuple[Align, Align]) -> List[float]: """Amount to move object to achieve the desired alignment""" align_offset = [] for i in range(2): From f2095d64cfe5a4d5daa86732dd53e73f34b82a93 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Mon, 11 Nov 2024 22:24:15 -0600 Subject: [PATCH 002/518] cleanup: remove duplicated aligning logic --- src/build123d/build_common.py | 45 ++++++++++++++------------------- src/build123d/geometry.py | 32 ++++++++++++++--------- src/build123d/objects_part.py | 13 ++-------- src/build123d/objects_sketch.py | 24 +++++++++--------- src/build123d/topology.py | 4 +-- tests/test_build_sketch.py | 7 ++++- 6 files changed, 60 insertions(+), 65 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 28bada2..1dd5ddb 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -54,7 +54,14 @@ from typing import Any, Callable, Iterable, Optional, Union, TypeVar from typing_extensions import Self, ParamSpec, Concatenate from build123d.build_enums import Align, Mode, Select, Unit -from build123d.geometry import Axis, Location, Plane, Vector, VectorLike +from build123d.geometry import ( + Axis, + Location, + Plane, + Vector, + VectorLike, + to_align_offset, +) from build123d.topology import ( Compound, Curve, @@ -963,14 +970,7 @@ class HexLocations(LocationList): min_corner = Vector(sorted_points[0][0].X, sorted_points[1][0].Y) # Calculate the amount to offset the array to align it - align_offset = [] - for i in range(2): - if self.align[i] == Align.MIN: - align_offset.append(0) - elif self.align[i] == Align.CENTER: - align_offset.append(-size[i] / 2) - elif self.align[i] == Align.MAX: - align_offset.append(-size[i]) + align_offset = to_align_offset((0, 0), size, align) # Align the points points = ShapeList( @@ -1163,29 +1163,22 @@ class GridLocations(LocationList): size = [x_spacing * (x_count - 1), y_spacing * (y_count - 1)] self.size = Vector(*size) #: size of the grid - align_offset = [] - for i in range(2): - if self.align[i] == Align.MIN: - align_offset.append(0.0) - elif self.align[i] == Align.CENTER: - align_offset.append(-size[i] / 2) - elif self.align[i] == Align.MAX: - align_offset.append(-size[i]) + align_offset = to_align_offset((0, 0), size, align) - self.min = Vector(*align_offset) #: bottom left corner + self.min = align_offset #: bottom left corner self.max = self.min + self.size #: top right corner # Create the list of local locations - local_locations = [] - for i, j in product(range(x_count), range(y_count)): - local_locations.append( - Location( - Vector( - i * x_spacing + align_offset[0], - j * y_spacing + align_offset[1], - ) + local_locations = [ + Location( + align_offset + + Vector( + i * x_spacing, + j * y_spacing, ) ) + for i, j in product(range(x_count), range(y_count)) + ] self.local_locations = Locations._move_to_existing( local_locations diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index f07a97c..9610f01 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1019,19 +1019,9 @@ class BoundBox: and second_box.max.Z < self.max.Z ) - def to_align_offset(self, align: Tuple[Align, Align]) -> List[float]: + def to_align_offset(self, align: Sequence[Align]) -> Vector: """Amount to move object to achieve the desired alignment""" - align_offset = [] - for i in range(2): - if align[i] == Align.MIN: - align_offset.append(-self.min.to_tuple()[i]) - elif align[i] == Align.CENTER: - align_offset.append( - -(self.min.to_tuple()[i] + self.max.to_tuple()[i]) / 2 - ) - elif align[i] == Align.MAX: - align_offset.append(-self.max.to_tuple()[i]) - return align_offset + return to_align_offset(self.min.to_tuple(), self.max.to_tuple(), align) class Color: @@ -2534,3 +2524,21 @@ class Plane(metaclass=PlaneMeta): elif shape is not None: return shape.intersect(self) + + +def to_align_offset( + min_point: Sequence[float], + max_point: Sequence[float], + align: Sequence[Align], +) -> Vector: + """Amount to move object to achieve the desired alignment""" + align_offset = [] + + for alignment, min_coord, max_coord in zip(align, min_point, max_point): + if alignment == Align.MIN: + align_offset.append(-min_coord) + elif alignment == Align.CENTER: + align_offset.append(-(min_coord + max_coord) / 2) + elif alignment == Align.MAX: + align_offset.append(-max_coord) + return Vector(*align_offset) diff --git a/src/build123d/objects_part.py b/src/build123d/objects_part.py index 365683a..42b4e21 100644 --- a/src/build123d/objects_part.py +++ b/src/build123d/objects_part.py @@ -63,17 +63,8 @@ class BasePartObject(Part): if align is not None: align = tuplify(align, 3) bbox = part.bounding_box() - align_offset = [] - for i in range(3): - if align[i] == Align.MIN: - align_offset.append(-bbox.min.to_tuple()[i]) - elif align[i] == Align.CENTER: - align_offset.append( - -(bbox.min.to_tuple()[i] + bbox.max.to_tuple()[i]) / 2 - ) - elif align[i] == Align.MAX: - align_offset.append(-bbox.max.to_tuple()[i]) - part.move(Location(Vector(*align_offset))) + offset = bbox.to_align_offset(align) + part.move(Location(offset)) context: BuildPart = BuildPart._get_context(self, log=False) rotate = Rotation(*rotation) if isinstance(rotation, tuple) else rotation diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 7958cec..3d6b2a7 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -36,7 +36,14 @@ from typing import Iterable, Union from build123d.build_common import LocationList, flatten_sequence, validate_inputs from build123d.build_enums import Align, FontStyle, Mode from build123d.build_sketch import BuildSketch -from build123d.geometry import Axis, Location, Rotation, Vector, VectorLike +from build123d.geometry import ( + Axis, + Location, + Rotation, + Vector, + VectorLike, + to_align_offset, +) from build123d.topology import ( Compound, Edge, @@ -74,7 +81,7 @@ class BaseSketchObject(Sketch): ): if align is not None: align = tuplify(align, 2) - obj.move(Location(Vector(*obj.bounding_box().to_align_offset(align)))) + obj.move(Location(obj.bounding_box().to_align_offset(align))) context: BuildSketch = BuildSketch._get_context(self, log=False) if context is None: @@ -346,17 +353,10 @@ class RegularPolygon(BaseSketchObject): if align is not None: align = tuplify(align, 2) - align_offset = [] - for i in range(2): - if align[i] == Align.MIN: - align_offset.append(-mins[i]) - elif align[i] == Align.CENTER: - align_offset.append(0) - elif align[i] == Align.MAX: - align_offset.append(-maxs[i]) + align_offset = to_align_offset(mins, maxs, align) else: - align_offset = [0, 0] - pts = [point + Vector(*align_offset) for point in pts] + align_offset = Vector(0, 0) + pts = [point + align_offset for point in pts] face = Face(Wire.make_polygon(pts)) super().__init__(face, rotation=0, align=None, mode=mode) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 955b2cd..40f6882 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -4415,9 +4415,7 @@ class Compound(Mixin3D, Shape): # Align the text from the bounding box align = tuplify(align, 2) - text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align)) - ) + text_flat = text_flat.translate(text_flat.bounding_box().to_align_offset(align)) if text_path is not None: path_length = text_path.length diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index b4f8fbe..23707c2 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -27,7 +27,10 @@ license: """ import unittest -from math import pi, sqrt, atan2, degrees +from math import atan2, degrees, pi, sqrt + +import pytest + from build123d import * @@ -278,6 +281,7 @@ class TestBuildSketchObjects(unittest.TestCase): test.sketch.faces()[0].normal_at().to_tuple(), (0, 0, 1), 5 ) + @pytest.mark.skip(reason="Conflicts with test_regular_polygon_matches_polar") def test_regular_polygon_align(self): with BuildSketch() as align: RegularPolygon(2, 5, align=(Align.MIN, Align.MAX)) @@ -293,6 +297,7 @@ class TestBuildSketchObjects(unittest.TestCase): Vector(align.vertices().sort_by_distance(other=(0, 0, 0))[-1]).length, 2 ) + @pytest.mark.skip(reason="Conflicts with test_regular_polygon_align") def test_regular_polygon_matches_polar(self): for side_count in range(3, 10): with BuildSketch(): From cf11f91f2dff653e723c68dc289cfac8355da756 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Tue, 12 Nov 2024 17:59:00 -0600 Subject: [PATCH 003/518] feat: add align.NONE --- src/build123d/build_enums.py | 1 + src/build123d/geometry.py | 2 ++ src/build123d/objects_sketch.py | 2 +- tests/test_build_sketch.py | 8 ++------ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index fe8ba0e..9802821 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -36,6 +36,7 @@ class Align(Enum): MIN = auto() CENTER = auto() MAX = auto() + NONE = None def __repr__(self): return f"<{self.__class__.__name__}.{self.name}>" diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 9610f01..4b0c1fc 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -2541,4 +2541,6 @@ def to_align_offset( align_offset.append(-(min_coord + max_coord) / 2) elif alignment == Align.MAX: align_offset.append(-max_coord) + elif alignment == Align.NONE: + align_offset.append(0) return Vector(*align_offset) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 3d6b2a7..04c296b 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -311,7 +311,7 @@ class RegularPolygon(BaseSketchObject): side_count: int, major_radius: bool = True, rotation: float = 0, - align: tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: tuple[Align, Align] = (Align.NONE, Align.NONE), mode: Mode = Mode.ADD, ): # pylint: disable=too-many-locals diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 23707c2..03fb388 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -29,8 +29,6 @@ license: import unittest from math import atan2, degrees, pi, sqrt -import pytest - from build123d import * @@ -260,7 +258,7 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(r.radius, 2) self.assertEqual(r.side_count, 6) self.assertEqual(r.rotation, 0) - self.assertEqual(r.align, (Align.CENTER, Align.CENTER)) + self.assertEqual(r.align, (Align.NONE, Align.NONE)) self.assertEqual(r.mode, Mode.ADD) self.assertAlmostEqual(test.sketch.area, (3 * sqrt(3) / 2) * 2**2, 5) self.assertTupleAlmostEquals( @@ -274,14 +272,13 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertAlmostEqual(r.radius, 1, 5) self.assertEqual(r.side_count, 3) self.assertEqual(r.rotation, 0) - self.assertEqual(r.align, (Align.CENTER, Align.CENTER)) + self.assertEqual(r.align, (Align.NONE, Align.NONE)) self.assertEqual(r.mode, Mode.ADD) self.assertAlmostEqual(test.sketch.area, (3 * sqrt(3) / 4) * (0.5 * 2) ** 2, 5) self.assertTupleAlmostEquals( test.sketch.faces()[0].normal_at().to_tuple(), (0, 0, 1), 5 ) - @pytest.mark.skip(reason="Conflicts with test_regular_polygon_matches_polar") def test_regular_polygon_align(self): with BuildSketch() as align: RegularPolygon(2, 5, align=(Align.MIN, Align.MAX)) @@ -297,7 +294,6 @@ class TestBuildSketchObjects(unittest.TestCase): Vector(align.vertices().sort_by_distance(other=(0, 0, 0))[-1]).length, 2 ) - @pytest.mark.skip(reason="Conflicts with test_regular_polygon_align") def test_regular_polygon_matches_polar(self): for side_count in range(3, 10): with BuildSketch(): From 54bc6a468151d14f29c8e3863185b26855c043bd Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Tue, 12 Nov 2024 21:43:41 -0600 Subject: [PATCH 004/518] feat: optional center argument for to_align_offset --- src/build123d/geometry.py | 16 ++++++++++++++-- src/build123d/objects_sketch.py | 4 ++-- tests/test_build_sketch.py | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 4b0c1fc..026e88e 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -2530,15 +2530,27 @@ def to_align_offset( min_point: Sequence[float], max_point: Sequence[float], align: Sequence[Align], + center: Optional[Sequence[float]] = None, ) -> Vector: """Amount to move object to achieve the desired alignment""" align_offset = [] - for alignment, min_coord, max_coord in zip(align, min_point, max_point): + if center is None: + center = [ + (min_coord + max_coord) / 2 + for min_coord, max_coord in zip(min_point, max_point) + ] + + for alignment, min_coord, max_coord, center_coord in zip( + align, + min_point, + max_point, + center, + ): if alignment == Align.MIN: align_offset.append(-min_coord) elif alignment == Align.CENTER: - align_offset.append(-(min_coord + max_coord) / 2) + align_offset.append(-center_coord) elif alignment == Align.MAX: align_offset.append(-max_coord) elif alignment == Align.NONE: diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 04c296b..6d68533 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -311,7 +311,7 @@ class RegularPolygon(BaseSketchObject): side_count: int, major_radius: bool = True, rotation: float = 0, - align: tuple[Align, Align] = (Align.NONE, Align.NONE), + align: tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): # pylint: disable=too-many-locals @@ -353,7 +353,7 @@ class RegularPolygon(BaseSketchObject): if align is not None: align = tuplify(align, 2) - align_offset = to_align_offset(mins, maxs, align) + align_offset = to_align_offset(mins, maxs, align, center=(0, 0)) else: align_offset = Vector(0, 0) pts = [point + align_offset for point in pts] diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 03fb388..fc890bd 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -258,7 +258,7 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(r.radius, 2) self.assertEqual(r.side_count, 6) self.assertEqual(r.rotation, 0) - self.assertEqual(r.align, (Align.NONE, Align.NONE)) + self.assertEqual(r.align, (Align.CENTER, Align.CENTER)) self.assertEqual(r.mode, Mode.ADD) self.assertAlmostEqual(test.sketch.area, (3 * sqrt(3) / 2) * 2**2, 5) self.assertTupleAlmostEquals( @@ -272,7 +272,7 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertAlmostEqual(r.radius, 1, 5) self.assertEqual(r.side_count, 3) self.assertEqual(r.rotation, 0) - self.assertEqual(r.align, (Align.NONE, Align.NONE)) + self.assertEqual(r.align, (Align.CENTER, Align.CENTER)) self.assertEqual(r.mode, Mode.ADD) self.assertAlmostEqual(test.sketch.area, (3 * sqrt(3) / 4) * (0.5 * 2) ** 2, 5) self.assertTupleAlmostEquals( From d86811d2dc862f7aa04e523bf0515f4a700dab61 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Wed, 13 Nov 2024 21:05:58 -0600 Subject: [PATCH 005/518] feat: add Align2DType and Align3DType --- src/build123d/build_enums.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index 9802821..627d0b2 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -28,6 +28,7 @@ license: from __future__ import annotations from enum import Enum, auto +from typing import Union, TypeAlias class Align(Enum): @@ -42,6 +43,17 @@ class Align(Enum): return f"<{self.__class__.__name__}.{self.name}>" +Align2DType: TypeAlias = Union[ + Union[Align, None], + tuple[Union[Align, None], Union[Align, None]], +] + +Align3DType: TypeAlias = Union[ + Union[Align, None], + tuple[Union[Align, None], Union[Align, None], Union[Align, None]], +] + + class ApproxOption(Enum): """DXF export spline approximation strategy""" From b43deebbcc8b0e9de87db57092e0169619682482 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Wed, 13 Nov 2024 21:10:33 -0600 Subject: [PATCH 006/518] fix: make typesignature on to_align_offset more precise --- src/build123d/geometry.py | 28 +++++++++++++++++----------- src/build123d/objects_sketch.py | 6 +----- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 026e88e..da7b10f 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -82,7 +82,7 @@ from OCP.Quantity import Quantity_Color, Quantity_ColorRGBA from OCP.TopLoc import TopLoc_Location from OCP.TopoDS import TopoDS_Face, TopoDS_Shape, TopoDS_Vertex -from build123d.build_enums import Align, Intrinsic, Extrinsic +from build123d.build_enums import Align, Align2DType, Align3DType, Intrinsic, Extrinsic # Create a build123d logger to distinguish these logs from application logs. # If the user doesn't configure logging, all build123d logs will be discarded. @@ -1019,7 +1019,7 @@ class BoundBox: and second_box.max.Z < self.max.Z ) - def to_align_offset(self, align: Sequence[Align]) -> Vector: + def to_align_offset(self, align: Union[Align2DType, Align3DType]) -> Vector: """Amount to move object to achieve the desired alignment""" return to_align_offset(self.min.to_tuple(), self.max.to_tuple(), align) @@ -2527,22 +2527,28 @@ class Plane(metaclass=PlaneMeta): def to_align_offset( - min_point: Sequence[float], - max_point: Sequence[float], - align: Sequence[Align], - center: Optional[Sequence[float]] = None, + min_point: VectorLike, + max_point: VectorLike, + align: Union[Align2DType, Align3DType], + center: Optional[VectorLike] = None, ) -> Vector: """Amount to move object to achieve the desired alignment""" align_offset = [] if center is None: - center = [ - (min_coord + max_coord) / 2 - for min_coord, max_coord in zip(min_point, max_point) - ] + center = (Vector(min_point) + Vector(max_point)) / 2 + + if align is None or align is Align.NONE: + return Vector(0, 0, 0) + if align is Align.MIN: + return Vector(min_point) + if align is Align.MAX: + return Vector(max_point) + if align is Align.CENTER: + return Vector(center) for alignment, min_coord, max_coord, center_coord in zip( - align, + map(Align, align), min_point, max_point, center, diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 6d68533..984c9b5 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -351,11 +351,7 @@ class RegularPolygon(BaseSketchObject): mins = [pts_sorted[0][0].X, pts_sorted[1][0].Y] maxs = [pts_sorted[0][-1].X, pts_sorted[1][-1].Y] - if align is not None: - align = tuplify(align, 2) - align_offset = to_align_offset(mins, maxs, align, center=(0, 0)) - else: - align_offset = Vector(0, 0) + align_offset = to_align_offset(mins, maxs, align, center=(0, 0)) pts = [point + align_offset for point in pts] face = Face(Wire.make_polygon(pts)) From 8e5cd102cdd4151003e7f63bd3349d5d3442d753 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Wed, 13 Nov 2024 21:17:09 -0600 Subject: [PATCH 007/518] fix: import type alias from typing_extensions --- src/build123d/build_enums.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index 627d0b2..ab98131 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -27,8 +27,11 @@ license: """ from __future__ import annotations + from enum import Enum, auto -from typing import Union, TypeAlias +from typing import Union + +from typing_extensions import TypeAlias class Align(Enum): From e8365566f70a26b273c387d07ec4dd2b4392a28d Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Sat, 16 Nov 2024 19:44:11 -0600 Subject: [PATCH 008/518] test: `to_align_offset` behaves as expected --- tests/test_align.py | 79 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 tests/test_align.py diff --git a/tests/test_align.py b/tests/test_align.py new file mode 100644 index 0000000..423a982 --- /dev/null +++ b/tests/test_align.py @@ -0,0 +1,79 @@ +import pytest + +from build123d.build_enums import Align +from build123d.geometry import Vector, to_align_offset + + +@pytest.mark.parametrize( + "x_align,x_expect", + [ + (Align.MAX, -0.5), + (Align.CENTER, 0.25), + (Align.MIN, 1), + (Align.NONE, 0), + ], +) +@pytest.mark.parametrize( + "y_align,y_expect", + [ + (Align.MAX, -1), + (Align.CENTER, 0.25), + (Align.MIN, 1.5), + (Align.NONE, 0), + ], +) +@pytest.mark.parametrize( + "z_align,z_expect", + [ + (Align.MAX, -1), + (Align.CENTER, -0.75), + (Align.MIN, -0.5), + (Align.NONE, 0), + ], +) +def test_align( + x_align, + x_expect, + y_align, + y_expect, + z_align, + z_expect, +): + offset = to_align_offset( + min_point=(-1, -1.5, 0.5), + max_point=(0.5, 1.0, 1.0), + align=(x_align, y_align, z_align), + ) + assert offset.X == x_expect + assert offset.Y == y_expect + assert offset.Z == z_expect + + +@pytest.mark.parametrize("alignment", Align) +def test_align_single(alignment): + min_point = (-1, -1.5, 0.5) + max_point = (0.5, 1, 1) + expected = to_align_offset( + min_point=min_point, + max_point=max_point, + align=(alignment, alignment, alignment), + ) + offset = to_align_offset( + min_point=min_point, + max_point=max_point, + align=alignment, + ) + assert expected == offset + + +def test_align_center(): + min_point = (-1, -1.5, 0.5) + max_point = (0.5, 1, 1) + center = (4, 2, 6) + offset = to_align_offset( + min_point=min_point, + max_point=max_point, + center=center, + align=Align.CENTER, + ) + assert offset == -Vector(center) From 2ceef0307ac69247ac9b158e2d5153041fcbbf04 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Sat, 16 Nov 2024 19:45:12 -0600 Subject: [PATCH 009/518] fix: return -Vector if a single alignment --- src/build123d/geometry.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index da7b10f..94ad4b0 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -2541,11 +2541,11 @@ def to_align_offset( if align is None or align is Align.NONE: return Vector(0, 0, 0) if align is Align.MIN: - return Vector(min_point) + return -Vector(min_point) if align is Align.MAX: - return Vector(max_point) + return -Vector(max_point) if align is Align.CENTER: - return Vector(center) + return -Vector(center) for alignment, min_coord, max_coord, center_coord in zip( map(Align, align), From 1c4b8ff0458269cc59b98e770965f3ab4c6c7721 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Sun, 17 Nov 2024 08:20:03 -0600 Subject: [PATCH 010/518] test: check for invalid slots --- tests/test_build_sketch.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index fc890bd..b561409 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -29,6 +29,8 @@ license: import unittest from math import atan2, degrees, pi, sqrt +import pytest + from build123d import * @@ -509,5 +511,18 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertTupleAlmostEquals(tuple(c1), tuple(c2), 2) +@pytest.mark.parametrize( + "slot,args", + [ + (SlotOverall, (5, 10)), + (SlotCenterToCenter, (-1, 10)), + (SlotCenterPoint, ((0, 0, 0), (2, 0, 0), 10)), + ], +) +def test_invalid_slots(slot, args): + with pytest.raises(ValueError): + slot(*args) + + if __name__ == "__main__": unittest.main(failfast=True) From a5aa8cbc9934c53bc47bc220ee15de7cb1cfb681 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Sun, 17 Nov 2024 08:34:39 -0600 Subject: [PATCH 011/518] fix: SlotOverall errors if width <= height --- src/build123d/objects_sketch.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 984c9b5..79ef520 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -499,6 +499,11 @@ class SlotOverall(BaseSketchObject): align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): + if width <= height: + raise ValueError( + f"Slot requires that width > height. Got: {width=}, {height=}" + ) + context = BuildSketch._get_context(self) validate_inputs(context, self) From fa5e8deb3e80a13094b9f6b29c6be67a1903df95 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Sun, 17 Nov 2024 08:35:27 -0600 Subject: [PATCH 012/518] fix: SlotCenterToCenter errors if center_separation <= 0 --- src/build123d/objects_sketch.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 79ef520..abb8b5d 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -458,6 +458,11 @@ class SlotCenterToCenter(BaseSketchObject): rotation: float = 0, mode: Mode = Mode.ADD, ): + if center_separation <= 0: + raise ValueError( + f"Requires center_separation > 0. Got: {center_separation=}" + ) + context = BuildSketch._get_context(self) validate_inputs(context, self) From 55345a4bc5e0fda3275931bcce9a03bf7e94120d Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Sun, 17 Nov 2024 08:37:28 -0600 Subject: [PATCH 013/518] fix: SlotCenterPoint errors on width <= height --- src/build123d/objects_sketch.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index abb8b5d..ca85a60 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -425,6 +425,13 @@ class SlotCenterPoint(BaseSketchObject): self.slot_height = height half_line = point_v - center_v + + if half_line.length * 2 <= height: + raise ValueError( + f"Slots must have width > height. " + "Got: {height=} width={half_line.length * 2} (computed)" + ) + face = Face( Wire.combine( [ From c31e92a165258b7b4ce99aefa6be8758aac540b2 Mon Sep 17 00:00:00 2001 From: Ethan Rooke Date: Sun, 17 Nov 2024 09:02:07 -0600 Subject: [PATCH 014/518] test: fix test_random_slots --- tests/test_pack.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/test_pack.py b/tests/test_pack.py index 736db50..56f64f7 100644 --- a/tests/test_pack.py +++ b/tests/test_pack.py @@ -8,10 +8,8 @@ date: November 9th 2023 desc: Unit tests for the build123d pack module """ -import operator import random import unittest -from functools import reduce from build123d import * @@ -53,15 +51,14 @@ class TestPack(unittest.TestCase): random.seed(123456) # 50 is an arbitrary number that is large enough to exercise # different aspects of the packer while still completing quickly. - inputs = [ - SlotOverall(random.randint(1, 20), random.randint(1, 20)) for _ in range(50) - ] + widths = [random.randint(2, 20) for _ in range(50)] + heights = [random.randint(1, width - 1) for width in widths] + inputs = [SlotOverall(width, height) for width, height in zip(widths, heights)] # Not raising in this call shows successfull non-overlap. packed = pack(inputs, 1) - self.assertEqual( - "bbox: 0.0 <= x <= 124.0, 0.0 <= y <= 105.0, 0.0 <= z <= 0.0", - str((Sketch() + packed).bounding_box()), - ) + bb = (Sketch() + packed).bounding_box() + self.assertEqual(bb.min, Vector(0, 0, 0)) + self.assertEqual(bb.max, Vector(70, 63, 0)) if __name__ == "__main__": From 3b0fcb017a8f629af5636780b18bf1becb5fb4d4 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 18 Nov 2024 14:18:37 -0500 Subject: [PATCH 015/518] Replaced unwrap with unwrap_topods_compound in topology.py Issue #788 --- src/build123d/topology.py | 73 +++++++++++++++++++++++++-------------- tests/test_direct_api.py | 25 +++++++++++++- 2 files changed, 72 insertions(+), 26 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 40f6882..8653c43 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -1732,13 +1732,6 @@ class Shape(NodeMixin): else: sum_shape = self.fuse(*summands) - # Simplify Compounds if possible - sum_shape = ( - sum_shape.unwrap(fully=True) - if isinstance(sum_shape, Compound) - else sum_shape - ) - if SkipClean.clean: sum_shape = sum_shape.clean() @@ -1782,12 +1775,6 @@ class Shape(NodeMixin): # Do the actual cut operation difference = self.cut(*subtrahends) - # Simplify Compounds if possible - difference = ( - difference.unwrap(fully=True) - if isinstance(difference, Compound) - else difference - ) # To allow the @, % and ^ operators to work 1D objects must be type Curve if minuend_dim == 1: difference = Curve(Compound(difference.edges()).wrapped) @@ -1805,13 +1792,6 @@ class Shape(NodeMixin): if new_shape.wrapped is not None and SkipClean.clean: new_shape = new_shape.clean() - # Simplify Compounds if possible - new_shape = ( - new_shape.unwrap(fully=True) - if isinstance(new_shape, Compound) - else new_shape - ) - # To allow the @, % and ^ operators to work 1D objects must be type Curve if self._dim == 1: new_shape = Curve(Compound(new_shape.edges()).wrapped) @@ -2621,7 +2601,11 @@ class Shape(NodeMixin): operation.SetRunParallel(True) operation.Build() - result = Shape.cast(operation.Shape()) + result = downcast(operation.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(result, TopoDS_Compound): + result = unwrap_topods_compound(result, True) + result = Shape.cast(result) base = args[0] if isinstance(args, tuple) else args base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) @@ -2829,7 +2813,12 @@ class Shape(NodeMixin): # Perform the splitting operation splitter.Build() - result = Compound(downcast(splitter.Shape())).unwrap(fully=False) + result = downcast(splitter.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(result, TopoDS_Compound): + result = unwrap_topods_compound(result, False) + result = Shape.cast(result) + if keep != Keep.BOTH: if not isinstance(tool, Plane): # Create solids from the surfaces for sorting @@ -2843,7 +2832,8 @@ class Shape(NodeMixin): (tops if is_up else bottoms).append(part) result = Compound(tops) if keep == Keep.TOP else Compound(bottoms) - return result.unwrap(fully=True) + result_wrapped = unwrap_topods_compound(result.wrapped, fully=True) + return Shape.cast(result_wrapped) @overload def split_by_perimeter( @@ -4415,7 +4405,9 @@ class Compound(Mixin3D, Shape): # Align the text from the bounding box align = tuplify(align, 2) - text_flat = text_flat.translate(text_flat.bounding_box().to_align_offset(align)) + text_flat = text_flat.translate( + Vector(*text_flat.bounding_box().to_align_offset(align)) + ) if text_path is not None: path_length = text_path.length @@ -8464,7 +8456,10 @@ class Wire(Mixin1D, Shape): wire_builder.Build() if not wire_builder.IsDone(): if wire_builder.Error() == BRepBuilderAPI_NonManifoldWire: - warnings.warn("Wire is non manifold", stacklevel=2) + warnings.warn( + "Wire is non manifold (e.g. branching, self intersecting)", + stacklevel=2, + ) elif wire_builder.Error() == BRepBuilderAPI_EmptyWire: raise RuntimeError("Wire is empty") elif wire_builder.Error() == BRepBuilderAPI_DisconnectedWire: @@ -9232,6 +9227,34 @@ def topo_explore_common_vertex( return None # No common vertex found +def unwrap_topods_compound( + compound: TopoDS_Compound, fully: bool = True +) -> Union[TopoDS_Compound, TopoDS_Shape]: + """Strip unnecessary Compound wrappers + + Args: + compound (TopoDS_Compound): The TopoDS_Compound to unwrap. + fully (bool, optional): return base shape without any TopoDS_Compound + wrappers (otherwise one TopoDS_Compound is left). Defaults to True. + + Returns: + Union[TopoDS_Compound, TopoDS_Shape]: base shape + """ + + if compound.NbChildren() == 1: + iterator = TopoDS_Iterator(compound) + single_element = downcast(iterator.Value()) + + # If the single element is another TopoDS_Compound, unwrap it recursively + if isinstance(single_element, TopoDS_Compound): + return unwrap_topods_compound(single_element, fully) + + return single_element if fully else compound + + # If there are no elements or more than one element, return TopoDS_Compound + return compound + + class SkipClean: """Skip clean context for use in operator driven code where clean=False wouldn't work""" diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 8f5e62d..307dad0 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -90,6 +90,7 @@ from build123d.topology import ( polar, new_edges, delta, + unwrap_topods_compound, ) from build123d.jupyter_tools import display @@ -1577,6 +1578,28 @@ class TestFunctions(unittest.TestCase): with self.assertRaises(TypeError): Vector(1, 1, 1) & ("x", "y", "z") + def test_unwrap_topods_compound(self): + # Complex Compound + b1 = Box(1, 1, 1).solid() + b2 = Box(2, 2, 2).solid() + c1 = Compound([b1, b2]) + c2 = Compound([b1, c1]) + c3 = Compound([c2]) + c4 = Compound([c3]) + self.assertEqual(c4.wrapped.NbChildren(), 1) + c5 = Compound(unwrap_topods_compound(c4.wrapped, False)) + self.assertEqual(c5.wrapped.NbChildren(), 2) + + # unwrap fully + c0 = Compound([b1]) + c1 = Compound([c0]) + result = Shape.cast(unwrap_topods_compound(c1.wrapped, True)) + self.assertTrue(isinstance(result, Solid)) + + # unwrap not fully + result = Shape.cast(unwrap_topods_compound(c1.wrapped, False)) + self.assertTrue(isinstance(result, Compound)) + class TestImportExport(DirectApiTestCase): def test_import_export(self): @@ -2579,7 +2602,7 @@ class TestPlane(DirectApiTestCase): ( Axis.X.direction, # plane x_dir Axis.Z.direction, # plane y_dir - -Axis.Y.direction, # plane z_dir + -Axis.Y.direction, # plane z_dir ), # Trapezoid face, positive y coordinate ( From e82b20a575acf3de228b48024cc65aaaad0d285a Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 19 Nov 2024 13:46:54 -0500 Subject: [PATCH 016/518] Curve object become Wire/Edge, replace Compound.first_level_shapes with Shape.get_top_level_shapes Issue #788 --- src/build123d/topology.py | 257 ++++++++++++++++++++++---------------- tests/test_algebra.py | 64 +++++++++- tests/test_direct_api.py | 14 ++- 3 files changed, 218 insertions(+), 117 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 8653c43..ea8cfad 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -382,6 +382,46 @@ def tuplify(obj: Any, dim: int) -> tuple: class Mixin1D: """Methods to add to the Edge and Wire classes""" + def __add__(self, other: Union[list[Shape], Shape]) -> Self: + """fuse shape to wire/edge operator +""" + + # Convert `other` to list of base objects and filter out None values + summands = [ + shape + for o in (other if isinstance(other, (list, tuple)) else [other]) + if o is not None + for shape in o.get_top_level_shapes() + ] + # If there is nothing to add return the original object + if not summands: + return self + + if not all(summand._dim == 1 for summand in summands): + raise ValueError("Only shapes with the same dimension can be added") + + summand_edges = [e for summand in summands for e in summand.edges()] + if self.wrapped is None: # an empty object + if len(summands) == 1: + sum_shape = summands[0] + else: + try: + sum_shape = Wire(summand_edges) + except Exception: + sum_shape = summands[0].fuse(*summands[1:]) + else: + try: + sum_shape = Wire(self.edges() + summand_edges) + except Exception: + sum_shape = self.fuse(*summands) + + if SkipClean.clean: + sum_shape = sum_shape.clean() + + # If there is only one Edge, return that + sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape + + return sum_shape + def start_point(self) -> Vector: """The start point of this edge @@ -1710,7 +1750,7 @@ class Shape(NodeMixin): shape for o in (other if isinstance(other, (list, tuple)) else [other]) if o is not None - for shape in (o.first_level_shapes() if isinstance(o, Compound) else [o]) + for shape in o.get_top_level_shapes() ] # If there is nothing to add return the original object if not summands: @@ -1735,10 +1775,6 @@ class Shape(NodeMixin): if SkipClean.clean: sum_shape = sum_shape.clean() - # To allow the @, % and ^ operators to work 1D objects must be type Curve - if addend_dim == 1: - sum_shape = Curve(Compound(sum_shape.edges()).wrapped) - return sum_shape def __sub__(self, other: Union[Shape, Iterable[Shape]]) -> Self: @@ -1752,7 +1788,7 @@ class Shape(NodeMixin): shape for o in (other if isinstance(other, (list, tuple)) else [other]) if o is not None - for shape in (o.first_level_shapes() if isinstance(o, Compound) else [o]) + for shape in o.get_top_level_shapes() ] # If there is nothing to subtract return the original object if not subtrahends: @@ -1775,10 +1811,6 @@ class Shape(NodeMixin): # Do the actual cut operation difference = self.cut(*subtrahends) - # To allow the @, % and ^ operators to work 1D objects must be type Curve - if minuend_dim == 1: - difference = Curve(Compound(difference.edges()).wrapped) - return difference def __and__(self, other: Shape) -> Self: @@ -1792,10 +1824,6 @@ class Shape(NodeMixin): if new_shape.wrapped is not None and SkipClean.clean: new_shape = new_shape.clean() - # To allow the @, % and ^ operators to work 1D objects must be type Curve - if self._dim == 1: - new_shape = Curve(Compound(new_shape.edges()).wrapped) - return new_shape def __rmul__(self, other): @@ -1828,10 +1856,7 @@ class Shape(NodeMixin): upgrader.Build() self.wrapped = downcast(upgrader.Shape()) except Exception: - warnings.warn( - f"Unable to clean {self}", - stacklevel=2, - ) + warnings.warn(f"Unable to clean {self}", stacklevel=2) return self def fix(self) -> Self: @@ -2175,8 +2200,53 @@ class Shape(NodeMixin): return out + def get_top_level_shapes(self) -> ShapeList[Shape]: + """ + Retrieve the first level of child shapes from the shape. + + This method collects all the non-compound shapes directly contained in the + current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses + its immediate children and collects all shapes that are not further nested + compounds. Nested compounds are traversed to gather their non-compound elements + without returning the nested compound itself. + + Returns: + ShapeList[Shape]: A list of all first-level non-compound child shapes. + + Example: + If the current shape is a compound containing both simple shapes + (e.g., edges, vertices) and other compounds, the method returns a list + of only the simple shapes directly contained at the top level. + """ + if self.wrapped is None: + return ShapeList() + + first_level_shapes = [] + stack = [self] + + while stack: + current_shape = stack.pop() + if isinstance(current_shape.wrapped, TopoDS_Compound): + iterator = TopoDS_Iterator() + iterator.Initialize(current_shape.wrapped) + while iterator.More(): + child_shape = Shape.cast(iterator.Value()) + if isinstance(child_shape.wrapped, TopoDS_Compound): + # Traverse further into the compound + stack.append(child_shape) + else: + # Add non-compound shape + first_level_shapes.append(child_shape) + iterator.Next() + else: + first_level_shapes.append(current_shape) + + return ShapeList(first_level_shapes) + def vertices(self) -> ShapeList[Vertex]: """vertices - all the vertices in this Shape""" + if self.wrapped is None: + return ShapeList() vertex_list = ShapeList( [Vertex(downcast(i)) for i in self._entities(Vertex.__name__)] ) @@ -2190,13 +2260,14 @@ class Shape(NodeMixin): vertex_count = len(vertices) if vertex_count != 1: warnings.warn( - f"Found {vertex_count} vertices, returning first", - stacklevel=2, + f"Found {vertex_count} vertices, returning first", stacklevel=2 ) return vertices[0] def edges(self) -> ShapeList[Edge]: """edges - all the edges in this Shape""" + if self.wrapped is None: + return ShapeList() edge_list = ShapeList( [ Edge(i) @@ -2221,6 +2292,8 @@ class Shape(NodeMixin): def compounds(self) -> ShapeList[Compound]: """compounds - all the compounds in this Shape""" + if self.wrapped is None: + return ShapeList() if isinstance(self, Compound): # pylint: disable=not-an-iterable sub_compounds = [c for c in self if isinstance(c, Compound)] @@ -2242,6 +2315,8 @@ class Shape(NodeMixin): def wires(self) -> ShapeList[Wire]: """wires - all the wires in this Shape""" + if self.wrapped is None: + return ShapeList() return ShapeList([Wire(i) for i in self._entities(Wire.__name__)]) def wire(self) -> Wire: @@ -2257,6 +2332,8 @@ class Shape(NodeMixin): def faces(self) -> ShapeList[Face]: """faces - all the faces in this Shape""" + if self.wrapped is None: + return ShapeList() face_list = ShapeList([Face(i) for i in self._entities(Face.__name__)]) for face in face_list: face.topo_parent = self @@ -2273,6 +2350,8 @@ class Shape(NodeMixin): def shells(self) -> ShapeList[Shell]: """shells - all the shells in this Shape""" + if self.wrapped is None: + return ShapeList() return ShapeList([Shell(i) for i in self._entities(Shell.__name__)]) def shell(self) -> Shell: @@ -2288,6 +2367,8 @@ class Shape(NodeMixin): def solids(self) -> ShapeList[Solid]: """solids - all the solids in this Shape""" + if self.wrapped is None: + return ShapeList() return ShapeList([Solid(i) for i in self._entities(Solid.__name__)]) def solid(self) -> Solid: @@ -2607,7 +2688,7 @@ class Shape(NodeMixin): result = unwrap_topods_compound(result, True) result = Shape.cast(result) - base = args[0] if isinstance(args, tuple) else args + base = args[0] if isinstance(args, (list, tuple)) else args base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) return result @@ -4015,7 +4096,7 @@ class Compound(Mixin3D, Shape): @property def _dim(self) -> Union[int, None]: """The dimension of the shapes within the Compound - None if inconsistent""" - sub_dims = {s._dim for s in self.first_level_shapes()} + sub_dims = {s._dim for s in self.get_top_level_shapes()} return sub_dims.pop() if len(sub_dims) == 1 else None @overload @@ -4252,6 +4333,47 @@ class Compound(Mixin3D, Shape): # else: # logger.debug("Adding no children to %s", self.label) + def __add__(self, other: Union[list[Shape], Shape]) -> Shape: + """Combine other to self `+` operator + + Note that if all of the objects are connected Edges/Wires the result + will be a Wire, otherwise a Shape. + """ + if self._dim == 1: + curve = Curve() if self.wrapped is None else Curve(self.wrapped) + self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) + return curve + other + else: + summands = [ + shape + for o in (other if isinstance(other, (list, tuple)) else [other]) + if o is not None + for shape in o.get_top_level_shapes() + ] + # If there is nothing to add return the original object + if not summands: + return self + + summands = [ + s for s in self.get_top_level_shapes() + summands if s is not None + ] + + # Only fuse the parts if necessary + if len(summands) <= 1: + result: Shape = summands[0] + else: + fuse_op = BRepAlgoAPI_Fuse() + fuse_op.SetFuzzyValue(TOLERANCE) + self.copy_attributes_to( + summands[0], ["wrapped", "_NodeMixin__children"] + ) + result = self._bool_op(summands[:1], summands[1:], fuse_op) + + if SkipClean.clean: + result = result.clean() + + return result + def do_children_intersect( self, include_parent: bool = False, tolerance: float = 1e-5 ) -> tuple[bool, tuple[Shape, Shape], float]: @@ -4490,64 +4612,6 @@ class Compound(Mixin3D, Shape): return TopoDS_Iterator(self.wrapped).More() - def cut(self, *to_cut: Shape) -> Compound: - """Remove a shape from another one - - Args: - *to_cut: Shape: - - Returns: - - """ - - cut_op = BRepAlgoAPI_Cut() - - return tcast(Compound, self._bool_op(self, to_cut, cut_op)) - - def fuse(self, *to_fuse: Shape, glue: bool = False, tol: float = None) -> Compound: - """Fuse shapes together - - Args: - *to_fuse: Shape: - glue: bool: (Default value = False) - tol: float: (Default value = None) - - Returns: - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - args = tuple(self) + to_fuse - - if len(args) <= 1: - return_value: Shape = args[0] - else: - return_value = self._bool_op(args[:1], args[1:], fuse_op) - - # fuse_op.RefineEdges() - # fuse_op.FuseEdges() - - return tcast(Compound, return_value) - - def intersect(self, *to_intersect: Shape) -> Compound: - """Construct shape intersection - - Args: - *to_intersect: Shape: - - Returns: - - """ - - intersect_op = BRepAlgoAPI_Common() - - return tcast(Compound, self._bool_op(self, to_intersect, intersect_op)) - def get_type( self, obj_type: Union[ @@ -4587,36 +4651,6 @@ class Compound(Mixin3D, Shape): return results - def first_level_shapes( - self, _shapes: list[TopoDS_Shape] = None - ) -> ShapeList[Shape]: - """first_level_shapes - - This method iterates through the immediate children of the compound and - collects all non-compound shapes (e.g., vertices, edges, faces, solids). - If a child shape is itself a compound, the method recursively explores it, - retrieving all first-level shapes within any nested compounds. - - Note: the _shapes parameter is not to be assigned by the user. - - Returns: - ShapeList[Shape]: Shapes contained within the Compound - """ - if self.wrapped is None: - return ShapeList() - if _shapes is None: - _shapes = [] - iterator = TopoDS_Iterator() - iterator.Initialize(self.wrapped) - while iterator.More(): - child = Shape.cast(iterator.Value()) - if isinstance(child, Compound): - child.first_level_shapes(_shapes) - else: - _shapes.append(child) - iterator.Next() - return ShapeList(_shapes) - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: """Strip unnecessary Compound wrappers @@ -4675,6 +4709,8 @@ class Curve(Compound): def _dim(self) -> int: return 1 + __add__ = Mixin1D.__add__ + def __matmul__(self, position: float) -> Vector: """Position on curve operator @ - only works if continuous""" return Wire(self.edges()).position_at(position) @@ -9240,7 +9276,6 @@ def unwrap_topods_compound( Returns: Union[TopoDS_Compound, TopoDS_Shape]: base shape """ - if compound.NbChildren() == 1: iterator = TopoDS_Iterator(compound) single_element = downcast(iterator.Value()) diff --git a/tests/test_algebra.py b/tests/test_algebra.py index e99b496..6b4bbbc 100644 --- a/tests/test_algebra.py +++ b/tests/test_algebra.py @@ -339,6 +339,31 @@ class ObjectTests(unittest.TestCase): class AlgebraTests(unittest.TestCase): + + # Shapes + + def test_shape_plus(self): + f1 = Face.make_rect(1, 3) + f2 = Face.make_rect(3, 1) + f3 = f1 + f2 + self.assertTupleAlmostEquals(f3.bounding_box().size, (3, 3, 0), 6) + + f4 = f1 + [] + self.assertTupleAlmostEquals(f4.bounding_box().size, (1, 3, 0), 6) + + e1 = Edge.make_line((0, 0), (1, 1)) + with self.assertRaises(ValueError): + _ = f1 + e1 + + with self.assertRaises(ValueError): + _ = Shape() + f2 + + f5 = Face() + f1 + self.assertTupleAlmostEquals(f5.bounding_box().size, (1, 3, 0), 6) + + f6 = Face() + [f1, f2] + self.assertTupleAlmostEquals(f6.bounding_box().size, (3, 3, 0), 6) + # Part def test_part_plus(self): @@ -507,16 +532,47 @@ class AlgebraTests(unittest.TestCase): self.assertTupleAlmostEquals(result.bounding_box().max, (0.4, 0.4, 0.0), 3) # Curve - def test_curve_plus(self): + def test_curve_plus_continuous(self): l1 = Polyline((0, 0), (1, 0), (1, 1)) l2 = Line((1, 1), (0, 0)) l = l1 + l2 - w = Wire(l) - self.assertTrue(w.is_closed) + self.assertTrue(isinstance(l, Wire)) + self.assertTrue(l.is_closed) self.assertTupleAlmostEquals( - w.center(CenterOf.MASS), (0.6464466094067263, 0.35355339059327373, 0.0), 6 + l.center(CenterOf.MASS), (0.6464466094067263, 0.35355339059327373, 0.0), 6 ) + def test_curve_plus_noncontinuous(self): + e1 = Edge.make_line((0, 1), (1, 1)) + e2 = Edge.make_line((1, 1), (2, 1)) + e3 = Edge.make_line((2, 1), (3, 1)) + l = Curve() + [e1, e3] + self.assertTrue(isinstance(l, Compound)) + l += e2 # fills the hole and makes a single edge + self.assertTrue(isinstance(l, Edge)) + self.assertAlmostEqual(l.length, 3, 5) + + l2 = e1 + e3 + self.assertTrue(isinstance(l2, Compound)) + + def test_curve_plus_nothing(self): + e1 = Edge.make_line((0, 1), (1, 1)) + l = e1 + Curve() + self.assertTrue(isinstance(l, Edge)) + self.assertAlmostEqual(l.length, 1, 5) + + def test_nothing_plus_curve(self): + e1 = Edge.make_line((0, 1), (1, 1)) + l = Curve() + e1 + self.assertTrue(isinstance(l, Edge)) + self.assertAlmostEqual(l.length, 1, 5) + + def test_bad_dims(self): + e1 = Edge.make_line((0, 1), (1, 1)) + f1 = Face.make_rect(1, 1) + with self.assertRaises(ValueError): + _ = e1 + f1 + def test_curve_minus(self): l1 = Line((0, 0), (1, 1)) l2 = Line((0.25, 0.25), (0.75, 0.75)) diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 307dad0..9eba3db 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -878,13 +878,16 @@ class TestCompound(DirectApiTestCase): comp4 = comp3.unwrap(fully=True) self.assertTrue(isinstance(comp4, Face)) - def test_first_level_shapes(self): + def test_get_top_level_shapes(self): base_shapes = Compound(children=PolarLocations(15, 20) * Box(4, 4, 4)) - fls = base_shapes.first_level_shapes() + fls = base_shapes.get_top_level_shapes() self.assertTrue(isinstance(fls, ShapeList)) self.assertEqual(len(fls), 20) self.assertTrue(all(isinstance(s, Solid) for s in fls)) + b1 = Box(1, 1, 1).solid() + self.assertEqual(b1.get_top_level_shapes()[0], b1) + class TestEdge(DirectApiTestCase): def test_close(self): @@ -3615,10 +3618,12 @@ class TestShapeList(DirectApiTestCase): sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) with self.assertWarns(UserWarning): sl.vertex() + self.assertEqual(len(Edge().vertices()), 0) def test_edges(self): sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) self.assertEqual(len(sl.edges()), 8) + self.assertEqual(len(Edge().edges()), 0) def test_edge(self): sl = ShapeList([Edge.make_circle(1)]) @@ -3630,6 +3635,7 @@ class TestShapeList(DirectApiTestCase): def test_wires(self): sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) self.assertEqual(len(sl.wires()), 2) + self.assertEqual(len(Wire().wires()), 0) def test_wire(self): sl = ShapeList([Wire.make_circle(1)]) @@ -3641,6 +3647,7 @@ class TestShapeList(DirectApiTestCase): def test_faces(self): sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) self.assertEqual(len(sl.faces()), 9) + self.assertEqual(len(Face().faces()), 0) def test_face(self): sl = ShapeList( @@ -3654,6 +3661,7 @@ class TestShapeList(DirectApiTestCase): def test_shells(self): sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) self.assertEqual(len(sl.shells()), 2) + self.assertEqual(len(Shell().shells()), 0) def test_shell(self): sl = ShapeList([Vertex(1, 1, 1), Solid.make_box(1, 1, 1)]) @@ -3665,6 +3673,7 @@ class TestShapeList(DirectApiTestCase): def test_solids(self): sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) self.assertEqual(len(sl.solids()), 2) + self.assertEqual(len(Solid().solids()), 0) def test_solid(self): sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) @@ -3676,6 +3685,7 @@ class TestShapeList(DirectApiTestCase): def test_compounds(self): sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) self.assertEqual(len(sl.compounds()), 2) + self.assertEqual(len(Compound().compounds()), 0) def test_compound(self): sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) From 73f5f6cd2861eb9db7dd7a967b701694b2e0440e Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 19 Nov 2024 14:43:24 -0600 Subject: [PATCH 017/518] test.yml -> test on py310 and py311 and not py39 --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b0827ce..cd53c9a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,9 +8,8 @@ jobs: fail-fast: false matrix: python-version: [ - "3.9", "3.10", - #"3.11" + "3.11" ] os: [macos-13, ubuntu-latest, windows-latest] @@ -29,7 +28,6 @@ jobs: fail-fast: false matrix: python-version: [ - #"3.9", "3.10", #"3.11" ] From a61912fbe3585e60bcea9991f02d3078282a1f5d Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 19 Nov 2024 14:44:56 -0600 Subject: [PATCH 018/518] publish.yml -> print python3 version during wheel build --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a5387e5..8f173b0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,6 +20,7 @@ jobs: run: | pwd ls -lR + python3 -V python3 -m pip install --upgrade pip python3 -m pip -V python3 -m pip install build From 1022b88ca9daeea35d435051cab2d56207291671 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 19 Nov 2024 14:46:05 -0600 Subject: [PATCH 019/518] mypy.yml -> use py310 and py311 mypy is not in active use, but still keeping this up to date --- .github/workflows/mypy.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index f056e70..43b2c0d 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -7,9 +7,8 @@ jobs: fail-fast: false matrix: python-version: [ - "3.9", "3.10", - #"3.11" + "3.11" ] runs-on: ubuntu-latest @@ -21,4 +20,4 @@ jobs: - name: typecheck run: | - mypy --config-file mypy.ini src/build123d \ No newline at end of file + mypy --config-file mypy.ini src/build123d From 4adb26ebf0aa403eff176df6fbc30c07221d2472 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 19 Nov 2024 14:48:19 -0600 Subject: [PATCH 020/518] pyproject.toml -> no py39 support --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 037194e..6ef699d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ authors = [ ] description = "A python CAD programming library" readme = "README.md" -requires-python = ">= 3.9, < 3.13" +requires-python = ">= 3.10, < 3.13" keywords = [ "3d models", "3d printing", @@ -61,5 +61,5 @@ exclude = ["build123d._dev"] write_to = "src/build123d/_version.py" [tool.black] -target-version = ["py39", "py310", "py311", "py312"] +target-version = ["py310", "py311", "py312"] line-length = 88 From e772388dda3aaabc0b1a53e9721f1d4a1096692c Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 19 Nov 2024 15:01:26 -0600 Subject: [PATCH 021/518] .readthedocs.yaml -> py39 to py310 --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 33266c4..3c263a9 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -7,7 +7,7 @@ formats: build: os: "ubuntu-22.04" tools: - python: "3.9" + python: "3.10" apt_packages: - graphviz From 52e43d51e52d5fb113414f30bad3f10e98e082be Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 19 Nov 2024 19:39:57 -0500 Subject: [PATCH 022/518] Refactored shape extractors to avoid class references Issue #788 --- src/build123d/topology.py | 178 +++++++++++++++----------------------- 1 file changed, 68 insertions(+), 110 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index ea8cfad..be15a1b 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -2243,60 +2243,87 @@ class Shape(NodeMixin): return ShapeList(first_level_shapes) + @staticmethod + def _get_shape_list(shape: Shape, entity_type: str) -> ShapeList: + """Helper to extract entities of a specific type from a shape.""" + if shape.wrapped is None: + return ShapeList() + shape_list = ShapeList([Shape.cast(i) for i in shape._entities(entity_type)]) + for item in shape_list: + item.topo_parent = shape + return shape_list + + @staticmethod + def _get_single_shape(shape: Shape, entity_type: str) -> Shape: + """Helper to extract a single entity of a specific type from a shape, + with a warning if count != 1.""" + shape_list = Shape._get_shape_list(shape, entity_type) + entity_count = len(shape_list) + if entity_count != 1: + warnings.warn( + f"Found {entity_count} {entity_type.lower()}s, returning first", + stacklevel=2, + ) + return shape_list[0] if shape_list else None + def vertices(self) -> ShapeList[Vertex]: """vertices - all the vertices in this Shape""" - if self.wrapped is None: - return ShapeList() - vertex_list = ShapeList( - [Vertex(downcast(i)) for i in self._entities(Vertex.__name__)] - ) - for vertex in vertex_list: - vertex.topo_parent = self - return vertex_list + return Shape._get_shape_list(self, "Vertex") def vertex(self) -> Vertex: """Return the Vertex""" - vertices = self.vertices() - vertex_count = len(vertices) - if vertex_count != 1: - warnings.warn( - f"Found {vertex_count} vertices, returning first", stacklevel=2 - ) - return vertices[0] + return Shape._get_single_shape(self, "Vertex") def edges(self) -> ShapeList[Edge]: """edges - all the edges in this Shape""" - if self.wrapped is None: - return ShapeList() - edge_list = ShapeList( - [ - Edge(i) - for i in self._entities(Edge.__name__) - if not BRep_Tool.Degenerated_s(TopoDS.Edge_s(i)) - ] + edge_list = Shape._get_shape_list(self, "Edge") + return edge_list.filter_by( + lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True ) - for edge in edge_list: - edge.topo_parent = self - return edge_list def edge(self) -> Edge: """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn( - f"Found {edge_count} edges, returning first", - stacklevel=2, - ) - return edges[0] + return Shape._get_single_shape(self, "Edge") + + def wires(self) -> ShapeList[Wire]: + """wires - all the wires in this Shape""" + return Shape._get_shape_list(self, "Wire") + + def wire(self) -> Wire: + """Return the Wire""" + return Shape._get_single_shape(self, "Wire") + + def faces(self) -> ShapeList[Face]: + """faces - all the faces in this Shape""" + return Shape._get_shape_list(self, "Face") + + def face(self) -> Face: + """Return the Face""" + return Shape._get_single_shape(self, "Face") + + def shells(self) -> ShapeList[Shell]: + """shells - all the shells in this Shape""" + return Shape._get_shape_list(self, "Shell") + + def shell(self) -> Shell: + """Return the Shell""" + return Shape._get_single_shape(self, "Shell") + + def solids(self) -> ShapeList[Solid]: + """solids - all the solids in this Shape""" + return Shape._get_shape_list(self, "Solid") + + def solid(self) -> Solid: + """Return the Solid""" + return Shape._get_single_shape(self, "Solid") def compounds(self) -> ShapeList[Compound]: """compounds - all the compounds in this Shape""" if self.wrapped is None: return ShapeList() - if isinstance(self, Compound): + if isinstance(self.wrapped, TopoDS_Compound): # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c, Compound)] + sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] sub_compounds.append(self) else: sub_compounds = [] @@ -2304,83 +2331,14 @@ class Shape(NodeMixin): def compound(self) -> Compound: """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: + shape_list = self.compounds() + entity_count = len(shape_list) + if entity_count != 1: warnings.warn( - f"Found {compound_count} compounds, returning first", + f"Found {entity_count} compounds, returning first", stacklevel=2, ) - return compounds[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - if self.wrapped is None: - return ShapeList() - return ShapeList([Wire(i) for i in self._entities(Wire.__name__)]) - - def wire(self) -> Wire: - """Return the Wire""" - wires = self.wires() - wire_count = len(wires) - if wire_count != 1: - warnings.warn( - f"Found {wire_count} wires, returning first", - stacklevel=2, - ) - return wires[0] - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - if self.wrapped is None: - return ShapeList() - face_list = ShapeList([Face(i) for i in self._entities(Face.__name__)]) - for face in face_list: - face.topo_parent = self - return face_list - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - if self.wrapped is None: - return ShapeList() - return ShapeList([Shell(i) for i in self._entities(Shell.__name__)]) - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn( - f"Found {shell_count} shells, returning first", - stacklevel=2, - ) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - if self.wrapped is None: - return ShapeList() - return ShapeList([Solid(i) for i in self._entities(Solid.__name__)]) - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn( - f"Found {solid_count} solids, returning first", - stacklevel=2, - ) - return solids[0] + return shape_list[0] if shape_list else None @property def area(self) -> float: From 01691bcb4e4d92a7a33fec3acd091386ea7bf9e3 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 20 Nov 2024 08:09:31 -0600 Subject: [PATCH 023/518] mypy.yml -> use py310 and py312 and not py311 --- .github/workflows/mypy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 43b2c0d..ebf3b61 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -8,7 +8,8 @@ jobs: matrix: python-version: [ "3.10", - "3.11" + # "3.11", + "3.12" ] runs-on: ubuntu-latest From ae5448e10970d36176595b29142e9b06bf647139 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 20 Nov 2024 08:10:24 -0600 Subject: [PATCH 024/518] test.yml -> use py310 and py312 and not py311 --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cd53c9a..5ca3ca1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,8 @@ jobs: matrix: python-version: [ "3.10", - "3.11" + # "3.11", + "3.12", ] os: [macos-13, ubuntu-latest, windows-latest] @@ -29,7 +30,8 @@ jobs: matrix: python-version: [ "3.10", - #"3.11" + #"3.11", + #"3.12" ] os: [macos-14] From 875f33507fcc3e3ab35908aac8718eb847be0e89 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 22 Nov 2024 15:05:04 -0600 Subject: [PATCH 025/518] test.yml -> use cadquery-ocp from pypi on macos-arm64 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ca3ca1..c350447 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,15 +30,15 @@ jobs: matrix: python-version: [ "3.10", - #"3.11", - #"3.12" + "3.11", + "3.12" ] os: [macos-14] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-macos-arm64/ + - uses: ./.github/actions/setup/ with: python-version: ${{ matrix.python-version }} - name: test From e9bef21e305a7dda95d64932524b9e8dcea037e5 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 22 Nov 2024 15:10:01 -0600 Subject: [PATCH 026/518] test.yml -> combine x86_64 and macos-arm64 into a single job --- .github/workflows/test.yml | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c350447..f4efd4e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: tests on: [push, pull_request, workflow_dispatch] jobs: - tests_x86_64: + tests: strategy: fail-fast: false matrix: @@ -12,28 +12,7 @@ jobs: # "3.11", "3.12", ] - os: [macos-13, ubuntu-latest, windows-latest] - - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: ./.github/actions/setup/ - with: - python-version: ${{ matrix.python-version }} - - name: test - run: | - python -m pytest - - tests_arm64: - strategy: - fail-fast: false - matrix: - python-version: [ - "3.10", - "3.11", - "3.12" - ] - os: [macos-14] + os: [macos-13, macos-14, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: From 1755d29b663a86b3b2de893204f006e42a2cf411 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 22 Nov 2024 15:11:44 -0600 Subject: [PATCH 027/518] Delete .github/actions/setup-macos-arm64 directory and action.yml --- .github/actions/setup-macos-arm64/action.yml | 22 -------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/actions/setup-macos-arm64/action.yml diff --git a/.github/actions/setup-macos-arm64/action.yml b/.github/actions/setup-macos-arm64/action.yml deleted file mode 100644 index 48c0c8a..0000000 --- a/.github/actions/setup-macos-arm64/action.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: 'Setup' -inputs: - python-version: # id of input - description: 'Python version' - required: true - -runs: - using: "composite" - steps: - - name: python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - name: install requirements - shell: bash - run: | - pip install wheel - pip install mypy - pip install pytest - pip install pylint - pip install https://github.com/jdegenstein/ocp-build-system/releases/download/7.7.2_macos_arm64_cp310/cadquery_ocp-7.7.2-cp310-cp310-macosx_11_0_arm64.whl - pip install . From eab54d054f1da58023ffa3af42074b01782f7bc7 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 22 Nov 2024 15:33:57 -0600 Subject: [PATCH 028/518] README.md -> don't mention Apple Silicon --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b8e7be..1bf4995 100644 --- a/README.md +++ b/README.md @@ -43,4 +43,4 @@ cd build123d python3 -m pip install -e . ``` -Further installation instructions are available (e.g. Poetry, Apple Silicon) see the [installation section on readthedocs](https://build123d.readthedocs.io/en/latest/installation.html). +Further installation instructions are available (e.g. Poetry) see the [installation section on readthedocs](https://build123d.readthedocs.io/en/latest/installation.html). From dba9831ae39c72dffe465bdfb68f101f2dde336d Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 22 Nov 2024 15:37:13 -0600 Subject: [PATCH 029/518] installation.rst -> remove entire obsolete Apple Silicon workaround section --- docs/installation.rst | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 3a54c1d..c794857 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -2,7 +2,7 @@ Installation ############ -The recommended method for most users is to install **build123d** is: +The recommended method for most users to install **build123d** is: .. doctest:: @@ -110,35 +110,6 @@ Which should return something similar to: ├── Face at 0x165e88218f0, Center(0.5, 1.0, 0.0) └── Face at 0x165eb21ee70, Center(0.5, 1.0, 3.0) -Special notes on Apple Silicon installs ----------------------------------------------- - -Due to some dependencies not being available via pip, there is a bit of a hacky work around for Apple Silicon installs (M1 or M2 ARM64 architecture machines - if you aren't sure, try `uname -p` in a terminal and see if it returns arm). Specifically the cadquery-ocp dependency fails to resolve at install time. The error looks something like this: - -.. doctest:: - - └[~]> python3 -m pip install build123d - Collecting build123d - ... - INFO: pip is looking at multiple versions of build123d to determine which version is compatible with other requirements. This could take a while. - ERROR: Could not find a version that satisfies the requirement cadquery-ocp~=7.7.1 (from build123d) (from versions: none) - ERROR: No matching distribution found for cadquery-ocp~=7.7.1 - -A procedure for avoiding this issue is to install in a conda environment, which does have the missing dependency (substituting for the environment name you want to use for this install): - -.. doctest:: - - conda create -n python=3.10 - conda activate - conda install -c cadquery -c conda-forge cadquery=master - pip install svgwrite svgpathtools anytree scipy ipython trianglesolver \ - ocp_tessellate webcolors==1.12 "numpy>=2,<3" cachetools==5.2.0 \ - ocp_vscode requests orjson urllib3 certifi py-lib3mf \ - "svgpathtools>=1.5.1,<2" "svgelements>=1.9.1,<2" "ezdxf>=1.1.0,<2" - pip install --no-deps build123d ocpsvg - -`You can track the issue here `_ - Adding a nicer GUI ---------------------------------------------- From 12f5ec091061acb2aac2a1842a2e1d8fa4f5b814 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 5 Dec 2024 08:57:25 -0500 Subject: [PATCH 030/518] Creates valid subfiles --- tools/refactor_topo.py | 384 ++++++++++++++++++++++++++++++----------- 1 file changed, 284 insertions(+), 100 deletions(-) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index e1fcb4e..3b1a02d 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -1,9 +1,11 @@ from pathlib import Path import libcst as cst -from typing import List, Set, Dict, Union -from pprint import pprint +import libcst.matchers as m +from typing import List, Set, Dict from rope.base.project import Project from rope.refactor.importutils import ImportOrganizer +import subprocess +from datetime import datetime class ImportCollector(cst.CSTVisitor): @@ -73,46 +75,147 @@ class GlobalVariableExtractor(cst.CSTVisitor): self.global_variables.append(assign) +class ClassMethodExtractor(cst.CSTVisitor): + def __init__(self, methods_to_convert: List[str]): + self.methods_to_convert = methods_to_convert + self.extracted_methods: List[cst.FunctionDef] = [] + + def visit_ClassDef(self, node: cst.ClassDef) -> None: + # Extract the class name to append it to the function name + self.current_class_name = node.name.value + self.generic_visit(node) # Continue to visit child nodes + + def leave_ClassDef(self, original_node: cst.ClassDef) -> None: + # Clear the current class name after leaving the class + self.current_class_name = None + + def visit_FunctionDef(self, node: cst.FunctionDef) -> None: + # Check if the function should be converted + if node.name.value in self.methods_to_convert and self.current_class_name: + # Rename the method by appending the class name to avoid conflicts + new_name = f"{node.name.value}_{self.current_class_name.lower()}" + renamed_node = node.with_changes(name=cst.Name(new_name)) + # Remove `self` from parameters since it's now a standalone function + if renamed_node.params.params: + renamed_node = renamed_node.with_changes( + params=renamed_node.params.with_changes( + params=renamed_node.params.params[1:] + ) + ) + self.extracted_methods.append(renamed_node) + + def write_topo_class_files( + source_tree: cst.Module, extracted_classes: Dict[str, cst.ClassDef], imports: Set[str], output_dir: Path, ) -> None: - """ - Write files for each group of classes: - 1. Separate modules for "Shape", "Compound", "Solid", "Face" + "Shell", "Edge" + "Wire", and "Vertex" - 2. "ShapeList" is extracted into its own module and imported by all modules except "Shape" - """ + """Write files for each group of classes:""" # Create output directory if it doesn't exist output_dir.mkdir(parents=True, exist_ok=True) # Sort imports for consistency imports_code = "\n".join(imports) - # Define class groupings based on layers - class_groups = { - "shape": ["Shape"], - "vertex": ["Vertex"], - "edge_wire": ["Mixin1D", "Edge", "Wire"], - "face_shell": ["Face", "Shell"], - "solid": ["Mixin3D", "Solid"], - "compound": ["Compound"], - "shape_list": ["ShapeList"], + # Describe where the functions should go + function_source = { + "shape_core": [ + "downcast", + "fix", + "get_top_level_topods_shapes", + "_sew_topods_faces", + "shapetype", + "_topods_compound_dim", + "_topods_entities", + "_topods_face_normal_at", + "apply_ocp_monkey_patches", + "unwrap_topods_compound", + ], + "utils": [ + "delta", + "edges_to_wires", + "_extrude_topods_shape", + "find_max_dimension", + "isclose_b", + "_make_loft", + "_make_topods_compound_from_shapes", + "_make_topods_face_from_wires", + "new_edges", + "parse_arguments", + "parse_kwargs", + "polar", + "_topods_bool_op", + "tuplify", + "unwrapped_shapetype", + ], + "zero_d": [ + "topo_explore_common_vertex", + ], + "one_d": [ + "topo_explore_connected_edges", + ], + "two_d": ["sort_wires_by_build_order"], } - # Write ShapeList class separately - if "ShapeList" in extracted_classes: - class_file = output_dir / "shape_list.py" - shape_list_class = extracted_classes["ShapeList"] - shape_list_module = cst.Module( - body=[*cst.parse_module(imports_code).body, shape_list_class] - ) - class_file.write_text(shape_list_module.code) - print(f"Created {class_file}") + # Define class groupings based on layers + class_groups = { + "utils": ["_ClassMethodProxy"], + "shape_core": [ + "Shape", + "Comparable", + "ShapePredicate", + "GroupBy", + "ShapeList", + "Joint", + "SkipClean", + ], + "zero_d": ["Vertex"], + "one_d": ["Mixin1D", "Edge", "Wire"], + "two_d": ["Mixin2D", "Face", "Shell"], + "three_d": ["Mixin3D", "Solid"], + "composite": ["Compound", "Curve", "Sketch", "Part"], + } for group_name, class_names in class_groups.items(): - if group_name == "shape_list": - continue + module_docstring = f""" +build123d topology + +name: {group_name}.py +by: Gumyr +date: {datetime.now().strftime('%B %d, %Y')} + +desc: + +license: + + Copyright {datetime.now().strftime('%Y')} Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + header = [ + cst.SimpleStatementLine( + [cst.Expr(cst.SimpleString(f'"""{module_docstring}"""'))] + ) + ] + + if group_name in ["utils", "shape_core"]: + function_collector = StandaloneFunctionAndVariableCollector() + source_tree.visit(function_collector) + + variable_collector = GlobalVariableExtractor() + source_tree.visit(variable_collector) group_classes = [ extracted_classes[name] for name in class_names if name in extracted_classes @@ -121,87 +224,134 @@ def write_topo_class_files( continue # Add imports for base classes based on layer dependencies - additional_imports = ["from .utils import *"] - if group_name != "shape": - additional_imports.append("from .shape import Shape") - additional_imports.append("from .shape_list import ShapeList") - if group_name in ["edge_wire", "face_shell", "solid", "compound"]: - additional_imports.append("from .vertex import Vertex") - if group_name in ["face_shell", "solid", "compound"]: - additional_imports.append("from .edge_wire import Edge, Wire") - if group_name in ["solid", "compound"]: - additional_imports.append("from .face_shell import Face, Shell") - if group_name == "compound": - additional_imports.append("from .solid import Solid") + additional_imports = [] + if group_name != "shape_core": + additional_imports.append( + "from .shape_core import Shape, ShapeList, SkipClean, TrimmingTool, Joint" + ) + additional_imports.append("from .utils import _ClassMethodProxy") + if group_name not in ["shape_core", "vertex"]: + for sub_group_name in function_source.keys(): + additional_imports.append( + f"from .{sub_group_name} import " + + ",".join(function_source[sub_group_name]) + ) + if group_name not in ["shape_core", "utils", "vertex"]: + additional_imports.append("from .zero_d import Vertex") + if group_name in ["two_d"]: + additional_imports.append("from .one_d import Mixin1D") - # Create class file (e.g., face_shell.py) + if group_name in ["two_d", "three_d", "composite"]: + additional_imports.append("from .one_d import Edge, Wire") + if group_name in ["three_d", "composite"]: + additional_imports.append("from .one_d import Mixin1D") + + additional_imports.append("from .two_d import Mixin2D, Face, Shell") + if group_name == "composite": + additional_imports.append("from .one_d import Mixin1D") + additional_imports.append("from .three_d import Mixin3D, Solid") + + # Add TYPE_CHECKING imports + if group_name not in ["composite"]: + additional_imports.append("if TYPE_CHECKING:") + if group_name in ["shape_core", "utils"]: + additional_imports.append(" from .zero_d import Vertex") + if group_name in ["shape_core", "utils", "zero_d"]: + additional_imports.append(" from .one_d import Edge, Wire") + if group_name in ["shape_core", "utils", "one_d"]: + additional_imports.append(" from .two_d import Face, Shell") + if group_name in ["shape_core", "utils", "one_d", "two_d"]: + additional_imports.append(" from .three_d import Solid") + if group_name in ["shape_core", "utils", "one_d", "two_d", "three_d"]: + additional_imports.append( + " from .composite import Compound, Curve, Sketch, Part" + ) + # Create class file (e.g., two_d.py) class_file = output_dir / f"{group_name}.py" all_imports_code = "\n".join([imports_code, *additional_imports]) - class_module = cst.Module( - body=[*cst.parse_module(all_imports_code).body, *group_classes] - ) + + # if group_name in ["shape_core", "utils"]: + if group_name in function_source.keys(): + body = [*cst.parse_module(all_imports_code).body] + for func in function_collector.functions: + if group_name == "shape_core" and func.name.value in [ + "_topods_compound_dim", + "_topods_face_normal_at", + "apply_ocp_monkey_patches", + ]: + body.append(func) + + # If this is the "apply_ocp_monkey_patches" function, add a call to it + if func.name.value == "apply_ocp_monkey_patches": + apply_patches_call = cst.Expr( + value=cst.Call(func=cst.Name("apply_ocp_monkey_patches")) + ) + body.append(apply_patches_call) + body.append(cst.EmptyLine(indent=False)) + body.append(cst.EmptyLine(indent=False)) + + if group_name == "shape_core": + for var in variable_collector.global_variables: + # Check the name of the assigned variable(s) + for target in var.targets: + if isinstance(target.target, cst.Name): + var_name = target.target.value + # Check if the variable name is in the exclusion list + if var_name not in ["T", "K"]: + body.append(var) + body.append(cst.EmptyLine(indent=False)) + + # Add classes and inject variables after a specific class + for class_def in group_classes: + body.append(class_def) + + # Inject variables after the specified class + if class_def.name.value == "Comparable": + body.append( + cst.Comment( + "# This TypeVar allows IDEs to see the type of objects within the ShapeList" + ) + ) + body.append(cst.EmptyLine(indent=False)) + for var in variable_collector.global_variables: + # Check the name of the assigned variable(s) + for target in var.targets: + if isinstance(target.target, cst.Name): + var_name = target.target.value + # Check if the variable name is in the inclusion list + if var_name in ["T", "K"]: + body.append(var) + body.append(cst.EmptyLine(indent=False)) + + for func in function_collector.functions: + if func.name.value in function_source[ + group_name + ] and func.name.value not in [ + "_topods_compound_dim", + "_topods_face_normal_at", + "apply_ocp_monkey_patches", + ]: + body.append(func) + class_module = cst.Module(body=body, header=header) + else: + class_module = cst.Module( + body=[*cst.parse_module(all_imports_code).body, *group_classes], + header=header, + ) class_file.write_text(class_module.code) + print(f"Created {class_file}") # Create __init__.py to make it a proper package init_file = output_dir / "__init__.py" init_content = [] for group_name in class_groups.keys(): - if group_name != "shape_list": - init_content.append(f"from .{group_name} import *") + init_content.append(f"from .{group_name} import *") init_file.write_text("\n".join(init_content)) print(f"Created {init_file}") -def write_utils_file( - source_tree: cst.Module, imports: Set[str], output_dir: Path -) -> None: - """ - Extract and write standalone functions and global variables to a utils.py file. - - Args: - source_tree: The parsed source tree - imports: Set of import statements - output_dir: Directory to write the utils file - """ - # Collect standalone functions and global variables - function_collector = StandaloneFunctionAndVariableCollector() - source_tree.visit(function_collector) - - variable_collector = GlobalVariableExtractor() - source_tree.visit(variable_collector) - - # Create utils file - utils_file = output_dir / "utils.py" - - # Prepare the module body - module_body = [] - - # Add imports - imports_tree = cst.parse_module("\n".join(sorted(imports))) - module_body.extend(imports_tree.body) - - # Add global variables with newlines - for var in variable_collector.global_variables: - module_body.append(var) - module_body.append(cst.EmptyLine(indent=False)) - - # Add a newline between variables and functions - if variable_collector.global_variables and function_collector.functions: - module_body.append(cst.EmptyLine(indent=False)) - - # Add functions - module_body.extend(function_collector.functions) - - # Create the module - utils_module = cst.Module(body=module_body) - - # Write the file - utils_file.write_text(utils_module.code) - print(f"Created {utils_file}") - - def remove_unused_imports(file_path: Path, project: Project) -> None: """Remove unused imports from a Python file using rope. @@ -226,10 +376,31 @@ def remove_unused_imports(file_path: Path, project: Project) -> None: if changes: changes.do() print(f"Cleaned imports in {file_path}") + subprocess.run(["black", file_path]) + else: print(f"No unused imports found in {file_path}") +class UnionToPipeTransformer(cst.CSTTransformer): + def leave_Annotation( + self, original_node: cst.Annotation, updated_node: cst.Annotation + ) -> cst.Annotation: + # Check if the annotation is using a Union + if m.matches(updated_node.annotation, m.Subscript(value=m.Name("Union"))): + subscript = updated_node.annotation + if isinstance(subscript, cst.Subscript): + elements = [elt.slice.value for elt in subscript.slice] + # Build new binary operator nodes using | for each type in the Union + new_annotation = elements[0] + for element in elements[1:]: + new_annotation = cst.BinaryOperation( + left=new_annotation, operator=cst.BitOr(), right=element + ) + return updated_node.with_changes(annotation=new_annotation) + return updated_node + + def main(): # Define paths script_dir = Path(__file__).parent @@ -238,6 +409,7 @@ def main(): # Define classes to extract class_names = [ + "_ClassMethodProxy", "Shape", "Compound", "Solid", @@ -246,16 +418,26 @@ def main(): "Wire", "Edge", "Vertex", - "Mixin0D", + "Curve", + "Sketch", + "Part", "Mixin1D", "Mixin2D", "Mixin3D", - "MixinCompound", + "Comparable", + "ShapePredicate", + "SkipClean", "ShapeList", + "GroupBy", + "Joint", ] # Parse source file and collect imports source_tree = cst.parse_module(topo_file.read_text()) + source_tree = source_tree.visit(UnionToPipeTransformer()) + # transformed_module = source_tree.visit(UnionToPipeTransformer()) + # print(transformed_module.code) + collector = ImportCollector() source_tree.visit(collector) @@ -267,18 +449,20 @@ def main(): mixin_extractor = MixinClassExtractor() source_tree.visit(mixin_extractor) + # Extract functions + function_collector = StandaloneFunctionAndVariableCollector() + source_tree.visit(function_collector) + # for f in function_collector.functions: + # print(f.name.value) + # Write the class files write_topo_class_files( + source_tree=source_tree, extracted_classes=extractor.extracted_classes, imports=collector.imports, output_dir=output_dir, ) - # Write the utils file - write_utils_file( - source_tree=source_tree, imports=collector.imports, output_dir=output_dir - ) - # Create a Rope project instance project = Project(str(script_dir)) From b90d0979e2128271291ab43de3087ee0b8c1631f Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 6 Dec 2024 10:56:14 -0500 Subject: [PATCH 031/518] latest update --- tools/refactor_topo.py | 69 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 3b1a02d..0a1c395 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -1,3 +1,41 @@ +""" +refactor topology + +name: refactor_topology.py +by: Gumyr +date: Dec 05, 2024 + +desc: + This python script refactors the very large topology.py module into several + files based on the topological heirarchical order: + + shape_core.py - base classes Shape, ShapeList + + utils.py - utility classes & functions + + zero_d.py - Vertex + + one_d.py - Mixin1D, Edge, Wire + + two_d.py - Mixin2D, Face, Shell + + three_d.py - Mixin3D, Solid + + composite.py - Compound + Each of these modules import lower order modules to avoid import loops. They + also may contain functions used both by end users and higher order modules. + +license: + + Copyright 2024 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + from pathlib import Path import libcst as cst import libcst.matchers as m @@ -134,7 +172,6 @@ def write_topo_class_files( ], "utils": [ "delta", - "edges_to_wires", "_extrude_topods_shape", "find_max_dimension", "isclose_b", @@ -153,6 +190,7 @@ def write_topo_class_files( "topo_explore_common_vertex", ], "one_d": [ + "edges_to_wires", "topo_explore_connected_edges", ], "two_d": ["sort_wires_by_build_order"], @@ -169,6 +207,7 @@ def write_topo_class_files( "ShapeList", "Joint", "SkipClean", + "BoundBox", ], "zero_d": ["Vertex"], "one_d": ["Mixin1D", "Edge", "Wire"], @@ -227,7 +266,7 @@ license: additional_imports = [] if group_name != "shape_core": additional_imports.append( - "from .shape_core import Shape, ShapeList, SkipClean, TrimmingTool, Joint" + "from .shape_core import Shape, ShapeList, BoundBox, SkipClean, TrimmingTool, Joint" ) additional_imports.append("from .utils import _ClassMethodProxy") if group_name not in ["shape_core", "vertex"]: @@ -253,7 +292,7 @@ license: # Add TYPE_CHECKING imports if group_name not in ["composite"]: - additional_imports.append("if TYPE_CHECKING:") + additional_imports.append("if TYPE_CHECKING: # pragma: no cover") if group_name in ["shape_core", "utils"]: additional_imports.append(" from .zero_d import Vertex") if group_name in ["shape_core", "utils", "zero_d"]: @@ -343,13 +382,13 @@ license: print(f"Created {class_file}") # Create __init__.py to make it a proper package - init_file = output_dir / "__init__.py" - init_content = [] - for group_name in class_groups.keys(): - init_content.append(f"from .{group_name} import *") + # init_file = output_dir / "__init__.py" + # init_content = [] + # for group_name in class_groups.keys(): + # init_content.append(f"from .{group_name} import *") - init_file.write_text("\n".join(init_content)) - print(f"Created {init_file}") + # init_file.write_text("\n".join(init_content)) + # print(f"Created {init_file}") def remove_unused_imports(file_path: Path, project: Project) -> None: @@ -404,12 +443,15 @@ class UnionToPipeTransformer(cst.CSTTransformer): def main(): # Define paths script_dir = Path(__file__).parent - topo_file = script_dir / "topology.py" - output_dir = script_dir / "topology" + topo_file = script_dir / ".." / "src" / "build123d" / "topology_old.py" + output_dir = script_dir / ".." / "src" / "build123d" / "topology" + topo_file = topo_file.resolve() + output_dir = output_dir.resolve() # Define classes to extract class_names = [ "_ClassMethodProxy", + "BoundBox", "Shape", "Compound", "Solid", @@ -464,10 +506,13 @@ def main(): ) # Create a Rope project instance - project = Project(str(script_dir)) + # project = Project(str(script_dir)) + project = Project(str(output_dir)) # Clean up imports for file in output_dir.glob("*.py"): + if file.name == "__init__.py": + continue remove_unused_imports(file, project) From 36a89eafad9800d53b4b6e7bf97acca78e69b1df Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 7 Dec 2024 11:31:42 -0500 Subject: [PATCH 032/518] Added __init__.py generation --- tools/refactor_topo.py | 318 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 303 insertions(+), 15 deletions(-) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 0a1c395..4adbc0b 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -45,6 +45,196 @@ from rope.refactor.importutils import ImportOrganizer import subprocess from datetime import datetime +module_descriptions = { + "shape_core": """ +This module defines the foundational classes and methods for the build123d CAD library, enabling +detailed geometric operations and 3D modeling capabilities. It provides a hierarchy of classes +representing various geometric entities like vertices, edges, wires, faces, shells, solids, and +compounds. These classes are designed to work seamlessly with the OpenCascade Python bindings, +leveraging its robust CAD kernel. + +Key Features: +- **Shape Base Class:** Implements core functionalities such as transformations (rotation, + translation, scaling), geometric queries, and boolean operations (cut, fuse, intersect). +- **Custom Utilities:** Includes helper classes like `ShapeList` for advanced filtering, sorting, + and grouping of shapes, and `GroupBy` for organizing shapes by specific criteria. +- **Type Safety:** Extensive use of Python typing features ensures clarity and correctness in type + handling. +- **Advanced Geometry:** Supports operations like finding intersections, computing bounding boxes, + projecting faces, and generating triangulated meshes. + +The module is designed for extensibility, enabling developers to build complex 3D assemblies and +perform detailed CAD operations programmatically while maintaining a clean and structured API. +""", + "utils": """ +This module provides utility functions and helper classes for the build123d CAD library, enabling +advanced geometric operations and facilitating the use of the OpenCascade CAD kernel. It complements +the core library by offering reusable and modular tools for manipulating shapes, performing Boolean +operations, and validating geometry. + +Key Features: +- **Geometric Utilities**: + - `polar`: Converts polar coordinates to Cartesian. + - `tuplify`: Normalizes inputs into consistent tuples. + - `find_max_dimension`: Computes the maximum bounding dimension of shapes. + +- **Shape Creation**: + - `_make_loft`: Creates lofted shapes from wires and vertices. + - `_make_topods_compound_from_shapes`: Constructs compounds from multiple shapes. + - `_make_topods_face_from_wires`: Generates planar faces with optional holes. + +- **Boolean Operations**: + - `_topods_bool_op`: Generic Boolean operations for TopoDS_Shapes. + - `new_edges`: Identifies newly created edges from combined shapes. + +- **Utility Classes**: + - `_ClassMethodProxy`: Dynamically binds methods across classes. + +- **Enhanced Math**: + - `isclose_b`: Overrides `math.isclose` with a stricter absolute tolerance. + +This module is a critical component of build123d, supporting complex CAD workflows and geometric +transformations while maintaining a clean, extensible API. +""", + "zero_d": """ +This module provides the foundational implementation for zero-dimensional geometry in the build123d +CAD system, focusing on the `Vertex` class and its related operations. A `Vertex` represents a +single point in 3D space, serving as the cornerstone for more complex geometric structures such as +edges, wires, and faces. It is directly integrated with the OpenCascade kernel, enabling precise +modeling and manipulation of 3D objects. + +Key Features: +- **Vertex Class**: + - Supports multiple constructors, including Cartesian coordinates, iterable inputs, and + OpenCascade `TopoDS_Vertex` objects. + - Offers robust arithmetic operations such as addition and subtraction with other vertices, + vectors, or tuples. + - Provides utility methods for transforming vertices, converting to tuples, and iterating over + coordinate components. + +- **Intersection Utilities**: + - Includes `topo_explore_common_vertex`, a utility to identify shared vertices between edges, + facilitating advanced topological queries. + +- **Integration with Shape Hierarchy**: + - Extends the `Shape` base class, inheriting essential features such as transformation matrices + and bounding box computations. + +This module plays a critical role in defining precise geometric points and their interactions, +serving as the building block for complex 3D models in the build123d library. +""", + "one_d": """ +This module defines the classes and methods for one-dimensional geometric entities in the build123d +CAD library. It focuses on `Edge` and `Wire`, representing essential topological elements like +curves and connected sequences of curves within a 3D model. These entities are pivotal for +constructing complex shapes, boundaries, and paths in CAD applications. + +Key Features: +- **Edge Class**: + - Represents curves such as lines, arcs, splines, and circles. + - Supports advanced operations like trimming, offsetting, splitting, and projecting onto shapes. + - Includes methods for geometric queries like finding tangent angles, normals, and intersection + points. + +- **Wire Class**: + - Represents a connected sequence of edges forming a continuous path. + - Supports operations such as closure, projection, and edge manipulation. + +- **Mixin1D**: + - Shared functionality for both `Edge` and `Wire` classes, enabling splitting, extrusion, and + 1D-specific operations. + +This module integrates deeply with OpenCascade, leveraging its robust geometric and topological +operations. It provides utility functions to create, manipulate, and query 1D geometric entities, +ensuring precise and efficient workflows in 3D modeling tasks. +""", + "two_d": """ +This module provides classes and methods for two-dimensional geometric entities in the build123d CAD +library, focusing on the `Face` and `Shell` classes. These entities form the building blocks for +creating and manipulating complex 2D surfaces and 3D shells, enabling precise modeling for CAD +applications. + +Key Features: +- **Mixin2D**: + - Adds shared functionality to `Face` and `Shell` classes, such as splitting, extrusion, and + projection operations. + +- **Face Class**: + - Represents a 3D bounded surface with advanced features like trimming, offsetting, and Boolean + operations. + - Provides utilities for creating faces from wires, arrays of points, Bézier surfaces, and ruled + surfaces. + - Enables geometry queries like normal vectors, surface centers, and planarity checks. + +- **Shell Class**: + - Represents a collection of connected faces forming a closed surface. + - Supports operations like lofting and sweeping profiles along paths. + +- **Utilities**: + - Includes methods for sorting wires into buildable faces and creating holes within faces + efficiently. + +The module integrates deeply with OpenCascade to leverage its powerful CAD kernel, offering robust +and extensible tools for surface and shell creation, manipulation, and analysis. +""", + "three_d": """ +This module defines the `Solid` class and associated methods for creating, manipulating, and +querying three-dimensional solid geometries in the build123d CAD system. It provides powerful tools +for constructing complex 3D models, including operations such as extrusion, sweeping, filleting, +chamfering, and Boolean operations. The module integrates with OpenCascade to leverage its robust +geometric kernel for precise 3D modeling. + +Key Features: +- **Solid Class**: + - Represents closed, bounded 3D shapes with methods for volume calculation, bounding box + computation, and validity checks. + - Includes constructors for primitive solids (e.g., box, cylinder, cone, torus) and advanced + operations like lofting, revolving, and sweeping profiles along paths. + +- **Mixin3D**: + - Adds shared methods for operations like filleting, chamfering, splitting, and hollowing solids. + - Supports advanced workflows such as finding maximum fillet radii and extruding with rotation or + taper. + +- **Boolean Operations**: + - Provides utilities for union, subtraction, and intersection of solids. + +- **Thickening and Offsetting**: + - Allows transformation of faces or shells into solids through thickening. + +This module is essential for generating and manipulating complex 3D geometries in the build123d +library, offering a comprehensive API for CAD modeling. +""", + "composite": """ +This module defines advanced composite geometric entities for the build123d CAD system. It +introduces the `Compound` class as a central concept for managing groups of shapes, alongside +specialized subclasses such as `Curve`, `Sketch`, and `Part` for 1D, 2D, and 3D objects, +respectively. These classes streamline the construction and manipulation of complex geometric +assemblies. + +Key Features: +- **Compound Class**: + - Represents a collection of geometric shapes (e.g., vertices, edges, faces, solids) grouped + hierarchically. + - Supports operations like adding, removing, and combining shapes, as well as querying volumes, + centers, and intersections. + - Provides utility methods for unwrapping nested compounds and generating 3D text or coordinate + system triads. + +- **Specialized Subclasses**: + - `Curve`: Handles 1D objects like edges and wires. + - `Sketch`: Focused on 2D objects, such as faces. + - `Part`: Manages 3D solids and assemblies. + +- **Advanced Features**: + - Includes Boolean operations, hierarchy traversal, and bounding box-based intersection detection. + - Supports transformations, child-parent relationships, and dynamic updates. + +This module leverages OpenCascade for robust geometric operations while offering a Pythonic +interface for efficient and extensible CAD modeling workflows. +""", +} + class ImportCollector(cst.CSTVisitor): def __init__(self): @@ -179,8 +369,6 @@ def write_topo_class_files( "_make_topods_compound_from_shapes", "_make_topods_face_from_wires", "new_edges", - "parse_arguments", - "parse_kwargs", "polar", "_topods_bool_op", "tuplify", @@ -225,7 +413,7 @@ by: Gumyr date: {datetime.now().strftime('%B %d, %Y')} desc: - +{module_descriptions[group_name]} license: Copyright {datetime.now().strftime('%Y')} Gumyr @@ -294,16 +482,24 @@ license: if group_name not in ["composite"]: additional_imports.append("if TYPE_CHECKING: # pragma: no cover") if group_name in ["shape_core", "utils"]: - additional_imports.append(" from .zero_d import Vertex") + additional_imports.append( + " from .zero_d import Vertex # pylint: disable=R0801" + ) if group_name in ["shape_core", "utils", "zero_d"]: - additional_imports.append(" from .one_d import Edge, Wire") + additional_imports.append( + " from .one_d import Edge, Wire # pylint: disable=R0801" + ) if group_name in ["shape_core", "utils", "one_d"]: - additional_imports.append(" from .two_d import Face, Shell") + additional_imports.append( + " from .two_d import Face, Shell # pylint: disable=R0801" + ) if group_name in ["shape_core", "utils", "one_d", "two_d"]: - additional_imports.append(" from .three_d import Solid") + additional_imports.append( + " from .three_d import Solid # pylint: disable=R0801" + ) if group_name in ["shape_core", "utils", "one_d", "two_d", "three_d"]: additional_imports.append( - " from .composite import Compound, Curve, Sketch, Part" + " from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801" ) # Create class file (e.g., two_d.py) class_file = output_dir / f"{group_name}.py" @@ -321,7 +517,10 @@ license: body.append(func) # If this is the "apply_ocp_monkey_patches" function, add a call to it - if func.name.value == "apply_ocp_monkey_patches": + if ( + group_name == "shape_core" + and func.name.value == "apply_ocp_monkey_patches" + ): apply_patches_call = cst.Expr( value=cst.Call(func=cst.Name("apply_ocp_monkey_patches")) ) @@ -382,13 +581,102 @@ license: print(f"Created {class_file}") # Create __init__.py to make it a proper package - # init_file = output_dir / "__init__.py" - # init_content = [] - # for group_name in class_groups.keys(): - # init_content.append(f"from .{group_name} import *") + init_file = output_dir / "__init__.py" + init_content = f''' +""" +build123d.topology package - # init_file.write_text("\n".join(init_content)) - # print(f"Created {init_file}") +name: __init__.py +by: Gumyr +date: {datetime.now().strftime('%B %d, %Y')} + +desc: + This package contains modules for representing and manipulating 3D geometric shapes, + including operations on vertices, edges, faces, solids, and composites. + The package provides foundational classes to work with 3D objects, and methods to + manipulate and analyze those objects. + +license: + + Copyright {datetime.now().strftime('%Y')} Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +from .shape_core import ( + Shape, + Comparable, + ShapePredicate, + GroupBy, + ShapeList, + Joint, + SkipClean, + BoundBox, + downcast, + fix, + unwrap_topods_compound, +) +from .utils import ( + tuplify, + isclose_b, + polar, + delta, + new_edges, + find_max_dimension, +) +from .zero_d import Vertex, topo_explore_common_vertex +from .one_d import Edge, Wire, edges_to_wires, topo_explore_connected_edges +from .two_d import Face, Shell, sort_wires_by_build_order +from .three_d import Solid +from .composite import Compound, Curve, Sketch, Part + +__all__ = [ + "Shape", + "Comparable", + "ShapePredicate", + "GroupBy", + "ShapeList", + "Joint", + "SkipClean", + "BoundBox", + "downcast", + "fix", + "unwrap_topods_compound", + "tuplify", + "isclose_b", + "polar", + "delta", + "new_edges", + "find_max_dimension", + "Vertex", + "topo_explore_common_vertex", + "Edge", + "Wire", + "edges_to_wires", + "topo_explore_connected_edges", + "Face", + "Shell", + "sort_wires_by_build_order", + "Solid", + "Compound", + "Curve", + "Sketch", + "Part", +] +''' + init_file.write_text(init_content) + print(f"Created {init_file}") def remove_unused_imports(file_path: Path, project: Project) -> None: From d1de2a6da1ed959e8280552402139da802078b40 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 9 Dec 2024 10:09:38 -0500 Subject: [PATCH 033/518] Refactored topology.py ready to split into multiple modules --- src/build123d/build_common.py | 19 +- src/build123d/drafting.py | 18 +- src/build123d/exporters.py | 23 +- src/build123d/geometry.py | 2 +- src/build123d/importers.py | 2 +- src/build123d/objects_sketch.py | 2 +- src/build123d/operations_generic.py | 13 +- src/build123d/operations_part.py | 9 +- src/build123d/operations_sketch.py | 3 +- src/build123d/topology.py | 3272 ++++++++++++++------------- tests/test_algebra.py | 10 +- tests/test_build_sketch.py | 2 - tests/test_direct_api.py | 195 +- tests/test_joints.py | 4 +- 14 files changed, 1831 insertions(+), 1743 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 1dd5ddb..f2f42c5 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -429,23 +429,30 @@ class Builder(ABC): if mode == Mode.ADD: if self._obj is None: if len(typed[self._shape]) == 1: - self._obj = typed[self._shape][0] + combined = typed[self._shape][0] else: - self._obj = ( + combined = ( typed[self._shape].pop().fuse(*typed[self._shape]) ) else: - self._obj = self._obj.fuse(*typed[self._shape]) + combined = self._obj.fuse(*typed[self._shape]) elif mode == Mode.SUBTRACT: if self._obj is None: raise RuntimeError("Nothing to subtract from") - self._obj = self._obj.cut(*typed[self._shape]) + combined = self._obj.cut(*typed[self._shape]) elif mode == Mode.INTERSECT: if self._obj is None: raise RuntimeError("Nothing to intersect with") - self._obj = self._obj.intersect(*typed[self._shape]) + combined = self._obj.intersect(*typed[self._shape]) elif mode == Mode.REPLACE: - self._obj = Compound(list(typed[self._shape])) + combined = self._sub_class(list(typed[self._shape])) + + # If the boolean operation created a list, convert back + self._obj = ( + self._sub_class(combined) + if isinstance(combined, list) + else combined + ) if self._obj is not None and clean: self._obj = self._obj.clean() diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index d7c1086..4f824a7 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -439,23 +439,25 @@ class DimensionLine(BaseSketchObject): overage = shaft_length + draft.pad_around_text + label_length / 2 label_u_values = [0.5, -overage / path_length, 1 + overage / path_length] - # d_lines = Sketch(children=arrows[0]) d_lines = {} - # for arrow_pair in arrow_shapes: for u_value in label_u_values: - d_line = Sketch() - for add_arrow, arrow_shape in zip(arrows, arrow_shapes): - if add_arrow: - d_line += arrow_shape + select_arrow_shapes = [ + arrow_shape + for add_arrow, arrow_shape in zip(arrows, arrow_shapes) + if add_arrow + ] + d_line = Sketch(select_arrow_shapes) flip_label = path_obj.tangent_at(u_value).get_angle(Vector(1, 0, 0)) >= 180 loc = Draft._sketch_location(path_obj, u_value, flip_label) placed_label = label_shape.located(loc) - self_intersection = d_line.intersect(placed_label).area + self_intersection = Sketch.intersect(d_line, placed_label).area d_line += placed_label bbox_size = d_line.bounding_box().size # Minimize size while avoiding intersections - common_area = 0.0 if sketch is None else d_line.intersect(sketch).area + common_area = ( + 0.0 if sketch is None else Sketch.intersect(d_line, sketch).area + ) common_area += self_intersection score = (d_line.area - 10 * common_area) / bbox_size.X d_lines[d_line] = score diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index b56914c..96fcfdb 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -55,17 +55,14 @@ from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum # type: ignore from OCP.TopExp import TopExp_Explorer # type: ignore from typing_extensions import Self -from build123d.build_enums import Unit -from build123d.geometry import TOLERANCE, Color +from build123d.build_enums import Unit, GeomType +from build123d.geometry import TOLERANCE, Color, Vector, VectorLike from build123d.topology import ( BoundBox, Compound, Edge, Wire, - GeomType, Shape, - Vector, - VectorLike, ) from build123d.build_common import UNITS_PER_METER @@ -682,7 +679,7 @@ class ExportDXF(Export2D): def _convert_circle(self, edge: Edge, attribs: dict): """Converts a Circle object into a DXF circle entity.""" - curve = edge._geom_adaptor() + curve = edge.geom_adaptor() circle = curve.Circle() center = self._convert_point(circle.Location()) radius = circle.Radius() @@ -710,7 +707,7 @@ class ExportDXF(Export2D): def _convert_ellipse(self, edge: Edge, attribs: dict): """Converts an Ellipse object into a DXF ellipse entity.""" - geom = edge._geom_adaptor() + geom = edge.geom_adaptor() ellipse = geom.Ellipse() minor_radius = ellipse.MinorRadius() major_radius = ellipse.MajorRadius() @@ -743,7 +740,7 @@ class ExportDXF(Export2D): # This pulls the underlying Geom_BSplineCurve out of the Edge. # The adaptor also supplies a parameter range for the curve. - adaptor = edge._geom_adaptor() + adaptor = edge.geom_adaptor() curve = adaptor.Curve().Curve() u1 = adaptor.FirstParameter() u2 = adaptor.LastParameter() @@ -1157,7 +1154,7 @@ class ExportSVG(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def _line_segment(self, edge: Edge, reverse: bool) -> PT.Line: - curve = edge._geom_adaptor() + curve = edge.geom_adaptor() fp = curve.FirstParameter() lp = curve.LastParameter() (u0, u1) = (lp, fp) if reverse else (fp, lp) @@ -1187,7 +1184,7 @@ class ExportSVG(Export2D): def _circle_segments(self, edge: Edge, reverse: bool) -> list[PathSegment]: # pylint: disable=too-many-locals - curve = edge._geom_adaptor() + curve = edge.geom_adaptor() circle = curve.Circle() radius = circle.Radius() x_axis = circle.XAxis().Direction() @@ -1215,7 +1212,7 @@ class ExportSVG(Export2D): def _circle_element(self, edge: Edge) -> ET.Element: """Converts a Circle object into an SVG circle element.""" if edge.is_closed: - curve = edge._geom_adaptor() + curve = edge.geom_adaptor() circle = curve.Circle() radius = circle.Radius() center = circle.Location() @@ -1233,7 +1230,7 @@ class ExportSVG(Export2D): def _ellipse_segments(self, edge: Edge, reverse: bool) -> list[PathSegment]: # pylint: disable=too-many-locals - curve = edge._geom_adaptor() + curve = edge.geom_adaptor() ellipse = curve.Ellipse() minor_radius = ellipse.MinorRadius() major_radius = ellipse.MajorRadius() @@ -1276,7 +1273,7 @@ class ExportSVG(Export2D): # This pulls the underlying Geom_BSplineCurve out of the Edge. # The adaptor also supplies a parameter range for the curve. - adaptor = edge._geom_adaptor() + adaptor = edge.geom_adaptor() spline = adaptor.Curve().Curve() u1 = adaptor.FirstParameter() u2 = adaptor.LastParameter() diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 94ad4b0..219e9a2 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -963,7 +963,7 @@ class BoundBox: return result @classmethod - def _from_topo_ds( + def from_topo_ds( cls, shape: TopoDS_Shape, tolerance: float = None, diff --git a/src/build123d/importers.py b/src/build123d/importers.py index b9f5299..baf4dc0 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -113,7 +113,7 @@ def import_brep(file_name: Union[PathLike, str, bytes]) -> Shape: if shape.IsNull(): raise ValueError(f"Could not import {file_name}") - return Shape.cast(shape) + return Compound.cast(shape) def import_step(filename: Union[PathLike, str, bytes]) -> Compound: diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index ca85a60..c91d87c 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -43,6 +43,7 @@ from build123d.geometry import ( Vector, VectorLike, to_align_offset, + TOLERANCE, ) from build123d.topology import ( Compound, @@ -52,7 +53,6 @@ from build123d.topology import ( Sketch, Wire, tuplify, - TOLERANCE, topo_explore_common_vertex, ) diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 3b809cd..9909cbf 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -904,7 +904,7 @@ SplitType = Union[Edge, Wire, Face, Solid] def split( objects: Union[SplitType, Iterable[SplitType]] = None, - bisect_by: Union[Plane, Face] = Plane.XZ, + bisect_by: Union[Plane, Face, Shell] = Plane.XZ, keep: Keep = Keep.TOP, mode: Mode = Mode.REPLACE, ): @@ -937,7 +937,16 @@ def split( new_objects = [] for obj in object_list: - new_objects.append(obj.split(bisect_by, keep)) + bottom = None + if keep == Keep.BOTH: + top, bottom = obj.split(bisect_by, keep) + else: + top = obj.split(bisect_by, keep) + for subpart in [top, bottom]: + if isinstance(subpart, Iterable): + new_objects.extend(subpart) + elif subpart is not None: + new_objects.append(subpart) if context is not None: context._add_to_context(*new_objects, mode=mode) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 09e6fc3..464da38 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -173,7 +173,10 @@ def extrude( context._add_to_context(*new_solids, clean=clean, mode=mode) else: if len(new_solids) > 1: - new_solids = [new_solids.pop().fuse(*new_solids)] + fused_solids = new_solids.pop().fuse(*new_solids) + new_solids = ( + fused_solids if isinstance(fused_solids, list) else [fused_solids] + ) if clean: new_solids = [solid.clean() for solid in new_solids] @@ -597,7 +600,9 @@ def thicken( ) for direction in [1, -1] if both else [1]: new_solids.append( - face.thicken(depth=amount, normal_override=face_normal * direction) + Solid.thicken( + face, depth=amount, normal_override=face_normal * direction + ) ) if context is not None: diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index e5b2d6b..35e65b9 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -40,9 +40,8 @@ from build123d.topology import ( Sketch, topo_explore_connected_edges, topo_explore_common_vertex, - TOLERANCE, ) -from build123d.geometry import Vector +from build123d.geometry import Vector, TOLERANCE from build123d.build_common import flatten_sequence, validate_inputs from build123d.build_sketch import BuildSketch from scipy.spatial import Voronoi diff --git a/src/build123d/topology.py b/src/build123d/topology.py index be15a1b..b75fe5e 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -36,10 +36,12 @@ from __future__ import annotations # too-many-arguments, too-many-locals, too-many-public-methods, # too-many-statements, too-many-instance-attributes, too-many-branches import copy +import inspect import itertools import os import platform import sys +import types import warnings from abc import ABC, ABCMeta, abstractmethod from io import BytesIO @@ -54,20 +56,22 @@ from typing import ( Iterator, Optional, Protocol, + Sequence, Tuple, Type, TypeVar, Union, overload, + TYPE_CHECKING, ) from typing import cast as tcast from typing_extensions import Self, Literal, deprecated from anytree import NodeMixin, PreOrderIter, RenderTree -from IPython.lib.pretty import pretty +from IPython.lib.pretty import pretty, PrettyPrinter from numpy import ndarray from scipy.optimize import minimize -from scipy.spatial import ConvexHull +from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module from vtkmodules.vtkCommonDataModel import vtkPolyData from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter @@ -300,68 +304,46 @@ from build123d.geometry import ( ) +@property +def _topods_compound_dim(self) -> int | None: + """The dimension of the shapes within the Compound - None if inconsistent""" + sub_dims = {s.dim for s in get_top_level_topods_shapes(self)} + return sub_dims.pop() if len(sub_dims) == 1 else None + + +def _topods_face_normal_at(self, surface_point: gp_Pnt) -> Vector: + """normal_at point on surface""" + surface = BRep_Tool.Surface_s(self) + + # project point on surface + projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) + u_val, v_val = projector.LowerDistanceParameters() + + gp_pnt = gp_Pnt() + normal = gp_Vec() + BRepGProp_Face(self).Normal(u_val, v_val, gp_pnt, normal) + + return Vector(normal).normalized() + + +def apply_ocp_monkey_patches() -> None: + """Applies monkey patches to TopoDS classes.""" + TopoDS_Compound.dim = _topods_compound_dim + TopoDS_Face.dim = 2 + TopoDS_Face.normal_at = _topods_face_normal_at + TopoDS_Shape.dim = None + TopoDS_Shell.dim = 2 + TopoDS_Solid.dim = 3 + TopoDS_Vertex.dim = 0 + TopoDS_Edge.dim = 1 + TopoDS_Wire.dim = 1 + + +apply_ocp_monkey_patches() + + HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode -shape_LUT = { - ta.TopAbs_VERTEX: "Vertex", - ta.TopAbs_EDGE: "Edge", - ta.TopAbs_WIRE: "Wire", - ta.TopAbs_FACE: "Face", - ta.TopAbs_SHELL: "Shell", - ta.TopAbs_SOLID: "Solid", - ta.TopAbs_COMPOUND: "Compound", - ta.TopAbs_COMPSOLID: "CompSolid", -} - -shape_properties_LUT = { - ta.TopAbs_VERTEX: None, - ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, - ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, - ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, -} - -inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} - -downcast_LUT = { - ta.TopAbs_VERTEX: TopoDS.Vertex_s, - ta.TopAbs_EDGE: TopoDS.Edge_s, - ta.TopAbs_WIRE: TopoDS.Wire_s, - ta.TopAbs_FACE: TopoDS.Face_s, - ta.TopAbs_SHELL: TopoDS.Shell_s, - ta.TopAbs_SOLID: TopoDS.Solid_s, - ta.TopAbs_COMPOUND: TopoDS.Compound_s, - ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, -} - -geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { - ga.GeomAbs_Plane: GeomType.PLANE, - ga.GeomAbs_Cylinder: GeomType.CYLINDER, - ga.GeomAbs_Cone: GeomType.CONE, - ga.GeomAbs_Sphere: GeomType.SPHERE, - ga.GeomAbs_Torus: GeomType.TORUS, - ga.GeomAbs_BezierSurface: GeomType.BEZIER, - ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, - ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, - ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, - ga.GeomAbs_OffsetSurface: GeomType.OFFSET, - ga.GeomAbs_OtherSurface: GeomType.OTHER, -} - -geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { - ga.GeomAbs_Line: GeomType.LINE, - ga.GeomAbs_Circle: GeomType.CIRCLE, - ga.GeomAbs_Ellipse: GeomType.ELLIPSE, - ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, - ga.GeomAbs_Parabola: GeomType.PARABOLA, - ga.GeomAbs_BezierCurve: GeomType.BEZIER, - ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, - ga.GeomAbs_OffsetCurve: GeomType.OFFSET, - ga.GeomAbs_OtherCurve: GeomType.OTHER, -} Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] @@ -379,26 +361,70 @@ def tuplify(obj: Any, dim: int) -> tuple: return result +class _ClassMethodProxy: + """ + A proxy for dynamically binding a class method to different classes. + + This descriptor allows a class method defined in one class to be reused + in other classes while ensuring that the `cls` parameter refers to the + correct class (the class on which the method is being called). This avoids + issues where the method would otherwise always reference the original + defining class. + + Attributes: + method (classmethod): The class method to be proxied. + + Methods: + __get__(instance, owner): + Dynamically binds the proxied method to the calling class (`owner`). + + Example: + class Mixin1D: + @classmethod + def extrude(cls, shape, direction): + print(f"extrude called on {cls.__name__}") + + class Mixin2D: + extrude = ClassMethodProxy(Mixin1D.extrude) + + class Mixin3D: + extrude = ClassMethodProxy(Mixin1D.extrude) + + # Usage + Mixin2D.extrude(None, None) # Output: extrude called on Mixin2D + Mixin3D.extrude(None, None) # Output: extrude called on Mixin3D + """ + + def __init__(self, method): + self.method = method + + def __get__(self, instance, owner): + # Bind the method dynamically as a class method of `owner` + return types.MethodType(self.method.__func__, owner) + + class Mixin1D: """Methods to add to the Edge and Wire classes""" def __add__(self, other: Union[list[Shape], Shape]) -> Self: """fuse shape to wire/edge operator +""" - # Convert `other` to list of base objects and filter out None values + # Convert `other` to list of base topods objects and filter out None values summands = [ shape for o in (other if isinstance(other, (list, tuple)) else [other]) if o is not None - for shape in o.get_top_level_shapes() + for shape in get_top_level_topods_shapes(o.wrapped) ] # If there is nothing to add return the original object if not summands: return self - if not all(summand._dim == 1 for summand in summands): + if not all(summand.dim == 1 for summand in summands): raise ValueError("Only shapes with the same dimension can be added") + # Convert back to Edge/Wire objects now that it's safe to do so + summands = [Mixin1D.cast(s) for s in summands] summand_edges = [e for summand in summands for e in summand.edges()] if self.wrapped is None: # an empty object if len(summands) == 1: @@ -408,13 +434,15 @@ class Mixin1D: sum_shape = Wire(summand_edges) except Exception: sum_shape = summands[0].fuse(*summands[1:]) + if type(self).order == 4: + sum_shape = type(self)(sum_shape) else: try: sum_shape = Wire(self.edges() + summand_edges) except Exception: sum_shape = self.fuse(*summands) - if SkipClean.clean: + if SkipClean.clean and not isinstance(sum_shape, list): sum_shape = sum_shape.clean() # If there is only one Edge, return that @@ -422,12 +450,164 @@ class Mixin1D: return sum_shape + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Self: + "Returns the right type of wrapper, given a OCCT object" + + # Extend the lookup table with additional entries + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + + @overload + def split( + self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] + ) -> Optional[Self] | Optional[list[Self]]: + """split and keep inside or outside""" + + @overload + def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ + Optional[Self] | Optional[list[Self]], + Optional[Self] | Optional[list[Self]], + ]: + """split and keep inside and outside""" + + @overload + def split(self, tool: TrimmingTool) -> Optional[Self] | Optional[list[Self]]: + """split and keep inside (default)""" + + def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): + """split + + Split this shape by the provided plane or face. + + Args: + surface (Union[Plane,Face]): surface to segment shape + keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. + + Returns: + Shape: result of split + Returns: + Optional[Self] | Optional[list[Self]], + Tuple[Optional[Self] | Optional[list[Self]]]: The result of the split operation. + + - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` + if no top is found. + - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` + if no bottom is found. + - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is + either a `Self` or `list[Self]`, or `None` if no corresponding part is found. + """ + shape_list = TopTools_ListOfShape() + shape_list.Append(self.wrapped) + + # Define the splitting tool + trim_tool = ( + BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face + if isinstance(tool, Plane) + else tool.wrapped + ) + tool_list = TopTools_ListOfShape() + tool_list.Append(trim_tool) + + # Create the splitter algorithm + splitter = BRepAlgoAPI_Splitter() + + # Set the shape to be split and the splitting tool (plane face) + splitter.SetArguments(shape_list) + splitter.SetTools(tool_list) + + # Perform the splitting operation + splitter.Build() + + split_result = downcast(splitter.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(split_result, TopoDS_Compound): + split_result = unwrap_topods_compound(split_result, True) + + if not isinstance(tool, Plane): + # Create solids from the surfaces for sorting by thickening + offset_builder = BRepOffset_MakeOffset() + offset_builder.Initialize( + tool.wrapped, + Offset=0.1, + Tol=1.0e-5, + Intersection=True, + Join=GeomAbs_Intersection, + Thickening=True, + ) + offset_builder.MakeOffsetShape() + try: + tool_thickened = downcast(offset_builder.Shape()) + except StdFail_NotDone as err: + raise RuntimeError("Error determining top/bottom") from err + + tops, bottoms = [], [] + properties = GProp_GProps() + for part in get_top_level_topods_shapes(split_result): + sub_shape = self.__class__.cast(part) + if isinstance(tool, Plane): + is_up = tool.to_local_coords(sub_shape).center().Z >= 0 + else: + # Intersect self and the thickened tool + is_up_obj = _topods_bool_op( + (part,), (tool_thickened,), BRepAlgoAPI_Common() + ) + # Calculate volume of intersection + BRepGProp.VolumeProperties_s(is_up_obj, properties) + is_up = properties.Mass() >= TOLERANCE + (tops if is_up else bottoms).append(sub_shape) + + top = None if not tops else tops[0] if len(tops) == 1 else tops + bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms + + if keep == Keep.BOTH: + return (top, bottom) + if keep == Keep.TOP: + return top + if keep == Keep.BOTTOM: + return bottom + return None + + def vertices(self) -> ShapeList[Vertex]: + """vertices - all the vertices in this Shape""" + return Shape.get_shape_list(self, "Vertex") + + def vertex(self) -> Vertex: + """Return the Vertex""" + return Shape.get_single_shape(self, "Vertex") + + def edges(self) -> ShapeList[Edge]: + """edges - all the edges in this Shape""" + edge_list = Shape.get_shape_list(self, "Edge") + return edge_list.filter_by( + lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True + ) + + def edge(self) -> Edge: + """Return the Edge""" + return Shape.get_single_shape(self, "Edge") + + def wires(self) -> ShapeList[Wire]: + """wires - all the wires in this Shape""" + return Shape.get_shape_list(self, "Wire") + + def wire(self) -> Wire: + """Return the Wire""" + return Shape.get_single_shape(self, "Wire") + def start_point(self) -> Vector: """The start point of this edge Note that circles may have identical start and end points. """ - curve = self._geom_adaptor() + curve = self.geom_adaptor() umin = curve.FirstParameter() return Vector(curve.Value(umin)) @@ -437,7 +617,7 @@ class Mixin1D: Note that circles may have identical start and end points. """ - curve = self._geom_adaptor() + curve = self.geom_adaptor() umax = curve.LastParameter() return Vector(curve.Value(umax)) @@ -453,7 +633,7 @@ class Mixin1D: Returns: float: parameter value """ - curve = self._geom_adaptor() + curve = self.geom_adaptor() length = GCPnts_AbscissaPoint.Length_s(curve) return GCPnts_AbscissaPoint( @@ -484,7 +664,7 @@ class Mixin1D: """ if isinstance(position, (float, int)): - curve = self._geom_adaptor() + curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: parameter = self.param_at(position) else: @@ -492,8 +672,8 @@ class Mixin1D: else: try: pnt = Vector(position) - except Exception: - raise ValueError("position must be a float or a point") + except Exception as exc: + raise ValueError("position must be a float or a point") from exc # GeomAPI_ProjectPointOnCurve only works with Edges so find # the closest Edge if the shape has multiple Edges. my_edges: list[Edge] = self.edges() @@ -548,7 +728,7 @@ class Mixin1D: """ - curve = self._geom_adaptor() + curve = self.geom_adaptor() gtype = self.geom_type if gtype == GeomType.CIRCLE: @@ -610,15 +790,15 @@ class Mixin1D: all_lines: list[Edge, Wire] = [ line for line in [self, *lines] if line is not None ] - if any([not isinstance(line, (Edge, Wire)) for line in all_lines]): + if any(not isinstance(line, (Edge, Wire)) for line in all_lines): raise ValueError("Only Edges or Wires are valid") result = None # Are they all co-axial - if so, select one of the infinite planes all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all([e.geom_type == GeomType.LINE for e in all_edges]): + if all(e.geom_type == GeomType.LINE for e in all_edges): as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all([a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)]): + if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): origin = as_axis[0].position x_dir = as_axis[0].direction z_dir = as_axis[0].to_plane().x_dir @@ -643,7 +823,9 @@ class Mixin1D: points = list(set(points)) # unique points extreme_areas = {} for subset in combinations(points, 3): - area = Face(Wire.make_polygon(subset, close=True)).area + vector1 = subset[1] - subset[0] + vector2 = subset[2] - subset[0] + area = 0.5 * (vector1.cross(vector2).length) extreme_areas[area] = subset # The points that create the largest area make the most accurate plane extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] @@ -659,7 +841,7 @@ class Mixin1D: result = None else: # Are all of the points on the common plane - common = all([c_plane.contains(p) for p in points]) + common = all(c_plane.contains(p) for p in points) result = c_plane if common else None return result @@ -667,7 +849,7 @@ class Mixin1D: @property def length(self) -> float: """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self._geom_adaptor()) + return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) @property def radius(self) -> float: @@ -684,7 +866,7 @@ class Mixin1D: ValueError: if kernel can not reduce the shape to a circular edge """ - geom = self._geom_adaptor() + geom = self.geom_adaptor() try: circ = geom.Circle() except (Standard_NoSuchObject, Standard_Failure) as err: @@ -721,7 +903,7 @@ class Mixin1D: Returns: Vector: position on the underlying curve """ - curve = self._geom_adaptor() + curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: param = self.param_at(distance) @@ -772,7 +954,7 @@ class Mixin1D: Location: A Location object representing local coordinate system at the specified distance. """ - curve = self._geom_adaptor() + curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: param = self.param_at(distance) @@ -891,16 +1073,10 @@ class Mixin1D: obj = downcast(offset_builder.Shape()) if isinstance(obj, TopoDS_Compound): - offset_wire = None - for i, shape in enumerate(Compound(obj)): - offset_wire = Wire(shape.wrapped) - if i >= 1: - raise RuntimeError("Multiple Wires generated") - if offset_wire is None: - raise RuntimeError("No offset generated") - elif isinstance(obj, TopoDS_Wire): + obj = unwrap_topods_compound(obj, fully=True) + if isinstance(obj, TopoDS_Wire): offset_wire = Wire(obj) - else: + else: # Likely multiple Wires were generated raise RuntimeError("Unexpected result type") if side != Side.BOTH: @@ -971,7 +1147,7 @@ class Mixin1D: def project( self, face: Face, direction: VectorLike, closest: bool = True - ) -> Union[Mixin1D, list[Mixin1D]]: + ) -> Union[Mixin1D, ShapeList[Mixin1D]]: """Project onto a face along the specified direction Args: @@ -986,7 +1162,7 @@ class Mixin1D: bldr = BRepProj_Projection( self.wrapped, face.wrapped, Vector(direction).to_dir() ) - shapes = Compound(bldr.Shape()) + shapes: TopoDS_Compound = bldr.Shape() # select the closest projection if requested return_value: Union[Mixin1D, list[Mixin1D]] @@ -997,24 +1173,240 @@ class Mixin1D: min_dist = inf - for shape in shapes: - dist_calc.LoadS2(shape.wrapped) + # for shape in shapes: + for shape in get_top_level_topods_shapes(shapes): + dist_calc.LoadS2(shape) dist_calc.Perform() dist = dist_calc.Value() if dist < min_dist: min_dist = dist - return_value = tcast(Mixin1D, shape) + return_value = Mixin1D.cast(shape) else: - return_value = [tcast(Mixin1D, shape) for shape in shapes] + return_value = ShapeList( + Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) + ) return return_value + def project_to_viewport( + self, + viewport_origin: VectorLike, + viewport_up: VectorLike = (0, 0, 1), + look_at: VectorLike = None, + ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: + """project_to_viewport + + Project a shape onto a viewport returning visible and hidden Edges. + + Args: + viewport_origin (VectorLike): location of viewport + viewport_up (VectorLike, optional): direction of the viewport y axis. + Defaults to (0, 0, 1). + look_at (VectorLike, optional): point to look at. + Defaults to None (center of shape). + + Returns: + tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges + """ + + def extract_edges(compound): + edges = [] # List to store the extracted edges + + # Create a TopExp_Explorer to traverse the sub-shapes of the compound + explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) + + # Loop through the sub-shapes and extract edges + while explorer.More(): + edge = downcast(explorer.Current()) + edges.append(edge) + explorer.Next() + + return edges + + # Setup the projector + hidden_line_removal = HLRBRep_Algo() + hidden_line_removal.Add(self.wrapped) + + viewport_origin = Vector(viewport_origin) + look_at = Vector(look_at) if look_at else self.center() + projection_dir: Vector = (viewport_origin - look_at).normalized() + viewport_up = Vector(viewport_up).normalized() + camera_coordinate_system = gp_Ax2() + camera_coordinate_system.SetAxis( + gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) + ) + camera_coordinate_system.SetYDirection(viewport_up.to_dir()) + projector = HLRAlgo_Projector(camera_coordinate_system) + + hidden_line_removal.Projector(projector) + hidden_line_removal.Update() + hidden_line_removal.Hide() + + hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) + + # Create the visible edges + visible_edges = [] + for edges in [ + hlr_shapes.VCompound(), + hlr_shapes.Rg1LineVCompound(), + hlr_shapes.OutLineVCompound(), + ]: + if not edges.IsNull(): + visible_edges.extend(extract_edges(downcast(edges))) + + # Create the hidden edges + hidden_edges = [] + for edges in [ + hlr_shapes.HCompound(), + hlr_shapes.OutLineHCompound(), + hlr_shapes.Rg1LineHCompound(), + ]: + if not edges.IsNull(): + hidden_edges.extend(extract_edges(downcast(edges))) + + # Fix the underlying geometry - otherwise we will get segfaults + for edge in visible_edges: + BRepLib.BuildCurves3d_s(edge, TOLERANCE) + for edge in hidden_edges: + BRepLib.BuildCurves3d_s(edge, TOLERANCE) + + # convert to native shape objects + visible_edges = ShapeList(Edge(e) for e in visible_edges) + hidden_edges = ShapeList(Edge(e) for e in hidden_edges) + + return (visible_edges, hidden_edges) + + @classmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """extrude + + Extrude a Shape in the provided direction. + * Vertices generate Edges + * Edges generate Faces + * Wires generate Shells + * Faces generate Solids + * Shells generate Compounds + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Union[Edge, Face, Shell, Solid, Compound]: extruded shape + """ + return cls.cast(_extrude_topods_shape(obj.wrapped, direction)) + + +class Mixin2D: + """Additional methods to add to Face and Shell class""" + + project_to_viewport = Mixin1D.project_to_viewport + extrude = _ClassMethodProxy(Mixin1D.extrude) + split = Mixin1D.split + + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Self: + "Returns the right type of wrapper, given a OCCT object" + + # define the shape lookup table for casting + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + ta.TopAbs_FACE: Face, + ta.TopAbs_SHELL: Shell, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + + vertices = Mixin1D.vertices + vertex = Mixin1D.vertex + edges = Mixin1D.edges + edge = Mixin1D.edge + wires = Mixin1D.wires + wire = Mixin1D.wire + + def faces(self) -> ShapeList[Face]: + """faces - all the faces in this Shape""" + return Shape.get_shape_list(self, "Face") + + def face(self) -> Face: + """Return the Face""" + return Shape.get_single_shape(self, "Face") + + def shells(self) -> ShapeList[Shell]: + """shells - all the shells in this Shape""" + return Shape.get_shape_list(self, "Shell") + + def shell(self) -> Shell: + """Return the Shell""" + return Shape.get_single_shape(self, "Shell") + + def __neg__(self) -> Self: + """Reverse normal operator -""" + new_surface = copy.deepcopy(self) + new_surface.wrapped = downcast(self.wrapped.Complemented()) + + return new_surface + + def offset(self, amount: float) -> Self: + """Return a copy of self moved along the normal by amount""" + return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) + class Mixin3D: """Additional methods to add to 3D Shape classes""" + project_to_viewport = Mixin1D.project_to_viewport + extrude = _ClassMethodProxy(Mixin1D.extrude) + split = Mixin1D.split + + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Self: + "Returns the right type of wrapper, given a OCCT object" + + # define the shape lookup table for casting + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + ta.TopAbs_FACE: Face, + ta.TopAbs_SHELL: Shell, + ta.TopAbs_SOLID: Solid, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + + vertices = Mixin1D.vertices + vertex = Mixin1D.vertex + edges = Mixin1D.edges + edge = Mixin1D.edge + wires = Mixin1D.wires + wire = Mixin1D.wire + faces = Mixin2D.faces + face = Mixin2D.face + shells = Mixin2D.shells + shell = Mixin2D.shell + + def solids(self) -> ShapeList[Solid]: + """solids - all the solids in this Shape""" + return Shape.get_shape_list(self, "Solid") + + def solid(self) -> Solid: + """Return the Solid""" + return Shape.get_single_shape(self, "Solid") + def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: """Fillet @@ -1207,7 +1599,7 @@ class Mixin3D: raise ValueError("Center of GEOMETRY is not supported for this object") if center_of == CenterOf.MASS: properties = GProp_GProps() - calc_function = shape_properties_LUT[shapetype(self.wrapped)] + calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] if calc_function: calc_function(self.wrapped, properties) middle = Vector(properties.CentreOfMass()) @@ -1446,6 +1838,71 @@ class Shape(NodeMixin): _dim = None + shape_LUT = { + ta.TopAbs_VERTEX: "Vertex", + ta.TopAbs_EDGE: "Edge", + ta.TopAbs_WIRE: "Wire", + ta.TopAbs_FACE: "Face", + ta.TopAbs_SHELL: "Shell", + ta.TopAbs_SOLID: "Solid", + ta.TopAbs_COMPOUND: "Compound", + ta.TopAbs_COMPSOLID: "CompSolid", + } + + shape_properties_LUT = { + ta.TopAbs_VERTEX: None, + ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, + ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, + ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, + ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, + ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, + ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, + ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, + } + + inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} + + downcast_LUT = { + ta.TopAbs_VERTEX: TopoDS.Vertex_s, + ta.TopAbs_EDGE: TopoDS.Edge_s, + ta.TopAbs_WIRE: TopoDS.Wire_s, + ta.TopAbs_FACE: TopoDS.Face_s, + ta.TopAbs_SHELL: TopoDS.Shell_s, + ta.TopAbs_SOLID: TopoDS.Solid_s, + ta.TopAbs_COMPOUND: TopoDS.Compound_s, + ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, + } + + geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { + ga.GeomAbs_Line: GeomType.LINE, + ga.GeomAbs_Circle: GeomType.CIRCLE, + ga.GeomAbs_Ellipse: GeomType.ELLIPSE, + ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, + ga.GeomAbs_Parabola: GeomType.PARABOLA, + ga.GeomAbs_BezierCurve: GeomType.BEZIER, + ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, + ga.GeomAbs_OffsetCurve: GeomType.OFFSET, + ga.GeomAbs_OtherCurve: GeomType.OTHER, + } + geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { + ga.GeomAbs_Plane: GeomType.PLANE, + ga.GeomAbs_Cylinder: GeomType.CYLINDER, + ga.GeomAbs_Cone: GeomType.CONE, + ga.GeomAbs_Sphere: GeomType.SPHERE, + ga.GeomAbs_Torus: GeomType.TORUS, + ga.GeomAbs_BezierSurface: GeomType.BEZIER, + ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, + ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, + ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, + ga.GeomAbs_OffsetSurface: GeomType.OFFSET, + ga.GeomAbs_OtherSurface: GeomType.OTHER, + } + _transModeDict = { + Transition.TRANSFORMED: BRepBuilderAPI_Transformed, + Transition.ROUND: BRepBuilderAPI_RoundCorner, + Transition.RIGHT: BRepBuilderAPI_RightCorner, + } + def __init__( self, obj: TopoDS_Shape = None, @@ -1517,6 +1974,15 @@ class Shape(NodeMixin): self._color = node_color # Set the node's color for next time return node_color + @property + def is_planar_face(self) -> bool: + """Is the shape a planar face even though its geom_type may not be PLANE""" + if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): + return False + surface = BRep_Tool.Surface_s(self.wrapped) + is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) + return is_face_planar.IsPlanar() + @color.setter def color(self, value): """Set the shape's color""" @@ -1561,45 +2027,53 @@ class Shape(NodeMixin): Returns: bool: is the shape manifold or water tight """ - if isinstance(self, Compound): - # pylint: disable=not-an-iterable - return all(sub_shape.is_manifold for sub_shape in self) + # Extract one or more (if a Compound) shape from self + shape_stack = get_top_level_topods_shapes(self.wrapped) + results = [] - result = True - # Create an empty indexed data map to store the edges and their corresponding faces. - shape_map = TopTools_IndexedDataMapOfShapeListOfShape() + while shape_stack: + shape = shape_stack.pop(0) - # Fill the map with edges and their associated faces in the given shape. Each edge in - # the map is associated with a list of faces that share that edge. - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map - ) + result = True + # Create an empty indexed data map to store the edges and their corresponding faces. + shape_map = TopTools_IndexedDataMapOfShapeListOfShape() - # Iterate over the edges in the map and checks if each edge is non-degenerate and has - # exactly two faces associated with it. - for i in range(shape_map.Extent()): - # Access each edge in the map sequentially - edge = downcast(shape_map.FindKey(i + 1)) + # Fill the map with edges and their associated faces in the given shape. Each edge in + # the map is associated with a list of faces that share that edge. + TopExp.MapShapesAndAncestors_s( + # shape.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map + shape, + ta.TopAbs_EDGE, + ta.TopAbs_FACE, + shape_map, + ) - vertex0 = TopoDS_Vertex() - vertex1 = TopoDS_Vertex() + # Iterate over the edges in the map and checks if each edge is non-degenerate and has + # exactly two faces associated with it. + for i in range(shape_map.Extent()): + # Access each edge in the map sequentially + edge = downcast(shape_map.FindKey(i + 1)) - # Extract the two vertices of the current edge and stores them in vertex0/1. - TopExp.Vertices_s(edge, vertex0, vertex1) + vertex0 = TopoDS_Vertex() + vertex1 = TopoDS_Vertex() - # Check if both vertices are null and if they are the same vertex. If so, the - # edge is considered degenerate (i.e., has zero length), and it is skipped. - if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): - continue + # Extract the two vertices of the current edge and stores them in vertex0/1. + TopExp.Vertices_s(edge, vertex0, vertex1) - # Check if the current edge has exactly two faces associated with it. If not, - # it means the edge is not shared by exactly two faces, indicating that the - # shape is not manifold. - if shape_map.FindFromIndex(i + 1).Extent() != 2: - result = False - break + # Check if both vertices are null and if they are the same vertex. If so, the + # edge is considered degenerate (i.e., has zero length), and it is skipped. + if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): + continue - return result + # Check if the current edge has exactly two faces associated with it. If not, + # it means the edge is not shared by exactly two faces, indicating that the + # shape is not manifold. + if shape_map.FindFromIndex(i + 1).Extent() != 2: + result = False + break + results.append(result) + + return all(results) class _DisplayNode(NodeMixin): """Used to create anytree structures from TopoDS_Shapes""" @@ -1637,7 +2111,7 @@ class Shape(NodeMixin): ) -> list[_DisplayNode]: """Create an anytree copy of the TopoDS_Shape structure""" - obj_type = shape_LUT[shape.ShapeType()] + obj_type = Shape.shape_LUT[shape.ShapeType()] if show_center: loc = Shape(shape).bounding_box().center() else: @@ -1731,13 +2205,17 @@ class Shape(NodeMixin): Returns: str: tree representation of internal structure """ - - if isinstance(self, Compound) and self.children: + # if isinstance(self, Compound) and self.children: + if ( + self.wrapped is not None + and isinstance(self.wrapped, TopoDS_Compound) + and self.children + ): show_center = False if show_center is None else show_center result = Shape._show_tree(self, show_center) else: tree = Shape._build_tree( - self.wrapped, tree=[], limit=inverse_shape_LUT[limit_class] + self.wrapped, tree=[], limit=Shape.inverse_shape_LUT[limit_class] ) show_center = True if show_center is None else show_center result = Shape._show_tree(tree[0], show_center) @@ -1772,7 +2250,7 @@ class Shape(NodeMixin): else: sum_shape = self.fuse(*summands) - if SkipClean.clean: + if SkipClean.clean and not isinstance(sum_shape, list): sum_shape = sum_shape.clean() return sum_shape @@ -1830,16 +2308,16 @@ class Shape(NodeMixin): """right multiply for positioning operator *""" if not ( isinstance(other, (list, tuple)) - and all([isinstance(o, (Location, Plane)) for o in other]) + and all(isinstance(o, (Location, Plane)) for o in other) ): raise ValueError( "shapes can only be multiplied list of locations or planes" ) return [loc * self for loc in other] + @abstractmethod def center(self) -> Vector: """All of the derived classes from Shape need a center method""" - raise NotImplementedError def clean(self) -> Self: """clean @@ -1870,110 +2348,9 @@ class Shape(NodeMixin): return self @classmethod - def cast(cls, obj: TopoDS_Shape, for_construction: bool = False) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - new_shape = None - - # define the shape lookup table for casting - constructor__lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - new_shape = constructor__lut[shape_type](downcast(obj)) - new_shape.for_construction = for_construction - - return new_shape - - @deprecated("Use the `export_stl` function instead") - def export_stl( - self, - file_name: str, - tolerance: float = 1e-3, - angular_tolerance: float = 0.1, - ascii_format: bool = False, - ) -> bool: - """Export STL - - Exports a shape to a specified STL file. - - Args: - file_name (str): The path and file name to write the STL output to. - tolerance (float, optional): A linear deflection setting which limits the distance - between a curve and its tessellation. Setting this value too low will result in - large meshes that can consume computing resources. Setting the value too high can - result in meshes with a level of detail that is too low. The default is a good - starting point for a range of cases. Defaults to 1e-3. - angular_tolerance (float, optional): Angular deflection setting which limits the angle - between subsequent segments in a polyline. Defaults to 0.1. - ascii_format (bool, optional): Export the file as ASCII (True) or binary (False) - STL format. Defaults to False (binary). - - Returns: - bool: Success - """ - mesh = BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - mesh.Perform() - - writer = StlAPI_Writer() - - if ascii_format: - writer.ASCIIMode = True - else: - writer.ASCIIMode = False - - return writer.Write(self.wrapped, file_name) - - @deprecated("Use the `export_step` function instead") - def export_step(self, file_name: str, **kwargs) -> IFSelect_ReturnStatus: - """Export this shape to a STEP file. - - kwargs is used to provide optional keyword arguments to configure the exporter. - - Args: - file_name (str): Path and filename for writing. - kwargs: used to provide optional keyword arguments to configure the exporter. - - Returns: - IFSelect_ReturnStatus: OCCT return status - """ - # Handle the extra settings for the STEP export - pcurves = 1 - if "write_pcurves" in kwargs and not kwargs["write_pcurves"]: - pcurves = 0 - precision_mode = kwargs["precision_mode"] if "precision_mode" in kwargs else 0 - - writer = STEPControl_Writer() - Interface_Static.SetIVal_s("write.surfacecurve.mode", pcurves) - Interface_Static.SetIVal_s("write.precision.mode", precision_mode) - writer.Transfer(self.wrapped, STEPControl_AsIs) - - return writer.Write(file_name) - - @deprecated("Use the `export_brep` function instead") - def export_brep(self, file: Union[str, BytesIO]) -> bool: - """Export this shape to a BREP file - - Args: - file: Union[str, BytesIO]: - - Returns: - - """ - - return_value = BRepTools.Write_s(self.wrapped, file) - - return True if return_value is None else return_value + @abstractmethod + def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: + """Returns the right type of wrapper, given a OCCT object""" @property def geom_type(self) -> GeomType: @@ -1988,9 +2365,9 @@ class Shape(NodeMixin): shape: TopAbs_ShapeEnum = shapetype(self.wrapped) if shape == ta.TopAbs_EDGE: - geom = geom_LUT_EDGE[BRepAdaptor_Curve(self.wrapped).GetType()] + geom = Shape.geom_LUT_EDGE[BRepAdaptor_Curve(self.wrapped).GetType()] elif shape == ta.TopAbs_FACE: - geom = geom_LUT_FACE[BRepAdaptor_Surface(self.wrapped).GetType()] + geom = Shape.geom_LUT_FACE[BRepAdaptor_Surface(self.wrapped).GetType()] else: geom = GeomType.OTHER @@ -2072,9 +2449,7 @@ class Shape(NodeMixin): Returns: BoundBox: A box sized to contain this Shape """ - return BoundBox._from_topo_ds( - self.wrapped, tolerance=tolerance, optimal=optimal - ) + return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) def mirror(self, mirror_plane: Plane = None) -> Self: """ @@ -2153,7 +2528,7 @@ class Shape(NodeMixin): """ properties = GProp_GProps() - calc_function = shape_properties_LUT[shapetype(obj.wrapped)] + calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] if not calc_function: raise NotImplementedError @@ -2163,21 +2538,11 @@ class Shape(NodeMixin): def shape_type(self) -> Shapes: """Return the shape type string for this class""" - return tcast(Shapes, shape_LUT[shapetype(self.wrapped)]) + return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - def _entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(self.wrapped, inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) + def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: + """Return all of the TopoDS sub entities of the given type""" + return _topods_entities(self.wrapped, topo_type) def _entities_from( self, child_type: Shapes, parent_type: Shapes @@ -2187,15 +2552,15 @@ class Shape(NodeMixin): TopExp.MapShapesAndAncestors_s( self.wrapped, - inverse_shape_LUT[child_type], - inverse_shape_LUT[parent_type], + Shape.inverse_shape_LUT[child_type], + Shape.inverse_shape_LUT[parent_type], res, ) out: Dict[Shape, list[Shape]] = {} for i in range(1, res.Extent() + 1): - out[Shape.cast(res.FindKey(i))] = [ - Shape.cast(el) for el in res.FindFromIndex(i) + out[self.__class__.cast(res.FindKey(i))] = [ + self.__class__.cast(el) for el in res.FindFromIndex(i) ] return out @@ -2218,127 +2583,90 @@ class Shape(NodeMixin): (e.g., edges, vertices) and other compounds, the method returns a list of only the simple shapes directly contained at the top level. """ - if self.wrapped is None: - return ShapeList() - - first_level_shapes = [] - stack = [self] - - while stack: - current_shape = stack.pop() - if isinstance(current_shape.wrapped, TopoDS_Compound): - iterator = TopoDS_Iterator() - iterator.Initialize(current_shape.wrapped) - while iterator.More(): - child_shape = Shape.cast(iterator.Value()) - if isinstance(child_shape.wrapped, TopoDS_Compound): - # Traverse further into the compound - stack.append(child_shape) - else: - # Add non-compound shape - first_level_shapes.append(child_shape) - iterator.Next() - else: - first_level_shapes.append(current_shape) - - return ShapeList(first_level_shapes) + return ShapeList( + self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) + ) @staticmethod - def _get_shape_list(shape: Shape, entity_type: str) -> ShapeList: + def get_shape_list(shape: Shape, entity_type: str) -> ShapeList: """Helper to extract entities of a specific type from a shape.""" if shape.wrapped is None: return ShapeList() - shape_list = ShapeList([Shape.cast(i) for i in shape._entities(entity_type)]) + shape_list = ShapeList( + [shape.__class__.cast(i) for i in shape.entities(entity_type)] + ) for item in shape_list: item.topo_parent = shape return shape_list @staticmethod - def _get_single_shape(shape: Shape, entity_type: str) -> Shape: + def get_single_shape(shape: Shape, entity_type: str) -> Shape: """Helper to extract a single entity of a specific type from a shape, with a warning if count != 1.""" - shape_list = Shape._get_shape_list(shape, entity_type) + shape_list = Shape.get_shape_list(shape, entity_type) entity_count = len(shape_list) if entity_count != 1: warnings.warn( f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=2, + stacklevel=3, ) return shape_list[0] if shape_list else None def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape._get_shape_list(self, "Vertex") + """vertices - all the vertices in this Shape - subclasses may override""" + return ShapeList() def vertex(self) -> Vertex: """Return the Vertex""" - return Shape._get_single_shape(self, "Vertex") + return None def edges(self) -> ShapeList[Edge]: """edges - all the edges in this Shape""" - edge_list = Shape._get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) + return ShapeList() def edge(self) -> Edge: """Return the Edge""" - return Shape._get_single_shape(self, "Edge") + return None def wires(self) -> ShapeList[Wire]: """wires - all the wires in this Shape""" - return Shape._get_shape_list(self, "Wire") + return ShapeList() def wire(self) -> Wire: """Return the Wire""" - return Shape._get_single_shape(self, "Wire") + return None def faces(self) -> ShapeList[Face]: """faces - all the faces in this Shape""" - return Shape._get_shape_list(self, "Face") + return ShapeList() def face(self) -> Face: """Return the Face""" - return Shape._get_single_shape(self, "Face") + return None def shells(self) -> ShapeList[Shell]: """shells - all the shells in this Shape""" - return Shape._get_shape_list(self, "Shell") + return ShapeList() def shell(self) -> Shell: """Return the Shell""" - return Shape._get_single_shape(self, "Shell") + return None def solids(self) -> ShapeList[Solid]: """solids - all the solids in this Shape""" - return Shape._get_shape_list(self, "Solid") + return ShapeList() def solid(self) -> Solid: """Return the Solid""" - return Shape._get_single_shape(self, "Solid") + return None def compounds(self) -> ShapeList[Compound]: """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) + return ShapeList() def compound(self) -> Compound: """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None + return None @property def area(self) -> float: @@ -2467,14 +2795,11 @@ class Shape(NodeMixin): Returns: Shape: copy of transformed shape with all objects keeping their type """ - if isinstance(self, Vertex): - new_shape = Vertex(*t_matrix.multiply(Vector(self))) - else: - transformed = Shape.cast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape = copy.deepcopy(self, None) - new_shape.wrapped = transformed.wrapped + transformed = downcast( + BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() + ) + new_shape = copy.deepcopy(self, None) + new_shape.wrapped = transformed return new_shape @@ -2495,11 +2820,11 @@ class Shape(NodeMixin): Returns: Shape: a copy of the object, but with geometry transformed """ - transformed = Shape.cast( + transformed = downcast( BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() ) new_shape = copy.deepcopy(self, None) - new_shape.wrapped = transformed.wrapped + new_shape.wrapped = transformed return new_shape @@ -2585,10 +2910,18 @@ class Shape(NodeMixin): self, other: Union[Shape, VectorLike] ) -> tuple[float, Vector, Vector]: """Minimal distance between two shapes and the points on each shape""" - other = other if isinstance(other, Shape) else Vertex(other) + + if isinstance(other, Shape): + topods_shape = other.wrapped + else: + vec = Vector(other) + topods_shape = downcast( + BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() + ) + dist_calc = BRepExtrema_DistShapeShape() dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(other.wrapped) + dist_calc.LoadS2(topods_shape) dist_calc.Perform() return ( dist_calc.Value(), @@ -2613,7 +2946,7 @@ class Shape(NodeMixin): args: Iterable[Shape], tools: Iterable[Shape], operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self: + ) -> Self | ShapeList[Self]: """Generic boolean operation Args: @@ -2625,6 +2958,12 @@ class Shape(NodeMixin): Returns: """ + # Find the highest order class from all the inputs Solid > Vertex + order_dict = {type(s): type(s).order for s in [self] + list(args) + list(tools)} + highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] + + # The base of the operation + base = args[0] if isinstance(args, (list, tuple)) else args arg = TopTools_ListOfShape() for obj in args: @@ -2640,32 +2979,54 @@ class Shape(NodeMixin): operation.SetRunParallel(True) operation.Build() - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - result = Shape.cast(result) + topo_result = downcast(operation.Shape()) - base = args[0] if isinstance(args, (list, tuple)) else args + # Clean + if SkipClean.clean: + upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) + upgrader.AllowInternalEdges(False) + try: + upgrader.Build() + topo_result = downcast(upgrader.Shape()) + except Exception: + warnings.warn("Boolean operation unable to clean", stacklevel=2) + + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(topo_result, TopoDS_Compound): + topo_result = unwrap_topods_compound(topo_result, True) + + if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: + results = ShapeList( + highest_order[0].cast(s) + for s in get_top_level_topods_shapes(topo_result) + ) + for result in results: + base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) + return results + + result = highest_order[0].cast(topo_result) base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) return result - def cut(self, *to_cut: Shape) -> Self: + def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: """Remove the positional arguments from this Shape. Args: *to_cut: Shape: Returns: - + Self | ShapeList[Self]: Resulting object may be of a different class than self + or a ShapeList if multiple non-Compound object created """ cut_op = BRepAlgoAPI_Cut() return self._bool_op((self,), to_cut, cut_op) - def fuse(self, *to_fuse: Shape, glue: bool = False, tol: float = None) -> Self: + def fuse( + self, *to_fuse: Shape, glue: bool = False, tol: float = None + ) -> Self | ShapeList[Self]: """fuse Fuse a sequence of shapes into a single shape. @@ -2676,7 +3037,9 @@ class Shape(NodeMixin): tol (float, optional): tolerance. Defaults to None. Returns: - Shape: fused shape + Self | ShapeList[Self]: Resulting object may be of a different class than self + or a ShapeList if multiple non-Compound object created + """ fuse_op = BRepAlgoAPI_Fuse() @@ -2689,15 +3052,9 @@ class Shape(NodeMixin): return return_value - def _intersect_with_axis(self, *axes: Axis) -> Shape: - lines = [Edge(a) for a in axes] - return self.intersect(*lines) - - def _intersect_with_plane(self, *planes: Plane) -> Shape: - surfaces = [Face.make_plane(p) for p in planes] - return self.intersect(*surfaces) - - def intersect(self, *to_intersect: Union[Shape, Axis, Plane]) -> Shape: + def intersect( + self, *to_intersect: Union[Shape, Axis, Plane] + ) -> Self | ShapeList[Self]: """Intersection of the arguments and this shape Args: @@ -2705,20 +3062,44 @@ class Shape(NodeMixin): intersect with Returns: - Shape: Resulting object may be of a different class than self + Self | ShapeList[Self]: Resulting object may be of a different class than self + or a ShapeList if multiple non-Compound object created """ + def _to_vertex(vec: Vector) -> Vertex: + """Helper method to convert vector to shape""" + return self.__class__.cast( + downcast( + BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() + ) + ) + + def _to_edge(axis: Axis) -> Edge: + """Helper method to convert axis to shape""" + return self.__class__.cast( + BRepBuilderAPI_MakeEdge( + Geom_Line( + axis.position.to_pnt(), + axis.direction.to_dir(), + ) + ).Edge() + ) + + def _to_face(plane: Plane) -> Face: + """Helper method to convert plane to shape""" + return self.__class__.cast(BRepBuilderAPI_MakeFace(plane.wrapped).Face()) + # Convert any geometry objects into their respective topology objects objs = [] for obj in to_intersect: if isinstance(obj, Vector): - objs.append(Vertex(obj)) + objs.append(_to_vertex(obj)) elif isinstance(obj, Axis): - objs.append(Edge(obj)) + objs.append(_to_edge(obj)) elif isinstance(obj, Plane): - objs.append(Face.make_plane(obj)) + objs.append(_to_face(obj)) elif isinstance(obj, Location): - objs.append(Vertex(obj.position)) + objs.append(_to_vertex(obj.position)) else: objs.append(obj) @@ -2751,10 +3132,10 @@ class Shape(NodeMixin): tuple[list[Vertex], list[Edge]]: section results """ try: - section = BRepAlgoAPI_Section(other._geom_adaptor(), self.wrapped) + section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) except (TypeError, AttributeError): try: - section = BRepAlgoAPI_Section(self._geom_adaptor(), other.wrapped) + section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) except (TypeError, AttributeError): return ([], []) @@ -2762,18 +3143,18 @@ class Shape(NodeMixin): section.Build() # Get the resulting shapes from the intersection - intersectionShape = section.Shape() + intersection_shape = section.Shape() vertices = [] # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersectionShape, TopAbs_ShapeEnum.TopAbs_VERTEX) + explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) while explorer.More(): - vertices.append(Vertex(downcast(explorer.Current()))) + vertices.append(self.__class__.cast(downcast(explorer.Current()))) explorer.Next() edges = [] - explorer = TopExp_Explorer(intersectionShape, TopAbs_ShapeEnum.TopAbs_EDGE) + explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) while explorer.More(): - edges.append(Edge(downcast(explorer.Current()))) + edges.append(self.__class__.cast(downcast(explorer.Current()))) explorer.Next() return (vertices, edges) @@ -2818,78 +3199,29 @@ class Shape(NodeMixin): faces_dist.sort(key=lambda x: x[1]) faces = [face[0] for face in faces_dist] - return ShapeList([Face(face) for face in faces]) - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP) -> Self: - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - Face.make_plane(tool).wrapped if isinstance(tool, Plane) else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, False) - result = Shape.cast(result) - - if keep != Keep.BOTH: - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting - surface_up = tool.thicken(0.1) - tops, bottoms = [], [] - for part in result: - if isinstance(tool, Plane): - is_up = tool.to_local_coords(part).center().Z >= 0 - else: - is_up = surface_up.intersect(part).volume >= TOLERANCE - (tops if is_up else bottoms).append(part) - result = Compound(tops) if keep == Keep.TOP else Compound(bottoms) - - result_wrapped = unwrap_topods_compound(result.wrapped, fully=True) - return Shape.cast(result_wrapped) + return ShapeList([self.__class__.cast(face) for face in faces]) @overload def split_by_perimeter( self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Union[Optional[Shell], Optional[Face]]: ... + ) -> Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]]: + """split_by_perimeter and keep inside or outside""" @overload def split_by_perimeter( self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] ) -> tuple[ - Union[Optional[Shell], Optional[Face]], - Union[Optional[Shell], Optional[Face]], - ]: ... + Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]], + Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]], + ]: + """split_by_perimeter and keep inside and outside""" + @overload def split_by_perimeter( self, perimeter: Union[Edge, Wire] - ) -> Union[Optional[Shell], Optional[Face]]: ... + ) -> Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]]: + """split_by_perimeter and keep inside (default)""" + def split_by_perimeter( self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE ): @@ -2921,13 +3253,29 @@ class Shape(NodeMixin): """ - def get(los: TopTools_ListOfShape, shape_cls) -> list: + def get(los: TopTools_ListOfShape) -> list: + """Return objects from TopTools_ListOfShape as list""" shapes = [] for _ in range(los.Size()): - shapes.append(shape_cls(los.First())) + first = los.First() + if not first.IsNull(): + shapes.append(self.__class__.cast(first)) los.RemoveFirst() return shapes + def process_sides(sides): + """Process sides to determine if it should be None, a single element, + a Shell, or a ShapeList.""" + if not sides: + return None + if len(sides) == 1: + return sides[0] + # Attempt to create a shell + potential_shell = _sew_topods_faces([s.wrapped for s in sides]) + if isinstance(potential_shell, TopoDS_Shell): + return self.__class__.cast(potential_shell) + return ShapeList(sides) + if keep not in {Keep.INSIDE, Keep.OUTSIDE, Keep.BOTH}: raise ValueError( "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" @@ -2940,36 +3288,32 @@ class Shape(NodeMixin): for perimeter_edge in perimeter.edges(): perimeter_edges.Append(perimeter_edge.wrapped) - # Split the faces by the perimeter edges - lefts: list[Face] = [] - rights: list[Face] = [] - for target_face in self.faces(): - constructor = BRepFeat_SplitShape(target_face.wrapped) + # Split the shells by the perimeter edges + lefts: list[Shell] = [] + rights: list[Shell] = [] + for target_shell in self.shells(): + constructor = BRepFeat_SplitShape(target_shell.wrapped) constructor.Add(perimeter_edges) constructor.Build() - lefts.extend(get(constructor.Left(), Face)) - rights.extend(get(constructor.Right(), Face)) + lefts.extend(get(constructor.Left())) + rights.extend(get(constructor.Right())) - left = None if not lefts else lefts[0] if len(lefts) == 1 else Shell(lefts) - right = None if not rights else rights[0] if len(rights) == 1 else Shell(rights) + left = process_sides(lefts) + right = process_sides(rights) # Is left or right the inside? perimeter_length = perimeter.length - left_perimeter_length = ( - sum(e.length for e in left.edges()) if left is not None else 0 - ) - right_perimeter_length = ( - sum(e.length for e in right.edges()) if right is not None else 0 - ) + left_perimeter_length = sum(e.length for e in left.edges()) if left else 0 + right_perimeter_length = sum(e.length for e in right.edges()) if right else 0 left_inside = abs(perimeter_length - left_perimeter_length) < abs( perimeter_length - right_perimeter_length ) if keep == Keep.BOTH: return (left, right) if left_inside else (right, left) - elif keep == Keep.INSIDE: + if keep == Keep.INSIDE: return left if left_inside else right - else: # keep == Keep.OUTSIDE: - return right if left_inside else left + # keep == Keep.OUTSIDE: + return right if left_inside else left def distance(self, other: Shape) -> float: """Minimal distance between two shapes @@ -3161,12 +3505,12 @@ class Shape(NodeMixin): """ return self.__class__(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - def _repr_javascript_(self): - """Jupyter 3D representation support""" + # def _repr_javascript_(self): + # """Jupyter 3D representation support""" - from .jupyter_tools import display + # from .jupyter_tools import display - return display(self)._repr_javascript_() + # return display(self)._repr_javascript_() def transformed( self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) @@ -3197,7 +3541,7 @@ class Shape(NodeMixin): t_o.SetTranslation(Vector(offset).wrapped) return self._apply_transform(t_o * t_rx * t_ry * t_rz) - def find_intersection_points(self, axis: Axis) -> list[tuple[Vector, Vector]]: + def find_intersection_points(self, other: Axis) -> list[tuple[Vector, Vector]]: """Find point and normal at intersection Return both the point(s) and normal(s) of the intersection of the axis and the shape @@ -3210,7 +3554,7 @@ class Shape(NodeMixin): """ oc_shape = self.wrapped - intersection_line = gce_MakeLin(axis.wrapped).Value() + intersection_line = gce_MakeLin(other.wrapped).Value() intersect_maker = BRepIntCurveSurface_Inter() intersect_maker.Init(oc_shape, intersection_line, 0.0001) @@ -3218,10 +3562,10 @@ class Shape(NodeMixin): while intersect_maker.More(): inter_pt = intersect_maker.Pnt() # Calculate distance along axis - distance = axis.to_plane().to_local_coords(Vector(inter_pt)).Z + distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z intersections.append( ( - Face(intersect_maker.Face()), + intersect_maker.Face(), # TopoDS_Face Vector(inter_pt), distance, ) @@ -3232,7 +3576,7 @@ class Shape(NodeMixin): intersecting_faces = [i[0] for i in intersections] intersecting_points = [i[1] for i in intersections] intersecting_normals = [ - f.normal_at(intersecting_points[i]).normalized() + f.normal_at(intersecting_points[i].to_pnt()) for i, f in enumerate(intersecting_faces) ] result = [] @@ -3241,16 +3585,12 @@ class Shape(NodeMixin): return result - @deprecated("Use find_intersection_points instead") - def find_intersection(self, axis: Axis) -> list[tuple[Vector, Vector]]: - return self.find_intersection_points(axis) - def project_faces( self, faces: Union[list[Face], Compound], path: Union[Wire, Edge], start: float = 0, - ) -> Compound: + ) -> ShapeList[Face]: """Projected Faces following the given path on Shape Project by positioning each face of to the shape along the path and @@ -3275,7 +3615,11 @@ class Shape(NodeMixin): # The derived classes of Shape implement center shape_center = self.center() # pylint: disable=no-member - if isinstance(faces, Compound): + if ( + not isinstance(faces, (list, tuple)) + and faces.wrapped is not None + and isinstance(faces.wrapped, TopoDS_Compound) + ): faces = faces.faces() first_face_min_x = faces[0].bounding_box().min.X @@ -3310,168 +3654,7 @@ class Shape(NodeMixin): logger.debug("finished projecting '%d' faces", len(faces)) - return Compound(projected_faces) - - def _extrude( - self, direction: VectorLike - ) -> Union[Edge, Face, Shell, Solid, Compound]: - """_extrude - - Extrude self in the provided direction. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Union[Edge, Face, Shell, Solid, Compound]: extruded shape - """ - direction = Vector(direction) - - if not isinstance(self, (Vertex, Edge, Wire, Face, Shell)): - raise ValueError(f"extrude not supported for {type(self)}") - - prism_builder = BRepPrimAPI_MakePrism(self.wrapped, direction.wrapped) - new_shape = downcast(prism_builder.Shape()) - shape_type = new_shape.ShapeType() - - if shape_type == TopAbs_ShapeEnum.TopAbs_EDGE: - result = Edge(new_shape) - elif shape_type == TopAbs_ShapeEnum.TopAbs_FACE: - result = Face(new_shape) - elif shape_type == TopAbs_ShapeEnum.TopAbs_SHELL: - result = Shell(new_shape) - elif shape_type == TopAbs_ShapeEnum.TopAbs_SOLID: - result = Solid(new_shape) - elif shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(new_shape, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - topods_solid = downcast(explorer.Current()) - solids.append(Solid(topods_solid)) - explorer.Next() - result = Compound(solids) - else: - raise RuntimeError("extrude produced an unexpected result") - return result - - @classmethod - def extrude( - cls, obj: Union[Vertex, Edge, Wire, Face, Shell], direction: VectorLike - ) -> Self: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Union[Edge, Face, Shell, Solid, Compound]: extruded shape - """ - return obj._extrude(direction) - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - # visible_edges = ShapeList(map(Shape, visible_edges)) - # hidden_edges = ShapeList(map(Shape, hidden_edges)) - visible_edges = ShapeList(map(Edge, visible_edges)) - hidden_edges = ShapeList(map(Edge, hidden_edges)) - - return (visible_edges, hidden_edges) + return ShapeList(projected_faces) class Comparable(metaclass=ABCMeta): @@ -3510,6 +3693,10 @@ class ShapeList(list[T]): """Last element in the ShapeList""" return self[-1] + def center(self) -> Vector: + """The average of the center of objects within the ShapeList""" + return sum(o.center() for o in self) / len(self) if self else Vector(0, 0, 0) + def filter_by( self, filter_by: Union[ShapePredicate, Axis, Plane, GeomType], @@ -3541,10 +3728,25 @@ class ShapeList(list[T]): # could be moved out maybe? def axis_parallel_predicate(axis: Axis, tolerance: float): def pred(shape: Shape): - if isinstance(shape, Face) and shape.is_planar: - shape_axis = Axis(shape.center(), shape.normal_at(None)) - elif isinstance(shape, Edge) and shape.geom_type == GeomType.LINE: - shape_axis = Axis(shape.position_at(0), shape.tangent_at(0)) + if shape.is_planar_face: + gp_pnt = gp_Pnt() + normal = gp_Vec() + u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) + BRepGProp_Face(shape.wrapped).Normal(u_val, v_val, gp_pnt, normal) + normal = Vector(normal).normalized() + shape_axis = Axis(shape.center(), normal) + elif ( + isinstance(shape.wrapped, TopoDS_Edge) + and shape.geom_type == GeomType.LINE + ): + curve = shape.geom_adaptor() + umin = curve.FirstParameter() + tmp = gp_Pnt() + res = gp_Vec() + curve.D1(umin, tmp, res) + start_pos = Vector(tmp) + start_dir = Vector(gp_Dir(res)) + shape_axis = Axis(start_pos, start_dir) else: return False return axis.is_parallel(shape_axis, tolerance) @@ -3556,12 +3758,18 @@ class ShapeList(list[T]): plane_xyz = plane.z_dir.wrapped.XYZ() def pred(shape: Shape): - if isinstance(shape, Face) and shape.is_planar: - shape_axis = Axis(shape.center(), shape.normal_at(None)) + if shape.is_planar_face: + gp_pnt = gp_Pnt() + normal = gp_Vec() + u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) + BRepGProp_Face(shape.wrapped).Normal(u_val, v_val, gp_pnt, normal) + normal = Vector(normal).normalized() + shape_axis = Axis(shape.center(), normal) + # shape_axis = Axis(shape.center(), shape.normal_at(None)) return plane_axis.is_parallel(shape_axis, tolerance) - if isinstance(shape, Wire): + if isinstance(shape.wrapped, TopoDS_Wire): return all(pred(e) for e in shape.edges()) - if isinstance(shape, Edge): + if isinstance(shape.wrapped, TopoDS_Edge): for curve in shape.wrapped.TShape().Curves(): if curve.IsCurve3D(): return ShapeAnalysis_Curve.IsPlanar_s( @@ -3681,13 +3889,13 @@ class ShapeList(list[T]): tol_digits, ) - elif isinstance(group_by, (Edge, Wire)): + elif hasattr(group_by, "wrapped") and isinstance( + group_by.wrapped, (TopoDS_Edge, TopoDS_Wire) + ): def key_f(obj): - return round( - group_by.param_at_point(obj.center()), - tol_digits, - ) + pnt1, _pnt2 = group_by.closest_points(obj.center()) + return round(group_by.param_at_point(pnt1), tol_digits) elif isinstance(group_by, SortBy): if group_by == SortBy.LENGTH: @@ -3745,7 +3953,9 @@ class ShapeList(list[T]): key=lambda o: (axis_as_location * Location(o.center())).position.Z, reverse=reverse, ) - elif isinstance(sort_by, (Edge, Wire)): + elif hasattr(sort_by, "wrapped") and isinstance( + sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire) + ): def u_of_closest_center(obj) -> float: """u-value of closest point between object center and sort_by""" @@ -3805,9 +4015,8 @@ class ShapeList(list[T]): Returns: ShapeList: Sorted shapes """ - other = other if isinstance(other, Shape) else Vertex(other) distances = sorted( - [(other.distance_to(obj), obj) for obj in self], + [(obj.distance_to(other), obj) for obj in self], key=lambda obj: obj[0], reverse=reverse, ) @@ -3823,8 +4032,7 @@ class ShapeList(list[T]): vertex_count = len(vertices) if vertex_count != 1: warnings.warn( - f"Found {vertex_count} vertices, returning first", - stacklevel=2, + f"Found {vertex_count} vertices, returning first", stacklevel=2 ) return vertices[0] @@ -3837,10 +4045,7 @@ class ShapeList(list[T]): edges = self.edges() edge_count = len(edges) if edge_count != 1: - warnings.warn( - f"Found {edge_count} edges, returning first", - stacklevel=2, - ) + warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) return edges[0] def wires(self) -> ShapeList[Wire]: @@ -3852,10 +4057,7 @@ class ShapeList(list[T]): wires = self.wires() wire_count = len(wires) if wire_count != 1: - warnings.warn( - f"Found {wire_count} wires, returning first", - stacklevel=2, - ) + warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) return wires[0] def faces(self) -> ShapeList[Face]: @@ -3880,10 +4082,7 @@ class ShapeList(list[T]): shells = self.shells() shell_count = len(shells) if shell_count != 1: - warnings.warn( - f"Found {shell_count} shells, returning first", - stacklevel=2, - ) + warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) return shells[0] def solids(self) -> ShapeList[Solid]: @@ -3895,10 +4094,7 @@ class ShapeList(list[T]): solids = self.solids() solid_count = len(solids) if solid_count != 1: - warnings.warn( - f"Found {solid_count} solids, returning first", - stacklevel=2, - ) + warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) return solids[0] def compounds(self) -> ShapeList[Compound]: @@ -3911,8 +4107,7 @@ class ShapeList(list[T]): compound_count = len(compounds) if compound_count != 1: warnings.warn( - f"Found {compound_count} compounds, returning first", - stacklevel=2, + f"Found {compound_count} compounds, returning first", stacklevel=2 ) return compounds[0] @@ -4016,16 +4211,25 @@ class GroupBy(Generic[T, K]): def __repr__(self): return repr(ShapeList(self)) - def _repr_pretty_(self, p, cycle=False): + def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: + """ + Render a formatted representation of the object for pretty-printing in + interactive environments. + + Args: + printer (PrettyPrinter): The pretty printer instance handling the output. + cycle (bool): Indicates if a reference cycle is detected to + prevent infinite recursion. + """ if cycle: - p.text("(...)") + printer.text("(...)") else: - with p.group(1, "[", "]"): + with printer.group(1, "[", "]"): for idx, item in enumerate(self): if idx: - p.text(",") - p.breakable() - p.pretty(item) + printer.text(",") + printer.breakable() + printer.pretty(item) def group(self, key: K): """Select group by key""" @@ -4049,106 +4253,64 @@ class Compound(Mixin3D, Shape): (CAD) applications, allowing engineers and designers to work with assemblies of shapes as unified entities for efficient modeling and analysis.""" - _dim = None + order = 4.0 + + project_to_viewport = Mixin1D.project_to_viewport + extrude = _ClassMethodProxy(Mixin1D.extrude) + + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Self: + "Returns the right type of wrapper, given a OCCT object" + + # define the shape lookup table for casting + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + ta.TopAbs_FACE: Face, + ta.TopAbs_SHELL: Shell, + ta.TopAbs_SOLID: Solid, + ta.TopAbs_COMPOUND: Compound, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) @property def _dim(self) -> Union[int, None]: """The dimension of the shapes within the Compound - None if inconsistent""" - sub_dims = {s._dim for s in self.get_top_level_shapes()} + sub_dims = {s.dim for s in get_top_level_topods_shapes(self.wrapped)} return sub_dims.pop() if len(sub_dims) == 1 else None - @overload def __init__( self, - obj: TopoDS_Shape, + obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, label: str = "", color: Color = None, material: str = "", joints: dict[str, Joint] = None, parent: Compound = None, - children: Iterable[Shape] = None, - ): - """Build a Compound from an OCCT TopoDS_Shape/TopoDS_Compound - - Args: - obj (TopoDS_Shape, optional): OCCT Compound. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - children (Iterable[Shape], optional): assembly children. Defaults to None. - """ - - @overload - def __init__( - self, - shapes: Iterable[Shape], - label: str = "", - color: Color = None, - material: str = "", - joints: dict[str, Joint] = None, - parent: Compound = None, - children: Iterable[Shape] = None, + children: Sequence[Shape] = None, ): """Build a Compound from Shapes Args: - shapes (Iterable[Shape]): shapes within the compound + obj (TopoDS_Compound | Iterable[Shape], optional): OCCT Compound or shapes label (str, optional): Defaults to ''. color (Color, optional): Defaults to None. material (str, optional): tag for external tools. Defaults to ''. joints (dict[str, Joint], optional): names joints. Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. - children (Iterable[Shape], optional): assembly children. Defaults to None. + children (Sequence[Shape], optional): assembly children. Defaults to None. """ - def __init__(self, *args, **kwargs): - shapes, obj, label, color, material, joints, parent, children = (None,) * 8 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, material, joints, parent, children = args[:7] + ( - None, - ) * (7 - l_a) - elif isinstance(args[0], Iterable): - shapes, label, color, material, joints, parent, children = args[:7] + ( - None, - ) * (7 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "shapes", - "obj", - "label", - "material", - "color", - "joints", - "parent", - "children", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - shapes = kwargs.get("shapes", shapes) - material = kwargs.get("material", material) - joints = kwargs.get("joints", joints) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - children = kwargs.get("children", children) - - if shapes: - obj = Compound._make_compound([s.wrapped for s in shapes]) + if isinstance(obj, Iterable): + obj = _make_topods_compound_from_shapes([s.wrapped for s in obj]) super().__init__( obj=obj, - label="" if label is None else label, + label=label, color=color, parent=parent, ) @@ -4192,7 +4354,7 @@ class Compound(Mixin3D, Shape): raise ValueError("Center of GEOMETRY is not supported for this object") if center_of == CenterOf.MASS: properties = GProp_GProps() - calc_function = shape_properties_LUT[unwrapped_shapetype(self)] + calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] if calc_function: calc_function(self.wrapped, properties) middle = Vector(properties.CentreOfMass()) @@ -4202,42 +4364,6 @@ class Compound(Mixin3D, Shape): middle = self.bounding_box().center() return middle - @staticmethod - def _make_compound(occt_shapes: Iterable[TopoDS_Shape]) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound - """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) - - for shape in occt_shapes: - comp_builder.Add(comp, shape) - - return comp - - @classmethod - def make_compound(cls, shapes: Iterable[Shape]) -> Compound: - """Create a compound out of a list of shapes - Args: - shapes: Iterable[Shape]: - Returns: - """ - warnings.warn( - "make_compound() will be deprecated - use the Compound constructor instead", - DeprecationWarning, - stacklevel=2, - ) - - return cls(Compound._make_compound([s.wrapped for s in shapes])) - def _remove(self, shape: Shape) -> Compound: """Return self with the specified shape removed. @@ -4252,7 +4378,7 @@ class Compound(Mixin3D, Shape): """Method call after detaching from `parent`.""" logger.debug("Removing parent of %s (%s)", self.label, parent.label) if parent.children: - parent.wrapped = Compound._make_compound( + parent.wrapped = _make_topods_compound_from_shapes( [c.wrapped for c in parent.children] ) else: @@ -4266,20 +4392,24 @@ class Compound(Mixin3D, Shape): def _post_attach(self, parent: Compound): """Method call after attaching to `parent`.""" logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = Compound._make_compound([c.wrapped for c in parent.children]) + parent.wrapped = _make_topods_compound_from_shapes( + [c.wrapped for c in parent.children] + ) def _post_detach_children(self, children): """Method call before detaching `children`.""" if children: kids = ",".join([child.label for child in children]) logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = Compound._make_compound([c.wrapped for c in self.children]) + self.wrapped = _make_topods_compound_from_shapes( + [c.wrapped for c in self.children] + ) # else: # logger.debug("Removing no children from %s", self.label) def _pre_attach_children(self, children): """Method call before attaching `children`.""" - if not all([isinstance(child, Shape) for child in children]): + if not all(isinstance(child, Shape) for child in children): raise ValueError("Each child must be of type Shape") def _post_attach_children(self, children: Iterable[Shape]): @@ -4287,11 +4417,13 @@ class Compound(Mixin3D, Shape): if children: kids = ",".join([child.label for child in children]) logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = Compound._make_compound([c.wrapped for c in self.children]) + self.wrapped = _make_topods_compound_from_shapes( + [c.wrapped for c in self.children] + ) # else: # logger.debug("Adding no children to %s", self.label) - def __add__(self, other: Union[list[Shape], Shape]) -> Shape: + def __add__(self, other: Shape | Sequence[Shape]) -> Compound: """Combine other to self `+` operator Note that if all of the objects are connected Edges/Wires the result @@ -4301,36 +4433,77 @@ class Compound(Mixin3D, Shape): curve = Curve() if self.wrapped is None else Curve(self.wrapped) self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) return curve + other + + summands = [ + shape + for o in (other if isinstance(other, (list, tuple)) else [other]) + if o is not None + for shape in o.get_top_level_shapes() + ] + # If there is nothing to add return the original object + if not summands: + return self + + summands = [s for s in self.get_top_level_shapes() + summands if s is not None] + + # Only fuse the parts if necessary + if len(summands) <= 1: + result: Shape = Compound(summands[0:1]) else: - summands = [ - shape - for o in (other if isinstance(other, (list, tuple)) else [other]) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self + fuse_op = BRepAlgoAPI_Fuse() + fuse_op.SetFuzzyValue(TOLERANCE) + self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) + result = self._bool_op(summands[:1], summands[1:], fuse_op) + if isinstance(result, list): + result = Compound(result) + self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - summands = [ - s for s in self.get_top_level_shapes() + summands if s is not None - ] + if SkipClean.clean: + result = result.clean() - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = summands[0] - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to( - summands[0], ["wrapped", "_NodeMixin__children"] - ) - result = self._bool_op(summands[:1], summands[1:], fuse_op) + return result - if SkipClean.clean: - result = result.clean() + def __sub__(self, other: Shape | Sequence[Shape]) -> Compound: + """Cut other to self `-` operator""" + difference = Shape.__sub__(self, other) + difference = Compound( + difference if isinstance(difference, list) else [difference] + ) + self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - return result + return difference + + def __and__(self, other: Shape | Sequence[Shape]) -> Compound: + """Intersect other to self `&` operator""" + intersection = Shape.__and__(self, other) + intersection = Compound( + intersection if isinstance(intersection, list) else [intersection] + ) + self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) + return intersection + + def compounds(self) -> ShapeList[Compound]: + """compounds - all the compounds in this Shape""" + if self.wrapped is None: + return ShapeList() + if isinstance(self.wrapped, TopoDS_Compound): + # pylint: disable=not-an-iterable + sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] + sub_compounds.append(self) + else: + sub_compounds = [] + return ShapeList(sub_compounds) + + def compound(self) -> Compound: + """Return the Compound""" + shape_list = self.compounds() + entity_count = len(shape_list) + if entity_count != 1: + warnings.warn( + f"Found {entity_count} compounds, returning first", + stacklevel=2, + ) + return shape_list[0] if shape_list else None def do_children_intersect( self, include_parent: bool = False, tolerance: float = 1e-5 @@ -4363,16 +4536,20 @@ class Compound(Mixin3D, Shape): for child_index_pair in child_index_pairs: # First check for bounding box intersections .. # .. then confirm with actual object intersections which could be complex + bbox_intersection = children_bbox[child_index_pair[0]].intersect( + children_bbox[child_index_pair[1]] + ) bbox_common_volume = ( - children_bbox[child_index_pair[0]] - .intersect(children_bbox[child_index_pair[1]]) - .volume + 0.0 if isinstance(bbox_intersection, list) else bbox_intersection.volume ) if bbox_common_volume > tolerance: + obj_intersection = children[child_index_pair[0]].intersect( + children[child_index_pair[1]] + ) common_volume = ( - children[child_index_pair[0]] - .intersect(children[child_index_pair[1]]) - .volume + 0.0 + if isinstance(obj_intersection, list) + else obj_intersection.volume ) if common_volume > tolerance: return ( @@ -4505,7 +4682,7 @@ class Compound(Mixin3D, Shape): [(0, 0, 0), (-axes_scale / 20, axes_scale / 30, 0)], [(-1, 0, 0), (-1, 1.5, 0)], ) - arrow = arrow_arc.fuse(copy.copy(arrow_arc).mirror(Plane.XZ)) + arrow = Wire([arrow_arc, copy.copy(arrow_arc).mirror(Plane.XZ)]) x_label = ( Compound.make_text( "X", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) @@ -4530,17 +4707,20 @@ class Compound(Mixin3D, Shape): .move(Location(z_axis @ 1)) .edges() ) - triad = Edge.fuse( - x_axis, - y_axis, - z_axis, - arrow.moved(Location(x_axis @ 1)), - arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), - arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), - *x_label, - *y_label, - *z_label, + triad = Curve( + [ + x_axis, + y_axis, + z_axis, + arrow.moved(Location(x_axis @ 1)), + arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), + arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), + *x_label, + *y_label, + *z_label, + ] ) + return triad def __iter__(self) -> Iterator[Shape]: @@ -4552,7 +4732,7 @@ class Compound(Mixin3D, Shape): iterator = TopoDS_Iterator(self.wrapped) while iterator.More(): - yield Shape.cast(iterator.Value()) + yield Compound.cast(iterator.Value()) iterator.Next() def __len__(self) -> int: @@ -4697,16 +4877,15 @@ class Edge(Mixin1D, Shape): # pylint: disable=too-many-public-methods - _dim = 1 + order = 1.0 @property def _dim(self) -> int: return 1 - @overload def __init__( self, - obj: TopoDS_Shape, + obj: Optional[TopoDS_Shape | Axis] = None, label: str = "", color: Color = None, parent: Compound = None, @@ -4714,68 +4893,29 @@ class Edge(Mixin1D, Shape): """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge Args: - obj (TopoDS_Shape, optional): OCCT Face. + obj (TopoDS_Shape | Axis, optional): OCCT Edge or Axis. label (str, optional): Defaults to ''. color (Color, optional): Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. """ - @overload - def __init__( - self, - axis: Axis, - label: str = "", - color: Color = None, - parent: Compound = None, - ): - """Build an infinite Edge from an Axis - - Args: - axis (Axis): Axis to be converted to an infinite Edge - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - axis, obj, label, color, parent = (None,) * 5 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Axis): - axis, label, color, parent = args[:4] + (None,) * (4 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["axis", "obj", "label", "color", "parent"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - axis = kwargs.get("axis", axis) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if axis is not None: + if isinstance(obj, Axis): obj = BRepBuilderAPI_MakeEdge( Geom_Line( - axis.position.to_pnt(), - axis.direction.to_dir(), + obj.position.to_pnt(), + obj.direction.to_dir(), ) ).Edge() super().__init__( obj=obj, - label="" if label is None else label, + label=label, color=color, parent=parent, ) - def _geom_adaptor(self) -> BRepAdaptor_Curve: - """ """ + def geom_adaptor(self) -> BRepAdaptor_Curve: + """Return the Geom Curve from this Edge""" return BRepAdaptor_Curve(self.wrapped) def close(self) -> Union[Edge, Wire]: @@ -4796,7 +4936,7 @@ class Edge(Mixin1D, Shape): """center of an underlying circle or ellipse geometry.""" geom_type = self.geom_type - geom_adaptor = self._geom_adaptor() + geom_adaptor = self.geom_adaptor() if geom_type == GeomType.CIRCLE: return_value = Vector(geom_adaptor.Circle().Position().Location()) @@ -4866,7 +5006,9 @@ class Edge(Mixin1D, Shape): return u_values - def _intersect_with_edge(self, edge: Edge) -> Shape: + def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: + """find intersection vertices and edges""" + # Find any intersection points vertex_intersections = [ Vertex(pnt) for pnt in self.find_intersection_points(edge) @@ -4876,29 +5018,17 @@ class Edge(Mixin1D, Shape): intersect_op = BRepAlgoAPI_Common() edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - return Compound(vertex_intersections + edge_intersections) - - def _intersect_with_axis(self, axis: Axis) -> Shape: - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(axis) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (Edge(axis),), intersect_op).edges() - - return Compound(vertex_intersections + edge_intersections) + return vertex_intersections, edge_intersections def find_intersection_points( - self, edge: Union[Axis, Edge] = None, tolerance: float = TOLERANCE + self, other: Axis | Edge = None, tolerance: float = TOLERANCE ) -> ShapeList[Vector]: """find_intersection_points Determine the points where a 2D edge crosses itself or another 2D edge Args: - edge (Union[Axis, Edge]): curve to compare with + other (Axis | Edge): curve to compare with tolerance (float, optional): the precision of computing the intersection points. Defaults to TOLERANCE. @@ -4906,19 +5036,21 @@ class Edge(Mixin1D, Shape): ShapeList[Vector]: list of intersection points """ # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(edge, Axis): + if isinstance(other, Axis): self_bbox_w_edge = self.bounding_box().add( - Vertex(edge.position).bounding_box() + Vertex(other.position).bounding_box() ) - edge = Edge.make_line( - edge.position + edge.direction * (-1 * self_bbox_w_edge.diagonal), - edge.position + edge.direction * self_bbox_w_edge.diagonal, + other = Edge.make_line( + other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), + other.position + other.direction * self_bbox_w_edge.diagonal, ) # To determine the 2D plane to work on - plane = self.common_plane(edge) + plane = self.common_plane(other) if plane is None: raise ValueError("All objects must be on the same plane") - edge_surface: Geom_Surface = Face.make_plane(plane)._geom_adaptor() + # Convert the plane into a Geom_Surface + pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() + edge_surface = BRep_Tool.Surface_s(pln_shape) self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( self.wrapped, @@ -4927,13 +5059,13 @@ class Edge(Mixin1D, Shape): self.param_at(0), self.param_at(1), ) - if edge is not None: + if other is not None: edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - edge.wrapped, + other.wrapped, edge_surface, TopLoc_Location(), - edge.param_at(0), - edge.param_at(1), + other.param_at(0), + other.param_at(1), ) intersector = Geom2dAPI_InterCurveCurve( self_2d_curve, edge_2d_curve, tolerance @@ -4953,10 +5085,10 @@ class Edge(Mixin1D, Shape): valid_crosses = [] for pnt in crosses: try: - if edge is not None: + if other is not None: if ( self.distance_to(pnt) <= TOLERANCE - and edge.distance_to(pnt) <= TOLERANCE + and other.distance_to(pnt) <= TOLERANCE ): valid_crosses.append(pnt) else: @@ -4967,25 +5099,44 @@ class Edge(Mixin1D, Shape): return ShapeList(valid_crosses) - def intersect(self, other: Union[Edge, Axis]) -> Union[Shape, None]: - intersection: Compound - if isinstance(other, Edge): - intersection = self._intersect_with_edge(other) - elif isinstance(other, Axis): - intersection = self._intersect_with_axis(other) - else: - return NotImplemented + def intersect( + self, *to_intersect: Edge | Axis + ) -> Optional[Shape | ShapeList[Shape]]: + """intersect Edge with Edge or Axis - if intersection is not None: + Args: + other (Union[Edge, Axis]): other object + + Returns: + Union[Shape, None]: Compound of vertices and/or edges + """ + edges = [Edge(obj) if isinstance(obj, Axis) else obj for obj in to_intersect] + if not all(isinstance(obj, Edge) for obj in edges): + raise TypeError( + "Only Edge or Axis instances are supported for intersection" + ) + + # Find any intersection points + points_sets: list[set[Vector]] = [] + for edge_pair in combinations([self] + edges, 2): + intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) + points_sets.append(set(intersection_points)) + + # Find the intersection of all sets + common_points = set.intersection(*points_sets) + common_vertices = [Vertex(*pnt) for pnt in common_points] + + # Find Edge/Edge overlaps + common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() + + if common_vertices or common_edges: # If there is just one vertex or edge return it - vertices = intersection.get_type(Vertex) - edges = intersection.get_type(Edge) - if len(vertices) == 1 and len(edges) == 0: - return vertices[0] - elif len(vertices) == 0 and len(edges) == 1: - return edges[0] - else: - return intersection + if len(common_vertices) == 1 and len(common_edges) == 0: + return common_vertices[0] + if len(common_vertices) == 0 and len(common_edges) == 1: + return common_edges[0] + return ShapeList(common_vertices + common_edges) + return None def reversed(self) -> Edge: """Return a copy of self with the opposite orientation""" @@ -5619,7 +5770,7 @@ class Edge(Mixin1D, Shape): return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) -class Face(Shape): +class Face(Mixin2D, Shape): """A Face in build123d represents a 3D bounded surface within the topological data structure. It encapsulates geometric information, defining a face of a 3D shape. These faces are integral components of complex structures, such as solids and @@ -5628,7 +5779,7 @@ class Face(Shape): # pylint: disable=too-many-public-methods - _dim = 2 + order = 2.0 @property def _dim(self) -> int: @@ -5705,7 +5856,10 @@ class Face(Shape): parent = kwargs.get("parent", parent) if outer_wire is not None: - obj = Face._make_from_wires(outer_wire, inner_wires) + inner_topods_wires = ( + [w.wrapped for w in inner_wires] if inner_wires is not None else [] + ) + obj = _make_topods_face_from_wires(outer_wire.wrapped, inner_topods_wires) super().__init__( obj=obj, @@ -5750,7 +5904,7 @@ class Face(Shape): if self.is_planar: flat_face = Plane(self).to_local_coords(self) flat_face_edges = flat_face.edges() - if all([e.geom_type == GeomType.LINE for e in flat_face_edges]): + if all(e.geom_type == GeomType.LINE for e in flat_face_edges): flat_face_vertices = flat_face.vertices() result = "POLYGON" if len(flat_face_edges) == 4: @@ -5763,10 +5917,8 @@ class Face(Shape): [edge.tangent_at(0) for edge in pair] for pair in edge_pairs ] if all( - [ - edge_directions[0].get_angle(edge_directions[1]) == 90 - for edge_directions in edge_pair_directions - ] + edge_directions[0].get_angle(edge_directions[1]) == 90 + for edge_directions in edge_pair_directions ): result = "RECTANGLE" if len(flat_face_edges.group_by(SortBy.LENGTH)) == 1: @@ -5781,29 +5933,18 @@ class Face(Shape): return Plane(origin, z_dir=self.normal_at(origin)).location @property - def is_planar(face: Face) -> bool: + def is_planar(self) -> bool: """Is the face planar even though its geom_type may not be PLANE""" - surface = BRep_Tool.Surface_s(face.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() + return self.is_planar_face - def _geom_adaptor(self) -> Geom_Surface: - """ """ + def geom_adaptor(self) -> Geom_Surface: + """Return the Geom Surface for this Face""" return BRep_Tool.Surface_s(self.wrapped) def _uv_bounds(self) -> Tuple[float, float, float, float]: + """Return the u min, u max, v min, v max values""" return BRepTools.UVBounds_s(self.wrapped) - def __neg__(self) -> Face: - """Reverse normal operator -""" - new_face = copy.deepcopy(self) - new_face.wrapped = downcast(self.wrapped.Complemented()) - return new_face - - def offset(self, amount: float) -> Face: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - @overload def normal_at(self, surface_point: VectorLike = None) -> Vector: """normal_at point on surface @@ -5849,7 +5990,7 @@ class Face(Shape): surface_point, u, v = (None,) * 3 if args: - if isinstance(args[0], Iterable): + if isinstance(args[0], Sequence): surface_point = args[0] elif isinstance(args[0], (int, float)): u = args[0] @@ -5871,7 +6012,7 @@ class Face(Shape): raise ValueError("Both u & v values must be specified") # get the geometry - surface = self._geom_adaptor() + surface = self.geom_adaptor() if surface_point is None: u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() @@ -6041,93 +6182,7 @@ class Face(Shape): return return_value @classmethod - def make_from_wires( - cls, outer_wire: Wire, inner_wires: Iterable[Wire] = None - ) -> Face: - """make_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (list[Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error - - Returns: - Face: planar face potentially with holes - """ - warnings.warn( - "make_from_wires() will be deprecated - use the Face constructor instead", - DeprecationWarning, - stacklevel=2, - ) - - return Face(Face._make_from_wires(outer_wire, inner_wires)) - - @classmethod - def _make_from_wires( - cls, outer_wire: Wire, inner_wires: Iterable[Wire] = None - ) -> TopoDS_Shape: - """make_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (list[Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error - - Returns: - Face: planar face potentially with holes - """ - if inner_wires and not outer_wire.is_closed: - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = inner_wires if inner_wires else [] - - # check if wires are coplanar - verification_compound = Compound([outer_wire] + inner_wires) - if not BRepLib_FindSurface( - verification_compound.wrapped, OnlyPlane=True - ).Found(): - raise ValueError("Cannot build face(s): wires not planar") - - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire.wrapped) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) - - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) - - for inner_wire in inner_wires: - if not inner_wire.is_closed: - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire.wrapped) - - face_builder.Build() - - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") - - face = face_builder.Face() - - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() - - return sf_f.Result() - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: + def sew_faces(cls, faces: Iterable[Face]) -> ShapeList[ShapeList[Face]]: """sew faces Group contiguous faces and return them in a list of ShapeList @@ -6139,35 +6194,29 @@ class Face(Shape): RuntimeError: OCCT SewedShape generated unexpected output Returns: - list[ShapeList[Face]]: grouped contiguous faces + ShapeList[ShapeList[Face]]: grouped contiguous faces """ - # Create the shell build - shell_builder = BRepBuilderAPI_Sewing() - # Add the given faces to it - for face in faces: - shell_builder.Add(face.wrapped) - # Attempt to sew the faces into a contiguous shell - shell_builder.Perform() - # Extract the sewed shape - a face, a shell, a solid or a compound - sewed_shape = downcast(shell_builder.SewedShape()) + # Sew the faces + sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) + top_level_shapes = get_top_level_topods_shapes(sewed_shape) + sewn_faces = ShapeList() - # Create a list of ShapeList of Faces - if isinstance(sewed_shape, TopoDS_Face): - sewn_faces = [ShapeList([Face(sewed_shape)])] - elif isinstance(sewed_shape, TopoDS_Shell): - sewn_faces = [Shell(sewed_shape).faces()] - elif isinstance(sewed_shape, TopoDS_Compound): - sewn_faces = [] - for face in Compound(sewed_shape).get_type(Face): - sewn_faces.append(ShapeList([face])) - for shell in Compound(sewed_shape).get_type(Shell): - sewn_faces.append(shell.faces()) - elif isinstance(sewed_shape, TopoDS_Solid): - sewn_faces = [Solid(sewed_shape).faces()] - else: - raise RuntimeError( - f"SewedShape returned a {type(sewed_shape)} which was unexpected" - ) + # For each of the top level shapes create a ShapeList of Face + for top_level_shape in top_level_shapes: + if isinstance(top_level_shape, TopoDS_Face): + sewn_faces.append(ShapeList([Face(top_level_shape)])) + elif isinstance(top_level_shape, TopoDS_Shell): + sewn_faces.append(Shell(top_level_shape).faces()) + elif isinstance(top_level_shape, TopoDS_Solid): + sewn_faces.append( + ShapeList( + Face(f) for f in _topods_entities(top_level_shape, "Face") + ) + ) + else: + raise RuntimeError( + f"SewedShape returned a {type(top_level_shape)} which was unexpected" + ) return sewn_faces @@ -6206,9 +6255,13 @@ class Face(Shape): path = Wire([path.edge()]) builder = BRepOffsetAPI_MakePipeShell(path.wrapped) builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Solid._transModeDict[transition]) + builder.SetTransitionMode(Shape._transModeDict[transition]) builder.Build() - return Shape.cast(builder.Shape()).clean().face() + result = Face(builder.Shape()) + if SkipClean.clean: + result = result.clean() + + return result @classmethod def make_surface_from_array_of_points( @@ -6222,12 +6275,14 @@ class Face(Shape): """make_surface_from_array_of_points Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter space of the face. - The second dimension correspond to points on the horizontal direction in the parameter space of the face. - The 2 dimensions are U,V dimensions of the parameter space of the face. + The first dimension correspond to points on the vertical direction in the parameter + space of the face. The second dimension correspond to points on the horizontal + direction in the parameter space of the face. The 2 dimensions are U,V dimensions + of the parameter space of the face. Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V parameters second is U parameters. + points (list[list[VectorLike]]): a 2D list of points, first dimension is V + parameters second is U parameters. tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. smoothing (Tuple[float, float, float], optional): optional tuple of 3 weights use for variational smoothing. Defaults to None. @@ -6370,7 +6425,7 @@ class Face(Shape): if isinstance(exterior, Wire): outside_edges = exterior.edges() elif isinstance(exterior, Iterable) and all( - [isinstance(o, Edge) for o in exterior] + isinstance(o, Edge) for o in exterior ): outside_edges = exterior else: @@ -6483,15 +6538,9 @@ class Face(Shape): # Need to wrap in b3d objects for comparison to work # ref.wrapped != edge.wrapped but ref == edge - edges = [Shape.cast(e) for e in edges] + edges = [Mixin2D.cast(e) for e in edges] - if reference_edge: - if reference_edge not in edges: - raise ValueError("One or more vertices are not part of edge") - edge1 = reference_edge - edge2 = [x for x in edges if x != reference_edge][0] - else: - edge1, edge2 = edges + edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) chamfer_builder.AddChamfer( TopoDS.Edge_s(edge1.wrapped), @@ -6515,43 +6564,9 @@ class Face(Shape): and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE ) - def thicken( - self, depth: float, normal_override: Optional[VectorLike] = None - ) -> Solid: - """Thicken Face - - Create a solid from a potentially non planar face by thickening along the normals. - - .. image:: thickenFace.png - - Non-planar faces are thickened both towards and away from the center of the sphere. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - normal_override (Vector, optional): The normal_override vector can be used to - indicate which way is 'up', potentially flipping the face normal direction - such that many faces with different normals all go in the same direction - (direction need only be +/- 90 degrees from the face normal). Defaults to None. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - # Check to see if the normal needs to be flipped - adjusted_depth = depth - if normal_override is not None: - face_center = self.center() - face_normal = self.normal_at(face_center).normalized() - if face_normal.dot(Vector(normal_override).normalized()) < 0: - adjusted_depth = -depth - - return _thicken(self.wrapped, adjusted_depth) - def project_to_shape( - self, target_object: Shape, direction: VectorLike, taper: float = 0 - ) -> ShapeList[Face]: + self, target_object: Shape, direction: VectorLike + ) -> ShapeList[Face | Shell]: """Project Face to target Object Project a Face onto a Shape generating new Face(s) on the surfaces of the object. @@ -6569,180 +6584,39 @@ class Face(Shape): Args: target_object (Shape): Object to project onto direction (VectorLike): projection direction - taper (float, optional): taper angle. Defaults to 0. Returns: ShapeList[Face]: Face(s) projected on target object ordered by distance """ - max_dimension = Compound([self, target_object]).bounding_box().diagonal - if taper == 0: - face_extruded = Solid.extrude(self, Vector(direction) * max_dimension) + max_dimension = find_max_dimension([self, target_object]) + extruded_topods_self = _extrude_topods_shape( + self.wrapped, Vector(direction) * max_dimension + ) + + intersected_shapes = ShapeList() + if isinstance(target_object, Vertex): + raise TypeError("projection to a vertex is not supported") + if isinstance(target_object, Face): + topods_shape = _topods_bool_op( + (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() + ) + if not topods_shape.IsNull(): + intersected_shapes.append(Face(topods_shape)) else: - face_extruded = Solid.extrude_taper( - self, Vector(direction) * max_dimension, taper=taper - ) + for target_shell in target_object.shells(): + topods_shape = _topods_bool_op( + (extruded_topods_self,), + (target_shell.wrapped,), + BRepAlgoAPI_Common(), + ) + for topods_shell in get_top_level_topods_shapes(topods_shape): + intersected_shapes.append(Shell(topods_shell)) - intersected_faces = ShapeList() - for target_face in target_object.faces(): - intersected_faces.extend(face_extruded.intersect(target_face).faces()) - - # intersected faces may be fragmented so we'll put them back together - sewed_face_list = Face.sew_faces(intersected_faces) - sewed_faces = ShapeList() - for face_group in sewed_face_list: - if len(face_group) > 1: - sewed_faces.append(face_group.pop(0).fuse(*face_group).clean()) - else: - sewed_faces.append(face_group[0]) - - return sewed_faces.sort_by(Axis(self.center(), direction)) - - def project_to_shape_alt( - self, target_object: Shape, direction: VectorLike - ) -> Union[None, Face, Compound]: - """project_to_shape_alt - - Return the Faces contained within the first projection of self onto - the target. - - Args: - target_object (Shape): Object to project onto - direction (VectorLike): projection direction - - Returns: - Union[None, Face, Compound]: projection - """ - - perimeter = self.outer_wire() - direction = Vector(direction) - projection_axis = Axis((0, 0, 0), direction) - max_size = target_object.bounding_box().add(self.bounding_box()).diagonal - projection_faces: list[Face] = [] - - def get(los: TopTools_ListOfShape, shape_cls) -> list: - shapes = [] - for _i in range(los.Size()): - shapes.append(shape_cls(los.First())) - los.RemoveFirst() - return shapes - - def desired_faces(face_list: list[Face]) -> bool: - return ( - face_list - and face_list[0]._extrude(direction * -max_size).intersect(self).area - > TOLERANCE - ) - - # - # Self projection - # - projection_plane = Plane(direction * -max_size, z_dir=-direction) - - # Setup the projector - hidden_line_remover = HLRBRep_Algo() - hidden_line_remover.Add(target_object.wrapped) - hlr_projector = HLRAlgo_Projector(projection_plane.to_gp_ax2()) - hidden_line_remover.Projector(hlr_projector) - hidden_line_remover.Update() - hidden_line_remover.Hide() - hlr_shapes = HLRBRep_HLRToShape(hidden_line_remover) - - # Find the visible edges - target_edges_on_xy = [] - for edge_compound in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edge_compound.IsNull(): - target_edges_on_xy.extend(Compound(edge_compound).edges()) - - target_edges = [ - projection_plane.from_local_coords(e) for e in target_edges_on_xy + intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) + intersected_shapes = [ + s.face() if len(s.faces()) == 1 else s for s in intersected_shapes ] - target_wires = edges_to_wires(target_edges) - # return target_wires - - # projection_plane = Plane(self.center(), z_dir=direction) - # projection_plane = Plane((0, 0, 0), z_dir=direction) - # visible, _hidden = target_object.project_to_viewport( - # viewport_origin=direction * -max_size, - # # viewport_up=projection_plane.x_dir, - # viewport_up=(direction.X, direction.Y, 0), - # # viewport_up=(direction.Y,direction.X,0), - # # viewport_up=projection_plane.y_dir.cross(direction), - # look_at=projection_plane.z_dir, - # ) - # self_visible_edges = [projection_plane.from_local_coords(e) for e in visible] - # self_visible_wires = edges_to_wires(self_visible_edges) - - # Project the perimeter onto the target object - hlr_projector = BRepProj_Projection( - perimeter.wrapped, target_object.wrapped, direction.to_dir() - ) - # print(len(Compound(hlr_projector.Shape()).wires().sort_by(projection_axis))) - projected_wires = ( - Compound(hlr_projector.Shape()).wires().sort_by(projection_axis) - ) - - # target_projected_wires = [] - # for target_wire in target_wires: - # hlr_projector = BRepProj_Projection( - # target_wire.wrapped, target_object.wrapped, direction.to_dir() - # ) - # target_projected_wires.extend( - # Compound(hlr_projector.Shape()).wires().sort_by(projection_axis) - # ) - # return target_projected_wires - # target_projected_edges = [e for w in target_projected_wires for e in w.edges()] - - edge_sequence = TopTools_SequenceOfShape() - for e in projected_wires.edges(): - edge_sequence.Append(e.wrapped) - - # Split the faces by the projection edges & keep the part of - # these faces bound by the projection - for target_face in target_object.faces(): - constructor = BRepFeat_SplitShape(target_face.wrapped) - constructor.Add(edge_sequence) - constructor.Build() - lefts = get(constructor.Left(), Face) - rights = get(constructor.Right(), Face) - # Keep the faces that correspond to the projection - if desired_faces(lefts): - projection_faces.extend(lefts) - if desired_faces(rights): - projection_faces.extend(rights) - - # # Filter out faces on the back - # projection_faces = ShapeList(projection_faces).filter_by( - # lambda f: f._extrude(direction * -1).intersect(target_object).area > 0, - # reverse=True, - # ) - - # Project the targets own edges on the projection_faces - # trim_wires = [] - # for projection_face in projection_faces: - # for target_wire in target_wires: - # hlr_projector = BRepProj_Projection( - # target_wire.wrapped, projection_face.wrapped, direction.to_dir() - # ) - # # print(len(Compound(hlr_projector.Shape()).wires().sort_by(projection_axis))) - # trim_wires.extend( - # Compound(hlr_projector.Shape()).wires() - # ) - - # return trim_wires - - # Create the object to return depending on the # projected faces - if not projection_faces: - projection = None - elif len(projection_faces) == 1: - projection = projection_faces[0] - else: - projection = projection_faces.pop(0).fuse(*projection_faces).clean() - - return projection + return intersected_shapes def make_holes(self, interior_wires: list[Wire]) -> Face: """Make Holes in Face @@ -6803,10 +6677,16 @@ class Face(Shape): bool: indicating whether or not point is within Face """ - return Compound([self]).is_inside(point, tolerance) + solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) + solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) + return solid_classifier.IsOnAFace() + + # surface = BRep_Tool.Surface_s(self.wrapped) + # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) + # return projector.LowerDistance() <= TOLERANCE -class Shell(Shape): +class Shell(Mixin2D, Shape): """A Shell is a fundamental component in build123d's topological data structure representing a connected set of faces forming a closed surface in 3D space. As part of a geometric model, it defines a watertight enclosure, commonly encountered @@ -6815,16 +6695,15 @@ class Shell(Shape): allows for efficient handling of surfaces within a model, supporting various operations and analyses.""" - _dim = 2 + order = 2.5 @property def _dim(self) -> int: return 2 - @overload def __init__( self, - obj: TopoDS_Shape, + obj: Optional[TopoDS_Shape | Face | Iterable[Face]] = None, label: str = "", color: Color = None, parent: Compound = None, @@ -6832,94 +6711,26 @@ class Shell(Shape): """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell Args: - obj (TopoDS_Shape, optional): OCCT Shell. + obj (TopoDS_Shape | Face | Iterable[Face], optional): OCCT Shell, Face or Faces. label (str, optional): Defaults to ''. color (Color, optional): Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. """ - @overload - def __init__( - self, - face: Face, - label: str = "", - color: Color = None, - parent: Compound = None, - ): - """Build a shell from a single Face + if isinstance(obj, Iterable) and len(obj) == 1: + obj = obj[0] - Args: - face (Face): Face to convert to Shell - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - faces: Iterable[Face], - label: str = "", - color: Color = None, - parent: Compound = None, - ): - """Build a shell from Faces - - Args: - faces (Iterable[Face]): Faces to assemble - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - face, faces, obj, label, color, parent = (None,) * 6 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Face): - face, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Iterable): - faces, label, color, parent = args[:4] + (None,) * (4 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "face", - "faces", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - face = kwargs.get("face", face) - faces = kwargs.get("faces", faces) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if faces: - if len(faces) == 1: - face = faces[0] - else: - obj = Shell._make_shell(faces) - if face: + if isinstance(obj, Face): builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(face.wrapped).Surface().Surface() + BRepAdaptor_Surface(obj.wrapped).Surface().Surface() ) obj = builder.Shape() + elif isinstance(obj, Iterable): + obj = _sew_topods_faces([f.wrapped for f in obj]) super().__init__( obj=obj, - label="" if label is None else label, + label=label, color=color, parent=parent, ) @@ -6927,34 +6738,14 @@ class Shell(Shape): @property def volume(self) -> float: """volume - the volume of this Shell if manifold, otherwise zero""" - # when density == 1, mass == volume if self.is_manifold: - return Solid(self).volume + solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) + properties = GProp_GProps() + calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] + calc_function(solid_shell, properties) + return properties.Mass() return 0.0 - @classmethod - def make_shell(cls, faces: Iterable[Face]) -> Shell: - """Create a Shell from provided faces""" - warnings.warn( - "make_shell() will be deprecated - use the Shell constructor instead", - DeprecationWarning, - stacklevel=2, - ) - return Shell(Shell._make_shell(faces)) - - @classmethod - def _make_shell(cls, faces: Iterable[Face]) -> TopoDS_Shape: - """Create a Shell from provided faces""" - shell_builder = BRepBuilderAPI_Sewing() - - for face in faces: - shell_builder.Add(face.wrapped) - - shell_builder.Perform() - shape = shell_builder.SewedShape() - - return shape - def center(self) -> Vector: """Center of mass of the shell""" properties = GProp_GProps() @@ -6985,9 +6776,13 @@ class Shell(Shape): path = Wire(Wire(path.edges()).order_edges()) builder = BRepOffsetAPI_MakePipeShell(path.wrapped) builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Solid._transModeDict[transition]) + builder.SetTransitionMode(Shape._transModeDict[transition]) builder.Build() - return Shape.cast(builder.Shape()) + result = Shell(builder.Shape()) + if SkipClean.clean: + result = result.clean() + + return result @classmethod def make_loft( @@ -6995,10 +6790,9 @@ class Shell(Shape): ) -> Shell: """make loft - Makes a loft from a list of wires and vertices. - Vertices can appear only at the beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - Wires may be closed or opened. + Makes a loft from a list of wires and vertices. Vertices can appear only at the + beginning or end of the list, but cannot appear consecutively within the list nor + between wires. Wires may be closed or opened. Args: objs (list[Vertex, Wire]): wire perimeters or vertices @@ -7012,22 +6806,6 @@ class Shell(Shape): """ return cls(_make_loft(objs, False, ruled)) - def thicken(self, depth: float) -> Solid: - """Thicken Shell - - Create a solid from a shell by thickening along the normals. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - return _thicken(self.wrapped, depth) - class Solid(Mixin3D, Shape): """A Solid in build123d represents a three-dimensional solid geometry @@ -7037,16 +6815,15 @@ class Solid(Mixin3D, Shape): operations (union, intersection, and difference), are often performed on Solid objects to create or modify complex geometries.""" - _dim = 3 + order = 3.0 @property def _dim(self) -> int: return 3 - @overload def __init__( self, - obj: TopoDS_Shape, + obj: TopoDS_Shape | Shell = None, label: str = "", color: Color = None, material: str = "", @@ -7056,7 +6833,7 @@ class Solid(Mixin3D, Shape): """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid Args: - obj (TopoDS_Shape, optional): OCCT Solid. + obj (TopoDS_Shape | Shell, optional): OCCT Solid or Shell. label (str, optional): Defaults to ''. color (Color, optional): Defaults to None. material (str, optional): tag for external tools. Defaults to ''. @@ -7064,71 +6841,13 @@ class Solid(Mixin3D, Shape): parent (Compound, optional): assembly parent. Defaults to None. """ - @overload - def __init__( - self, - shell: Shell, - label: str = "", - color: Color = None, - material: str = "", - joints: dict[str, Joint] = None, - parent: Compound = None, - ): - """Build a shell from Faces - - Args: - shell (Shell): manifold shell of the new solid - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - shell, obj, label, color, material, joints, parent = (None,) * 7 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, material, joints, parent = args[:6] + (None,) * ( - 6 - l_a - ) - elif isinstance(args[0], Shell): - shell, label, color, material, joints, parent = args[:6] + (None,) * ( - 6 - l_a - ) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "shell", - "obj", - "label", - "color", - "material", - "joints", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - shell = kwargs.get("shell", shell) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - material = kwargs.get("material", material) - joints = kwargs.get("joints", joints) - parent = kwargs.get("parent", parent) - - if shell is not None: - obj = Solid._make_solid(shell) + if isinstance(obj, Shell): + obj = Solid._make_solid(obj) super().__init__( obj=obj, - label="" if label is None else label, + # label="" if label is None else label, + label=label, color=color, parent=parent, ) @@ -7141,16 +6860,6 @@ class Solid(Mixin3D, Shape): # when density == 1, mass == volume return Shape.compute_mass(self) - @classmethod - def make_solid(cls, shell: Shell) -> Solid: - """Create a Solid object from the surface shell""" - warnings.warn( - "make_compound() will be deprecated - use the Compound constructor instead", - DeprecationWarning, - stacklevel=2, - ) - return Solid(Solid._make_solid(shell)) - @classmethod def _make_solid(cls, shell: Shell) -> TopoDS_Solid: """Create a Solid object from the surface shell""" @@ -7291,8 +7000,8 @@ class Solid(Mixin3D, Shape): ) -> Solid: """make loft - Makes a loft from a list of wires and vertices. - Vertices can appear only at the beginning or end of the list, but cannot appear consecutively within the list + Makes a loft from a list of wires and vertices. Vertices can appear only at the + beginning or end of the list, but cannot appear consecutively within the list nor between wires. Args: @@ -7526,12 +7235,12 @@ class Solid(Mixin3D, Shape): # extrude inner wires inner_solids = [ - Shape(extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w)) + extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w) for w in inner_wires ] # combine the inner solids into compound - inner_comp = Compound._make_compound(inner_solids) + inner_comp = _make_topods_compound_from_shapes(inner_solids) # subtract from the outer solid return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) @@ -7567,7 +7276,7 @@ class Solid(Mixin3D, Shape): direction *= -1 until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - max_dimension = Compound([section, target_object]).bounding_box().diagonal + max_dimension = find_max_dimension([section, target_object]) clipping_direction = ( direction * max_dimension if until == Until.NEXT @@ -7632,7 +7341,7 @@ class Solid(Mixin3D, Shape): "clipping error - extrusion may be incorrect", stacklevel=2, ) - extrusion = Shape.fuse(*extrusion_parts) + extrusion = Solid.fuse(*extrusion_parts) return extrusion @@ -7673,12 +7382,6 @@ class Solid(Mixin3D, Shape): return cls(revol_builder.Shape()) - _transModeDict = { - Transition.TRANSFORMED: BRepBuilderAPI_Transformed, - Transition.ROUND: BRepBuilderAPI_RoundCorner, - Transition.RIGHT: BRepBuilderAPI_RightCorner, - } - @classmethod def _set_sweep_mode( cls, @@ -7747,7 +7450,7 @@ class Solid(Mixin3D, Shape): else: builder.SetMode(is_frenet) - builder.SetTransitionMode(Solid._transModeDict[transition]) + builder.SetTransitionMode(Shape._transModeDict[transition]) builder.Add(wire.wrapped, False, rotate) @@ -7755,7 +7458,7 @@ class Solid(Mixin3D, Shape): if make_solid: builder.MakeSolid() - shapes.append(Shape.cast(builder.Shape())) + shapes.append(Mixin3D.cast(builder.Shape())) return_value, inner_shapes = shapes[0], shapes[1:] @@ -7815,6 +7518,66 @@ class Solid(Mixin3D, Shape): return cls(builder.Shape()) + @classmethod + def thicken( + cls, + surface: Face | Shell, + depth: float, + normal_override: Optional[VectorLike] = None, + ) -> Solid: + """Thicken Face or Shell + + Create a solid from a potentially non planar face or shell by thickening along + the normals. + + .. image:: thickenFace.png + + Non-planar faces are thickened both towards and away from the center of the sphere. + + Args: + depth (float): Amount to thicken face(s), can be positive or negative. + normal_override (Vector, optional): Face only. The normal_override vector can be + used to indicate which way is 'up', potentially flipping the face normal + direction such that many faces with different normals all go in the same + direction (direction need only be +/- 90 degrees from the face normal). + Defaults to None. + + Raises: + RuntimeError: Opencascade internal failures + + Returns: + Solid: The resulting Solid object + """ + # Check to see if the normal needs to be flipped + adjusted_depth = depth + if isinstance(surface, Face) and normal_override is not None: + surface_center = surface.center() + surface_normal = surface.normal_at(surface_center).normalized() + if surface_normal.dot(Vector(normal_override).normalized()) < 0: + adjusted_depth = -depth + + offset_builder = BRepOffset_MakeOffset() + offset_builder.Initialize( + surface.wrapped, + Offset=adjusted_depth, + Tol=1.0e-5, + Mode=BRepOffset_Skin, + # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both + # sides of the surface but doesn't seem to work + Intersection=True, + SelfInter=False, + Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection + Thickening=True, + RemoveIntEdges=True, + ) + offset_builder.MakeOffsetShape() + try: + result = Solid(offset_builder.Shape()) + except StdFail_NotDone as err: + raise RuntimeError("Error applying thicken to given surface") from err + + return result + class Vertex(Shape): """A Vertex in build123d represents a zero-dimensional point in the topological @@ -7824,7 +7587,7 @@ class Vertex(Shape): manipulation of 3D shapes. They hold coordinate information and are essential for constructing complex structures like wires, faces, and solids.""" - _dim = 0 + order = 0.0 @property def _dim(self) -> int: @@ -7889,11 +7652,32 @@ class Vertex(Shape): super().__init__(ocp_vx) self.X, self.Y, self.Z = self.to_tuple() + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Self: + "Returns the right type of wrapper, given a OCCT object" + + # define the shape lookup table for casting + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + @property def volume(self) -> float: """volume - the volume of this Vertex, which is always zero""" return 0.0 + def vertices(self) -> ShapeList[Vertex]: + """vertices - all the vertices in this Shape""" + return ShapeList((self,)) # Vertex is an iterable + + def vertex(self) -> Vertex: + """Return the Vertex""" + return self + def to_tuple(self) -> tuple[float, float, float]: """Return vertex as three tuple of floats""" geom_point = BRep_Tool.Pnt_s(self.wrapped) @@ -7969,6 +7753,7 @@ class Vertex(Shape): return new_vertex def __and__(self, *args, **kwargs): + """intersect operator +""" raise NotImplementedError("Vertices can't be intersected") def __repr__(self) -> str: @@ -7979,7 +7764,7 @@ class Vertex(Shape): Returns: Vertex as String """ - return f"Vertex: ({self.X}, {self.Y}, {self.Z})" + return f"Vertex({self.X}, {self.Y}, {self.Z})" def __iter__(self): """Initialize to beginning""" @@ -8001,6 +7786,21 @@ class Vertex(Shape): raise StopIteration return value + def transform_shape(self, t_matrix: Matrix) -> Vertex: + """Apply affine transform without changing type + + Transforms a copy of this Vertex by the provided 3D affine transformation matrix. + Note that not all transformation are supported - primarily designed for translation + and rotation. See :transform_geometry: for more comprehensive transformations. + + Args: + t_matrix (Matrix): affine transformation matrix + + Returns: + Vertex: copy of transformed shape with all objects keeping their type + """ + return Vertex(*t_matrix.multiply(Vector(self))) + class Wire(Mixin1D, Shape): """A Wire in build123d is a topological entity representing a connected sequence @@ -8009,7 +7809,7 @@ class Wire(Mixin1D, Shape): solids. They store information about the connectivity and order of edges, allowing precise definition of paths within a 3D model.""" - _dim = 1 + order = 1.5 @property def _dim(self) -> int: @@ -8118,7 +7918,12 @@ class Wire(Mixin1D, Shape): edge, label, color, parent = args[:4] + (None,) * (4 - l_a) elif isinstance(args[0], Wire): wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Curve): + # elif isinstance(args[0], Curve): + elif ( + hasattr(args[0], "wrapped") + and isinstance(args[0].wrapped, TopoDS_Compound) + and args[0].wrapped.dim == 1 + ): # Curve curve, label, color, parent = args[:4] + (None,) * (4 - l_a) elif isinstance(args[0], Iterable): edges, sequenced, label, color, parent = args[:5] + (None,) * (5 - l_a) @@ -8167,8 +7972,8 @@ class Wire(Mixin1D, Shape): parent=parent, ) - def _geom_adaptor(self) -> BRepAdaptor_CompCurve: - """ """ + def geom_adaptor(self) -> BRepAdaptor_CompCurve: + """Return the Geom Comp Curve for this Wire""" return BRepAdaptor_CompCurve(self.wrapped) def close(self) -> Wire: @@ -8204,7 +8009,7 @@ class Wire(Mixin1D, Shape): edges_in = TopTools_HSequenceOfShape() wires_out = TopTools_HSequenceOfShape() - for edge in Compound(wires).edges(): + for edge in [e for w in wires for e in w.edges()]: edges_in.Append(edge.wrapped) ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) @@ -8306,9 +8111,9 @@ class Wire(Mixin1D, Shape): edges_uv_values: list[tuple[float, float, Edge]] = [] found_end_of_wire = False # for finding ends of closed wires - for e in edges: - u = self.param_at_point(e.position_at(0)) - v = self.param_at_point(e.position_at(1)) + for edge in edges: + u = self.param_at_point(edge.position_at(0)) + v = self.param_at_point(edge.position_at(1)) if self.is_closed: # Avoid two beginnings or ends u = ( 1 - u @@ -8331,33 +8136,33 @@ class Wire(Mixin1D, Shape): # Edge might be reversed and require flipping parms u, v = (v, u) if u > v else (u, v) - edges_uv_values.append((u, v, e)) + edges_uv_values.append((u, v, edge)) new_edges = [] - for u, v, e in edges_uv_values: + for u, v, edge in edges_uv_values: if v < start or u > end: # Edge not needed continue - elif start <= u and v <= end: # keep whole Edge - new_edges.append(e) + if start <= u and v <= end: # keep whole Edge + new_edges.append(edge) elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = e.param_at_point(self.position_at(start)) - v_edge = e.param_at_point(self.position_at(end)) + u_edge = edge.param_at_point(self.position_at(start)) + v_edge = edge.param_at_point(self.position_at(end)) u_edge, v_edge = ( (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) ) - new_edges.append(e.trim(u_edge, v_edge)) + new_edges.append(edge.trim(u_edge, v_edge)) elif start <= u: # keep start of Edge - u_edge = e.param_at_point(self.position_at(end)) + u_edge = edge.param_at_point(self.position_at(end)) if u_edge != 0: - new_edges.append(e.trim(0, u_edge)) + new_edges.append(edge.trim(0, u_edge)) else: # v <= end keep end of Edge - v_edge = e.param_at_point(self.position_at(start)) + v_edge = edge.param_at_point(self.position_at(start)) if v_edge != 1: - new_edges.append(e.trim(v_edge, 1)) + new_edges.append(edge.trim(v_edge, 1)) return Wire(new_edges) @@ -8368,33 +8173,6 @@ class Wire(Mixin1D, Shape): ] return ShapeList(ordered_edges) - @classmethod - def make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> Wire: - """make_wire - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - - Raises: - ValueError: Edges are disconnected and can't be sequenced. - RuntimeError: Wire is empty - - Returns: - Wire: assembled edges - """ - warnings.warn( - "make_wire() will be deprecated - use the Wire constructor instead", - DeprecationWarning, - stacklevel=2, - ) - return Wire(edges, sequenced) - @classmethod def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: """_make_wire @@ -8569,7 +8347,16 @@ class Wire(Mixin1D, Shape): Returns: Wire: filleted wire """ - return Face(self).fillet_2d(radius, vertices).outer_wire() + # Create a face to fillet + unfilleted_face = _make_topods_face_from_wires(self.wrapped) + # Fillet the face + fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) + for vertex in vertices: + fillet_builder.AddFillet(vertex.wrapped, radius) + fillet_builder.Build() + filleted_face = downcast(fillet_builder.Shape()) + # Return the outer wire + return Wire(BRepTools.OuterWire_s(filleted_face)) def chamfer_2d( self, @@ -8592,7 +8379,58 @@ class Wire(Mixin1D, Shape): Returns: Wire: chamfered wire """ - return Face(self).chamfer_2d(distance, distance2, vertices, edge).outer_wire() + reference_edge = edge + del edge + + # Create a face to chamfer + unchamfered_face = _make_topods_face_from_wires(self.wrapped) + chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) + + vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() + TopExp.MapShapesAndAncestors_s( + unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map + ) + + for v in vertices: + edges = vertex_edge_map.FindFromKey(v.wrapped) + + # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs + # Using First() and Last() to omit + edges = [edges.First(), edges.Last()] + + # Need to wrap in b3d objects for comparison to work + # ref.wrapped != edge.wrapped but ref == edge + edges = [Edge(e) for e in edges] + + edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) + + chamfer_builder.AddChamfer( + TopoDS.Edge_s(edge1.wrapped), + TopoDS.Edge_s(edge2.wrapped), + distance, + distance2, + ) + + chamfer_builder.Build() + chamfered_face = chamfer_builder.Shape() + # Fix the shape + shape_fix = ShapeFix_Shape(chamfered_face) + shape_fix.Perform() + chamfered_face = downcast(shape_fix.Shape()) + # Return the outer wire + return Wire(BRepTools.OuterWire_s(chamfered_face)) + + @staticmethod + def order_chamfer_edges(reference_edge, edges) -> tuple[Edge, Edge]: + """Order the edges of a chamfer relative to a reference Edge""" + if reference_edge: + if reference_edge not in edges: + raise ValueError("One or more vertices are not part of edge") + edge1 = reference_edge + edge2 = [x for x in edges if x != reference_edge][0] + else: + edge1, edge2 = edges + return edge1, edge2 @classmethod def make_rect( @@ -8785,13 +8623,13 @@ class Wire(Mixin1D, Shape): if direction_vector is not None: projection_object = BRepProj_Projection( self.wrapped, - Shape.cast(target_object.wrapped).wrapped, + target_object.wrapped, gp_Dir(*direction_vector.to_tuple()), ) else: projection_object = BRepProj_Projection( self.wrapped, - Shape.cast(target_object.wrapped).wrapped, + target_object.wrapped, gp_Pnt(*center_point.to_tuple()), ) @@ -8878,48 +8716,20 @@ class Joint(ABC): @abstractmethod def connect_to(self, other: Joint): """All derived classes must provide a connect_to method""" - raise NotImplementedError @abstractmethod def relative_to(self, other: Joint) -> Location: """Return relative location to another joint""" - raise NotImplementedError @property @abstractmethod - def location(self) -> Location: # pragma: no cover + def location(self) -> Location: """Location of joint""" - raise NotImplementedError @property @abstractmethod - def symbol(self) -> Compound: # pragma: no cover + def symbol(self) -> Compound: """A CAD object positioned in global space to illustrate the joint""" - raise NotImplementedError - - -def _thicken(obj: TopoDS_Shape, depth: float): - solid = BRepOffset_MakeOffset() - solid.Initialize( - obj, - Offset=depth, - Tol=1.0e-5, - Mode=BRepOffset_Skin, - # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both - # sides of the surface but doesn't seem to work - Intersection=True, - SelfInter=False, - Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection - Thickening=True, - RemoveIntEdges=True, - ) - solid.MakeOffsetShape() - try: - result = Solid(solid.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error applying thicken to given Face") from err - - return result.clean() def _make_loft( @@ -8929,8 +8739,8 @@ def _make_loft( ) -> TopoDS_Shape: """make loft - Makes a loft from a list of wires and vertices. - Vertices can appear only at the beginning or end of the list, but cannot appear consecutively within the list + Makes a loft from a list of wires and vertices. Vertices can appear only at the + beginning or end of the list, but cannot appear consecutively within the list nor between wires. Args: @@ -8945,14 +8755,15 @@ def _make_loft( """ if len(objs) < 2: raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj, Vertex)] + vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] vertex_count = len(vertices) if vertex_count > 2: raise ValueError("Only two vertices are allowed") if vertex_count == 1 and not ( - isinstance(objs[0], Vertex) or isinstance(objs[-1], Vertex) + isinstance(objs[0].wrapped, TopoDS_Vertex) + or isinstance(objs[-1].wrapped, TopoDS_Vertex) ): raise ValueError( "The vertex must be either at the beginning or end of the list" @@ -8963,7 +8774,10 @@ def _make_loft( raise ValueError( "You can't have only 2 vertices to loft; try adding some wires" ) - if not (isinstance(objs[0], Vertex) and isinstance(objs[-1], Vertex)): + if not ( + isinstance(objs[0].wrapped, TopoDS_Vertex) + and isinstance(objs[-1].wrapped, TopoDS_Vertex) + ): raise ValueError( "The vertices must be at the beginning and end of the list" ) @@ -8971,9 +8785,9 @@ def _make_loft( loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) for obj in objs: - if isinstance(obj, Vertex): + if isinstance(obj.wrapped, TopoDS_Vertex): loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj, Wire): + elif isinstance(obj.wrapped, TopoDS_Wire): loft_builder.AddWire(obj.wrapped) loft_builder.Build() @@ -8991,7 +8805,7 @@ def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: """ - f_downcast: Any = downcast_LUT[shapetype(obj)] + f_downcast: Any = Shape.downcast_LUT[shapetype(obj)] return_value = f_downcast(obj) return return_value @@ -9038,21 +8852,22 @@ def fix(obj: TopoDS_Shape) -> TopoDS_Shape: return downcast(shape_fix.Shape()) -def isclose_b(a: float, b: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: +def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: """Determine whether two floating point numbers are close in value. Overridden abs_tol default for the math.isclose function. Args: - a (float): First value to compare - b (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", relative to the - magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", regardless of the - magnitude of the input values. Defaults to 1e-14 (unlike math.isclose which defaults to zero). + x (float): First value to compare + y (float): Second value to compare + rel_tol (float, optional): Maximum difference for being considered "close", + relative to the magnitude of the input values. Defaults to 1e-9. + abs_tol (float, optional): Maximum difference for being considered "close", + regardless of the magnitude of the input values. Defaults to 1e-14 + (unlike math.isclose which defaults to zero). Returns: True if a is close in value to b, and False otherwise. """ - return isclose(a, b, rel_tol=rel_tol, abs_tol=abs_tol) + return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) def shapetype(obj: TopoDS_Shape) -> TopAbs_ShapeEnum: @@ -9065,7 +8880,7 @@ def shapetype(obj: TopoDS_Shape) -> TopAbs_ShapeEnum: def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj, Compound): + if isinstance(obj.wrapped, TopoDS_Compound): shapetypes = set(shapetype(o.wrapped) for o in obj) if len(shapetypes) == 1: result = shapetypes.pop() @@ -9167,9 +8982,14 @@ def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: operation.SetRunParallel(True) operation.Build() - edges = Shape.cast(operation.Shape()).edges() - for edge in edges: - edge.topo_parent = combined + edges = [] + explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) + while explorer.More(): + found_edge = combined.__class__.cast(downcast(explorer.Current())) + found_edge.topo_parent = combined + edges.append(found_edge) + explorer.Next() + return ShapeList(edges) @@ -9195,11 +9015,11 @@ def topo_explore_connected_edges(edge: Edge, parent: Shape = None) -> ShapeList[ def topo_explore_common_vertex( - edge1: Union[Edge, TopoDS_Edge], edge2: Union[Edge, TopoDS_Edge] -) -> Union[Vertex, None]: + edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge +) -> Optional[Vertex]: """Given two edges, find the common vertex""" - topods_edge1 = edge1.wrapped if isinstance(edge1, Edge) else edge1 - topods_edge2 = edge2.wrapped if isinstance(edge2, Edge) else edge2 + topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped + topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped # Explore vertices of the first edge vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) @@ -9223,7 +9043,7 @@ def topo_explore_common_vertex( def unwrap_topods_compound( compound: TopoDS_Compound, fully: bool = True -) -> Union[TopoDS_Compound, TopoDS_Shape]: +) -> TopoDS_Compound | TopoDS_Shape: """Strip unnecessary Compound wrappers Args: @@ -9232,7 +9052,7 @@ def unwrap_topods_compound( wrappers (otherwise one TopoDS_Compound is left). Defaults to True. Returns: - Union[TopoDS_Compound, TopoDS_Shape]: base shape + TopoDS_Compound | TopoDS_Shape: base shape """ if compound.NbChildren() == 1: iterator = TopoDS_Iterator(compound) @@ -9248,6 +9068,242 @@ def unwrap_topods_compound( return compound +def get_top_level_topods_shapes(topods_shape: TopoDS_Shape) -> ShapeList[TopoDS_Shape]: + """ + Retrieve the first level of child shapes from the shape. + + This method collects all the non-compound shapes directly contained in the + current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses + its immediate children and collects all shapes that are not further nested + compounds. Nested compounds are traversed to gather their non-compound elements + without returning the nested compound itself. + + Returns: + ShapeList[TopoDS_Shape]: A list of all first-level non-compound child shapes. + + Example: + If the current shape is a compound containing both simple shapes + (e.g., edges, vertices) and other compounds, the method returns a list + of only the simple shapes directly contained at the top level. + """ + if topods_shape is None: + return ShapeList() + + first_level_shapes = [] + stack = [topods_shape] + + while stack: + current_shape = stack.pop() + if isinstance(current_shape, TopoDS_Compound): + iterator = TopoDS_Iterator() + iterator.Initialize(current_shape) + while iterator.More(): + child_shape = downcast(iterator.Value()) + if isinstance(child_shape, TopoDS_Compound): + # Traverse further into the compound + stack.append(child_shape) + else: + # Add non-compound shape + first_level_shapes.append(child_shape) + iterator.Next() + else: + first_level_shapes.append(current_shape) + + return ShapeList(first_level_shapes) + + +def _topods_bool_op( + args: Iterable[TopoDS_Shape], + tools: Iterable[TopoDS_Shape], + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, +) -> TopoDS_Shape: + """Generic boolean operation for TopoDS_Shapes + + Args: + args: Iterable[TopoDS_Shape]: + tools: Iterable[TopoDS_Shape]: + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: + + Returns: TopoDS_Shape + + """ + + arg = TopTools_ListOfShape() + for obj in args: + arg.Append(obj) + + tool = TopTools_ListOfShape() + for obj in tools: + tool.Append(obj) + + operation.SetArguments(arg) + operation.SetTools(tool) + + operation.SetRunParallel(True) + operation.Build() + + result = downcast(operation.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(result, TopoDS_Compound): + result = unwrap_topods_compound(result, True) + + return result + + +def _make_topods_face_from_wires( + outer_wire: TopoDS_Wire, inner_wires: Optional[Sequence[TopoDS_Wire]] = None +) -> TopoDS_Face: + """_make_topods_face_from_wires + + Makes a planar face from one or more wires + + Args: + outer_wire (TopoDS_Wire): closed perimeter wire + inner_wires (Sequence[TopoDS_Wire], optional): holes. Defaults to None. + + Raises: + ValueError: outer wire not closed + ValueError: wires not planar + ValueError: inner wire not closed + ValueError: internal error + + Returns: + TopoDS_Face: planar face potentially with holes + """ + if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): + raise ValueError("Cannot build face(s): outer wire is not closed") + inner_wires = inner_wires if inner_wires else [] + + # check if wires are coplanar + verification_compound = _make_topods_compound_from_shapes( + [outer_wire] + inner_wires + ) + if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): + raise ValueError("Cannot build face(s): wires not planar") + + # fix outer wire + sf_s = ShapeFix_Shape(outer_wire) + sf_s.Perform() + topo_wire = TopoDS.Wire_s(sf_s.Shape()) + + face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) + + for inner_wire in inner_wires: + if not BRep_Tool.IsClosed_s(inner_wire): + raise ValueError("Cannot build face(s): inner wire is not closed") + face_builder.Add(inner_wire) + + face_builder.Build() + + if not face_builder.IsDone(): + raise ValueError(f"Cannot build face(s): {face_builder.Error()}") + + face = face_builder.Face() + + sf_f = ShapeFix_Face(face) + sf_f.FixOrientation() + sf_f.Perform() + + return downcast(sf_f.Result()) + + +def _sew_topods_faces(faces: Sequence[TopoDS_Face]) -> TopoDS_Shape: + """Sew faces into a shell if possible""" + shell_builder = BRepBuilderAPI_Sewing() + for face in faces: + shell_builder.Add(face) + shell_builder.Perform() + return downcast(shell_builder.SewedShape()) + + +def _make_topods_compound_from_shapes( + occt_shapes: Sequence[TopoDS_Shape], +) -> TopoDS_Compound: + """Create an OCCT TopoDS_Compound + + Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects + + Args: + occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes + + Returns: + TopoDS_Compound: OCCT compound + """ + comp = TopoDS_Compound() + comp_builder = TopoDS_Builder() + comp_builder.MakeCompound(comp) + + for shape in occt_shapes: + comp_builder.Add(comp, shape) + + return comp + + +def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: + """Return the maximum dimension of one or more shapes""" + shapes = shapes if isinstance(shapes, Iterable) else [shapes] + composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) + bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) + return bbox.diagonal + + +def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: + """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" + out = {} # using dict to prevent duplicates + + explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) + + while explorer.More(): + item = explorer.Current() + out[item.HashCode(HASH_CODE_MAX)] = ( + item # needed to avoid pseudo-duplicate entities + ) + explorer.Next() + + return list(out.values()) + + +def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: + """extrude + + Extrude a Shape in the provided direction. + * Vertices generate Edges + * Edges generate Faces + * Wires generate Shells + * Faces generate Solids + * Shells generate Compounds + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + TopoDS_Shape: extruded shape + """ + direction = Vector(direction) + + if obj is None or not isinstance( + obj, + (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), + ): + raise ValueError(f"extrude not supported for {type(obj)}") + + prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) + extrusion = downcast(prism_builder.Shape()) + shape_type = extrusion.ShapeType() + if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: + solids = [] + explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) + while explorer.More(): + solids.append(downcast(explorer.Current())) + explorer.Next() + extrusion = _make_topods_compound_from_shapes(solids) + return extrusion + + class SkipClean: """Skip clean context for use in operator driven code where clean=False wouldn't work""" diff --git a/tests/test_algebra.py b/tests/test_algebra.py index 6b4bbbc..3d354a6 100644 --- a/tests/test_algebra.py +++ b/tests/test_algebra.py @@ -1,6 +1,5 @@ import math import unittest -import pytest from build123d import * from build123d.topology import Shape @@ -553,7 +552,7 @@ class AlgebraTests(unittest.TestCase): self.assertAlmostEqual(l.length, 3, 5) l2 = e1 + e3 - self.assertTrue(isinstance(l2, Compound)) + self.assertTrue(isinstance(l2, list)) def test_curve_plus_nothing(self): e1 = Edge.make_line((0, 1), (1, 1)) @@ -626,7 +625,8 @@ class AlgebraTests(unittest.TestCase): def test_part_minus_empty(self): b = Box(1, 2, 3) r = b - Part() - self.assertEqual(b.wrapped, r.wrapped) + self.assertAlmostEqual(b.volume, r.volume, 5) + self.assertEqual(r._dim, 3) def test_empty_and_part(self): b = Box(1, 2, 3) @@ -660,7 +660,8 @@ class AlgebraTests(unittest.TestCase): def test_sketch_minus_empty(self): b = Rectangle(1, 2) r = b - Sketch() - self.assertEqual(b.wrapped, r.wrapped) + self.assertAlmostEqual(b.area, r.area, 5) + self.assertEqual(r._dim, 2) def test_empty_and_sketch(self): b = Rectangle(1, 3) @@ -823,6 +824,7 @@ class LocationTests(unittest.TestCase): # on plane, located to grid position, and finally rotated c_plane = plane * outer_loc * rotations[i] s += c_plane * Circle(1) + s = Sketch(s.faces()) for loc in PolarLocations(0.8, (i + 3) * 2): # Use polar locations on c_plane diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index b561409..205bebf 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -480,8 +480,6 @@ class TestBuildSketchObjects(unittest.TestCase): line = Polyline((0, 0), (10, 10), (20, 10)) test = trace(line, 4) - self.assertEqual(len(test.faces()), 3) - test = trace(line, 4).clean() self.assertEqual(len(test.faces()), 1) def test_full_round(self): diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 9eba3db..0ae4030 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -66,6 +66,7 @@ from build123d.geometry import ( Location, LocationEncoder, Matrix, + Plane, Pos, Rot, Rotation, @@ -78,7 +79,6 @@ from build123d.topology import ( Compound, Edge, Face, - Plane, Shape, ShapeList, Shell, @@ -419,10 +419,10 @@ class TestBoundBox(DirectApiTestCase): # Test creation of a bounding box from a shape - note the low accuracy comparison # as the box is a little larger than the shape - bb1 = BoundBox._from_topo_ds(Solid.make_cylinder(1, 1).wrapped, optimal=False) + bb1 = BoundBox.from_topo_ds(Solid.make_cylinder(1, 1).wrapped, optimal=False) self.assertVectorAlmostEquals(bb1.size, (2, 2, 1), 1) - bb2 = BoundBox._from_topo_ds( + bb2 = BoundBox.from_topo_ds( Solid.make_cylinder(0.5, 0.5).translate((0, 0, 0.1)).wrapped, optimal=False ) self.assertTrue(bb2.is_inside(bb1)) @@ -459,11 +459,11 @@ class TestBoundBox(DirectApiTestCase): class TestCadObjects(DirectApiTestCase): def _make_circle(self): circle = gp_Circ(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 2.0) - return Shape.cast(BRepBuilderAPI_MakeEdge(circle).Edge()) + return Edge.cast(BRepBuilderAPI_MakeEdge(circle).Edge()) def _make_ellipse(self): ellipse = gp_Elips(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 4.0, 2.0) - return Shape.cast(BRepBuilderAPI_MakeEdge(ellipse).Edge()) + return Edge.cast(BRepBuilderAPI_MakeEdge(ellipse).Edge()) def test_edge_wrapper_center(self): e = self._make_circle() @@ -608,7 +608,7 @@ class TestCadObjects(DirectApiTestCase): self.assertVectorAlmostEquals(e2.center(CenterOf.MASS), (1.0, 2.0, 4.0), 3) def test_vertices(self): - e = Shape.cast(BRepBuilderAPI_MakeEdge(gp_Pnt(0, 0, 0), gp_Pnt(1, 1, 0)).Edge()) + e = Edge.cast(BRepBuilderAPI_MakeEdge(gp_Pnt(0, 0, 0), gp_Pnt(1, 1, 0)).Edge()) self.assertEqual(2, len(e.vertices())) def test_edge_wrapper_radius(self): @@ -849,8 +849,8 @@ class TestCompound(DirectApiTestCase): # N.B. b and bb overlap but still add to Compound volume def test_constructor(self): - with self.assertRaises(ValueError): - Compound(bob="fred") + with self.assertRaises(TypeError): + Compound(foo="bar") def test_len(self): self.assertEqual(len(Compound()), 0) @@ -1139,7 +1139,7 @@ class TestEdge(DirectApiTestCase): self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) def test_init(self): - with self.assertRaises(ValueError): + with self.assertRaises(TypeError): Edge(direction=(1, 0, 0)) @@ -1354,11 +1354,11 @@ class TestFace(DirectApiTestCase): for y in range(11) ] surface = Face.make_surface_from_array_of_points(pnts) - solid = surface.thicken(1) + solid = Solid.thicken(surface, 1) self.assertAlmostEqual(solid.volume, 101.59, 2) square = Face.make_rect(10, 10) - bbox = square.thicken(1, normal_override=(0, 0, -1)).bounding_box() + bbox = Solid.thicken(square, 1, normal_override=(0, 0, -1)).bounding_box() self.assertVectorAlmostEquals(bbox.min, (-5, -5, -1), 5) self.assertVectorAlmostEquals(bbox.max, (5, 5, 0), 5) @@ -1596,11 +1596,11 @@ class TestFunctions(unittest.TestCase): # unwrap fully c0 = Compound([b1]) c1 = Compound([c0]) - result = Shape.cast(unwrap_topods_compound(c1.wrapped, True)) + result = Compound.cast(unwrap_topods_compound(c1.wrapped, True)) self.assertTrue(isinstance(result, Solid)) # unwrap not fully - result = Shape.cast(unwrap_topods_compound(c1.wrapped, False)) + result = Compound.cast(unwrap_topods_compound(c1.wrapped, False)) self.assertTrue(isinstance(result, Compound)) @@ -1632,18 +1632,18 @@ class TestImportExport(DirectApiTestCase): self.assertVectorAlmostEquals(stl_box.position, (0, 0, 0), 5) -class TestJupyter(DirectApiTestCase): - def test_repr_javascript(self): - shape = Solid.make_box(1, 1, 1) +# class TestJupyter(DirectApiTestCase): +# def test_repr_javascript(self): +# shape = Solid.make_box(1, 1, 1) - # Test no exception on rendering to js - js1 = shape._repr_javascript_() +# # Test no exception on rendering to js +# js1 = shape._repr_javascript_() - assert "function render" in js1 +# assert "function render" in js1 - def test_display_error(self): - with self.assertRaises(AttributeError): - display(Vector()) +# def test_display_error(self): +# with self.assertRaises(AttributeError): +# display(Vector()) class TestLocation(DirectApiTestCase): @@ -1930,6 +1930,19 @@ class TestLocation(DirectApiTestCase): self.assertTrue(isinstance(i, Vertex)) self.assertVectorAlmostEquals(Vector(i), (0.5, 0.5, 0.5), 5) + e1 = Edge.make_line((0, -1), (2, 1)) + e2 = Edge.make_line((0, 1), (2, -1)) + e3 = Edge.make_line((0, 0), (2, 0)) + + i = e1.intersect(e2, e3) + self.assertTrue(isinstance(i, Vertex)) + self.assertVectorAlmostEquals(i, (1, 0, 0), 5) + + e4 = Edge.make_line((1, -1), (1, 1)) + e5 = Edge.make_line((2, -1), (2, 1)) + i = e3.intersect(e4, e5) + self.assertIsNone(i) + class TestMatrix(DirectApiTestCase): def test_matrix_creation_and_access(self): @@ -2946,6 +2959,7 @@ class TestProjection(DirectApiTestCase): projected_text = sphere.project_faces( faces=Compound.make_text("dog", font_size=14), path=arch_path, + start=0.01, # avoid a character spanning the sphere edge ) self.assertEqual(len(projected_text.solids()), 0) self.assertEqual(len(projected_text.faces()), 3) @@ -3051,9 +3065,9 @@ class TestShape(DirectApiTestCase): def test_split(self): shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) split_shape = shape.split(Plane.XY, keep=Keep.BOTTOM) - self.assertEqual(len(split_shape.solids()), 2) - self.assertAlmostEqual(split_shape.volume, 0.25, 5) - self.assertTrue(isinstance(split_shape, Compound)) + self.assertTrue(isinstance(split_shape, list)) + self.assertEqual(len(split_shape), 2) + self.assertAlmostEqual(split_shape[0].volume + split_shape[1].volume, 0.25, 5) split_shape = shape.split(Plane.XY, keep=Keep.TOP) self.assertEqual(len(split_shape.solids()), 1) self.assertTrue(isinstance(split_shape, Solid)) @@ -3068,16 +3082,17 @@ class TestShape(DirectApiTestCase): def test_split_by_non_planar_face(self): box = Solid.make_box(1, 1, 1) tool = Circle(1).wire() - tool_shell: Shell = Shape.extrude(tool, Vector(0, 0, 1)) - split = box.split(tool_shell, keep=Keep.BOTH) + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + top, bottom = box.split(tool_shell, keep=Keep.BOTH) - self.assertEqual(len(split.solids()), 2) - self.assertGreater(split.solids()[0].volume, split.solids()[1].volume) + self.assertFalse(top is None) + self.assertFalse(bottom is None) + self.assertGreater(top.volume, bottom.volume) def test_split_by_shell(self): box = Solid.make_box(5, 5, 1) tool = Wire.make_rect(4, 4) - tool_shell: Shell = Shape.extrude(tool, Vector(0, 0, 1)) + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) split = box.split(tool_shell, keep=Keep.TOP) inner_vol = 2 * 2 outer_vol = 5 * 5 @@ -3097,41 +3112,28 @@ class TestShape(DirectApiTestCase): ring_projected = ring.project_to_shape(target0, (0, 0, -1))[0] ring_outerwire = ring_projected.outer_wire() inside1, outside1 = target0.split_by_perimeter(ring_outerwire, Keep.BOTH) + if isinstance(inside1, list): + inside1 = Compound(inside1) + if isinstance(outside1, list): + outside1 = Compound(outside1) self.assertLess(inside1.area, outside1.area) self.assertEqual(len(outside1.faces()), 2) # Test 2 - extract multiple faces - with BuildPart() as cross: - with BuildSketch(Pos(Z=-5) * Rot(Z=-45)) as skt: - Rectangle(5, 1, align=Align.MIN) - Rectangle(1, 5, align=Align.MIN) - fillet(skt.vertices(), 0.3) - extrude(amount=10) - target2 = cross.part + target2 = Box(1, 10, 10) square = Face.make_rect(3, 3, Plane((12, 0, 0), z_dir=(1, 0, 0))) - square_projected = square.project_to_shape(cross.part, (-1, 0, 0))[0] - projected_edges = square_projected.edges().sort_by(SortBy.DISTANCE)[2:] - projected_perimeter = Wire(projected_edges) - inside2 = target2.split_by_perimeter(projected_perimeter, Keep.INSIDE) - self.assertTrue(isinstance(inside2, Shell)) - - # Test 3 - Invalid, wire on shape edge - target3 = Solid.make_cylinder(5, 10, Plane((0, 0, -5))) - square_projected = square.project_to_shape(target3, (-1, 0, 0))[0].unwrap( - fully=True + square_projected = square.project_to_shape(target2, (-1, 0, 0))[0] + outside2 = target2.split_by_perimeter( + square_projected.outer_wire(), Keep.OUTSIDE ) - project_perimeter = square_projected.outer_wire() - inside3 = target3.split_by_perimeter(project_perimeter, Keep.INSIDE) - self.assertIsNone(inside3) - outside3 = target3.split_by_perimeter(project_perimeter, Keep.OUTSIDE) - self.assertAlmostEqual(outside3.area, target3.shell().area, 5) + self.assertTrue(isinstance(outside2, Shell)) # Test 4 - invalid inputs with self.assertRaises(ValueError): - _, _ = target2.split_by_perimeter(projected_perimeter.edges()[0], Keep.BOTH) + _, _ = target2.split_by_perimeter(Edge.make_line((0, 0), (1, 0)), Keep.BOTH) with self.assertRaises(ValueError): - _, _ = target3.split_by_perimeter(projected_perimeter, Keep.TOP) + _, _ = target2.split_by_perimeter(Edge.make_circle(1), Keep.TOP) def test_distance(self): sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) @@ -3332,7 +3334,7 @@ class TestShape(DirectApiTestCase): s = Solid.make_sphere(1).solid() self.assertTrue(isinstance(s, Solid)) with self.assertWarns(UserWarning): - Solid.make_sphere(1).split(Plane.XY, keep=Keep.BOTH).solid() + Compound(Solid.make_sphere(1).split(Plane.XY, keep=Keep.BOTH)).solid() def test_manifold(self): self.assertTrue(Solid.make_box(1, 1, 1).is_manifold) @@ -3498,6 +3500,17 @@ class TestShapeList(DirectApiTestCase): self.assertEqual(len(box.faces().group_by(SortBy.AREA)[0]), 2) self.assertEqual(len(box.faces().group_by(SortBy.AREA)[1]), 4) + line = Edge.make_line((0, 0, 0), (1, 1, 2)) + vertices_by_line = box.vertices().group_by(line) + self.assertEqual(len(vertices_by_line[0]), 1) + self.assertEqual(len(vertices_by_line[1]), 2) + self.assertEqual(len(vertices_by_line[2]), 1) + self.assertEqual(len(vertices_by_line[3]), 1) + self.assertEqual(len(vertices_by_line[4]), 2) + self.assertEqual(len(vertices_by_line[5]), 1) + self.assertVectorAlmostEquals(vertices_by_line[0][0], (0, 0, 0), 5) + self.assertVectorAlmostEquals(vertices_by_line[-1][0], (1, 1, 2), 5) + with BuildPart() as boxes: with GridLocations(10, 10, 3, 3): Box(1, 1, 1) @@ -3549,34 +3562,34 @@ class TestShapeList(DirectApiTestCase): def test_group_by_str_repr(self): nonagon = RegularPolygon(5, 9) - expected = [ - "[[],", - " [,", - " ],", - " [,", - " ],", - " [,", - " ],", - " [,", - " ]]", - ] + # TODO: re-enable this test once the topology refactor complete + # expected = [ + # "[[],", + # " [,", + # " ],", + # " [,", + # " ],", + # " [,", + # " ],", + # " [,", + # " ]]", + # ] + # self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) - self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) - - expected_repr = ( - "[[]," - " [," - " ]," - " [," - " ]," - " [," - " ]," - " [," - " ]]" - ) - self.assertDunderReprEqual( - repr(nonagon.edges().group_by(Axis.X)), expected_repr - ) + # expected_repr = ( + # "[[]," + # " [," + # " ]," + # " [," + # " ]," + # " [," + # " ]," + # " [," + # " ]]" + # ) + # self.assertDunderReprEqual( + # repr(nonagon.edges().group_by(Axis.X)), expected_repr + # ) f = io.StringIO() p = pretty.PrettyPrinter(f) @@ -3732,8 +3745,8 @@ class TestShells(DirectApiTestCase): self.assertAlmostEqual(nm_shell.volume, 0, 5) def test_constructor(self): - with self.assertRaises(ValueError): - Shell(bob="fred") + with self.assertRaises(TypeError): + Shell(foo="bar") x_section = Rot(90) * Spline((0, -5), (-3, -2), (-2, 0), (-3, 2), (0, 5)) surface = sweep(x_section, Circle(5).wire()) @@ -3760,8 +3773,8 @@ class TestShells(DirectApiTestCase): self.assertEqual(len(sweep_e_w.faces()), 2) self.assertEqual(len(sweep_w_e.faces()), 2) self.assertEqual(len(sweep_c2_c1.faces()), 2) - self.assertEqual(len(sweep_w_w.faces()), 4) - self.assertEqual(len(sweep_c2_c2.faces()), 4) + self.assertEqual(len(sweep_w_w.faces()), 3) # 3 with clean, 4 without + self.assertEqual(len(sweep_c2_c2.faces()), 3) # 3 with clean, 4 without def test_make_loft(self): r = 3 @@ -3775,8 +3788,8 @@ class TestShells(DirectApiTestCase): def test_thicken(self): rect = Wire.make_rect(10, 5) - shell: Shell = Shape.extrude(rect, Vector(0, 0, 3)) - thick = shell.thicken(1) + shell: Shell = Shell.extrude(rect, Vector(0, 0, 3)) + thick = Solid.thicken(shell, 1) self.assertEqual(isinstance(thick, Solid), True) inner_vol = 3 * 10 * 5 @@ -3953,8 +3966,8 @@ class TestSolid(DirectApiTestCase): self.assertAlmostEqual(swept.volume, 5 * (1 - 0.1**2), 5) def test_constructor(self): - with self.assertRaises(ValueError): - Solid(bob="fred") + with self.assertRaises(TypeError): + Solid(foo="bar") class TestVector(DirectApiTestCase): @@ -4273,7 +4286,7 @@ class TestVertex(DirectApiTestCase): test_vertex - [1, 2, 3] def test_vertex_str(self): - self.assertEqual(str(Vertex(0, 0, 0)), "Vertex: (0.0, 0.0, 0.0)") + self.assertEqual(str(Vertex(0, 0, 0)), "Vertex(0.0, 0.0, 0.0)") def test_vertex_to_vector(self): self.assertIsInstance(Vector(Vertex(0, 0, 0)), Vector) diff --git a/tests/test_joints.py b/tests/test_joints.py index dc61498..f42187f 100644 --- a/tests/test_joints.py +++ b/tests/test_joints.py @@ -34,7 +34,7 @@ from build123d.build_enums import Align, CenterOf, GeomType from build123d.build_common import Mode from build123d.build_part import BuildPart from build123d.build_sketch import BuildSketch -from build123d.geometry import Axis, Location, Rotation, Vector, VectorLike +from build123d.geometry import Axis, Location, Plane, Rotation, Vector, VectorLike from build123d.joints import ( BallJoint, CylindricalJoint, @@ -45,7 +45,7 @@ from build123d.joints import ( from build123d.objects_part import Box, Cone, Cylinder, Sphere from build123d.objects_sketch import Circle from build123d.operations_part import extrude -from build123d.topology import Edge, Plane, Solid +from build123d.topology import Edge, Solid class DirectApiTestCase(unittest.TestCase): From a34f3403972bed2ee6ad4dcc48750823a5cb8803 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 9 Dec 2024 11:52:20 -0500 Subject: [PATCH 034/518] Fixing drafting problem only tested with pytest --- src/build123d/drafting.py | 7 +++++-- src/build123d/operations_sketch.py | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index 4f824a7..171e669 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -50,7 +50,7 @@ from build123d.objects_curve import Line, TangentArc from build123d.objects_sketch import BaseSketchObject, Polygon, Text from build123d.operations_generic import fillet, mirror, sweep from build123d.operations_sketch import make_face, trace -from build123d.topology import Compound, Edge, Sketch, Vertex, Wire +from build123d.topology import Compound, Curve, Edge, Sketch, Vertex, Wire class ArrowHead(BaseSketchObject): @@ -704,7 +704,10 @@ class TechnicalDrawing(BaseSketchObject): ) bf_pnt3 = box_frame_curve.edges().sort_by(Axis.X)[0] @ (1 / 3) bf_pnt4 = box_frame_curve.edges().sort_by(Axis.X)[0] @ (2 / 3) - box_frame_curve += Edge.make_line(bf_pnt3, (bf_pnt2.X, bf_pnt3.Y)) + box_frame_curve = Curve() + [ + box_frame_curve, + Edge.make_line(bf_pnt3, (bf_pnt2.X, bf_pnt3.Y)), + ] box_frame_curve += Edge.make_line(bf_pnt4, (bf_pnt2.X, bf_pnt4.Y)) bf_pnt5 = box_frame_curve.edges().sort_by(Axis.Y)[-1] @ (1 / 3) bf_pnt6 = box_frame_curve.edges().sort_by(Axis.Y)[-1] @ (2 / 3) diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index 35e65b9..78e8936 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -305,4 +305,9 @@ def trace( context.pending_edges = ShapeList() combined_faces = Face.fuse(*new_faces) if len(new_faces) > 1 else new_faces[0] - return Sketch(combined_faces.wrapped) + result = ( + Sketch(combined_faces) + if isinstance(combined_faces, list) + else Sketch(combined_faces.wrapped) + ) + return result From d7c73e1e81adcf79a4d655b9e50eb90531a2a996 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 15 Dec 2024 11:00:51 -0500 Subject: [PATCH 035/518] Fixed Vector.__hash__ (used by set) by rounding --- src/build123d/geometry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 219e9a2..6c86a78 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -450,7 +450,7 @@ class Vector: def __hash__(self) -> int: """Hash of Vector""" - return hash(self.X) + hash(self.Y) + hash(self.Z) + return hash(round(self.X, 6)) + hash(round(self.Y, 6)) + hash(round(self.Z, 6)) def __copy__(self) -> Vector: """Return copy of self""" From 6cb574c772282af9f045a75b4d7f84c9fd85e753 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 15 Dec 2024 12:48:43 -0500 Subject: [PATCH 036/518] Improved Vector.__hash__ algorithm --- src/build123d/geometry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 6c86a78..dd4c48b 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -450,7 +450,7 @@ class Vector: def __hash__(self) -> int: """Hash of Vector""" - return hash(round(self.X, 6)) + hash(round(self.Y, 6)) + hash(round(self.Z, 6)) + return hash((round(self.X, 6), round(self.Y, 6), round(self.Z, 6))) def __copy__(self) -> Vector: """Return copy of self""" From 87c046b2400ed48cbdc2cc2be2ba4fef100ab42d Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 16 Dec 2024 19:40:15 -0500 Subject: [PATCH 037/518] Added Optional to input parameters --- tools/refactor_topo.py | 60 +++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 4adbc0b..51a6b6f 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -333,6 +333,51 @@ class ClassMethodExtractor(cst.CSTVisitor): self.extracted_methods.append(renamed_node) +class OptionalTransformer(cst.CSTTransformer): + def __init__(self): + super().__init__() + self.requires_optional_import = False # Tracks if `Optional` import is needed + + def leave_AnnAssign( + self, original_node: cst.AnnAssign, updated_node: cst.AnnAssign + ) -> cst.AnnAssign: + # Check if the annotation has a default value of `None` + if ( + isinstance(updated_node.value, cst.Name) + and updated_node.value.value == "None" + ): + # Wrap the annotation type in `Optional` + if updated_node.annotation: + self.requires_optional_import = True + new_annotation = cst.Subscript( + value=cst.Name("Optional"), + slice=[ + cst.SubscriptElement( + slice=cst.Index(updated_node.annotation.annotation) + ) + ], + ) + return updated_node.with_changes( + annotation=cst.Annotation(new_annotation) + ) + return updated_node + + def leave_Module( + self, original_node: cst.Module, updated_node: cst.Module + ) -> cst.Module: + # Add the `Optional` import if required + if self.requires_optional_import: + import_stmt = cst.ImportFrom( + module=cst.Name("typing"), + names=[cst.ImportAlias(name=cst.Name("Optional"))], + ) + new_body = [cst.SimpleStatementLine([import_stmt])] + list( + updated_node.body + ) + return updated_node.with_changes(body=new_body) + return updated_node + + def write_topo_class_files( source_tree: cst.Module, extracted_classes: Dict[str, cst.ClassDef], @@ -764,10 +809,12 @@ def main(): # Parse source file and collect imports source_tree = cst.parse_module(topo_file.read_text()) - source_tree = source_tree.visit(UnionToPipeTransformer()) - # transformed_module = source_tree.visit(UnionToPipeTransformer()) - # print(transformed_module.code) + # Apply transformations + source_tree = source_tree.visit(UnionToPipeTransformer()) # Existing transformation + source_tree = source_tree.visit(OptionalTransformer()) # New Optional conversion + + # Collect imports collector = ImportCollector() source_tree.visit(collector) @@ -782,8 +829,6 @@ def main(): # Extract functions function_collector = StandaloneFunctionAndVariableCollector() source_tree.visit(function_collector) - # for f in function_collector.functions: - # print(f.name.value) # Write the class files write_topo_class_files( @@ -793,11 +838,8 @@ def main(): output_dir=output_dir, ) - # Create a Rope project instance - # project = Project(str(script_dir)) - project = Project(str(output_dir)) - # Clean up imports + project = Project(str(output_dir)) for file in output_dir.glob("*.py"): if file.name == "__init__.py": continue From 127d04858209ee733d47927063cdd0171db6789e Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 17 Dec 2024 11:33:31 -0500 Subject: [PATCH 038/518] Revert "Added Optional to input parameters" This reverts commit 87c046b2400ed48cbdc2cc2be2ba4fef100ab42d. --- tools/refactor_topo.py | 60 +++++++----------------------------------- 1 file changed, 9 insertions(+), 51 deletions(-) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 51a6b6f..4adbc0b 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -333,51 +333,6 @@ class ClassMethodExtractor(cst.CSTVisitor): self.extracted_methods.append(renamed_node) -class OptionalTransformer(cst.CSTTransformer): - def __init__(self): - super().__init__() - self.requires_optional_import = False # Tracks if `Optional` import is needed - - def leave_AnnAssign( - self, original_node: cst.AnnAssign, updated_node: cst.AnnAssign - ) -> cst.AnnAssign: - # Check if the annotation has a default value of `None` - if ( - isinstance(updated_node.value, cst.Name) - and updated_node.value.value == "None" - ): - # Wrap the annotation type in `Optional` - if updated_node.annotation: - self.requires_optional_import = True - new_annotation = cst.Subscript( - value=cst.Name("Optional"), - slice=[ - cst.SubscriptElement( - slice=cst.Index(updated_node.annotation.annotation) - ) - ], - ) - return updated_node.with_changes( - annotation=cst.Annotation(new_annotation) - ) - return updated_node - - def leave_Module( - self, original_node: cst.Module, updated_node: cst.Module - ) -> cst.Module: - # Add the `Optional` import if required - if self.requires_optional_import: - import_stmt = cst.ImportFrom( - module=cst.Name("typing"), - names=[cst.ImportAlias(name=cst.Name("Optional"))], - ) - new_body = [cst.SimpleStatementLine([import_stmt])] + list( - updated_node.body - ) - return updated_node.with_changes(body=new_body) - return updated_node - - def write_topo_class_files( source_tree: cst.Module, extracted_classes: Dict[str, cst.ClassDef], @@ -809,12 +764,10 @@ def main(): # Parse source file and collect imports source_tree = cst.parse_module(topo_file.read_text()) + source_tree = source_tree.visit(UnionToPipeTransformer()) + # transformed_module = source_tree.visit(UnionToPipeTransformer()) + # print(transformed_module.code) - # Apply transformations - source_tree = source_tree.visit(UnionToPipeTransformer()) # Existing transformation - source_tree = source_tree.visit(OptionalTransformer()) # New Optional conversion - - # Collect imports collector = ImportCollector() source_tree.visit(collector) @@ -829,6 +782,8 @@ def main(): # Extract functions function_collector = StandaloneFunctionAndVariableCollector() source_tree.visit(function_collector) + # for f in function_collector.functions: + # print(f.name.value) # Write the class files write_topo_class_files( @@ -838,8 +793,11 @@ def main(): output_dir=output_dir, ) - # Clean up imports + # Create a Rope project instance + # project = Project(str(script_dir)) project = Project(str(output_dir)) + + # Clean up imports for file in output_dir.glob("*.py"): if file.name == "__init__.py": continue From 5b88e87bad69f26b09c480a55b81c4547214a338 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 17 Dec 2024 11:58:58 -0500 Subject: [PATCH 039/518] Replace Optional with | None --- src/build123d/topology.py | 24 ++++++++++++------------ tools/refactor_topo.py | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index b75fe5e..b218cb0 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -468,18 +468,18 @@ class Mixin1D: @overload def split( self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Optional[Self] | Optional[list[Self]]: + ) -> Self | list[Self] | None: """split and keep inside or outside""" @overload def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Optional[Self] | Optional[list[Self]], - Optional[Self] | Optional[list[Self]], + Self | list[Self] | None, + Self | list[Self] | None, ]: """split and keep inside and outside""" @overload - def split(self, tool: TrimmingTool) -> Optional[Self] | Optional[list[Self]]: + def split(self, tool: TrimmingTool) -> Self | list[Self] | None: """split and keep inside (default)""" def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): @@ -494,8 +494,8 @@ class Mixin1D: Returns: Shape: result of split Returns: - Optional[Self] | Optional[list[Self]], - Tuple[Optional[Self] | Optional[list[Self]]]: The result of the split operation. + Self | list[Self] | None, + Tuple[Self | list[Self] | None]: The result of the split operation. - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` if no top is found. @@ -3204,22 +3204,22 @@ class Shape(NodeMixin): @overload def split_by_perimeter( self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]]: + ) -> Face | Shell | ShapeList[Face] | None: """split_by_perimeter and keep inside or outside""" @overload def split_by_perimeter( self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] ) -> tuple[ - Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]], - Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]], + Face | Shell | ShapeList[Face] | None, + Face | Shell | ShapeList[Face] | None, ]: """split_by_perimeter and keep inside and outside""" @overload def split_by_perimeter( self, perimeter: Union[Edge, Wire] - ) -> Optional[Face] | Optional[Shell] | Optional[ShapeList[Face]]: + ) -> Face | Shell | ShapeList[Face] | None: """split_by_perimeter and keep inside (default)""" def split_by_perimeter( @@ -3241,8 +3241,8 @@ class Shape(NodeMixin): ValueError: keep must be one of Keep.INSIDE|OUTSIDE|BOTH Returns: - Union[Optional[Shell], Optional[Face], - Tuple[Optional[Shell], Optional[Face]]]: The result of the split operation. + Union[Face | Shell | ShapeList[Face] | None, + Tuple[Face | Shell | ShapeList[Face] | None]: The result of the split operation. - **Keep.INSIDE**: Returns the inside part as a `Shell` or `Face`, or `None` if no inside part is found. diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 4adbc0b..6fa5c27 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -728,6 +728,24 @@ class UnionToPipeTransformer(cst.CSTTransformer): return updated_node +class OptionalToPipeTransformer(cst.CSTTransformer): + def leave_Annotation( + self, original_node: cst.Annotation, updated_node: cst.Annotation + ) -> cst.Annotation: + # Match Optional[...] annotations + if m.matches(updated_node.annotation, m.Subscript(value=m.Name("Optional"))): + subscript = updated_node.annotation + if isinstance(subscript, cst.Subscript) and subscript.slice: + # Extract the inner type of Optional + inner_type = subscript.slice[0].slice.value + # Replace Optional[X] with X | None + new_annotation = cst.BinaryOperation( + left=inner_type, operator=cst.BitOr(), right=cst.Name("None") + ) + return updated_node.with_changes(annotation=new_annotation) + return updated_node + + def main(): # Define paths script_dir = Path(__file__).parent @@ -765,6 +783,7 @@ def main(): # Parse source file and collect imports source_tree = cst.parse_module(topo_file.read_text()) source_tree = source_tree.visit(UnionToPipeTransformer()) + source_tree = source_tree.visit(OptionalToPipeTransformer()) # transformed_module = source_tree.visit(UnionToPipeTransformer()) # print(transformed_module.code) From e36ab04cbc0199b4a1eb8ab23f60d37864ba450a Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 17 Dec 2024 11:43:54 -0600 Subject: [PATCH 040/518] action.yml -> add pytest-cov dependency to setup --- .github/actions/setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index ae1abc7..ed36938 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -17,5 +17,6 @@ runs: pip install wheel pip install mypy pip install pytest + pip install pytest-cov pip install pylint pip install . From dd1aabba784ac162ffd48287dabb61b79971f2f6 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 17 Dec 2024 11:48:33 -0600 Subject: [PATCH 041/518] coverage.yml -> depend on .github/actions/setup like other workflows --- .github/workflows/coverage.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ca7272b..68dfebf 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -6,14 +6,11 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v5 + - name: Setup + uses: ./.github/actions/setup/ with: python-version: '3.10' - - name: Install dependencies - run: pip install -r requirements.txt - name: Run tests and collect coverage run: pytest --cov=build123d - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - + uses: codecov/codecov-action@v5 From 590deb3937bdff6f1f2369017aa6e45d1038a5f6 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 17 Dec 2024 11:49:20 -0600 Subject: [PATCH 042/518] Delete requirements.txt no longer needed --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 62c8eab..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pytest-cov --e . From 005f3af80ee1607c3cc6b83252bd51e713eafe67 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 17 Dec 2024 12:06:52 -0600 Subject: [PATCH 043/518] coverage.yml -> try double quotes instead of single quotes to get python-version to be passed down correctly. --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 68dfebf..25bc1f2 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -9,7 +9,7 @@ jobs: - name: Setup uses: ./.github/actions/setup/ with: - python-version: '3.10' + python-version: "3.10" - name: Run tests and collect coverage run: pytest --cov=build123d - name: Upload coverage to Codecov From fd5515d27494b8a2a77ac35239ce80f224686eb9 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 17 Dec 2024 13:19:39 -0600 Subject: [PATCH 044/518] action.yml -> point to inputs.python-version instead of matrix.python-version --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index ed36938..9a4af02 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -10,7 +10,7 @@ runs: - name: python uses: actions/setup-python@v5 with: - python-version: ${{ matrix.python-version }} + python-version: ${{ inputs.python-version }} - name: install requirements shell: bash run: | From 217b70aa1ec530aa97b8e3d793dedda0b1851c02 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 20 Dec 2024 14:31:42 -0500 Subject: [PATCH 045/518] Implemented review feedback - fixed mypy on shape_core.py & utils.py --- mypy.ini | 12 +- src/build123d/exporters.py | 16 +- src/build123d/geometry.py | 2 +- src/build123d/topology.py | 924 +++++++++++++++++++++++-------------- tests/test_direct_api.py | 4 - tests/test_exporters.py | 2 + tools/refactor_topo.py | 36 +- 7 files changed, 607 insertions(+), 389 deletions(-) diff --git a/mypy.ini b/mypy.ini index 9938434..2180a44 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,7 +1,9 @@ # Global options: [mypy] -no_implicit_optional=False + +[mypy-OCP.*] +ignore_missing_imports = True [mypy-anytree.*] ignore_missing_imports = True @@ -12,3 +14,11 @@ ignore_missing_imports = True [mypy-vtkmodules.*] ignore_missing_imports = True +[mypy-build123d.topology.jupyter_tools.*] +ignore_missing_imports = True + +[mypy-IPython.lib.pretty.*] +ignore_missing_imports = True + +[mypy-svgpathtools.*] +ignore_missing_imports = True diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 96fcfdb..b869ac5 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -53,6 +53,7 @@ from OCP.HLRAlgo import HLRAlgo_Projector # type: ignore from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape # type: ignore from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum # type: ignore from OCP.TopExp import TopExp_Explorer # type: ignore +from OCP.TopoDS import TopoDS from typing_extensions import Self from build123d.build_enums import Unit, GeomType @@ -1060,7 +1061,7 @@ class ExportSVG(Export2D): ) while explorer.More(): topo_wire = explorer.Current() - loose_wires.append(Wire(topo_wire)) + loose_wires.append(Wire(TopoDS.Wire_s(topo_wire))) explorer.Next() # print(f"{len(loose_wires)} loose wires") for wire in loose_wires: @@ -1097,12 +1098,13 @@ class ExportSVG(Export2D): @staticmethod def _wire_edges(wire: Wire, reverse: bool) -> List[Edge]: - edges = [] - explorer = BRepTools_WireExplorer(wire.wrapped) - while explorer.More(): - topo_edge = explorer.Current() - edges.append(Edge(topo_edge)) - explorer.Next() + # edges = [] + # explorer = BRepTools_WireExplorer(wire.wrapped) + # while explorer.More(): + # topo_edge = explorer.Current() + # edges.append(Edge(topo_edge)) + # explorer.Next() + edges = wire.edges() if reverse: edges.reverse() return edges diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index dd4c48b..fa9a26e 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -542,7 +542,7 @@ class Vector: #:TypeVar("VectorLike"): Tuple of float or Vector defining a position in space VectorLike = Union[ - Vector, tuple[float, float], tuple[float, float, float], Iterable[float] + Vector, tuple[float, float], tuple[float, float, float], Sequence[float] ] diff --git a/src/build123d/topology.py b/src/build123d/topology.py index b218cb0..7299d6b 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -57,6 +57,7 @@ from typing import ( Optional, Protocol, Sequence, + SupportsIndex, Tuple, Type, TypeVar, @@ -78,6 +79,7 @@ from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter import OCP.GeomAbs as ga # Geometry type enum import OCP.TopAbs as ta # Topology type enum from OCP.Aspect import Aspect_TOL_SOLID +from OCP.Bnd import Bnd_Box from OCP.BOPAlgo import BOPAlgo_GlueEnum from OCP.BRep import BRep_Tool @@ -304,16 +306,9 @@ from build123d.geometry import ( ) -@property -def _topods_compound_dim(self) -> int | None: - """The dimension of the shapes within the Compound - None if inconsistent""" - sub_dims = {s.dim for s in get_top_level_topods_shapes(self)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - -def _topods_face_normal_at(self, surface_point: gp_Pnt) -> Vector: - """normal_at point on surface""" - surface = BRep_Tool.Surface_s(self) +def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: + """Find the normal at a point on surface""" + surface = BRep_Tool.Surface_s(face) # project point on surface projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) @@ -321,25 +316,29 @@ def _topods_face_normal_at(self, surface_point: gp_Pnt) -> Vector: gp_pnt = gp_Pnt() normal = gp_Vec() - BRepGProp_Face(self).Normal(u_val, v_val, gp_pnt, normal) + BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) return Vector(normal).normalized() -def apply_ocp_monkey_patches() -> None: - """Applies monkey patches to TopoDS classes.""" - TopoDS_Compound.dim = _topods_compound_dim - TopoDS_Face.dim = 2 - TopoDS_Face.normal_at = _topods_face_normal_at - TopoDS_Shape.dim = None - TopoDS_Shell.dim = 2 - TopoDS_Solid.dim = 3 - TopoDS_Vertex.dim = 0 - TopoDS_Edge.dim = 1 - TopoDS_Wire.dim = 1 +def topods_dim(topods: TopoDS_Shape) -> int | None: + """Return the dimension of this TopoDS_Shape""" + shape_dim_map = { + (TopoDS_Vertex,): 0, + (TopoDS_Edge, TopoDS_Wire): 1, + (TopoDS_Face, TopoDS_Shell): 2, + (TopoDS_Solid,): 3, + } + for shape_types, dim in shape_dim_map.items(): + if isinstance(topods, shape_types): + return dim -apply_ocp_monkey_patches() + if isinstance(topods, TopoDS_Compound): + sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} + return sub_dims.pop() if len(sub_dims) == 1 else None + + return None HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode @@ -350,7 +349,7 @@ Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] TrimmingTool = Union[Plane, "Shell", "Face"] -def tuplify(obj: Any, dim: int) -> tuple: +def tuplify(obj: Any, dim: int) -> tuple | None: """Create a size tuple""" if obj is None: result = None @@ -361,48 +360,6 @@ def tuplify(obj: Any, dim: int) -> tuple: return result -class _ClassMethodProxy: - """ - A proxy for dynamically binding a class method to different classes. - - This descriptor allows a class method defined in one class to be reused - in other classes while ensuring that the `cls` parameter refers to the - correct class (the class on which the method is being called). This avoids - issues where the method would otherwise always reference the original - defining class. - - Attributes: - method (classmethod): The class method to be proxied. - - Methods: - __get__(instance, owner): - Dynamically binds the proxied method to the calling class (`owner`). - - Example: - class Mixin1D: - @classmethod - def extrude(cls, shape, direction): - print(f"extrude called on {cls.__name__}") - - class Mixin2D: - extrude = ClassMethodProxy(Mixin1D.extrude) - - class Mixin3D: - extrude = ClassMethodProxy(Mixin1D.extrude) - - # Usage - Mixin2D.extrude(None, None) # Output: extrude called on Mixin2D - Mixin3D.extrude(None, None) # Output: extrude called on Mixin3D - """ - - def __init__(self, method): - self.method = method - - def __get__(self, instance, owner): - # Bind the method dynamically as a class method of `owner` - return types.MethodType(self.method.__func__, owner) - - class Mixin1D: """Methods to add to the Edge and Wire classes""" @@ -420,7 +377,7 @@ class Mixin1D: if not summands: return self - if not all(summand.dim == 1 for summand in summands): + if not all(topods_dim(summand) == 1 for summand in summands): raise ValueError("Only shapes with the same dimension can be added") # Convert back to Edge/Wire objects now that it's safe to do so @@ -1278,37 +1235,11 @@ class Mixin1D: return (visible_edges, hidden_edges) - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Union[Edge, Face, Shell, Solid, Compound]: extruded shape - """ - return cls.cast(_extrude_topods_shape(obj.wrapped, direction)) - class Mixin2D: """Additional methods to add to Face and Shell class""" project_to_viewport = Mixin1D.project_to_viewport - extrude = _ClassMethodProxy(Mixin1D.extrude) split = Mixin1D.split @classmethod @@ -1353,6 +1284,8 @@ class Mixin2D: def __neg__(self) -> Self: """Reverse normal operator -""" + if self.wrapped is None: + raise ValueError("Invalid Shape") new_surface = copy.deepcopy(self) new_surface.wrapped = downcast(self.wrapped.Complemented()) @@ -1367,7 +1300,6 @@ class Mixin3D: """Additional methods to add to 3D Shape classes""" project_to_viewport = Mixin1D.project_to_viewport - extrude = _ClassMethodProxy(Mixin1D.extrude) split = Mixin1D.split @classmethod @@ -1813,7 +1745,10 @@ class Mixin3D: return self.__class__(shape) -class Shape(NodeMixin): +TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) + + +class Shape(NodeMixin, Generic[TOPODS]): """Shape Base class for all CAD objects such as Edge, Face, Solid, etc. @@ -1905,12 +1840,14 @@ class Shape(NodeMixin): def __init__( self, - obj: TopoDS_Shape = None, + obj: TopoDS_Shape | None = None, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): - self.wrapped = downcast(obj) if obj is not None else None + self.wrapped: TOPODS | None = ( + tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None + ) self.for_construction = False self.label = label self._color = color @@ -1919,41 +1856,50 @@ class Shape(NodeMixin): self.parent = parent # Extracted objects like Vertices and Edges may need to know where they came from - self.topo_parent: Shape = None + self.topo_parent: Shape | None = None @property - def location(self) -> Location: + def location(self) -> Location | None: """Get this Shape's Location""" + if self.wrapped is None: + return None return Location(self.wrapped.Location()) @location.setter def location(self, value: Location): """Set Shape's Location to value""" - self.wrapped.Location(value.wrapped) + if self.wrapped is not None: + self.wrapped.Location(value.wrapped) @property - def position(self) -> Vector: + def position(self) -> Vector | None: """Get the position component of this Shape's Location""" + if self.wrapped is None or self.location is None: + return None return self.location.position @position.setter def position(self, value: VectorLike): """Set the position component of this Shape's Location to value""" loc = self.location - loc.position = value - self.location = loc + if loc is not None: + loc.position = Vector(value) + self.location = loc @property - def orientation(self) -> Vector: + def orientation(self) -> Vector | None: """Get the orientation component of this Shape's Location""" + if self.location is None: + return None return self.location.orientation @orientation.setter def orientation(self, rotations: VectorLike): """Set the orientation component of this Shape's Location to rotations""" loc = self.location - loc.orientation = rotations - self.location = loc + if loc is not None: + loc.orientation = Vector(rotations) + self.location = loc @property def color(self) -> Union[None, Color]: @@ -1962,7 +1908,7 @@ class Shape(NodeMixin): # Find the correct color for this node if self._color is None: # Find parent color - current_node = self + current_node: Compound | Shape | None = self while current_node is not None: parent_color = current_node._color if parent_color is not None: @@ -1974,6 +1920,11 @@ class Shape(NodeMixin): self._color = node_color # Set the node's color for next time return node_color + @color.setter + def color(self, value): + """Set the shape's color""" + self._color = value + @property def is_planar_face(self) -> bool: """Is the shape a planar face even though its geom_type may not be PLANE""" @@ -1983,12 +1934,9 @@ class Shape(NodeMixin): is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) return is_face_planar.IsPlanar() - @color.setter - def color(self, value): - """Set the shape's color""" - self._color = value - - def copy_attributes_to(self, target: Shape, exceptions: Iterable[str] = None): + def copy_attributes_to( + self, target: Shape, exceptions: Iterable[str] | None = None + ): """Copy common object attributes to target Note that preset attributes of target will not be overridden. @@ -2028,7 +1976,10 @@ class Shape(NodeMixin): bool: is the shape manifold or water tight """ # Extract one or more (if a Compound) shape from self - shape_stack = get_top_level_topods_shapes(self.wrapped) + if self.wrapped is None: + shape_stack = [] + else: + shape_stack = get_top_level_topods_shapes(self.wrapped) results = [] while shape_stack: @@ -2052,7 +2003,7 @@ class Shape(NodeMixin): # exactly two faces associated with it. for i in range(shape_map.Extent()): # Access each edge in the map sequentially - edge = downcast(shape_map.FindKey(i + 1)) + edge = TopoDS.Edge_s(shape_map.FindKey(i + 1)) vertex0 = TopoDS_Vertex() vertex1 = TopoDS_Vertex() @@ -2081,15 +2032,15 @@ class Shape(NodeMixin): def __init__( self, label: str = "", - address: int = None, - position: Union[Vector, Location] = None, - parent: Shape._DisplayNode = None, + address: int | None = None, + position: Union[Vector, Location, None] = None, + parent: Shape._DisplayNode | None = None, ): self.label = label self.address = address self.position = position self.parent = parent - self.children = [] + self.children: list[Shape] = [] _ordered_shapes = [ TopAbs_ShapeEnum.TopAbs_COMPOUND, @@ -2105,13 +2056,14 @@ class Shape(NodeMixin): def _build_tree( shape: TopoDS_Shape, tree: list[_DisplayNode], - parent: _DisplayNode = None, + parent: _DisplayNode | None = None, limit: TopAbs_ShapeEnum = TopAbs_ShapeEnum.TopAbs_VERTEX, show_center: bool = True, ) -> list[_DisplayNode]: """Create an anytree copy of the TopoDS_Shape structure""" obj_type = Shape.shape_LUT[shape.ShapeType()] + loc: Vector | Location if show_center: loc = Shape(shape).bounding_box().center() else: @@ -2177,7 +2129,7 @@ class Shape(NodeMixin): limit_class: Literal[ "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" ] = "Vertex", - show_center: bool = None, + show_center: bool | None = None, ) -> str: """Display internal topology @@ -2205,7 +2157,6 @@ class Shape(NodeMixin): Returns: str: tree representation of internal structure """ - # if isinstance(self, Compound) and self.children: if ( self.wrapped is not None and isinstance(self.wrapped, TopoDS_Compound) @@ -2215,7 +2166,9 @@ class Shape(NodeMixin): result = Shape._show_tree(self, show_center) else: tree = Shape._build_tree( - self.wrapped, tree=[], limit=Shape.inverse_shape_LUT[limit_class] + tcast(TopoDS_Shape, self.wrapped), + tree=[], + limit=Shape.inverse_shape_LUT[limit_class], ) show_center = True if show_center is None else show_center result = Shape._show_tree(tree[0], show_center) @@ -2291,7 +2244,7 @@ class Shape(NodeMixin): return difference - def __and__(self, other: Shape) -> Self: + def __and__(self, other: Shape | Iterable[Shape]) -> Self | ShapeList[Self]: """intersect shape with self operator &""" others = other if isinstance(other, (list, tuple)) else [other] @@ -2299,7 +2252,11 @@ class Shape(NodeMixin): raise ValueError("Cannot intersect shape with empty compound") new_shape = self.intersect(*others) - if new_shape.wrapped is not None and SkipClean.clean: + if ( + not isinstance(new_shape, list) + and new_shape.wrapped is not None + and SkipClean.clean + ): new_shape = new_shape.clean() return new_shape @@ -2316,7 +2273,7 @@ class Shape(NodeMixin): return [loc * self for loc in other] @abstractmethod - def center(self) -> Vector: + def center(self, center_of: CenterOf | None = None) -> Vector: """All of the derived classes from Shape need a center method""" def clean(self) -> Self: @@ -2327,21 +2284,25 @@ class Shape(NodeMixin): Returns: Shape: Original object with extraneous internal edges removed """ + if self.wrapped is None: + return self upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) upgrader.AllowInternalEdges(False) # upgrader.SetAngularTolerance(1e-5) try: upgrader.Build() - self.wrapped = downcast(upgrader.Shape()) + self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) except Exception: warnings.warn(f"Unable to clean {self}", stacklevel=2) return self def fix(self) -> Self: """fix - try to fix shape if not valid""" + if self.wrapped is None: + return self if not self.is_valid(): shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = fix(self.wrapped) + shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) return shape_copy @@ -2356,18 +2317,23 @@ class Shape(NodeMixin): def geom_type(self) -> GeomType: """Gets the underlying geometry type. - Args: - Returns: + GeomType: The geometry type of the shape """ + if self.wrapped is None: + raise ValueError("Cannot determine geometry type of an empty shape") shape: TopAbs_ShapeEnum = shapetype(self.wrapped) if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[BRepAdaptor_Curve(self.wrapped).GetType()] + geom = Shape.geom_LUT_EDGE[ + BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() + ] elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[BRepAdaptor_Surface(self.wrapped).GetType()] + geom = Shape.geom_LUT_FACE[ + BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() + ] else: geom = GeomType.OTHER @@ -2382,6 +2348,8 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None: + return 0 return self.wrapped.HashCode(HASH_CODE_MAX) def is_null(self) -> bool: @@ -2394,7 +2362,7 @@ class Shape(NodeMixin): Returns: """ - return self.wrapped.IsNull() + return self.wrapped is None or self.wrapped.IsNull() def is_same(self, other: Shape) -> bool: """Returns True if other and this shape are same, i.e. if they share the @@ -2407,6 +2375,8 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None or other.wrapped is None: + return False return self.wrapped.IsSame(other.wrapped) def is_equal(self, other: Shape) -> bool: @@ -2420,11 +2390,26 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None or other.wrapped is None: + return False return self.wrapped.IsEqual(other.wrapped) def __eq__(self, other) -> bool: - """Are shapes same operator ==""" - return self.is_same(other) if isinstance(other, Shape) else NotImplemented + """Check if two shapes are the same. + + This method checks if the current shape is the same as the other shape. + Two shapes are considered the same if they share the same TShape with + the same Locations. Orientations may differ. + + Args: + other (Shape): The shape to compare with. + + Returns: + bool: True if the shapes are the same, False otherwise. + """ + if isinstance(other, Shape): + return self.is_same(other) + return NotImplemented def is_valid(self) -> bool: """Returns True if no defect is detected on the shape S or any of its @@ -2436,11 +2421,15 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None: + return True chk = BRepCheck_Analyzer(self.wrapped) chk.SetParallel(True) return chk.IsValid() - def bounding_box(self, tolerance: float = None, optimal: bool = True) -> BoundBox: + def bounding_box( + self, tolerance: float | None = None, optimal: bool = True + ) -> BoundBox: """Create a bounding box for this Shape. Args: @@ -2449,9 +2438,12 @@ class Shape(NodeMixin): Returns: BoundBox: A box sized to contain this Shape """ + if self.wrapped is None: + return BoundBox(Bnd_Box()) + tolerance = TOLERANCE if tolerance is None else tolerance return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - def mirror(self, mirror_plane: Plane = None) -> Self: + def mirror(self, mirror_plane: Plane | None = None) -> Self: """ Applies a mirror transform to this Shape. Does not duplicate objects about the plane. @@ -2464,6 +2456,8 @@ class Shape(NodeMixin): if not mirror_plane: mirror_plane = Plane.XY + if self.wrapped is None: + return self transformation = gp_Trsf() transformation.SetMirror( gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) @@ -2500,7 +2494,7 @@ class Shape(NodeMixin): sum_wc = sum_wc.add(weighted_center) middle = Vector(sum_wc.multiply(1.0 / total_mass)) elif center_of == CenterOf.BOUNDING_BOX: - total_mass = len(objects) + total_mass = len(list(objects)) weighted_centers = [] for obj in objects: @@ -2527,6 +2521,9 @@ class Shape(NodeMixin): Returns: """ + if obj.wrapped is None: + return 0.0 + properties = GProp_GProps() calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] @@ -2542,12 +2539,17 @@ class Shape(NodeMixin): def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: """Return all of the TopoDS sub entities of the given type""" + if self.wrapped is None: + return [] return _topods_entities(self.wrapped, topo_type) def _entities_from( self, child_type: Shapes, parent_type: Shapes ) -> Dict[Shape, list[Shape]]: """This function is very slow on M1 macs and is currently unused""" + if self.wrapped is None: + return {} + res = TopTools_IndexedDataMapOfShapeListOfShape() TopExp.MapShapesAndAncestors_s( @@ -2583,12 +2585,19 @@ class Shape(NodeMixin): (e.g., edges, vertices) and other compounds, the method returns a list of only the simple shapes directly contained at the top level. """ + if self.wrapped is None: + return ShapeList() return ShapeList( self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) ) @staticmethod - def get_shape_list(shape: Shape, entity_type: str) -> ShapeList: + def get_shape_list( + shape: Shape, + entity_type: Literal[ + "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" + ], + ) -> ShapeList: """Helper to extract entities of a specific type from a shape.""" if shape.wrapped is None: return ShapeList() @@ -2600,7 +2609,12 @@ class Shape(NodeMixin): return shape_list @staticmethod - def get_single_shape(shape: Shape, entity_type: str) -> Shape: + def get_single_shape( + shape: Shape, + entity_type: Literal[ + "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" + ], + ) -> Shape: """Helper to extract a single entity of a specific type from a shape, with a warning if count != 1.""" shape_list = Shape.get_shape_list(shape, entity_type) @@ -2616,7 +2630,7 @@ class Shape(NodeMixin): """vertices - all the vertices in this Shape - subclasses may override""" return ShapeList() - def vertex(self) -> Vertex: + def vertex(self) -> Vertex | None: """Return the Vertex""" return None @@ -2624,7 +2638,7 @@ class Shape(NodeMixin): """edges - all the edges in this Shape""" return ShapeList() - def edge(self) -> Edge: + def edge(self) -> Edge | None: """Return the Edge""" return None @@ -2632,7 +2646,7 @@ class Shape(NodeMixin): """wires - all the wires in this Shape""" return ShapeList() - def wire(self) -> Wire: + def wire(self) -> Wire | None: """Return the Wire""" return None @@ -2640,7 +2654,7 @@ class Shape(NodeMixin): """faces - all the faces in this Shape""" return ShapeList() - def face(self) -> Face: + def face(self) -> Face | None: """Return the Face""" return None @@ -2648,7 +2662,7 @@ class Shape(NodeMixin): """shells - all the shells in this Shape""" return ShapeList() - def shell(self) -> Shell: + def shell(self) -> Shell | None: """Return the Shell""" return None @@ -2656,7 +2670,7 @@ class Shape(NodeMixin): """solids - all the solids in this Shape""" return ShapeList() - def solid(self) -> Solid: + def solid(self) -> Solid | None: """Return the Solid""" return None @@ -2664,13 +2678,15 @@ class Shape(NodeMixin): """compounds - all the compounds in this Shape""" return ShapeList() - def compound(self) -> Compound: + def compound(self) -> Compound | None: """Return the Compound""" return None @property def area(self) -> float: """area -the surface area of all faces in this Shape""" + if self.wrapped is None: + return 0.0 properties = GProp_GProps() BRepGProp.SurfaceProperties_s(self.wrapped, properties) @@ -2687,11 +2703,15 @@ class Shape(NodeMixin): Returns: Shape: copy of transformed Shape """ + if self.wrapped is None: + return self shape_copy: Shape = copy.deepcopy(self, None) transformed_shape = BRepBuilderAPI_Transform( - shape_copy.wrapped, transformation, True + self.wrapped, + transformation, + True, ).Shape() - shape_copy.wrapped = downcast(transformed_shape) + shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) return shape_copy def rotate(self, axis: Axis, angle: float) -> Self: @@ -2770,18 +2790,13 @@ class Shape(NodeMixin): Changes to the CAD structure of the base object will be reflected in all instances. """ reference = copy.deepcopy(self) - reference.wrapped.TShape(self.wrapped.TShape()) + if self.wrapped is not None: + assert ( + reference.wrapped is not None + ) # Ensure mypy knows reference.wrapped is not None + reference.wrapped.TShape(self.wrapped.TShape()) return reference - def copy(self) -> Self: - """Here for backwards compatibility with cq-editor""" - warnings.warn( - "copy() will be deprecated - use copy.copy() or copy.deepcopy() instead", - DeprecationWarning, - stacklevel=2, - ) - return copy.deepcopy(self, None) - def transform_shape(self, t_matrix: Matrix) -> Self: """Apply affine transform without changing type @@ -2795,11 +2810,13 @@ class Shape(NodeMixin): Returns: Shape: copy of transformed shape with all objects keeping their type """ + new_shape = copy.deepcopy(self, None) + if self.wrapped is None: + return new_shape transformed = downcast( BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() ) - new_shape = copy.deepcopy(self, None) - new_shape.wrapped = transformed + new_shape.wrapped = tcast(TOPODS, transformed) return new_shape @@ -2820,11 +2837,13 @@ class Shape(NodeMixin): Returns: Shape: a copy of the object, but with geometry transformed """ + new_shape = copy.deepcopy(self, None) + if self.wrapped is None: + return new_shape transformed = downcast( BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() ) - new_shape = copy.deepcopy(self, None) - new_shape.wrapped = transformed + new_shape.wrapped = tcast(TOPODS, transformed) return new_shape @@ -2837,7 +2856,10 @@ class Shape(NodeMixin): Returns: """ - + if self.wrapped is None: + raise ValueError("Cannot locate an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot locate a shape at an empty location") self.wrapped.Location(loc.wrapped) return self @@ -2853,8 +2875,12 @@ class Shape(NodeMixin): Returns: Shape: copy of Shape at location """ + if self.wrapped is None: + raise ValueError("Cannot locate an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot locate a shape at an empty location") shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) + shape_copy.wrapped.Location(loc.wrapped) # type: ignore return shape_copy def move(self, loc: Location) -> Self: @@ -2866,6 +2892,10 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None: + raise ValueError("Cannot move an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot move a shape at an empty location") self.wrapped.Move(loc.wrapped) @@ -2882,8 +2912,12 @@ class Shape(NodeMixin): Returns: Shape: copy of Shape moved to relative location """ + if self.wrapped is None: + raise ValueError("Cannot move an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot move a shape at an empty location") shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = downcast(shape_copy.wrapped.Moved(loc.wrapped)) + shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) return shape_copy def relocate(self, loc: Location): @@ -2892,9 +2926,14 @@ class Shape(NodeMixin): Args: loc (Location): new location to set for self """ + if self.wrapped is None: + raise ValueError("Cannot relocate an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot relocate a shape at an empty location") + if self.location != loc: old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) + old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore new_ax = gp_Ax3() new_ax.Transform(loc.wrapped.Transformation()) @@ -2903,21 +2942,23 @@ class Shape(NodeMixin): trsf.SetDisplacement(new_ax, old_ax) builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - self.wrapped = downcast(builder.Shape()) + self.wrapped = tcast(TOPODS, downcast(builder.Shape())) self.wrapped.Location(loc.wrapped) def distance_to_with_closest_points( self, other: Union[Shape, VectorLike] ) -> tuple[float, Vector, Vector]: """Minimal distance between two shapes and the points on each shape""" + if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): + raise ValueError("Cannot calculate distance to or from an empty shape") if isinstance(other, Shape): - topods_shape = other.wrapped + topods_shape = tcast(TopoDS_Shape, other.wrapped) else: vec = Vector(other) - topods_shape = downcast( - BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() - ) + topods_shape = BRepBuilderAPI_MakeVertex( + gp_Pnt(vec.X, vec.Y, vec.Z) + ).Vertex() dist_calc = BRepExtrema_DistShapeShape() dist_calc.LoadS1(self.wrapped) @@ -2935,7 +2976,7 @@ class Shape(NodeMixin): def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: """Points on two shapes where the distance between them is minimal""" - return tuple(self.distance_to_with_closest_points(other)[1:]) + return self.distance_to_with_closest_points(other)[1:3] def __hash__(self) -> int: """Return has code""" @@ -2967,11 +3008,13 @@ class Shape(NodeMixin): arg = TopTools_ListOfShape() for obj in args: - arg.Append(obj.wrapped) + if obj.wrapped is not None: + arg.Append(obj.wrapped) tool = TopTools_ListOfShape() for obj in tools: - tool.Append(obj.wrapped) + if obj.wrapped is not None: + tool.Append(obj.wrapped) operation.SetArguments(arg) operation.SetTools(tool) @@ -3025,7 +3068,7 @@ class Shape(NodeMixin): return self._bool_op((self,), to_cut, cut_op) def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float = None + self, *to_fuse: Shape, glue: bool = False, tol: float | None = None ) -> Self | ShapeList[Self]: """fuse @@ -3099,7 +3142,9 @@ class Shape(NodeMixin): elif isinstance(obj, Plane): objs.append(_to_face(obj)) elif isinstance(obj, Location): - objs.append(_to_vertex(obj.position)) + if obj.wrapped is None: + raise ValueError("Cannot intersect with an empty location") + objs.append(_to_vertex(tcast(Vector, obj.position))) else: objs.append(obj) @@ -3109,6 +3154,31 @@ class Shape(NodeMixin): return shape_intersections + @classmethod + @abstractmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """extrude + + Extrude a Shape in the provided direction. + * Vertices generate Edges + * Edges generate Faces + * Wires generate Shells + * Faces generate Solids + * Shells generate Compounds + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Edge | Face | Shell | Solid | Compound: extruded shape + """ + def _ocp_section( self: Shape, other: Union[Vertex, Edge, Wire, Face] ) -> tuple[list[Vertex], list[Edge]]: @@ -3131,6 +3201,9 @@ class Shape(NodeMixin): Returns: tuple[list[Vertex], list[Edge]]: section results """ + if self.wrapped is None or other.wrapped is None: + return ([], []) + try: section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) except (TypeError, AttributeError): @@ -3175,11 +3248,13 @@ class Shape(NodeMixin): Returns: list[Face]: A list of intersected faces sorted by distance from axis.position """ + if self.wrapped is None: + return ShapeList() + line = gce_MakeLin(axis.wrapped).Value() - shape = self.wrapped intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(shape, line, tol) + intersect_maker.Init(self.wrapped, line, tol) faces_dist = [] # using a list instead of a dictionary to be able to sort it while intersect_maker.More(): @@ -3281,6 +3356,9 @@ class Shape(NodeMixin): "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" ) + if self.wrapped is None: + raise ValueError("Cannot split an empty shape") + # Process the perimeter if not perimeter.is_closed: raise ValueError("perimeter must be a closed Wire or Edge") @@ -3324,6 +3402,8 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None or other.wrapped is None: + raise ValueError("Cannot calculate distance to or from an empty shape") return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() @@ -3336,11 +3416,15 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None: + raise ValueError("Cannot calculate distance to or from an empty shape") dist_calc = BRepExtrema_DistShapeShape() dist_calc.LoadS1(self.wrapped) for other_shape in others: + if other_shape.wrapped is None: + raise ValueError("Cannot calculate distance to or from an empty shape") dist_calc.LoadS2(other_shape.wrapped) dist_calc.Perform() @@ -3356,6 +3440,8 @@ class Shape(NodeMixin): Returns: """ + if self.wrapped is None: + raise ValueError("Cannot mesh an empty shape") if not BRepTools.Triangulation_s(self.wrapped, tolerance): BRepMesh_IncrementalMesh( @@ -3366,6 +3452,9 @@ class Shape(NodeMixin): self, tolerance: float, angular_tolerance: float = 0.1 ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: """General triangulated approximation""" + if self.wrapped is None: + raise ValueError("Cannot tessellate an empty shape") + self.mesh(tolerance, angular_tolerance) vertices: list[Vector] = [] @@ -3373,6 +3462,7 @@ class Shape(NodeMixin): offset = 0 for face in self.faces(): + assert face.wrapped is not None loc = TopLoc_Location() poly = BRep_Tool.Triangulation_s(face.wrapped, loc) trsf = loc.Transformation() @@ -3409,7 +3499,7 @@ class Shape(NodeMixin): def to_splines( self, degree: int = 3, tolerance: float = 1e-3, nurbs: bool = False - ) -> T: + ) -> Self: """to_splines Approximate shape with b-splines of the specified degree. @@ -3420,8 +3510,11 @@ class Shape(NodeMixin): nurbs (bool, optional): Use rational splines. Defaults to False. Returns: - T: _description_ + Self: Approximated shape """ + if self.wrapped is None: + raise ValueError("Cannot approximate an empty shape") + params = ShapeCustom_RestrictionParameters() result = ShapeCustom.BSplineRestriction_s( @@ -3441,8 +3534,8 @@ class Shape(NodeMixin): def to_vtk_poly_data( self, - tolerance: float = None, - angular_tolerance: float = None, + tolerance: float | None = None, + angular_tolerance: float | None = None, normals: bool = False, ) -> vtkPolyData: """Convert shape to vtkPolyData @@ -3454,6 +3547,9 @@ class Shape(NodeMixin): Returns: data object in VTK consisting of points, vertices, lines, and polygons """ + if self.wrapped is None: + raise ValueError("Cannot convert an empty shape") + vtk_shape = IVtkOCC_Shape(self.wrapped) shape_data = IVtkVTK_ShapeData() shape_mesher = IVtkOCC_ShapeMesher() @@ -3492,25 +3588,12 @@ class Shape(NodeMixin): return return_value - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs + def _repr_javascript_(self): + """Jupyter 3D representation support""" - Approximate planar face with arcs and straight line segments. + from .jupyter_tools import display - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - return self.__class__(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - - # def _repr_javascript_(self): - # """Jupyter 3D representation support""" - - # from .jupyter_tools import display - - # return display(self)._repr_javascript_() + return display(self)._repr_javascript_() def transformed( self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) @@ -3552,11 +3635,12 @@ class Shape(NodeMixin): Returns: list[tuple[Vector, Vector]]: Point and normal of intersection """ - oc_shape = self.wrapped + if self.wrapped is None: + return [] intersection_line = gce_MakeLin(other.wrapped).Value() intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(oc_shape, intersection_line, 0.0001) + intersect_maker.Init(self.wrapped, intersection_line, 0.0001) intersections = [] while intersect_maker.More(): @@ -3576,7 +3660,7 @@ class Shape(NodeMixin): intersecting_faces = [i[0] for i in intersections] intersecting_points = [i[1] for i in intersections] intersecting_normals = [ - f.normal_at(intersecting_points[i].to_pnt()) + _topods_face_normal_at(f, intersecting_points[i].to_pnt()) for i, f in enumerate(intersecting_faces) ] result = [] @@ -3657,7 +3741,7 @@ class Shape(NodeMixin): return ShapeList(projected_faces) -class Comparable(metaclass=ABCMeta): +class Comparable(ABC): """Abstract base class that requires comparison methods""" @abstractmethod @@ -3695,7 +3779,11 @@ class ShapeList(list[T]): def center(self) -> Vector: """The average of the center of objects within the ShapeList""" - return sum(o.center() for o in self) / len(self) if self else Vector(0, 0, 0) + if not self: + return Vector(0, 0, 0) + + total_center = sum((o.center() for o in self), Vector(0, 0, 0)) + return total_center / len(self) def filter_by( self, @@ -3729,12 +3817,17 @@ class ShapeList(list[T]): def axis_parallel_predicate(axis: Axis, tolerance: float): def pred(shape: Shape): if shape.is_planar_face: + assert shape.wrapped is not None and isinstance(shape, Face) gp_pnt = gp_Pnt() - normal = gp_Vec() + surface_normal = gp_Vec() u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal(u_val, v_val, gp_pnt, normal) - normal = Vector(normal).normalized() - shape_axis = Axis(shape.center(), normal) + BRepGProp_Face(shape.wrapped).Normal( + u_val, v_val, gp_pnt, surface_normal + ) + normalized_surface_normal = Vector( + surface_normal.X(), surface_normal.Y(), surface_normal.Z() + ).normalized() + shape_axis = Axis(shape.center(), normalized_surface_normal) elif ( isinstance(shape.wrapped, TopoDS_Edge) and shape.geom_type == GeomType.LINE @@ -3759,13 +3852,15 @@ class ShapeList(list[T]): def pred(shape: Shape): if shape.is_planar_face: - gp_pnt = gp_Pnt() - normal = gp_Vec() + assert shape.wrapped is not None and isinstance(shape, Face) + gp_pnt: gp_Pnt = gp_Pnt() + surface_normal: gp_Vec = gp_Vec() u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal(u_val, v_val, gp_pnt, normal) - normal = Vector(normal).normalized() - shape_axis = Axis(shape.center(), normal) - # shape_axis = Axis(shape.center(), shape.normal_at(None)) + BRepGProp_Face(shape.wrapped).Normal( + u_val, v_val, gp_pnt, surface_normal + ) + normalized_surface_normal = Vector(surface_normal).normalized() + shape_axis = Axis(shape.center(), normalized_surface_normal) return plane_axis.is_parallel(shape_axis, tolerance) if isinstance(shape.wrapped, TopoDS_Wire): return all(pred(e) for e in shape.edges()) @@ -3881,6 +3976,9 @@ class ShapeList(list[T]): """ if isinstance(group_by, Axis): + if group_by.wrapped is None: + raise ValueError("Cannot group by an empty axis") + assert group_by.location is not None axis_as_location = group_by.location.inverse() def key_f(obj): @@ -3892,6 +3990,8 @@ class ShapeList(list[T]): elif hasattr(group_by, "wrapped") and isinstance( group_by.wrapped, (TopoDS_Edge, TopoDS_Wire) ): + if group_by.wrapped is None: + raise ValueError("Cannot group by an empty Edge or Wire") def key_f(obj): pnt1, _pnt2 = group_by.closest_points(obj.center()) @@ -3946,7 +4046,11 @@ class ShapeList(list[T]): Returns: ShapeList: sorted list of objects """ + if isinstance(sort_by, Axis): + if sort_by.wrapped is None: + raise ValueError("Cannot sort by an empty axis") + assert sort_by.location is not None axis_as_location = sort_by.location.inverse() objects = sorted( self, @@ -3956,9 +4060,12 @@ class ShapeList(list[T]): elif hasattr(sort_by, "wrapped") and isinstance( sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire) ): + if sort_by.wrapped is None: + raise ValueError("Cannot sort by an empty Edge or Wire") def u_of_closest_center(obj) -> float: """u-value of closest point between object center and sort_by""" + assert not isinstance(sort_by, SortBy) pnt1, _pnt2 = sort_by.closest_points(obj.center()) return sort_by.param_at_point(pnt1) @@ -3975,9 +4082,10 @@ class ShapeList(list[T]): reverse=reverse, ) elif sort_by == SortBy.RADIUS: + with_radius = [obj for obj in self if hasattr(obj, "radius")] objects = sorted( - self, - key=lambda obj: obj.radius, + with_radius, + key=lambda obj: obj.radius, # type: ignore reverse=reverse, ) elif sort_by == SortBy.DISTANCE: @@ -3987,15 +4095,17 @@ class ShapeList(list[T]): reverse=reverse, ) elif sort_by == SortBy.AREA: + with_area = [obj for obj in self if hasattr(obj, "area")] objects = sorted( - self, - key=lambda obj: obj.area, + with_area, + key=lambda obj: obj.area, # type: ignore reverse=reverse, ) elif sort_by == SortBy.VOLUME: + with_volume = [obj for obj in self if hasattr(obj, "volume")] objects = sorted( - self, - key=lambda obj: obj.volume, + with_volume, + key=lambda obj: obj.volume, # type: ignore reverse=reverse, ) @@ -4016,7 +4126,7 @@ class ShapeList(list[T]): ShapeList: Sorted shapes """ distances = sorted( - [(obj.distance_to(other), obj) for obj in self], + [(obj.distance_to(other), obj) for obj in self], # type: ignore key=lambda obj: obj[0], reverse=reverse, ) @@ -4024,7 +4134,7 @@ class ShapeList(list[T]): def vertices(self) -> ShapeList[Vertex]: """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) + return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore def vertex(self) -> Vertex: """Return the Vertex""" @@ -4038,7 +4148,7 @@ class ShapeList(list[T]): def edges(self) -> ShapeList[Edge]: """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) + return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore def edge(self) -> Edge: """Return the Edge""" @@ -4050,7 +4160,7 @@ class ShapeList(list[T]): def wires(self) -> ShapeList[Wire]: """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) + return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore def wire(self) -> Wire: """Return the Wire""" @@ -4062,7 +4172,7 @@ class ShapeList(list[T]): def faces(self) -> ShapeList[Face]: """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) + return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore def face(self) -> Face: """Return the Face""" @@ -4075,7 +4185,7 @@ class ShapeList(list[T]): def shells(self) -> ShapeList[Shell]: """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) + return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore def shell(self) -> Shell: """Return the Shell""" @@ -4087,7 +4197,7 @@ class ShapeList(list[T]): def solids(self) -> ShapeList[Solid]: """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) + return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore def solid(self) -> Solid: """Return the Solid""" @@ -4099,7 +4209,7 @@ class ShapeList(list[T]): def compounds(self) -> ShapeList[Compound]: """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) + return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore def compound(self) -> Compound: """Return the Compound""" @@ -4111,68 +4221,63 @@ class ShapeList(list[T]): ) return compounds[0] - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z): + def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore """Sort operator >""" return self.sort_by(sort_by) - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z): + def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore """Reverse sort operator <""" return self.sort_by(sort_by, reverse=True) - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z): + def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: """Group and select largest group operator >>""" return self.group_by(group_by)[-1] - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z): + def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: """Group and select smallest group operator <<""" return self.group_by(group_by)[0] - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z): + def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: """Filter by axis or geomtype operator |""" return self.filter_by(filter_by) - def __eq__(self, other: object): + def __eq__(self, other: object) -> bool: """ShapeLists equality operator ==""" return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented + set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore ) # Normally implementing __eq__ is enough, but ShapeList subclasses list, # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList): + def __ne__(self, other: ShapeList) -> bool: # type: ignore """ShapeLists inequality operator !=""" return ( set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented ) - def __add__(self, other: ShapeList): + def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore """Combine two ShapeLists together operator +""" return ShapeList(list(self) + list(other)) - def __sub__(self, other: ShapeList) -> ShapeList: + def __sub__(self, other: ShapeList) -> ShapeList[T]: """Differences between two ShapeLists operator -""" - # hash_other = [hash(o) for o in other] - # hash_set = {hash(o): o for o in self if hash(o) not in hash_other} - # return ShapeList(hash_set.values()) return ShapeList(set(self) - set(other)) - def __and__(self, other: ShapeList): + def __and__(self, other: ShapeList) -> ShapeList[T]: """Intersect two ShapeLists operator &""" return ShapeList(set(self) & set(other)) @overload - def __getitem__(self, key: int) -> T: ... + def __getitem__(self, key: SupportsIndex) -> T: ... @overload def __getitem__(self, key: slice) -> ShapeList[T]: ... - def __getitem__(self, key: Union[int, slice]) -> Union[T, ShapeList[T]]: + def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: """Return slices of ShapeList as ShapeList""" if isinstance(key, slice): - return_value = ShapeList(list(self).__getitem__(key)) - else: - return_value = list(self).__getitem__(key) - return return_value + return ShapeList(list(self).__getitem__(key)) + return list(self).__getitem__(key) class GroupBy(Generic[T, K]): @@ -4243,7 +4348,7 @@ class GroupBy(Generic[T, K]): return self.group(self.key_f(shape)) -class Compound(Mixin3D, Shape): +class Compound(Mixin3D, Shape[TopoDS_Compound]): """A Compound in build123d is a topological entity representing a collection of geometric shapes grouped together within a single structure. It serves as a container for organizing diverse shapes like edges, faces, or solids. This @@ -4256,7 +4361,6 @@ class Compound(Mixin3D, Shape): order = 4.0 project_to_viewport = Mixin1D.project_to_viewport - extrude = _ClassMethodProxy(Mixin1D.extrude) @classmethod def cast(cls, obj: TopoDS_Shape) -> Self: @@ -4280,18 +4384,17 @@ class Compound(Mixin3D, Shape): @property def _dim(self) -> Union[int, None]: """The dimension of the shapes within the Compound - None if inconsistent""" - sub_dims = {s.dim for s in get_top_level_topods_shapes(self.wrapped)} - return sub_dims.pop() if len(sub_dims) == 1 else None + return topods_dim(self.wrapped) def __init__( self, obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, label: str = "", - color: Color = None, + color: Color | None = None, material: str = "", - joints: dict[str, Joint] = None, - parent: Compound = None, - children: Sequence[Shape] = None, + joints: dict[str, Joint] | None = None, + parent: Compound | None = None, + children: Sequence[Shape] | None = None, ): """Build a Compound from Shapes @@ -4505,6 +4608,26 @@ class Compound(Mixin3D, Shape): ) return shape_list[0] if shape_list else None + @classmethod + def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: + """extrude + + Extrude a Shell into a Compound. + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Edge: extruded shape + """ + return Compound( + TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) + ) + def do_children_intersect( self, include_parent: bool = False, tolerance: float = 1e-5 ) -> tuple[bool, tuple[Shape, Shape], float]: @@ -4569,7 +4692,7 @@ class Compound(Mixin3D, Shape): font_style: FontStyle = FontStyle.REGULAR, align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), position_on_path: float = 0.0, - text_path: Union[Edge, Wire] = None, + text_path: Union[Edge, Wire, None] = None, ) -> "Compound": """2D Text that optionally follows a path. @@ -4866,7 +4989,7 @@ class Curve(Compound): return Wire.combine(self.edges()) -class Edge(Mixin1D, Shape): +class Edge(Mixin1D, Shape[TopoDS_Edge]): """An Edge in build123d is a fundamental element in the topological data structure representing a one-dimensional geometric entity within a 3D model. It encapsulates information about a curve, which could be a line, arc, or other parametrically @@ -4885,15 +5008,15 @@ class Edge(Mixin1D, Shape): def __init__( self, - obj: Optional[TopoDS_Shape | Axis] = None, + obj: Optional[TopoDS_Edge | Axis | None] = None, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge Args: - obj (TopoDS_Shape | Axis, optional): OCCT Edge or Axis. + obj (TopoDS_Edge | Axis, optional): OCCT Edge or Axis. label (str, optional): Defaults to ''. color (Color, optional): Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. @@ -5021,7 +5144,7 @@ class Edge(Mixin1D, Shape): return vertex_intersections, edge_intersections def find_intersection_points( - self, other: Axis | Edge = None, tolerance: float = TOLERANCE + self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE ) -> ShapeList[Vector]: """find_intersection_points @@ -5138,6 +5261,24 @@ class Edge(Mixin1D, Shape): return ShapeList(common_vertices + common_edges) return None + @classmethod + def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: + """extrude + + Extrude a Vertex into an Edge. + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Edge: extruded shape + """ + return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) + def reversed(self) -> Edge: """Return a copy of self with the opposite orientation""" reversed_edge = copy.deepcopy(self) @@ -5254,7 +5395,9 @@ class Edge(Mixin1D, Shape): return u_value @classmethod - def make_bezier(cls, *cntl_pnts: VectorLike, weights: list[float] = None) -> Edge: + def make_bezier( + cls, *cntl_pnts: VectorLike, weights: list[float] | None = None + ) -> Edge: """make_bezier Create a rational (with weights) or non-rational bezier curve. The first and last @@ -5422,9 +5565,9 @@ class Edge(Mixin1D, Shape): def make_spline( cls, points: list[VectorLike], - tangents: list[VectorLike] = None, + tangents: list[VectorLike] | None = None, periodic: bool = False, - parameters: list[float] = None, + parameters: list[float] | None = None, scale: bool = True, tol: float = 1e-6, ) -> Edge: @@ -5518,7 +5661,7 @@ class Edge(Mixin1D, Shape): cls, points: list[VectorLike], tol: float = 1e-3, - smoothing: Tuple[float, float, float] = None, + smoothing: Tuple[float, float, float] | None = None, min_deg: int = 1, max_deg: int = 6, ) -> Edge: @@ -5728,8 +5871,8 @@ class Edge(Mixin1D, Shape): def project_to_shape( self, target_object: Shape, - direction: VectorLike = None, - center: VectorLike = None, + direction: VectorLike | None = None, + center: VectorLike | None = None, ) -> list[Edge]: """Project Edge @@ -5770,7 +5913,7 @@ class Edge(Mixin1D, Shape): return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) -class Face(Mixin2D, Shape): +class Face(Mixin2D, Shape[TopoDS_Face]): """A Face in build123d represents a 3D bounded surface within the topological data structure. It encapsulates geometric information, defining a face of a 3D shape. These faces are integral components of complex structures, such as solids and @@ -5788,10 +5931,10 @@ class Face(Mixin2D, Shape): @overload def __init__( self, - obj: TopoDS_Shape, + obj: TopoDS_Face, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face @@ -5806,10 +5949,10 @@ class Face(Mixin2D, Shape): def __init__( self, outer_wire: Wire, - inner_wires: Iterable[Wire] = None, + inner_wires: Iterable[Wire] | None = None, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a planar Face from a boundary Wire with optional hole Wires. @@ -5868,7 +6011,7 @@ class Face(Mixin2D, Shape): parent=parent, ) # Faces can optionally record the plane it was created on for later extrusion - self.created_on: Plane = None + self.created_on: Plane | None = None @property def length(self) -> float: @@ -5946,7 +6089,7 @@ class Face(Mixin2D, Shape): return BRepTools.UVBounds_s(self.wrapped) @overload - def normal_at(self, surface_point: VectorLike = None) -> Vector: + def normal_at(self, surface_point: VectorLike | None = None) -> Vector: """normal_at point on surface Args: @@ -6056,7 +6199,9 @@ class Face(Mixin2D, Shape): return Vector(gp_pnt) - def location_at(self, u: float, v: float, x_dir: VectorLike = None) -> Location: + def location_at( + self, u: float, v: float, x_dir: VectorLike | None = None + ) -> Location: """Location at the u/v position of face""" origin = self.position_at(u, v) if x_dir is None: @@ -6116,6 +6261,24 @@ class Face(Mixin2D, Shape): ) return self.outer_wire() + @classmethod + def extrude(cls, obj: Edge, direction: VectorLike) -> Face: + """extrude + + Extrude an Edge into a Face. + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Face: extruded shape + """ + return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) + @classmethod def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: """make_rect @@ -6268,7 +6431,7 @@ class Face(Mixin2D, Shape): cls, points: list[list[VectorLike]], tol: float = 1e-2, - smoothing: Tuple[float, float, float] = None, + smoothing: Tuple[float, float, float] | None = None, min_deg: int = 1, max_deg: int = 3, ) -> Face: @@ -6322,7 +6485,7 @@ class Face(Mixin2D, Shape): def make_bezier_surface( cls, points: list[list[VectorLike]], - weights: list[list[float]] = None, + weights: list[list[float]] | None = None, ) -> Face: """make_bezier_surface @@ -6371,8 +6534,8 @@ class Face(Mixin2D, Shape): def make_surface( cls, exterior: Union[Wire, Iterable[Edge]], - surface_points: Iterable[VectorLike] = None, - interior_wires: Iterable[Wire] = None, + surface_points: Iterable[VectorLike] | None = None, + interior_wires: Iterable[Wire] | None = None, ) -> Face: """Create Non-Planar Face @@ -6500,7 +6663,7 @@ class Face(Mixin2D, Shape): distance: float, distance2: float, vertices: Iterable[Vertex], - edge: Edge = None, + edge: Edge | None = None, ) -> Face: """Apply 2D chamfer to a face @@ -6520,7 +6683,6 @@ class Face(Mixin2D, Shape): """ reference_edge = edge - del edge chamfer_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) @@ -6685,8 +6847,24 @@ class Face(Mixin2D, Shape): # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) # return projector.LowerDistance() <= TOLERANCE + def to_arcs(self, tolerance: float = 1e-3) -> Face: + """to_arcs -class Shell(Mixin2D, Shape): + Approximate planar face with arcs and straight line segments. + + Args: + tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. + + Returns: + Face: approximated face + """ + if self.wrapped is None: + raise ValueError("Cannot approximate an empty shape") + + return self.__class__(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) + + +class Shell(Mixin2D, Shape[TopoDS_Shell]): """A Shell is a fundamental component in build123d's topological data structure representing a connected set of faces forming a closed surface in 3D space. As part of a geometric model, it defines a watertight enclosure, commonly encountered @@ -6703,10 +6881,10 @@ class Shell(Mixin2D, Shape): def __init__( self, - obj: Optional[TopoDS_Shape | Face | Iterable[Face]] = None, + obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell @@ -6752,6 +6930,24 @@ class Shell(Mixin2D, Shape): BRepGProp.LinearProperties_s(self.wrapped, properties) return Vector(properties.CentreOfMass()) + @classmethod + def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: + """extrude + + Extrude a Wire into a Shell. + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Edge: extruded shape + """ + return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) + @classmethod def sweep( cls, @@ -6807,7 +7003,7 @@ class Shell(Mixin2D, Shape): return cls(_make_loft(objs, False, ruled)) -class Solid(Mixin3D, Shape): +class Solid(Mixin3D, Shape[TopoDS_Solid]): """A Solid in build123d represents a three-dimensional solid geometry in a topological structure. A solid is a closed and bounded volume, enclosing a region in 3D space. It comprises faces, edges, and vertices connected in a @@ -6823,12 +7019,12 @@ class Solid(Mixin3D, Shape): def __init__( self, - obj: TopoDS_Shape | Shell = None, + obj: TopoDS_Solid | Shell | None = None, label: str = "", - color: Color = None, + color: Color | None = None, material: str = "", - joints: dict[str, Joint] = None, - parent: Compound = None, + joints: dict[str, Joint] | None = None, + parent: Compound | None = None, ): """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid @@ -6865,6 +7061,24 @@ class Solid(Mixin3D, Shape): """Create a Solid object from the surface shell""" return ShapeFix_Solid().SolidFromShell(shell.wrapped) + @classmethod + def extrude(cls, obj: Face, direction: VectorLike) -> Solid: + """extrude + + Extrude a Face into a Solid. + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Edge: extruded shape + """ + return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) + @classmethod def from_bounding_box(cls, bbox: BoundBox) -> Solid: """A box of the same dimensions and location""" @@ -7169,7 +7383,7 @@ class Solid(Mixin3D, Shape): center: VectorLike, normal: VectorLike, angle: float, - inner_wires: list[Wire] = None, + inner_wires: list[Wire] | None = None, ) -> Solid: """Extrude with Rotation @@ -7351,7 +7565,7 @@ class Solid(Mixin3D, Shape): section: Union[Face, Wire], angle: float, axis: Axis, - inner_wires: list[Wire] = None, + inner_wires: list[Wire] | None = None, ) -> Solid: """Revolve @@ -7407,7 +7621,7 @@ class Solid(Mixin3D, Shape): cls, section: Union[Face, Wire], path: Union[Wire, Edge], - inner_wires: list[Wire] = None, + inner_wires: list[Wire] | None = None, make_solid: bool = True, is_frenet: bool = False, mode: Union[Vector, Wire, Edge, None] = None, @@ -7579,7 +7793,7 @@ class Solid(Mixin3D, Shape): return result -class Vertex(Shape): +class Vertex(Shape[TopoDS_Vertex]): """A Vertex in build123d represents a zero-dimensional point in the topological data structure. It marks the endpoints of edges within a 3D model, defining precise locations in space. Vertices play a crucial role in defining the geometry of objects @@ -7801,8 +8015,13 @@ class Vertex(Shape): """ return Vertex(*t_matrix.multiply(Vector(self))) + @classmethod + def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: + """extrude - invalid operation for Vertex""" + raise NotImplementedError("Vertices can't be created by extrusion") -class Wire(Mixin1D, Shape): + +class Wire(Mixin1D, Shape[TopoDS_Wire]): """A Wire in build123d is a topological entity representing a connected sequence of edges forming a continuous curve or path in 3D space. Wires are essential components in modeling complex objects, defining boundaries for surfaces or @@ -7818,15 +8037,15 @@ class Wire(Mixin1D, Shape): @overload def __init__( self, - obj: TopoDS_Shape, + obj: TopoDS_Wire, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a wire from an OCCT TopoDS_Wire Args: - obj (TopoDS_Shape, optional): OCCT Wire. + obj (TopoDS_Wire, optional): OCCT Wire. label (str, optional): Defaults to ''. color (Color, optional): Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. @@ -7837,8 +8056,8 @@ class Wire(Mixin1D, Shape): self, edge: Edge, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a Wire from an Edge @@ -7854,8 +8073,8 @@ class Wire(Mixin1D, Shape): self, wire: Wire, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a Wire from an Wire - used when the input could be an Edge or Wire. @@ -7871,8 +8090,8 @@ class Wire(Mixin1D, Shape): self, wire: Curve, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a Wire from an Curve. @@ -7889,8 +8108,8 @@ class Wire(Mixin1D, Shape): edges: Iterable[Edge], sequenced: bool = False, label: str = "", - color: Color = None, - parent: Compound = None, + color: Color | None = None, + parent: Compound | None = None, ): """Build a wire from Edges @@ -7912,7 +8131,7 @@ class Wire(Mixin1D, Shape): if args: l_a = len(args) - if isinstance(args[0], TopoDS_Shape): + if isinstance(args[0], TopoDS_Wire): obj, label, color, parent = args[:4] + (None,) * (4 - l_a) elif isinstance(args[0], Edge): edge, label, color, parent = args[:4] + (None,) * (4 - l_a) @@ -7922,7 +8141,7 @@ class Wire(Mixin1D, Shape): elif ( hasattr(args[0], "wrapped") and isinstance(args[0].wrapped, TopoDS_Compound) - and args[0].wrapped.dim == 1 + and topods_dim(args[0].wrapped) == 1 ): # Curve curve, label, color, parent = args[:4] + (None,) * (4 - l_a) elif isinstance(args[0], Iterable): @@ -8020,6 +8239,11 @@ class Wire(Mixin1D, Shape): return wires + @classmethod + def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: + """extrude - invalid operation for Wire""" + raise NotImplementedError("Wires can't be created by extrusion") + def fix_degenerate_edges(self, precision: float) -> Wire: """fix_degenerate_edges @@ -8363,7 +8587,7 @@ class Wire(Mixin1D, Shape): distance: float, distance2: float, vertices: Iterable[Vertex], - edge: Edge = None, + edge: Edge | None = None, ) -> Wire: """chamfer_2d @@ -8581,8 +8805,8 @@ class Wire(Mixin1D, Shape): def project_to_shape( self, target_object: Shape, - direction: VectorLike = None, - center: VectorLike = None, + direction: VectorLike | None = None, + center: VectorLike | None = None, ) -> list[Wire]: """Project Wire @@ -8701,14 +8925,15 @@ class Joint(ABC): def __init__(self, label: str, parent: Union[Solid, Compound]): self.label = label self.parent = parent - self.connected_to: Joint = None + self.connected_to: Joint | None = None def _connect_to(self, other: Joint, **kwargs): # pragma: no cover """Connect Joint self by repositioning other""" if not isinstance(other, Joint): raise TypeError(f"other must of type Joint not {type(other)}") - + if self.parent.location is None: + raise ValueError("Parent location is not set") relative_location = self.relative_to(other, **kwargs) other.parent.locate(self.parent.location * relative_location) self.connected_to = other @@ -8753,6 +8978,7 @@ def _make_loft( Returns: TopoDS_Shape: Lofted object """ + objs = list(objs) # To determine its length if len(objs) < 2: raise ValueError("More than one wire is required") vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] @@ -8811,7 +9037,7 @@ def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: return return_value -def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> list[Wire]: +def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: """Convert edges to a list of wires. Args: @@ -8826,12 +9052,14 @@ def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> list[Wire]: wires_out = TopTools_HSequenceOfShape() for edge in edges: - edges_in.Append(edge.wrapped) + if edge.wrapped is not None: + edges_in.Append(edge.wrapped) ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - wires = ShapeList() + wires: ShapeList[Wire] = ShapeList() for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) + # wires.append(Wire(downcast(wires_out.Value(i + 1)))) + wires.append(Wire(TopoDS.Wire_s(wires_out.Value(i + 1)))) return wires @@ -8870,9 +9098,9 @@ def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) -def shapetype(obj: TopoDS_Shape) -> TopAbs_ShapeEnum: +def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj.IsNull(): + if obj is None or obj.IsNull(): raise ValueError("Null TopoDS_Shape object") return obj.ShapeType() @@ -8968,12 +9196,14 @@ def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: # Create a list of combined object edges combined_topo_edges = TopTools_ListOfShape() for edge in combined.edges(): - combined_topo_edges.Append(edge.wrapped) + if edge.wrapped is not None: + combined_topo_edges.Append(edge.wrapped) # Create a list of original object edges original_topo_edges = TopTools_ListOfShape() for edge in [e for obj in objects for e in obj.edges()]: - original_topo_edges.Append(edge.wrapped) + if edge.wrapped is not None: + original_topo_edges.Append(edge.wrapped) # Cut the original edges from the combined edges operation = BRepAlgoAPI_Cut() @@ -8993,15 +9223,21 @@ def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: return ShapeList(edges) -def topo_explore_connected_edges(edge: Edge, parent: Shape = None) -> ShapeList[Edge]: +def topo_explore_connected_edges( + edge: Edge, parent: Shape | None = None +) -> ShapeList[Edge]: """Given an edge extracted from a Shape, return the edges connected to it""" parent = parent if parent is not None else edge.topo_parent + if parent is None: + raise ValueError("edge has no valid parent") given_topods_edge = edge.wrapped + if given_topods_edge is None: + raise ValueError("edge is empty") connected_edges = set() # Find all the TopoDS_Edges for this Shape - topods_edges = ShapeList([e.wrapped for e in parent.edges()]) + topods_edges = [e.wrapped for e in parent.edges() if e.wrapped is not None] for topods_edge in topods_edges: # # Don't match with the given edge @@ -9011,7 +9247,7 @@ def topo_explore_connected_edges(edge: Edge, parent: Shape = None) -> ShapeList[ if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: connected_edges.add(topods_edge) - return ShapeList([Edge(e) for e in connected_edges]) + return ShapeList(Edge(e) for e in connected_edges) def topo_explore_common_vertex( @@ -9021,6 +9257,9 @@ def topo_explore_common_vertex( topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped + if topods_edge1 is None or topods_edge2 is None: + raise ValueError("edge is empty") + # Explore vertices of the first edge vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) while vert_exp.More(): @@ -9033,7 +9272,7 @@ def topo_explore_common_vertex( # Check if the vertices are the same if vertex1.IsSame(vertex2): - return Vertex(downcast(vertex1)) # Common vertex found + return Vertex(TopoDS.Vertex_s(vertex1)) # Common vertex found explorer2.Next() vert_exp.Next() @@ -9068,7 +9307,7 @@ def unwrap_topods_compound( return compound -def get_top_level_topods_shapes(topods_shape: TopoDS_Shape) -> ShapeList[TopoDS_Shape]: +def get_top_level_topods_shapes(topods_shape: TopoDS_Shape) -> list[TopoDS_Shape]: """ Retrieve the first level of child shapes from the shape. @@ -9079,7 +9318,7 @@ def get_top_level_topods_shapes(topods_shape: TopoDS_Shape) -> ShapeList[TopoDS_ without returning the nested compound itself. Returns: - ShapeList[TopoDS_Shape]: A list of all first-level non-compound child shapes. + list[TopoDS_Shape]: A list of all first-level non-compound child shapes. Example: If the current shape is a compound containing both simple shapes @@ -9109,7 +9348,7 @@ def get_top_level_topods_shapes(topods_shape: TopoDS_Shape) -> ShapeList[TopoDS_ else: first_level_shapes.append(current_shape) - return ShapeList(first_level_shapes) + return first_level_shapes def _topods_bool_op( @@ -9151,7 +9390,7 @@ def _topods_bool_op( def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Sequence[TopoDS_Wire]] = None + outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None ) -> TopoDS_Face: """_make_topods_face_from_wires @@ -9159,7 +9398,7 @@ def _make_topods_face_from_wires( Args: outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Sequence[TopoDS_Wire], optional): holes. Defaults to None. + inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. Raises: ValueError: outer wire not closed @@ -9172,7 +9411,7 @@ def _make_topods_face_from_wires( """ if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = inner_wires if inner_wires else [] + inner_wires = list(inner_wires) if inner_wires else [] # check if wires are coplanar verification_compound = _make_topods_compound_from_shapes( @@ -9204,7 +9443,7 @@ def _make_topods_face_from_wires( sf_f.FixOrientation() sf_f.Perform() - return downcast(sf_f.Result()) + return TopoDS.Face_s(sf_f.Result()) def _sew_topods_faces(faces: Sequence[TopoDS_Face]) -> TopoDS_Shape: @@ -9217,7 +9456,7 @@ def _sew_topods_faces(faces: Sequence[TopoDS_Face]) -> TopoDS_Shape: def _make_topods_compound_from_shapes( - occt_shapes: Sequence[TopoDS_Shape], + occt_shapes: Sequence[TopoDS_Shape | None], ) -> TopoDS_Compound: """Create an OCCT TopoDS_Compound @@ -9234,7 +9473,8 @@ def _make_topods_compound_from_shapes( comp_builder.MakeCompound(comp) for shape in occt_shapes: - comp_builder.Add(comp, shape) + if shape is not None: + comp_builder.Add(comp, shape) return comp diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 0ae4030..1892bcd 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -3211,10 +3211,6 @@ class TestShape(DirectApiTestCase): self.assertVectorAlmostEquals(box.position, (1, 2, 3), 5) self.assertVectorAlmostEquals(box.orientation, (10, 20, 30), 5) - def test_copy(self): - with self.assertWarns(DeprecationWarning): - Solid.make_box(1, 1, 1).copy() - def test_distance_to_with_closest_points(self): s0 = Solid.make_sphere(1).locate(Location((0, 2.1, 0))) s1 = Solid.make_sphere(1) diff --git a/tests/test_exporters.py b/tests/test_exporters.py index a038057..6e90d85 100644 --- a/tests/test_exporters.py +++ b/tests/test_exporters.py @@ -32,6 +32,8 @@ from build123d import ( ) from build123d.exporters import ExportSVG, ExportDXF, Drawing, LineType +from ocp_vscode import show + class ExportersTestCase(unittest.TestCase): @staticmethod diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 6fa5c27..9bccdfd 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -87,9 +87,6 @@ Key Features: - `_topods_bool_op`: Generic Boolean operations for TopoDS_Shapes. - `new_edges`: Identifies newly created edges from combined shapes. -- **Utility Classes**: - - `_ClassMethodProxy`: Dynamically binds methods across classes. - - **Enhanced Math**: - `isclose_b`: Overrides `math.isclose` with a stricter absolute tolerance. @@ -354,7 +351,7 @@ def write_topo_class_files( "get_top_level_topods_shapes", "_sew_topods_faces", "shapetype", - "_topods_compound_dim", + "topods_dim", "_topods_entities", "_topods_face_normal_at", "apply_ocp_monkey_patches", @@ -386,7 +383,6 @@ def write_topo_class_files( # Define class groupings based on layers class_groups = { - "utils": ["_ClassMethodProxy"], "shape_core": [ "Shape", "Comparable", @@ -456,7 +452,6 @@ license: additional_imports.append( "from .shape_core import Shape, ShapeList, BoundBox, SkipClean, TrimmingTool, Joint" ) - additional_imports.append("from .utils import _ClassMethodProxy") if group_name not in ["shape_core", "vertex"]: for sub_group_name in function_source.keys(): additional_imports.append( @@ -508,26 +503,6 @@ license: # if group_name in ["shape_core", "utils"]: if group_name in function_source.keys(): body = [*cst.parse_module(all_imports_code).body] - for func in function_collector.functions: - if group_name == "shape_core" and func.name.value in [ - "_topods_compound_dim", - "_topods_face_normal_at", - "apply_ocp_monkey_patches", - ]: - body.append(func) - - # If this is the "apply_ocp_monkey_patches" function, add a call to it - if ( - group_name == "shape_core" - and func.name.value == "apply_ocp_monkey_patches" - ): - apply_patches_call = cst.Expr( - value=cst.Call(func=cst.Name("apply_ocp_monkey_patches")) - ) - body.append(apply_patches_call) - body.append(cst.EmptyLine(indent=False)) - body.append(cst.EmptyLine(indent=False)) - if group_name == "shape_core": for var in variable_collector.global_variables: # Check the name of the assigned variable(s) @@ -562,13 +537,7 @@ license: body.append(cst.EmptyLine(indent=False)) for func in function_collector.functions: - if func.name.value in function_source[ - group_name - ] and func.name.value not in [ - "_topods_compound_dim", - "_topods_face_normal_at", - "apply_ocp_monkey_patches", - ]: + if func.name.value in function_source[group_name]: body.append(func) class_module = cst.Module(body=body, header=header) else: @@ -756,7 +725,6 @@ def main(): # Define classes to extract class_names = [ - "_ClassMethodProxy", "BoundBox", "Shape", "Compound", From 59bb0373a87e833469b44660ef5e57e3677a7235 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 20 Dec 2024 14:39:48 -0500 Subject: [PATCH 046/518] Review viewer import --- tests/test_exporters.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_exporters.py b/tests/test_exporters.py index 6e90d85..a038057 100644 --- a/tests/test_exporters.py +++ b/tests/test_exporters.py @@ -32,8 +32,6 @@ from build123d import ( ) from build123d.exporters import ExportSVG, ExportDXF, Drawing, LineType -from ocp_vscode import show - class ExportersTestCase(unittest.TestCase): @staticmethod From 5be9a270431619d0eb0b1bb0331df34cb20a6d41 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 21 Dec 2024 11:06:49 -0500 Subject: [PATCH 047/518] mypy fixes for zero_d.py & latest code review changes --- src/build123d/geometry.py | 15 ++++-- src/build123d/topology.py | 110 +++++++++++++++++++------------------- 2 files changed, 67 insertions(+), 58 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index fa9a26e..209ff8f 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -861,8 +861,12 @@ class BoundBox: """A BoundingBox for a Shape""" def __init__(self, bounding_box: Bnd_Box) -> None: - self.wrapped: Bnd_Box = bounding_box - x_min, y_min, z_min, x_max, y_max, z_max = bounding_box.Get() + if bounding_box.IsVoid(): + self.wrapped = None + x_min, y_min, z_min, x_max, y_max, z_max = (0,) * 6 + else: + self.wrapped: Bnd_Box = bounding_box + x_min, y_min, z_min, x_max, y_max, z_max = bounding_box.Get() self.min = Vector(x_min, y_min, z_min) #: location of minimum corner self.max = Vector(x_max, y_max, z_max) #: location of maximum corner self.size = Vector(x_max - x_min, y_max - y_min, z_max - z_min) #: overall size @@ -870,6 +874,8 @@ class BoundBox: @property def diagonal(self) -> float: """body diagonal length (i.e. object maximum size)""" + if self.wrapped is None: + return 0.0 return self.wrapped.SquareExtent() ** 0.5 def __repr__(self): @@ -914,13 +920,14 @@ class BoundBox: tmp = Bnd_Box() tmp.SetGap(tol) - tmp.Add(self.wrapped) + if self.wrapped is not None: + tmp.Add(self.wrapped) if isinstance(obj, tuple): tmp.Update(*obj) elif isinstance(obj, Vector): tmp.Update(*obj.to_tuple()) - elif isinstance(obj, BoundBox): + elif isinstance(obj, BoundBox) and obj.wrapped is not None: tmp.Add(obj.wrapped) return BoundBox(tmp) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 7299d6b..3e07edc 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -1469,6 +1469,7 @@ class Mixin3D: Returns: Self: Chamfered solid """ + edge_list = list(edge_list) if face: if any((edge for edge in edge_list if edge not in face.edges())): raise ValueError("Some edges are not part of the face") @@ -1566,6 +1567,7 @@ class Mixin3D: Returns: Solid: A hollow solid. """ + faces = list(faces) if faces else [] if kind == Kind.TANGENT: raise ValueError("Kind.TANGENT not supported") @@ -1631,6 +1633,7 @@ class Mixin3D: Returns: Solid: A shelled solid. """ + openings = list(openings) if openings else [] if kind == Kind.TANGENT: raise ValueError("Kind.TANGENT not supported") @@ -1771,7 +1774,10 @@ class Shape(NodeMixin, Generic[TOPODS]): # pylint: disable=too-many-instance-attributes, too-many-public-methods - _dim = None + @property + @abstractmethod + def _dim(self) -> int | None: + """Dimension of the object""" shape_LUT = { ta.TopAbs_VERTEX: "Vertex", @@ -2174,7 +2180,7 @@ class Shape(NodeMixin, Generic[TOPODS]): result = Shape._show_tree(tree[0], show_center) return result - def __add__(self, other: Union[list[Shape], Shape]) -> Self: + def __add__(self, other: Union[list[Shape], Shape]) -> Self | ShapeList[Self]: """fuse shape to self operator +""" # Convert `other` to list of base objects and filter out None values summands = [ @@ -2208,7 +2214,7 @@ class Shape(NodeMixin, Generic[TOPODS]): return sum_shape - def __sub__(self, other: Union[Shape, Iterable[Shape]]) -> Self: + def __sub__(self, other: Union[Shape, Iterable[Shape]]) -> Self | ShapeList[Self]: """cut shape from self operator -""" if self.wrapped is None: @@ -2483,6 +2489,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Vector: center of multiple objects """ + objects = list(objects) if center_of == CenterOf.MASS: total_mass = sum(Shape.compute_mass(o) for o in objects) weighted_centers = [ @@ -2999,8 +3006,10 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ + args = list(args) + tools = list(tools) # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + list(args) + list(tools)} + order_dict = {type(s): type(s).order for s in [self] + args + tools} highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] # The base of the operation @@ -4257,7 +4266,7 @@ class ShapeList(list[T]): def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore """Combine two ShapeLists together operator +""" - return ShapeList(list(self) + list(other)) + return ShapeList(itertools.chain(self, other)) def __sub__(self, other: ShapeList) -> ShapeList[T]: """Differences between two ShapeLists operator -""" @@ -4409,7 +4418,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): """ if isinstance(obj, Iterable): - obj = _make_topods_compound_from_shapes([s.wrapped for s in obj]) + obj = _make_topods_compound_from_shapes(s.wrapped for s in obj) super().__init__( obj=obj, @@ -4482,7 +4491,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): logger.debug("Removing parent of %s (%s)", self.label, parent.label) if parent.children: parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] + c.wrapped for c in parent.children ) else: parent.wrapped = None @@ -4496,7 +4505,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): """Method call after attaching to `parent`.""" logger.debug("Updated parent of %s to %s", self.label, parent.label) parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] + c.wrapped for c in parent.children ) def _post_detach_children(self, children): @@ -4505,7 +4514,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): kids = ",".join([child.label for child in children]) logger.debug("Removing children %s from %s", kids, self.label) self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] + c.wrapped for c in self.children ) # else: # logger.debug("Removing no children from %s", self.label) @@ -4521,12 +4530,12 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): kids = ",".join([child.label for child in children]) logger.debug("Adding children %s to %s", kids, self.label) self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] + c.wrapped for c in self.children ) # else: # logger.debug("Adding no children to %s", self.label) - def __add__(self, other: Shape | Sequence[Shape]) -> Compound: + def __add__(self, other: Shape | Iterable[Shape]) -> Compound: """Combine other to self `+` operator Note that if all of the objects are connected Edges/Wires the result @@ -4566,7 +4575,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): return result - def __sub__(self, other: Shape | Sequence[Shape]) -> Compound: + def __sub__(self, other: Shape | Iterable[Shape]) -> Compound: """Cut other to self `-` operator""" difference = Shape.__sub__(self, other) difference = Compound( @@ -4576,7 +4585,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): return difference - def __and__(self, other: Shape | Sequence[Shape]) -> Compound: + def __and__(self, other: Shape | Iterable[Shape]) -> Compound: """Intersect other to self `&` operator""" intersection = Shape.__and__(self, other) intersection = Compound( @@ -6558,6 +6567,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): Returns: Face: Potentially non-planar face """ + exterior = list(exterior) if isinstance(exterior, Iterable) else exterior # pylint: disable=too-many-branches if surface_points: surface_points = [Vector(p) for p in surface_points] @@ -6894,7 +6904,7 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): color (Color, optional): Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. """ - + obj = list(obj) if isinstance(obj, Iterable) else obj if isinstance(obj, Iterable) and len(obj) == 1: obj = obj[0] @@ -7812,7 +7822,7 @@ class Vertex(Shape[TopoDS_Vertex]): """Default Vertext at the origin""" @overload - def __init__(self, v: TopoDS_Vertex): # pragma: no cover + def __init__(self, ocp_vx: TopoDS_Vertex): # pragma: no cover """Vertex from OCCT TopoDS_Vertex object""" @overload @@ -7823,40 +7833,30 @@ class Vertex(Shape[TopoDS_Vertex]): def __init__(self, v: Iterable[float]): """Vertex from Vector or other iterators""" - @overload - def __init__(self, v: tuple[float]): - """Vertex from tuple of floats""" - def __init__(self, *args, **kwargs): self.vertex_index = 0 - x, y, z, ocp_vx = 0, 0, 0, None - unknown_args = ", ".join(set(kwargs.keys()).difference(["v", "X", "Y", "Z"])) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") + ocp_vx = kwargs.pop("ocp_vx", None) + v = kwargs.pop("v", None) + x = kwargs.pop("X", 0) + y = kwargs.pop("Y", 0) + z = kwargs.pop("Z", 0) - if args and all(isinstance(args[i], (int, float)) for i in range(len(args))): - values = list(args) - values += [0.0] * max(0, (3 - len(args))) - x, y, z = values[0:3] - elif len(args) == 1 or "v" in kwargs: - first_arg = args[0] if args else None - first_arg = kwargs.get("v", first_arg) # override with kwarg - if isinstance(first_arg, (tuple, Iterable)): - try: - values = [float(value) for value in first_arg] - except (TypeError, ValueError) as exc: - raise TypeError("Expected floats") from exc - if len(values) < 3: - values += [0.0] * (3 - len(values)) - x, y, z = values - elif isinstance(first_arg, TopoDS_Vertex): - ocp_vx = first_arg + # Handle unexpected kwargs + if kwargs: + raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + + if args: + if isinstance(args[0], TopoDS_Vertex): + ocp_vx = args[0] + elif isinstance(args[0], Iterable): + v = args[0] else: - raise TypeError("Expected floats, TopoDS_Vertex, or iterable") - x = kwargs.get("X", x) - y = kwargs.get("Y", y) - z = kwargs.get("Z", z) + x, y, z = args[:3] + (0,) * (3 - len(args)) + + if v is not None: + x, y, z = itertools.islice(itertools.chain(v, [0, 0, 0]), 3) + ocp_vx = ( downcast(BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z)).Vertex()) if ocp_vx is None @@ -7897,12 +7897,12 @@ class Vertex(Shape[TopoDS_Vertex]): geom_point = BRep_Tool.Pnt_s(self.wrapped) return (geom_point.X(), geom_point.Y(), geom_point.Z()) - def center(self) -> Vector: + def center(self, *args, **kwargs) -> Vector: """The center of a vertex is itself!""" return Vector(self) - def __add__( - self, other: Union[Vertex, Vector, Tuple[float, float, float]] + def __add__( # type: ignore + self, other: Vertex | Vector | tuple[float, float, float] ) -> Vertex: """Add @@ -7936,7 +7936,7 @@ class Vertex(Shape[TopoDS_Vertex]): ) return new_vertex - def __sub__(self, other: Union[Vertex, Vector, tuple]) -> Vertex: + def __sub__(self, other: Union[Vertex, Vector, tuple]) -> Vertex: # type: ignore """Subtract Substract a Vertex with a Vertex, Vector or Tuple from self @@ -8604,7 +8604,6 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Wire: chamfered wire """ reference_edge = edge - del edge # Create a face to chamfer unchamfered_face = _make_topods_face_from_wires(self.wrapped) @@ -8726,7 +8725,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): # ] # ): # raise ValueError("edges overlap") - + edges = list(edges) fragments_per_edge = int(2 / tolerance) points_lookup = {} # lookup from point index to edge/position on edge points = [] # convex hull point cloud @@ -9170,6 +9169,8 @@ def polar(length: float, angle: float) -> tuple[float, float]: def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: """Compare the OCCT objects of each list and return the differences""" + shapes_one = list(shapes_one) + shapes_two = list(shapes_two) occt_one = set(shape.wrapped for shape in shapes_one) occt_two = set(shape.wrapped for shape in shapes_two) occt_delta = list(occt_one - occt_two) @@ -9366,7 +9367,8 @@ def _topods_bool_op( Returns: TopoDS_Shape """ - + args = list(args) + tools = list(tools) arg = TopTools_ListOfShape() for obj in args: arg.Append(obj) @@ -9446,7 +9448,7 @@ def _make_topods_face_from_wires( return TopoDS.Face_s(sf_f.Result()) -def _sew_topods_faces(faces: Sequence[TopoDS_Face]) -> TopoDS_Shape: +def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: """Sew faces into a shell if possible""" shell_builder = BRepBuilderAPI_Sewing() for face in faces: @@ -9456,7 +9458,7 @@ def _sew_topods_faces(faces: Sequence[TopoDS_Face]) -> TopoDS_Shape: def _make_topods_compound_from_shapes( - occt_shapes: Sequence[TopoDS_Shape | None], + occt_shapes: Iterable[TopoDS_Shape | None], ) -> TopoDS_Compound: """Create an OCCT TopoDS_Compound @@ -9482,7 +9484,7 @@ def _make_topods_compound_from_shapes( def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: """Return the maximum dimension of one or more shapes""" shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) + composite = _make_topods_compound_from_shapes(s.wrapped for s in shapes) bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) return bbox.diagonal From 4c3d1544a90e0c3e81bb486b7e3066e8507bf56a Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 23 Dec 2024 11:46:20 -0500 Subject: [PATCH 048/518] Attempting to isolate mac specific issue --- src/build123d/topology.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 3e07edc..1bd0ed6 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -4266,7 +4266,8 @@ class ShapeList(list[T]): def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore """Combine two ShapeLists together operator +""" - return ShapeList(itertools.chain(self, other)) + # return ShapeList(itertools.chain(self, other)) + return ShapeList(list(self) + list(other)) def __sub__(self, other: ShapeList) -> ShapeList[T]: """Differences between two ShapeLists operator -""" From 48e4b5e0577d1f4ba9c90a62269d26d67afa91e2 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 28 Dec 2024 15:46:38 -0500 Subject: [PATCH 049/518] Resolved one_d.py mypy errors --- src/build123d/topology.py | 346 ++++++++++++++++++++++++-------------- tests/test_direct_api.py | 4 +- 2 files changed, 217 insertions(+), 133 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 1bd0ed6..20e71a8 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -36,15 +36,12 @@ from __future__ import annotations # too-many-arguments, too-many-locals, too-many-public-methods, # too-many-statements, too-many-instance-attributes, too-many-branches import copy -import inspect import itertools import os import platform import sys -import types import warnings -from abc import ABC, ABCMeta, abstractmethod -from io import BytesIO +from abc import ABC, abstractmethod from itertools import combinations from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose from typing import ( @@ -66,8 +63,7 @@ from typing import ( TYPE_CHECKING, ) from typing import cast as tcast -from typing_extensions import Self, Literal, deprecated - +from typing_extensions import Self, Literal from anytree import NodeMixin, PreOrderIter, RenderTree from IPython.lib.pretty import pretty, PrettyPrinter from numpy import ndarray @@ -171,6 +167,7 @@ from OCP.Geom import ( Geom_Line, ) from OCP.GeomAdaptor import GeomAdaptor_Curve +from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf, GeomAPI_IntCS from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType @@ -205,8 +202,6 @@ from OCP.gp import ( from OCP.GProp import GProp_GProps from OCP.HLRAlgo import HLRAlgo_Projector from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.IFSelect import IFSelect_ReturnStatus -from OCP.Interface import Interface_Static from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher from OCP.IVtkVTK import IVtkVTK_ShapeData from OCP.LocOpe import LocOpe_DPrism @@ -233,8 +228,6 @@ from OCP.Standard import ( from OCP.StdFail import StdFail_NotDone from OCP.StdPrs import StdPrs_BRepFont from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder -from OCP.STEPControl import STEPControl_AsIs, STEPControl_Writer -from OCP.StlAPI import StlAPI_Writer # Array of vectors (used for B-spline interpolation): # Array of points (used for B-spline construction): @@ -363,9 +356,11 @@ def tuplify(obj: Any, dim: int) -> tuple | None: class Mixin1D: """Methods to add to the Edge and Wire classes""" - def __add__(self, other: Union[list[Shape], Shape]) -> Self: + def __add__(self, other: Shape | Iterable[Shape]) -> Edge | Wire | ShapeList[Edge]: """fuse shape to wire/edge operator +""" + assert isinstance(self, Shape) # for typing + # Convert `other` to list of base topods objects and filter out None values summands = [ shape @@ -383,6 +378,9 @@ class Mixin1D: # Convert back to Edge/Wire objects now that it's safe to do so summands = [Mixin1D.cast(s) for s in summands] summand_edges = [e for summand in summands for e in summand.edges()] + + assert isinstance(self, Shape) # for typing + if self.wrapped is None: # an empty object if len(summands) == 1: sum_shape = summands[0] @@ -395,7 +393,7 @@ class Mixin1D: sum_shape = type(self)(sum_shape) else: try: - sum_shape = Wire(self.edges() + summand_edges) + sum_shape = Wire(self.edges() + ShapeList(summand_edges)) except Exception: sum_shape = self.fuse(*summands) @@ -408,7 +406,7 @@ class Mixin1D: return sum_shape @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: + def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: "Returns the right type of wrapper, given a OCCT object" # Extend the lookup table with additional entries @@ -461,6 +459,8 @@ class Mixin1D: - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is either a `Self` or `list[Self]`, or `None` if no corresponding part is found. """ + assert isinstance(self, Shape) # for typing + shape_list = TopTools_ListOfShape() shape_list.Append(self.wrapped) @@ -505,7 +505,8 @@ class Mixin1D: except StdFail_NotDone as err: raise RuntimeError("Error determining top/bottom") from err - tops, bottoms = [], [] + tops: list[Shape] = [] + bottoms: list[Shape] = [] properties = GProp_GProps() for part in get_top_level_topods_shapes(split_result): sub_shape = self.__class__.cast(part) @@ -534,14 +535,17 @@ class Mixin1D: def vertices(self) -> ShapeList[Vertex]: """vertices - all the vertices in this Shape""" + assert isinstance(self, Shape) # for typing return Shape.get_shape_list(self, "Vertex") def vertex(self) -> Vertex: """Return the Vertex""" + assert isinstance(self, Shape) # for typing return Shape.get_single_shape(self, "Vertex") def edges(self) -> ShapeList[Edge]: """edges - all the edges in this Shape""" + assert isinstance(self, Shape) # for typing edge_list = Shape.get_shape_list(self, "Edge") return edge_list.filter_by( lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True @@ -549,14 +553,17 @@ class Mixin1D: def edge(self) -> Edge: """Return the Edge""" + assert isinstance(self, Shape) # for typing return Shape.get_single_shape(self, "Edge") def wires(self) -> ShapeList[Wire]: """wires - all the wires in this Shape""" + assert isinstance(self, Shape) # for typing return Shape.get_shape_list(self, "Wire") def wire(self) -> Wire: """Return the Wire""" + assert isinstance(self, Shape) # for typing return Shape.get_single_shape(self, "Wire") def start_point(self) -> Vector: @@ -564,6 +571,7 @@ class Mixin1D: Note that circles may have identical start and end points. """ + assert isinstance(self, Shape) # for typing curve = self.geom_adaptor() umin = curve.FirstParameter() @@ -574,6 +582,7 @@ class Mixin1D: Note that circles may have identical start and end points. """ + assert isinstance(self, Shape) # for typing curve = self.geom_adaptor() umax = curve.LastParameter() @@ -590,6 +599,7 @@ class Mixin1D: Returns: float: parameter value """ + assert isinstance(self, Shape) # for typing curve = self.geom_adaptor() length = GCPnts_AbscissaPoint.Length_s(curve) @@ -619,6 +629,7 @@ class Mixin1D: Returns: Vector: tangent value """ + assert isinstance(self, Shape) # for typing if isinstance(position, (float, int)): curve = self.geom_adaptor() @@ -684,6 +695,7 @@ class Mixin1D: Returns: """ + assert isinstance(self, Shape) # for typing curve = self.geom_adaptor() gtype = self.geom_type @@ -717,6 +729,8 @@ class Mixin1D: Returns: Vector: center """ + assert isinstance(self, Shape) # for typing + if center_of == CenterOf.GEOMETRY: middle = self.position_at(0.5) elif center_of == CenterOf.MASS: @@ -727,7 +741,7 @@ class Mixin1D: middle = self.bounding_box().center() return middle - def common_plane(self, *lines: Union[Edge, Wire]) -> Union[None, Plane]: + def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: """common_plane Find the plane containing all the edges/wires (including self). If there @@ -743,8 +757,10 @@ class Mixin1D: # pylint: disable=too-many-locals # Note: BRepLib_FindSurface is not helpful as it requires the # Edges to form a surface perimeter. + assert isinstance(self, Shape) # for typing + points: list[Vector] = [] - all_lines: list[Edge, Wire] = [ + all_lines: list[Edge | Wire] = [ line for line in [self, *lines] if line is not None ] if any(not isinstance(line, (Edge, Wire)) for line in all_lines): @@ -766,9 +782,6 @@ class Mixin1D: # Shorten any infinite lines (from converted Axis) normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - # shortened_lines = [ - # l.trim(0.4999999999, 0.5000000001) for l in infinite_lines - # ] shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] all_lines = normal_lines + shortened_lines @@ -791,7 +804,9 @@ class Mixin1D: x_dir = (extremes[1] - extremes[0]).normalized() z_dir = (extremes[2] - extremes[0]).cross(x_dir) try: - c_plane = Plane(origin=(sum(extremes) / 3), z_dir=z_dir) + c_plane = Plane( + origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir + ) c_plane = c_plane.shift_origin((0, 0)) except ValueError: # There is no valid common plane @@ -806,6 +821,7 @@ class Mixin1D: @property def length(self) -> float: """Edge or Wire length""" + assert isinstance(self, Shape) # for typing return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) @property @@ -823,6 +839,7 @@ class Mixin1D: ValueError: if kernel can not reduce the shape to a circular edge """ + assert isinstance(self, Shape) # for typing geom = self.geom_adaptor() try: circ = geom.Circle() @@ -833,11 +850,17 @@ class Mixin1D: @property def is_forward(self) -> bool: """Does the Edge/Wire loop forward or reverse""" + assert isinstance(self, Shape) # for typing + if self.wrapped is None: + raise ValueError("Can't determine direction of empty Edge or Wire") return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD @property def is_closed(self) -> bool: """Are the start and end points equal?""" + assert isinstance(self, Shape) # for typing + if self.wrapped is None: + raise ValueError("Can't determine if empty Edge or Wire is closed") return BRep_Tool.IsClosed_s(self.wrapped) @property @@ -860,6 +883,7 @@ class Mixin1D: Returns: Vector: position on the underlying curve """ + assert isinstance(self, Shape) # for typing curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: @@ -911,6 +935,7 @@ class Mixin1D: Location: A Location object representing local coordinate system at the specified distance. """ + assert isinstance(self, Shape) # for typing curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: @@ -970,15 +995,15 @@ class Mixin1D: self.location_at(d, position_mode, frame_method, planar) for d in distances ] - def __matmul__(self: Union[Edge, Wire], position: float) -> Vector: + def __matmul__(self, position: float) -> Vector: """Position on wire operator @""" return self.position_at(position) - def __mod__(self: Union[Edge, Wire], position: float) -> Vector: + def __mod__(self, position: float) -> Vector: """Tangent on wire operator %""" return self.tangent_at(position) - def __xor__(self: Union[Edge, Wire], position: float) -> Location: + def __xor__(self, position: float) -> Location: """Location on wire operator ^""" return self.location_at(position) @@ -1039,7 +1064,7 @@ class Mixin1D: if side != Side.BOTH: # Find and remove the end arcs offset_edges = offset_wire.edges() - edges_to_keep = [[], [], []] + edges_to_keep: list[list[int]] = [[], [], []] i = 0 for edge in offset_edges: if edge.geom_type == GeomType.CIRCLE and ( @@ -1072,7 +1097,9 @@ class Mixin1D: else: edge0 = Edge.make_line(self0, end1) edge1 = Edge.make_line(self1, end0) - offset_wire = Wire(line.edges() + offset_wire.edges() + [edge0, edge1]) + offset_wire = Wire( + line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) + ) offset_edges = offset_wire.edges() return offset_edges[0] if len(offset_edges) == 1 else offset_wire @@ -1104,7 +1131,7 @@ class Mixin1D: def project( self, face: Face, direction: VectorLike, closest: bool = True - ) -> Union[Mixin1D, ShapeList[Mixin1D]]: + ) -> Edge | Wire | ShapeList[Edge | Wire]: """Project onto a face along the specified direction Args: @@ -1115,6 +1142,9 @@ class Mixin1D: Returns: """ + assert isinstance(self, Shape) # for typing + if self.wrapped is None: + raise ValueError("Can't project an empty Edge or Wire") bldr = BRepProj_Projection( self.wrapped, face.wrapped, Vector(direction).to_dir() @@ -1122,7 +1152,7 @@ class Mixin1D: shapes: TopoDS_Compound = bldr.Shape() # select the closest projection if requested - return_value: Union[Mixin1D, list[Mixin1D]] + return_value: Edge | Wire | ShapeList[Edge | Wire] if closest: dist_calc = BRepExtrema_DistShapeShape() @@ -1151,7 +1181,7 @@ class Mixin1D: self, viewport_origin: VectorLike, viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike = None, + look_at: VectorLike | None = None, ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: """project_to_viewport @@ -1167,6 +1197,7 @@ class Mixin1D: Returns: tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges """ + assert isinstance(self, Shape) # for typing def extract_edges(compound): edges = [] # List to store the extracted edges @@ -1295,12 +1326,62 @@ class Mixin2D: """Return a copy of self moved along the normal by amount""" return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) + def find_intersection_points( + self, other: Axis, tolerance: float = TOLERANCE + ) -> list[tuple[Vector, Vector]]: + """Find point and normal at intersection + + Return both the point(s) and normal(s) of the intersection of the axis and the shape + + Args: + axis (Axis): axis defining the intersection line + + Returns: + list[tuple[Vector, Vector]]: Point and normal of intersection + """ + assert isinstance(self, Shape) # for typing + + if self.wrapped is None: + return [] + + intersection_line = gce_MakeLin(other.wrapped).Value() + intersect_maker = BRepIntCurveSurface_Inter() + intersect_maker.Init(self.wrapped, intersection_line, tolerance) + + intersections = [] + while intersect_maker.More(): + inter_pt = intersect_maker.Pnt() + # Calculate distance along axis + distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z + intersections.append( + ( + intersect_maker.Face(), # TopoDS_Face + Vector(inter_pt), + distance, + ) + ) + intersect_maker.Next() + + intersections.sort(key=lambda x: x[2]) + intersecting_faces = [i[0] for i in intersections] + intersecting_points = [i[1] for i in intersections] + intersecting_normals = [ + _topods_face_normal_at(f, intersecting_points[i].to_pnt()) + for i, f in enumerate(intersecting_faces) + ] + result = [] + for pnt, normal in zip(intersecting_points, intersecting_normals): + result.append((pnt, normal)) + + return result + class Mixin3D: """Additional methods to add to 3D Shape classes""" project_to_viewport = Mixin1D.project_to_viewport split = Mixin1D.split + find_intersection_points = Mixin2D.find_intersection_points @classmethod def cast(cls, obj: TopoDS_Shape) -> Self: @@ -2180,7 +2261,7 @@ class Shape(NodeMixin, Generic[TOPODS]): result = Shape._show_tree(tree[0], show_center) return result - def __add__(self, other: Union[list[Shape], Shape]) -> Self | ShapeList[Self]: + def __add__(self, other: Shape | Iterable[Shape]) -> Self | ShapeList[Self]: """fuse shape to self operator +""" # Convert `other` to list of base objects and filter out None values summands = [ @@ -2250,7 +2331,7 @@ class Shape(NodeMixin, Generic[TOPODS]): return difference - def __and__(self, other: Shape | Iterable[Shape]) -> Self | ShapeList[Self]: + def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: """intersect shape with self operator &""" others = other if isinstance(other, (list, tuple)) else [other] @@ -2260,6 +2341,7 @@ class Shape(NodeMixin, Generic[TOPODS]): if ( not isinstance(new_shape, list) + and new_shape is not None and new_shape.wrapped is not None and SkipClean.clean ): @@ -2279,7 +2361,7 @@ class Shape(NodeMixin, Generic[TOPODS]): return [loc * self for loc in other] @abstractmethod - def center(self, center_of: CenterOf | None = None) -> Vector: + def center(self, *args, **kwargs) -> Vector: """All of the derived classes from Shape need a center method""" def clean(self) -> Self: @@ -3106,7 +3188,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def intersect( self, *to_intersect: Union[Shape, Axis, Plane] - ) -> Self | ShapeList[Self]: + ) -> None | Self | ShapeList[Self]: """Intersection of the arguments and this shape Args: @@ -3160,7 +3242,13 @@ class Shape(NodeMixin, Generic[TOPODS]): # Find the shape intersections intersect_op = BRepAlgoAPI_Common() shape_intersections = self._bool_op((self,), objs, intersect_op) - + if isinstance(shape_intersections, ShapeList) and not shape_intersections: + return None + elif ( + not isinstance(shape_intersections, ShapeList) + and shape_intersections.is_null() + ): + return None return shape_intersections @classmethod @@ -3600,7 +3688,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def _repr_javascript_(self): """Jupyter 3D representation support""" - from .jupyter_tools import display + from build123d.jupyter_tools import display return display(self)._repr_javascript_() @@ -3633,51 +3721,6 @@ class Shape(NodeMixin, Generic[TOPODS]): t_o.SetTranslation(Vector(offset).wrapped) return self._apply_transform(t_o * t_rx * t_ry * t_rz) - def find_intersection_points(self, other: Axis) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape - - Args: - axis (Axis): axis defining the intersection line - - Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection - """ - if self.wrapped is None: - return [] - - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, 0.0001) - - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) - ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - def project_faces( self, faces: Union[list[Face], Compound], @@ -4266,7 +4309,7 @@ class ShapeList(list[T]): def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) + # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 return ShapeList(list(self) + list(other)) def __sub__(self, other: ShapeList) -> ShapeList[T]: @@ -4672,24 +4715,25 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): bbox_intersection = children_bbox[child_index_pair[0]].intersect( children_bbox[child_index_pair[1]] ) - bbox_common_volume = ( - 0.0 if isinstance(bbox_intersection, list) else bbox_intersection.volume - ) - if bbox_common_volume > tolerance: + if bbox_intersection is not None: obj_intersection = children[child_index_pair[0]].intersect( children[child_index_pair[1]] ) - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - (children[child_index_pair[0]], children[child_index_pair[1]]), - common_volume, + if obj_intersection is not None: + common_volume = ( + 0.0 + if isinstance(obj_intersection, list) + else obj_intersection.volume ) + if common_volume > tolerance: + return ( + True, + ( + children[child_index_pair[0]], + children[child_index_pair[1]], + ), + common_volume, + ) return (False, (), 0.0) @classmethod @@ -5095,6 +5139,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): list[float]: u values between 0.0 and 1.0 """ angle = angle % 360 # angle needs to always be positive 0..360 + u_values: list[float] if self.geom_type == GeomType.LINE: if self.tangent_angle_at(0) == angle: @@ -5104,7 +5149,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): else: # Solve this problem geometrically by creating a tangent curve and finding intercepts periodic = int(self.is_closed) # if closed don't include end point - tan_pnts = [] + tan_pnts: list[VectorLike] = [] previous_tangent = None # When angles go from 360 to 0 a discontinuity is created so add 360 to these @@ -5130,7 +5175,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts = [] + intercept_pnts: list[Vector] = [] for i in range(min_range, max_range + 1, 360): line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) intercept_pnts.extend(tan_curve.find_intersection_points(line)) @@ -5233,8 +5278,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return ShapeList(valid_crosses) def intersect( - self, *to_intersect: Edge | Axis - ) -> Optional[Shape | ShapeList[Shape]]: + self, *to_intersect: Edge | Axis | Plane + ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: """intersect Edge with Edge or Axis Args: @@ -5243,24 +5288,58 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Returns: Union[Shape, None]: Compound of vertices and/or edges """ - edges = [Edge(obj) if isinstance(obj, Axis) else obj for obj in to_intersect] - if not all(isinstance(obj, Edge) for obj in edges): - raise TypeError( - "Only Edge or Axis instances are supported for intersection" - ) + edges: list[Edge] = [] + planes: list[Plane] = [] + edges_common_to_planes: list[Edge] = [] - # Find any intersection points + for obj in to_intersect: + match obj: + case Axis(): + edges.append(Edge(obj)) + case Edge(): + edges.append(obj) + case Plane(): + planes.append(obj) + case _: + raise ValueError(f"Unknown object type: {type(obj)}") + + # Find any edge / edge intersection points points_sets: list[set[Vector]] = [] for edge_pair in combinations([self] + edges, 2): intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) points_sets.append(set(intersection_points)) + # Find any edge / plane intersection points & edges + for edge, plane in itertools.product([self] + edges, planes): + # Find point intersections + geom_line = BRep_Tool.Curve_s( + edge.wrapped, edge.param_at(0), edge.param_at(1) + ) + geom_plane = Geom_Plane(plane.local_coord_system) + intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) + plane_intersection_points: list[Vector] = [] + if intersection_calculator.IsDone(): + plane_intersection_points = [ + Vector(intersection_calculator.Point(i + 1)) + for i in range(intersection_calculator.NbPoints()) + ] + points_sets.append(set(plane_intersection_points)) + + # Find edge intersections + if (edge_plane := edge.common_plane()) is not None: # is a 2D edge + if edge_plane.z_dir == plane.z_dir or -edge_plane.z_dir == plane.z_dir: + edges_common_to_planes.append(edge) + + edges.extend(edges_common_to_planes) + # Find the intersection of all sets common_points = set.intersection(*points_sets) common_vertices = [Vertex(*pnt) for pnt in common_points] # Find Edge/Edge overlaps - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() + common_edges: list[Edge] = [] + if edges: + common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() if common_vertices or common_edges: # If there is just one vertex or edge return it @@ -5614,21 +5693,21 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Edge: the spline """ # pylint: disable=too-many-locals - points = [Vector(point) for point in points] + point_vectors = [Vector(point) for point in points] if tangents: - tangents = tuple(Vector(v) for v in tangents) - pnts = TColgp_HArray1OfPnt(1, len(points)) - for i, point in enumerate(points): + tangent_vectors = tuple(Vector(v) for v in tangents) + pnts = TColgp_HArray1OfPnt(1, len(point_vectors)) + for i, point in enumerate(point_vectors): pnts.SetValue(i + 1, point.to_pnt()) if parameters is None: spline_builder = GeomAPI_Interpolate(pnts, periodic, tol) else: - if len(parameters) != (len(points) + periodic): + if len(parameters) != (len(point_vectors) + periodic): raise ValueError( "There must be one parameter for each interpolation point " "(plus one if periodic), or none specified. Parameter count: " - f"{len(parameters)}, point count: {len(points)}" + f"{len(parameters)}, point count: {len(point_vectors)}" ) parameters_array = TColStd_HArray1OfReal(1, len(parameters)) for p_index, p_value in enumerate(parameters): @@ -5637,21 +5716,25 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): spline_builder = GeomAPI_Interpolate(pnts, parameters_array, periodic, tol) if tangents: - if len(tangents) == 2 and len(points) != 2: + if len(tangent_vectors) == 2 and len(point_vectors) != 2: # Specify only initial and final tangent: - spline_builder.Load(tangents[0].wrapped, tangents[1].wrapped, scale) + spline_builder.Load( + tangent_vectors[0].wrapped, tangent_vectors[1].wrapped, scale + ) else: - if len(tangents) != len(points): + if len(tangent_vectors) != len(point_vectors): raise ValueError( f"There must be one tangent for each interpolation point, " f"or just two end point tangents. Tangent count: " - f"{len(tangents)}, point count: {len(points)}" + f"{len(tangent_vectors)}, point count: {len(point_vectors)}" ) # Specify a tangent for each interpolation point: - tangents_array = TColgp_Array1OfVec(1, len(tangents)) - tangent_enabled_array = TColStd_HArray1OfBoolean(1, len(tangents)) - for t_index, t_value in enumerate(tangents): + tangents_array = TColgp_Array1OfVec(1, len(tangent_vectors)) + tangent_enabled_array = TColStd_HArray1OfBoolean( + 1, len(tangent_vectors) + ) + for t_index, t_value in enumerate(tangent_vectors): tangent_enabled_array.SetValue(t_index + 1, t_value is not None) tangent_vec = t_value if t_value is not None else Vector() tangents_array.SetValue(t_index + 1, tangent_vec.wrapped) @@ -5874,7 +5957,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): locations = self.locations(t_values) if positions_only: for loc in locations: - loc.orientation = (0, 0, 0) + loc.orientation = Vector(0, 0, 0) return locations @@ -8533,12 +8616,12 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: Wire: an irregular polygon """ - vertices = [Vector(v) for v in vertices] - if (vertices[0] - vertices[-1]).length > TOLERANCE and close: - vertices.append(vertices[0]) + vectors = [Vector(v) for v in vertices] + if (vectors[0] - vectors[-1]).length > TOLERANCE and close: + vectors.append(vectors[0]) wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vertices: + for vertex in vectors: wire_builder.Add(vertex.to_pnt()) return cls(wire_builder.Wire()) @@ -8742,7 +8825,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): # Filter the fragments connecting_edge_data = [] - trim_points = {} + trim_points: dict[int, list[int]] = {} for simplice in convex_hull.simplices: edge0 = points_lookup[simplice[0]][0] edge1 = points_lookup[simplice[1]][0] @@ -8778,13 +8861,13 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): ) trim_data = {} - for edge, points in trim_points.items(): - s_points = sorted(points) + for edge_index, start_end_pnts in trim_points.items(): + s_points = sorted(start_end_pnts) f_points = [] for i in range(0, len(s_points) - 1, 2): if s_points[i] != s_points[i + 1]: f_points.append(tuple(s_points[i : i + 2])) - trim_data[edge] = f_points + trim_data[edge_index] = f_points connecting_edges = [ Edge.make_line( @@ -8793,10 +8876,10 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): for line in connecting_edge_data ] trimmed_edges = [ - edges[edge].trim( + edges[edge_index].trim( points_lookup[trim_pair[0]][1], points_lookup[trim_pair[1]][1] ) - for edge, trim_pairs in trim_data.items() + for edge_index, trim_pairs in trim_data.items() for trim_pair in trim_pairs ] hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) @@ -8834,11 +8917,14 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): """ # pylint: disable=too-many-branches + if self.wrapped is None or target_object.wrapped is None: + raise ValueError("Can't project empty Wires or to empty Shapes") + if not (direction is None) ^ (center is None): raise ValueError("One of either direction or center must be provided") if direction is not None: direction_vector = Vector(direction).normalized() - center_point = None + center_point = Vector() # for typing, never used else: direction_vector = None center_point = Vector(center) diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 1892bcd..a34f2f2 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -4205,9 +4205,7 @@ class TestVector(DirectApiTestCase): self.assertVectorAlmostEquals( (v1 & Solid.make_box(2, 4, 5)).vertex(), (1, 2, 3), 5 ) - self.assertTrue( - len(v1.intersect(Solid.make_box(0.5, 0.5, 0.5)).vertices()) == 0 - ) + self.assertIsNone(v1.intersect(Solid.make_box(0.5, 0.5, 0.5))) class TestVectorLike(DirectApiTestCase): From 5ecea4bb91139a5e07938155810515d35670dbc0 Mon Sep 17 00:00:00 2001 From: snoyer Date: Mon, 30 Dec 2024 20:47:22 +0400 Subject: [PATCH 050/518] remove `is_inkscape_label` parameter --- src/build123d/importers.py | 15 ++++++--------- tests/test_importers.py | 8 ++------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/build123d/importers.py b/src/build123d/importers.py index b9f5299..1bb1693 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -31,6 +31,7 @@ license: import os from os import PathLike, fsdecode +import re import unicodedata from math import degrees from pathlib import Path @@ -337,7 +338,6 @@ def import_svg( flip_y: bool = True, ignore_visibility: bool = False, label_by: str = "id", - is_inkscape_label: bool = False, ) -> ShapeList[Union[Wire, Face]]: """import_svg @@ -345,10 +345,9 @@ def import_svg( svg_file (Union[str, Path, TextIO]): svg file flip_y (bool, optional): flip objects to compensate for svg orientation. Defaults to True. ignore_visibility (bool, optional): Defaults to False. - label_by (str, optional): xml attribute. Defaults to "id". - is_inkscape_label (bool, optional): flag to indicate that the attribute - is an Inkscape label like `inkscape:label` - label_by would be set to - `label` in this case. Defaults to False. + label_by (str, optional): XML attribute to use for imported shapes' `label` property. + Defaults to "id". + Use `inkscape:label` to read labels set from Inkscape's "Layers and Objects" panel. Raises: ValueError: unexpected shape type @@ -357,10 +356,8 @@ def import_svg( ShapeList[Union[Wire, Face]]: objects contained in svg """ shapes = [] - label_by = ( - "{http://www.inkscape.org/namespaces/inkscape}" + label_by - if is_inkscape_label - else label_by + label_by = re.sub( + r"^inkscape:(.+)", r"{http://www.inkscape.org/namespaces/inkscape}\1", label_by ) for face_or_wire, color_and_label in import_svg_document( svg_file, diff --git a/tests/test_importers.py b/tests/test_importers.py index 7c7e4a1..3e1155b 100644 --- a/tests/test_importers.py +++ b/tests/test_importers.py @@ -71,13 +71,9 @@ class ImportSVG(unittest.TestCase): def test_import_svg(self): svg_file = Path(__file__).parent / "../tests/svg_import_test.svg" - for tag in ["id", "label"]: + for tag in ["id", "inkscape:label"]: # Import the svg object as a ShapeList - svg = import_svg( - svg_file, - label_by=tag, - is_inkscape_label=tag == "label", - ) + svg = import_svg(svg_file, label_by=tag) # Exact the shape of the plate & holes base_faces = svg.filter_by(lambda f: "base" in f.label) From 93bcaa1e118cdda874f9293a45d72d6d87d4243d Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 30 Dec 2024 13:43:45 -0500 Subject: [PATCH 051/518] Fixed two_d.py typing errors --- src/build123d/topology.py | 2996 ++++++++++++++++++------------------- 1 file changed, 1491 insertions(+), 1505 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 20e71a8..f5cc68b 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -353,1482 +353,6 @@ def tuplify(obj: Any, dim: int) -> tuple | None: return result -class Mixin1D: - """Methods to add to the Edge and Wire classes""" - - def __add__(self, other: Shape | Iterable[Shape]) -> Edge | Wire | ShapeList[Edge]: - """fuse shape to wire/edge operator +""" - - assert isinstance(self, Shape) # for typing - - # Convert `other` to list of base topods objects and filter out None values - summands = [ - shape - for o in (other if isinstance(other, (list, tuple)) else [other]) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] - # If there is nothing to add return the original object - if not summands: - return self - - if not all(topods_dim(summand) == 1 for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] - summand_edges = [e for summand in summands for e in summand.edges()] - - assert isinstance(self, Shape) # for typing - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - try: - sum_shape = Wire(summand_edges) - except Exception: - sum_shape = summands[0].fuse(*summands[1:]) - if type(self).order == 4: - sum_shape = type(self)(sum_shape) - else: - try: - sum_shape = Wire(self.edges() + ShapeList(summand_edges)) - except Exception: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape - - return sum_shape - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" - - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - assert isinstance(self, Shape) # for typing - - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - assert isinstance(self, Shape) # for typing - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - assert isinstance(self, Shape) # for typing - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - assert isinstance(self, Shape) # for typing - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - assert isinstance(self, Shape) # for typing - return Shape.get_single_shape(self, "Edge") - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - assert isinstance(self, Shape) # for typing - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - assert isinstance(self, Shape) # for typing - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - assert isinstance(self, Shape) # for typing - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - assert isinstance(self, Shape) # for typing - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - assert isinstance(self, Shape) # for typing - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - assert isinstance(self, Shape) # for typing - - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - assert isinstance(self, Shape) # for typing - - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of object - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - assert isinstance(self, Shape) # for typing - - if center_of == CenterOf.GEOMETRY: - middle = self.position_at(0.5) - elif center_of == CenterOf.MASS: - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: - """common_plane - - Find the plane containing all the edges/wires (including self). If there - is no common plane return None. If the edges are coaxial, select one - of the infinite number of valid planes. - - Args: - lines (sequence of Union[Edge,Wire]): edges in common with self - - Returns: - Union[None, Plane]: Either the common plane or None - """ - # pylint: disable=too-many-locals - # Note: BRepLib_FindSurface is not helpful as it requires the - # Edges to form a surface perimeter. - assert isinstance(self, Shape) # for typing - - points: list[Vector] = [] - all_lines: list[Edge | Wire] = [ - line for line in [self, *lines] if line is not None - ] - if any(not isinstance(line, (Edge, Wire)) for line in all_lines): - raise ValueError("Only Edges or Wires are valid") - - result = None - # Are they all co-axial - if so, select one of the infinite planes - all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all(e.geom_type == GeomType.LINE for e in all_edges): - as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): - origin = as_axis[0].position - x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir - c_plane = Plane(origin, z_dir=z_dir) - result = c_plane.shift_origin((0, 0)) - - if result is None: # not coaxial - # Shorten any infinite lines (from converted Axis) - normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) - infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] - all_lines = normal_lines + shortened_lines - - for line in all_lines: - num_points = 2 if line.geom_type == GeomType.LINE else 8 - points.extend( - [line.position_at(i / (num_points - 1)) for i in range(num_points)] - ) - points = list(set(points)) # unique points - extreme_areas = {} - for subset in combinations(points, 3): - vector1 = subset[1] - subset[0] - vector2 = subset[2] - subset[0] - area = 0.5 * (vector1.cross(vector2).length) - extreme_areas[area] = subset - # The points that create the largest area make the most accurate plane - extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] - - # Create a plane from these points - x_dir = (extremes[1] - extremes[0]).normalized() - z_dir = (extremes[2] - extremes[0]).cross(x_dir) - try: - c_plane = Plane( - origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir - ) - c_plane = c_plane.shift_origin((0, 0)) - except ValueError: - # There is no valid common plane - result = None - else: - # Are all of the points on the common plane - common = all(c_plane.contains(p) for p in points) - result = c_plane if common else None - - return result - - @property - def length(self) -> float: - """Edge or Wire length""" - assert isinstance(self, Shape) # for typing - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) - - @property - def radius(self) -> float: - """Calculate the radius. - - Note that when applied to a Wire, the radius is simply the radius of the first edge. - - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - assert isinstance(self, Shape) # for typing - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - assert isinstance(self, Shape) # for typing - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - assert isinstance(self, Shape) # for typing - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve - """ - assert isinstance(self, Shape) # for typing - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] - - def location_at( - self, - distance: float, - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> Location: - """Locations along curve - - Generate a location along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - Location: A Location object representing local coordinate system - at the specified distance. - """ - assert isinstance(self, Shape) # for typing - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - law: GeomFill_TrihedronLaw - if frame_method == FrameMethod.FRENET: - law = GeomFill_Frenet() - else: - law = GeomFill_CorrectedFrenet() - - law.SetCurve(curve) - - tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() - - law.D0(param, tangent, normal, binormal) - pnt = curve.Value(param) - - transformation = gp_Trsf() - if planar: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() - ) - else: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() - ) - - return Location(TopLoc_Location(transformation)) - - def locations( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> list[Location]: - """Locations along curve - - Generate location along the curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - list[Location]: A list of Location objects representing local coordinate - systems at the specified distances. - """ - return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances - ] - - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) - - def offset_2d( - self, - distance: float, - kind: Kind = Kind.ARC, - side: Side = Side.BOTH, - closed: bool = True, - ) -> Union[Edge, Wire]: - """2d Offset - - Offsets a planar edge/wire - - Args: - distance (float): distance from edge/wire to offset - kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. - side (Side, optional): side to place offset. Defaults to Side.BOTH. - closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT - offset. Defaults to True. - Raises: - RuntimeError: Multiple Wires generated - RuntimeError: Unexpected result type - - Returns: - Wire: offset wire - """ - # pylint: disable=too-many-branches, too-many-locals, too-many-statements - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - line = self if isinstance(self, Wire) else Wire([self]) - - # Avoiding a bug when the wire contains a single Edge - if len(line.edges()) == 1: - edge = line.edges()[0] - edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] - topods_wire = Wire(edges).wrapped - else: - topods_wire = line.wrapped - - offset_builder = BRepOffsetAPI_MakeOffset() - offset_builder.Init(kind_dict[kind]) - # offset_builder.SetApprox(True) - offset_builder.AddWire(topods_wire) - offset_builder.Perform(distance) - - obj = downcast(offset_builder.Shape()) - if isinstance(obj, TopoDS_Compound): - obj = unwrap_topods_compound(obj, fully=True) - if isinstance(obj, TopoDS_Wire): - offset_wire = Wire(obj) - else: # Likely multiple Wires were generated - raise RuntimeError("Unexpected result type") - - if side != Side.BOTH: - # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] - centers = [w.position_at(0.5) for w in wires] - angles = [ - line.tangent_at(0).get_signed_angle(c - line.position_at(0)) - for c in centers - ] - if side == Side.LEFT: - offset_wire = wires[int(angles[0] > angles[1])] - else: - offset_wire = wires[int(angles[0] <= angles[1])] - - if closed: - self0 = line.position_at(0) - self1 = line.position_at(1) - end0 = offset_wire.position_at(0) - end1 = offset_wire.position_at(1) - if (self0 - end0).length - abs(distance) <= TOLERANCE: - edge0 = Edge.make_line(self0, end0) - edge1 = Edge.make_line(self1, end1) - else: - edge0 = Edge.make_line(self0, end1) - edge1 = Edge.make_line(self1, end0) - offset_wire = Wire( - line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) - ) - - offset_edges = offset_wire.edges() - return offset_edges[0] if len(offset_edges) == 1 else offset_wire - - def perpendicular_line( - self, length: float, u_value: float, plane: Plane = Plane.XY - ) -> Edge: - """perpendicular_line - - Create a line on the given plane perpendicular to and centered on beginning of self - - Args: - length (float): line length - u_value (float): position along line between 0.0 and 1.0 - plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. - - Returns: - Edge: perpendicular line - """ - start = self.position_at(u_value) - local_plane = Plane( - origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir - ) - line = Edge.make_line( - start + local_plane.y_dir * length / 2, - start - local_plane.y_dir * length / 2, - ) - return line - - def project( - self, face: Face, direction: VectorLike, closest: bool = True - ) -> Edge | Wire | ShapeList[Edge | Wire]: - """Project onto a face along the specified direction - - Args: - face: Face: - direction: VectorLike: - closest: bool: (Default value = True) - - Returns: - - """ - assert isinstance(self, Shape) # for typing - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") - - bldr = BRepProj_Projection( - self.wrapped, face.wrapped, Vector(direction).to_dir() - ) - shapes: TopoDS_Compound = bldr.Shape() - - # select the closest projection if requested - return_value: Edge | Wire | ShapeList[Edge | Wire] - - if closest: - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - min_dist = inf - - # for shape in shapes: - for shape in get_top_level_topods_shapes(shapes): - dist_calc.LoadS2(shape) - dist_calc.Perform() - dist = dist_calc.Value() - - if dist < min_dist: - min_dist = dist - return_value = Mixin1D.cast(shape) - - else: - return_value = ShapeList( - Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) - ) - - return return_value - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike | None = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - assert isinstance(self, Shape) # for typing - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - visible_edges = ShapeList(Edge(e) for e in visible_edges) - hidden_edges = ShapeList(Edge(e) for e in hidden_edges) - - return (visible_edges, hidden_edges) - - -class Mixin2D: - """Additional methods to add to Face and Shell class""" - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") - - def __neg__(self) -> Self: - """Reverse normal operator -""" - if self.wrapped is None: - raise ValueError("Invalid Shape") - new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) - - return new_surface - - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - - def find_intersection_points( - self, other: Axis, tolerance: float = TOLERANCE - ) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape - - Args: - axis (Axis): axis defining the intersection line - - Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection - """ - assert isinstance(self, Shape) # for typing - - if self.wrapped is None: - return [] - - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, tolerance) - - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) - ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - - -class Mixin3D: - """Additional methods to add to 3D Shape classes""" - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") - - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") - - def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: - """Fillet - - Fillets the specified edges of this solid. - - Args: - radius (float): float > 0, the radius of the fillet - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - - Returns: - Any: Filleted solid - """ - native_edges = [e.wrapped for e in edge_list] - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(radius, native_edge) - - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - f"Failed creating a fillet with radius of {radius}, try a smaller value" - f" or use max_fillet() to find the largest valid fillet radius" - ) from err - - return new_shape - - def max_fillet( - self, - edge_list: Iterable[Edge], - tolerance=0.1, - max_iterations: int = 10, - ) -> float: - """Find Maximum Fillet Size - - Find the largest fillet radius for the given Shape and edges with a - recursive binary search. - - Example: - - max_fillet_radius = my_shape.max_fillet(shape_edges) - max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) - - - Args: - edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid - tolerance (float, optional): maximum error from actual value. Defaults to 0.1. - max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. - - Raises: - RuntimeError: failed to find the max value - ValueError: the provided Shape is invalid - - Returns: - float: maximum fillet radius - """ - - def __max_fillet(window_min: float, window_max: float, current_iteration: int): - window_mid = (window_min + window_max) / 2 - - if current_iteration == max_iterations: - raise RuntimeError( - f"Failed to find the max value within {tolerance} in {max_iterations}" - ) - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(window_mid, native_edge) - - # Do these numbers work? - if not try with the smaller window - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise fillet_exception - except fillet_exception: - return __max_fillet(window_min, window_mid, current_iteration + 1) - - # These numbers work, are they close enough? - if not try larger window - if window_mid - window_min <= tolerance: - return_value = window_mid - else: - return_value = __max_fillet( - window_mid, window_max, current_iteration + 1 - ) - return return_value - - if not self.is_valid(): - raise ValueError("Invalid Shape") - - native_edges = [e.wrapped for e in edge_list] - - # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform - # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone - - max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) - - return max_radius - - def chamfer( - self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face = None, - ) -> Self: - """Chamfer - - Chamfers the specified edges of this solid. - - Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face): identifies the side where length is measured. The edge(s) must be - part of the face - - Returns: - Self: Chamfered solid - """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") - - native_edges = [e.wrapped for e in edge_list] - - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) - else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__(sol.Shape()).fix() - - return return_value - - def offset_3d( - self, - openings: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Shell - - Make an offset solid of self. - - Args: - openings (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): offset amount - positive offset outwards, negative inwards - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A shelled solid. - """ - openings = list(openings) if openings else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - - occ_faces_list = TopTools_ListOfShape() - for face in openings: - occ_faces_list.Append(face.wrapped) - - offset_builder = BRepOffsetAPI_MakeThickSolid() - offset_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - RemoveIntEdges=True, - Join=kind_dict[kind], - ) - offset_builder.Build() - - try: - offset_occt_solid = offset_builder.Shape() - except (StdFail_NotDone, Standard_Failure) as err: - raise RuntimeError( - "offset Error, an alternative kind may resolve this error" - ) from err - - offset_solid = self.__class__(offset_occt_solid) - - # The Solid can be inverted, if so reverse - if offset_solid.volume < 0: - offset_solid.wrapped.Reverse() - - return offset_solid - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. - - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float = None, - taper: float = 0, - up_to_face: Face = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] - else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) - - TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) @@ -4401,6 +2925,1448 @@ class GroupBy(Generic[T, K]): return self.group(self.key_f(shape)) +class Mixin1D(Shape): + """Methods to add to the Edge and Wire classes""" + + def __add__(self, other: Shape | Iterable[Shape]) -> Edge | Wire | ShapeList[Edge]: + """fuse shape to wire/edge operator +""" + + # Convert `other` to list of base topods objects and filter out None values + summands = [ + shape + for o in (other if isinstance(other, (list, tuple)) else [other]) + if o is not None + for shape in get_top_level_topods_shapes(o.wrapped) + ] + # If there is nothing to add return the original object + if not summands: + return self + + if not all(topods_dim(summand) == 1 for summand in summands): + raise ValueError("Only shapes with the same dimension can be added") + + # Convert back to Edge/Wire objects now that it's safe to do so + summands = [Mixin1D.cast(s) for s in summands] + summand_edges = [e for summand in summands for e in summand.edges()] + + if self.wrapped is None: # an empty object + if len(summands) == 1: + sum_shape = summands[0] + else: + try: + sum_shape = Wire(summand_edges) + except Exception: + sum_shape = summands[0].fuse(*summands[1:]) + if type(self).order == 4: + sum_shape = type(self)(sum_shape) + else: + try: + sum_shape = Wire(self.edges() + ShapeList(summand_edges)) + except Exception: + sum_shape = self.fuse(*summands) + + if SkipClean.clean and not isinstance(sum_shape, list): + sum_shape = sum_shape.clean() + + # If there is only one Edge, return that + sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape + + return sum_shape + + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: + "Returns the right type of wrapper, given a OCCT object" + + # Extend the lookup table with additional entries + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + + @overload + def split( + self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] + ) -> Self | list[Self] | None: + """split and keep inside or outside""" + + @overload + def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ + Self | list[Self] | None, + Self | list[Self] | None, + ]: + """split and keep inside and outside""" + + @overload + def split(self, tool: TrimmingTool) -> Self | list[Self] | None: + """split and keep inside (default)""" + + def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): + """split + + Split this shape by the provided plane or face. + + Args: + surface (Union[Plane,Face]): surface to segment shape + keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. + + Returns: + Shape: result of split + Returns: + Self | list[Self] | None, + Tuple[Self | list[Self] | None]: The result of the split operation. + + - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` + if no top is found. + - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` + if no bottom is found. + - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is + either a `Self` or `list[Self]`, or `None` if no corresponding part is found. + """ + shape_list = TopTools_ListOfShape() + shape_list.Append(self.wrapped) + + # Define the splitting tool + trim_tool = ( + BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face + if isinstance(tool, Plane) + else tool.wrapped + ) + tool_list = TopTools_ListOfShape() + tool_list.Append(trim_tool) + + # Create the splitter algorithm + splitter = BRepAlgoAPI_Splitter() + + # Set the shape to be split and the splitting tool (plane face) + splitter.SetArguments(shape_list) + splitter.SetTools(tool_list) + + # Perform the splitting operation + splitter.Build() + + split_result = downcast(splitter.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(split_result, TopoDS_Compound): + split_result = unwrap_topods_compound(split_result, True) + + if not isinstance(tool, Plane): + # Create solids from the surfaces for sorting by thickening + offset_builder = BRepOffset_MakeOffset() + offset_builder.Initialize( + tool.wrapped, + Offset=0.1, + Tol=1.0e-5, + Intersection=True, + Join=GeomAbs_Intersection, + Thickening=True, + ) + offset_builder.MakeOffsetShape() + try: + tool_thickened = downcast(offset_builder.Shape()) + except StdFail_NotDone as err: + raise RuntimeError("Error determining top/bottom") from err + + tops: list[Shape] = [] + bottoms: list[Shape] = [] + properties = GProp_GProps() + for part in get_top_level_topods_shapes(split_result): + sub_shape = self.__class__.cast(part) + if isinstance(tool, Plane): + is_up = tool.to_local_coords(sub_shape).center().Z >= 0 + else: + # Intersect self and the thickened tool + is_up_obj = _topods_bool_op( + (part,), (tool_thickened,), BRepAlgoAPI_Common() + ) + # Calculate volume of intersection + BRepGProp.VolumeProperties_s(is_up_obj, properties) + is_up = properties.Mass() >= TOLERANCE + (tops if is_up else bottoms).append(sub_shape) + + top = None if not tops else tops[0] if len(tops) == 1 else tops + bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms + + if keep == Keep.BOTH: + return (top, bottom) + if keep == Keep.TOP: + return top + if keep == Keep.BOTTOM: + return bottom + return None + + def vertices(self) -> ShapeList[Vertex]: + """vertices - all the vertices in this Shape""" + return Shape.get_shape_list(self, "Vertex") + + def vertex(self) -> Vertex: + """Return the Vertex""" + return Shape.get_single_shape(self, "Vertex") + + def edges(self) -> ShapeList[Edge]: + """edges - all the edges in this Shape""" + edge_list = Shape.get_shape_list(self, "Edge") + return edge_list.filter_by( + lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True + ) + + def edge(self) -> Edge: + """Return the Edge""" + return Shape.get_single_shape(self, "Edge") + + def wires(self) -> ShapeList[Wire]: + """wires - all the wires in this Shape""" + return Shape.get_shape_list(self, "Wire") + + def wire(self) -> Wire: + """Return the Wire""" + return Shape.get_single_shape(self, "Wire") + + def start_point(self) -> Vector: + """The start point of this edge + + Note that circles may have identical start and end points. + """ + curve = self.geom_adaptor() + umin = curve.FirstParameter() + + return Vector(curve.Value(umin)) + + def end_point(self) -> Vector: + """The end point of this edge. + + Note that circles may have identical start and end points. + """ + curve = self.geom_adaptor() + umax = curve.LastParameter() + + return Vector(curve.Value(umax)) + + def param_at(self, distance: float) -> float: + """Parameter along a curve + + Compute parameter value at the specified normalized distance. + + Args: + d (float): normalized distance (0.0 >= d >= 1.0) + + Returns: + float: parameter value + """ + curve = self.geom_adaptor() + + length = GCPnts_AbscissaPoint.Length_s(curve) + return GCPnts_AbscissaPoint( + curve, length * distance, curve.FirstParameter() + ).Parameter() + + def tangent_at( + self, + position: Union[float, VectorLike] = 0.5, + position_mode: PositionMode = PositionMode.PARAMETER, + ) -> Vector: + """tangent_at + + Find the tangent at a given position on the 1D shape where the position + is either a float (or int) parameter or a point that lies on the shape. + + Args: + position (Union[float, VectorLike]): distance, parameter value, or + point on shape. Defaults to 0.5. + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. + + Raises: + ValueError: invalid position + + Returns: + Vector: tangent value + """ + if isinstance(position, (float, int)): + curve = self.geom_adaptor() + if position_mode == PositionMode.PARAMETER: + parameter = self.param_at(position) + else: + parameter = self.param_at(position / self.length) + else: + try: + pnt = Vector(position) + except Exception as exc: + raise ValueError("position must be a float or a point") from exc + # GeomAPI_ProjectPointOnCurve only works with Edges so find + # the closest Edge if the shape has multiple Edges. + my_edges: list[Edge] = self.edges() + distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] + sorted_distances = sorted(distances, key=lambda x: x[0]) + closest_edge = my_edges[sorted_distances[0][1]] + # Get the extreme of the parameter values for this Edge + first: float = closest_edge.param_at(0) + last: float = closest_edge.param_at(1) + # Extract the Geom_Curve from the Shape + curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) + projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) + parameter = projector.LowerDistanceParameter() + + tmp = gp_Pnt() + res = gp_Vec() + curve.D1(parameter, tmp, res) + + return Vector(gp_Dir(res)) + + def tangent_angle_at( + self, + location_param: float = 0.5, + position_mode: PositionMode = PositionMode.PARAMETER, + plane: Plane = Plane.XY, + ) -> float: + """tangent_angle_at + + Compute the tangent angle at the specified location + + Args: + location_param (float, optional): distance or parameter value. Defaults to 0.5. + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. + plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. + + Returns: + float: angle in degrees between 0 and 360 + """ + tan_vector = self.tangent_at(location_param, position_mode) + angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 + return angle + + def normal(self) -> Vector: + """Calculate the normal Vector. Only possible for planar curves. + + :return: normal vector + + Args: + + Returns: + + """ + curve = self.geom_adaptor() + gtype = self.geom_type + + if gtype == GeomType.CIRCLE: + circ = curve.Circle() + return_value = Vector(circ.Axis().Direction()) + elif gtype == GeomType.ELLIPSE: + ell = curve.Ellipse() + return_value = Vector(ell.Axis().Direction()) + else: + find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) + surf = find_surface.Surface() + + if isinstance(surf, Geom_Plane): + pln = surf.Pln() + return_value = Vector(pln.Axis().Direction()) + else: + raise ValueError("Normal not defined") + + return return_value + + def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: + """Center of object + + Return the center based on center_of + + Args: + center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. + + Returns: + Vector: center + """ + if center_of == CenterOf.GEOMETRY: + middle = self.position_at(0.5) + elif center_of == CenterOf.MASS: + properties = GProp_GProps() + BRepGProp.LinearProperties_s(self.wrapped, properties) + middle = Vector(properties.CentreOfMass()) + elif center_of == CenterOf.BOUNDING_BOX: + middle = self.bounding_box().center() + return middle + + def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: + """common_plane + + Find the plane containing all the edges/wires (including self). If there + is no common plane return None. If the edges are coaxial, select one + of the infinite number of valid planes. + + Args: + lines (sequence of Union[Edge,Wire]): edges in common with self + + Returns: + Union[None, Plane]: Either the common plane or None + """ + # pylint: disable=too-many-locals + # Note: BRepLib_FindSurface is not helpful as it requires the + # Edges to form a surface perimeter. + points: list[Vector] = [] + all_lines: list[Edge | Wire] = [ + line for line in [self, *lines] if line is not None + ] + if any(not isinstance(line, (Edge, Wire)) for line in all_lines): + raise ValueError("Only Edges or Wires are valid") + + result = None + # Are they all co-axial - if so, select one of the infinite planes + all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] + if all(e.geom_type == GeomType.LINE for e in all_edges): + as_axis = [Axis(e @ 0, e % 0) for e in all_edges] + if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): + origin = as_axis[0].position + x_dir = as_axis[0].direction + z_dir = as_axis[0].to_plane().x_dir + c_plane = Plane(origin, z_dir=z_dir) + result = c_plane.shift_origin((0, 0)) + + if result is None: # not coaxial + # Shorten any infinite lines (from converted Axis) + normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) + infinite_lines = filter(lambda line: line.length > 1e50, all_lines) + shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] + all_lines = normal_lines + shortened_lines + + for line in all_lines: + num_points = 2 if line.geom_type == GeomType.LINE else 8 + points.extend( + [line.position_at(i / (num_points - 1)) for i in range(num_points)] + ) + points = list(set(points)) # unique points + extreme_areas = {} + for subset in combinations(points, 3): + vector1 = subset[1] - subset[0] + vector2 = subset[2] - subset[0] + area = 0.5 * (vector1.cross(vector2).length) + extreme_areas[area] = subset + # The points that create the largest area make the most accurate plane + extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] + + # Create a plane from these points + x_dir = (extremes[1] - extremes[0]).normalized() + z_dir = (extremes[2] - extremes[0]).cross(x_dir) + try: + c_plane = Plane( + origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir + ) + c_plane = c_plane.shift_origin((0, 0)) + except ValueError: + # There is no valid common plane + result = None + else: + # Are all of the points on the common plane + common = all(c_plane.contains(p) for p in points) + result = c_plane if common else None + + return result + + @property + def length(self) -> float: + """Edge or Wire length""" + return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) + + @property + def radius(self) -> float: + """Calculate the radius. + + Note that when applied to a Wire, the radius is simply the radius of the first edge. + + Args: + + Returns: + radius + + Raises: + ValueError: if kernel can not reduce the shape to a circular edge + + """ + geom = self.geom_adaptor() + try: + circ = geom.Circle() + except (Standard_NoSuchObject, Standard_Failure) as err: + raise ValueError("Shape could not be reduced to a circle") from err + return circ.Radius() + + @property + def is_forward(self) -> bool: + """Does the Edge/Wire loop forward or reverse""" + if self.wrapped is None: + raise ValueError("Can't determine direction of empty Edge or Wire") + return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD + + @property + def is_closed(self) -> bool: + """Are the start and end points equal?""" + if self.wrapped is None: + raise ValueError("Can't determine if empty Edge or Wire is closed") + return BRep_Tool.IsClosed_s(self.wrapped) + + @property + def volume(self) -> float: + """volume - the volume of this Edge or Wire, which is always zero""" + return 0.0 + + def position_at( + self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER + ) -> Vector: + """Position At + + Generate a position along the underlying curve. + + Args: + distance (float): distance or parameter value + position_mode (PositionMode, optional): position calculation mode. Defaults to + PositionMode.PARAMETER. + + Returns: + Vector: position on the underlying curve + """ + curve = self.geom_adaptor() + + if position_mode == PositionMode.PARAMETER: + param = self.param_at(distance) + else: + param = self.param_at(distance / self.length) + + return Vector(curve.Value(param)) + + def positions( + self, + distances: Iterable[float], + position_mode: PositionMode = PositionMode.PARAMETER, + ) -> list[Vector]: + """Positions along curve + + Generate positions along the underlying curve + + Args: + distances (Iterable[float]): distance or parameter values + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. + + Returns: + list[Vector]: positions along curve + """ + return [self.position_at(d, position_mode) for d in distances] + + def location_at( + self, + distance: float, + position_mode: PositionMode = PositionMode.PARAMETER, + frame_method: FrameMethod = FrameMethod.FRENET, + planar: bool = False, + ) -> Location: + """Locations along curve + + Generate a location along the underlying curve. + + Args: + distance (float): distance or parameter value + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. + frame_method (FrameMethod, optional): moving frame calculation method. + Defaults to FrameMethod.FRENET. + planar (bool, optional): planar mode. Defaults to False. + + Returns: + Location: A Location object representing local coordinate system + at the specified distance. + """ + curve = self.geom_adaptor() + + if position_mode == PositionMode.PARAMETER: + param = self.param_at(distance) + else: + param = self.param_at(distance / self.length) + + law: GeomFill_TrihedronLaw + if frame_method == FrameMethod.FRENET: + law = GeomFill_Frenet() + else: + law = GeomFill_CorrectedFrenet() + + law.SetCurve(curve) + + tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() + + law.D0(param, tangent, normal, binormal) + pnt = curve.Value(param) + + transformation = gp_Trsf() + if planar: + transformation.SetTransformation( + gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() + ) + else: + transformation.SetTransformation( + gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() + ) + + return Location(TopLoc_Location(transformation)) + + def locations( + self, + distances: Iterable[float], + position_mode: PositionMode = PositionMode.PARAMETER, + frame_method: FrameMethod = FrameMethod.FRENET, + planar: bool = False, + ) -> list[Location]: + """Locations along curve + + Generate location along the curve + + Args: + distances (Iterable[float]): distance or parameter values + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. + frame_method (FrameMethod, optional): moving frame calculation method. + Defaults to FrameMethod.FRENET. + planar (bool, optional): planar mode. Defaults to False. + + Returns: + list[Location]: A list of Location objects representing local coordinate + systems at the specified distances. + """ + return [ + self.location_at(d, position_mode, frame_method, planar) for d in distances + ] + + def __matmul__(self, position: float) -> Vector: + """Position on wire operator @""" + return self.position_at(position) + + def __mod__(self, position: float) -> Vector: + """Tangent on wire operator %""" + return self.tangent_at(position) + + def __xor__(self, position: float) -> Location: + """Location on wire operator ^""" + return self.location_at(position) + + def offset_2d( + self, + distance: float, + kind: Kind = Kind.ARC, + side: Side = Side.BOTH, + closed: bool = True, + ) -> Union[Edge, Wire]: + """2d Offset + + Offsets a planar edge/wire + + Args: + distance (float): distance from edge/wire to offset + kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. + side (Side, optional): side to place offset. Defaults to Side.BOTH. + closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT + offset. Defaults to True. + Raises: + RuntimeError: Multiple Wires generated + RuntimeError: Unexpected result type + + Returns: + Wire: offset wire + """ + # pylint: disable=too-many-branches, too-many-locals, too-many-statements + kind_dict = { + Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, + Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, + Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, + } + line = self if isinstance(self, Wire) else Wire([self]) + + # Avoiding a bug when the wire contains a single Edge + if len(line.edges()) == 1: + edge = line.edges()[0] + edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] + topods_wire = Wire(edges).wrapped + else: + topods_wire = line.wrapped + + offset_builder = BRepOffsetAPI_MakeOffset() + offset_builder.Init(kind_dict[kind]) + # offset_builder.SetApprox(True) + offset_builder.AddWire(topods_wire) + offset_builder.Perform(distance) + + obj = downcast(offset_builder.Shape()) + if isinstance(obj, TopoDS_Compound): + obj = unwrap_topods_compound(obj, fully=True) + if isinstance(obj, TopoDS_Wire): + offset_wire = Wire(obj) + else: # Likely multiple Wires were generated + raise RuntimeError("Unexpected result type") + + if side != Side.BOTH: + # Find and remove the end arcs + offset_edges = offset_wire.edges() + edges_to_keep: list[list[int]] = [[], [], []] + i = 0 + for edge in offset_edges: + if edge.geom_type == GeomType.CIRCLE and ( + edge.arc_center == line.position_at(0) + or edge.arc_center == line.position_at(1) + ): + i += 1 + else: + edges_to_keep[i].append(edge) + edges_to_keep[0] += edges_to_keep[2] + wires = [Wire(edges) for edges in edges_to_keep[0:2]] + centers = [w.position_at(0.5) for w in wires] + angles = [ + line.tangent_at(0).get_signed_angle(c - line.position_at(0)) + for c in centers + ] + if side == Side.LEFT: + offset_wire = wires[int(angles[0] > angles[1])] + else: + offset_wire = wires[int(angles[0] <= angles[1])] + + if closed: + self0 = line.position_at(0) + self1 = line.position_at(1) + end0 = offset_wire.position_at(0) + end1 = offset_wire.position_at(1) + if (self0 - end0).length - abs(distance) <= TOLERANCE: + edge0 = Edge.make_line(self0, end0) + edge1 = Edge.make_line(self1, end1) + else: + edge0 = Edge.make_line(self0, end1) + edge1 = Edge.make_line(self1, end0) + offset_wire = Wire( + line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) + ) + + offset_edges = offset_wire.edges() + return offset_edges[0] if len(offset_edges) == 1 else offset_wire + + def perpendicular_line( + self, length: float, u_value: float, plane: Plane = Plane.XY + ) -> Edge: + """perpendicular_line + + Create a line on the given plane perpendicular to and centered on beginning of self + + Args: + length (float): line length + u_value (float): position along line between 0.0 and 1.0 + plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. + + Returns: + Edge: perpendicular line + """ + start = self.position_at(u_value) + local_plane = Plane( + origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir + ) + line = Edge.make_line( + start + local_plane.y_dir * length / 2, + start - local_plane.y_dir * length / 2, + ) + return line + + def project( + self, face: Face, direction: VectorLike, closest: bool = True + ) -> Edge | Wire | ShapeList[Edge | Wire]: + """Project onto a face along the specified direction + + Args: + face: Face: + direction: VectorLike: + closest: bool: (Default value = True) + + Returns: + + """ + if self.wrapped is None: + raise ValueError("Can't project an empty Edge or Wire") + + bldr = BRepProj_Projection( + self.wrapped, face.wrapped, Vector(direction).to_dir() + ) + shapes: TopoDS_Compound = bldr.Shape() + + # select the closest projection if requested + return_value: Edge | Wire | ShapeList[Edge | Wire] + + if closest: + dist_calc = BRepExtrema_DistShapeShape() + dist_calc.LoadS1(self.wrapped) + + min_dist = inf + + # for shape in shapes: + for shape in get_top_level_topods_shapes(shapes): + dist_calc.LoadS2(shape) + dist_calc.Perform() + dist = dist_calc.Value() + + if dist < min_dist: + min_dist = dist + return_value = Mixin1D.cast(shape) + + else: + return_value = ShapeList( + Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) + ) + + return return_value + + def project_to_viewport( + self, + viewport_origin: VectorLike, + viewport_up: VectorLike = (0, 0, 1), + look_at: VectorLike | None = None, + ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: + """project_to_viewport + + Project a shape onto a viewport returning visible and hidden Edges. + + Args: + viewport_origin (VectorLike): location of viewport + viewport_up (VectorLike, optional): direction of the viewport y axis. + Defaults to (0, 0, 1). + look_at (VectorLike, optional): point to look at. + Defaults to None (center of shape). + + Returns: + tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges + """ + + def extract_edges(compound): + edges = [] # List to store the extracted edges + + # Create a TopExp_Explorer to traverse the sub-shapes of the compound + explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) + + # Loop through the sub-shapes and extract edges + while explorer.More(): + edge = downcast(explorer.Current()) + edges.append(edge) + explorer.Next() + + return edges + + # Setup the projector + hidden_line_removal = HLRBRep_Algo() + hidden_line_removal.Add(self.wrapped) + + viewport_origin = Vector(viewport_origin) + look_at = Vector(look_at) if look_at else self.center() + projection_dir: Vector = (viewport_origin - look_at).normalized() + viewport_up = Vector(viewport_up).normalized() + camera_coordinate_system = gp_Ax2() + camera_coordinate_system.SetAxis( + gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) + ) + camera_coordinate_system.SetYDirection(viewport_up.to_dir()) + projector = HLRAlgo_Projector(camera_coordinate_system) + + hidden_line_removal.Projector(projector) + hidden_line_removal.Update() + hidden_line_removal.Hide() + + hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) + + # Create the visible edges + visible_edges = [] + for edges in [ + hlr_shapes.VCompound(), + hlr_shapes.Rg1LineVCompound(), + hlr_shapes.OutLineVCompound(), + ]: + if not edges.IsNull(): + visible_edges.extend(extract_edges(downcast(edges))) + + # Create the hidden edges + hidden_edges = [] + for edges in [ + hlr_shapes.HCompound(), + hlr_shapes.OutLineHCompound(), + hlr_shapes.Rg1LineHCompound(), + ]: + if not edges.IsNull(): + hidden_edges.extend(extract_edges(downcast(edges))) + + # Fix the underlying geometry - otherwise we will get segfaults + for edge in visible_edges: + BRepLib.BuildCurves3d_s(edge, TOLERANCE) + for edge in hidden_edges: + BRepLib.BuildCurves3d_s(edge, TOLERANCE) + + # convert to native shape objects + visible_edges = ShapeList(Edge(e) for e in visible_edges) + hidden_edges = ShapeList(Edge(e) for e in hidden_edges) + + return (visible_edges, hidden_edges) + + +class Mixin2D(Shape): + """Additional methods to add to Face and Shell class""" + + project_to_viewport = Mixin1D.project_to_viewport + split = Mixin1D.split + + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: + "Returns the right type of wrapper, given a OCCT object" + + # define the shape lookup table for casting + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + ta.TopAbs_FACE: Face, + ta.TopAbs_SHELL: Shell, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + + vertices = Mixin1D.vertices + vertex = Mixin1D.vertex + edges = Mixin1D.edges + edge = Mixin1D.edge + wires = Mixin1D.wires + + def faces(self) -> ShapeList[Face]: + """faces - all the faces in this Shape""" + return Shape.get_shape_list(self, "Face") + + def face(self) -> Face: + """Return the Face""" + return Shape.get_single_shape(self, "Face") + + def shells(self) -> ShapeList[Shell]: + """shells - all the shells in this Shape""" + return Shape.get_shape_list(self, "Shell") + + def shell(self) -> Shell: + """Return the Shell""" + return Shape.get_single_shape(self, "Shell") + + def __neg__(self) -> Self: + """Reverse normal operator -""" + if self.wrapped is None: + raise ValueError("Invalid Shape") + new_surface = copy.deepcopy(self) + new_surface.wrapped = downcast(self.wrapped.Complemented()) + + return new_surface + + def offset(self, amount: float) -> Self: + """Return a copy of self moved along the normal by amount""" + return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) + + def find_intersection_points( + self, other: Axis, tolerance: float = TOLERANCE + ) -> list[tuple[Vector, Vector]]: + """Find point and normal at intersection + + Return both the point(s) and normal(s) of the intersection of the axis and the shape + + Args: + axis (Axis): axis defining the intersection line + + Returns: + list[tuple[Vector, Vector]]: Point and normal of intersection + """ + if self.wrapped is None: + return [] + + intersection_line = gce_MakeLin(other.wrapped).Value() + intersect_maker = BRepIntCurveSurface_Inter() + intersect_maker.Init(self.wrapped, intersection_line, tolerance) + + intersections = [] + while intersect_maker.More(): + inter_pt = intersect_maker.Pnt() + # Calculate distance along axis + distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z + intersections.append( + ( + intersect_maker.Face(), # TopoDS_Face + Vector(inter_pt), + distance, + ) + ) + intersect_maker.Next() + + intersections.sort(key=lambda x: x[2]) + intersecting_faces = [i[0] for i in intersections] + intersecting_points = [i[1] for i in intersections] + intersecting_normals = [ + _topods_face_normal_at(f, intersecting_points[i].to_pnt()) + for i, f in enumerate(intersecting_faces) + ] + result = [] + for pnt, normal in zip(intersecting_points, intersecting_normals): + result.append((pnt, normal)) + + return result + + +class Mixin3D(Shape): + """Additional methods to add to 3D Shape classes""" + + project_to_viewport = Mixin1D.project_to_viewport + split = Mixin1D.split + find_intersection_points = Mixin2D.find_intersection_points + + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Self: + "Returns the right type of wrapper, given a OCCT object" + + # define the shape lookup table for casting + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + ta.TopAbs_FACE: Face, + ta.TopAbs_SHELL: Shell, + ta.TopAbs_SOLID: Solid, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + + vertices = Mixin1D.vertices + vertex = Mixin1D.vertex + edges = Mixin1D.edges + edge = Mixin1D.edge + wires = Mixin1D.wires + wire = Mixin1D.wire + faces = Mixin2D.faces + face = Mixin2D.face + shells = Mixin2D.shells + shell = Mixin2D.shell + + def solids(self) -> ShapeList[Solid]: + """solids - all the solids in this Shape""" + return Shape.get_shape_list(self, "Solid") + + def solid(self) -> Solid: + """Return the Solid""" + return Shape.get_single_shape(self, "Solid") + + def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: + """Fillet + + Fillets the specified edges of this solid. + + Args: + radius (float): float > 0, the radius of the fillet + edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid + + Returns: + Any: Filleted solid + """ + native_edges = [e.wrapped for e in edge_list] + + fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) + + for native_edge in native_edges: + fillet_builder.Add(radius, native_edge) + + try: + new_shape = self.__class__(fillet_builder.Shape()) + if not new_shape.is_valid(): + raise Standard_Failure + except (StdFail_NotDone, Standard_Failure) as err: + raise ValueError( + f"Failed creating a fillet with radius of {radius}, try a smaller value" + f" or use max_fillet() to find the largest valid fillet radius" + ) from err + + return new_shape + + def max_fillet( + self, + edge_list: Iterable[Edge], + tolerance=0.1, + max_iterations: int = 10, + ) -> float: + """Find Maximum Fillet Size + + Find the largest fillet radius for the given Shape and edges with a + recursive binary search. + + Example: + + max_fillet_radius = my_shape.max_fillet(shape_edges) + max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) + + + Args: + edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid + tolerance (float, optional): maximum error from actual value. Defaults to 0.1. + max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. + + Raises: + RuntimeError: failed to find the max value + ValueError: the provided Shape is invalid + + Returns: + float: maximum fillet radius + """ + + def __max_fillet(window_min: float, window_max: float, current_iteration: int): + window_mid = (window_min + window_max) / 2 + + if current_iteration == max_iterations: + raise RuntimeError( + f"Failed to find the max value within {tolerance} in {max_iterations}" + ) + + fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) + + for native_edge in native_edges: + fillet_builder.Add(window_mid, native_edge) + + # Do these numbers work? - if not try with the smaller window + try: + new_shape = self.__class__(fillet_builder.Shape()) + if not new_shape.is_valid(): + raise fillet_exception + except fillet_exception: + return __max_fillet(window_min, window_mid, current_iteration + 1) + + # These numbers work, are they close enough? - if not try larger window + if window_mid - window_min <= tolerance: + return_value = window_mid + else: + return_value = __max_fillet( + window_mid, window_max, current_iteration + 1 + ) + return return_value + + if not self.is_valid(): + raise ValueError("Invalid Shape") + + native_edges = [e.wrapped for e in edge_list] + + # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform + # specific exceptions are required. + if platform.system() == "Darwin": + fillet_exception = Standard_Failure + else: + fillet_exception = StdFail_NotDone + + max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) + + return max_radius + + def chamfer( + self, + length: float, + length2: Optional[float], + edge_list: Iterable[Edge], + face: Face = None, + ) -> Self: + """Chamfer + + Chamfers the specified edges of this solid. + + Args: + length (float): length > 0, the length (length) of the chamfer + length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical + chamfer. Should be `None` if not required. + edge_list (Iterable[Edge]): a list of Edge objects, which must belong to + this solid + face (Face): identifies the side where length is measured. The edge(s) must be + part of the face + + Returns: + Self: Chamfered solid + """ + edge_list = list(edge_list) + if face: + if any((edge for edge in edge_list if edge not in face.edges())): + raise ValueError("Some edges are not part of the face") + + native_edges = [e.wrapped for e in edge_list] + + # make a edge --> faces mapping + edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() + TopExp.MapShapesAndAncestors_s( + self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map + ) + + # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API + chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) + + if length2: + distance1 = length + distance2 = length2 + else: + distance1 = length + distance2 = length + + for native_edge in native_edges: + if face: + topo_face = face.wrapped + else: + topo_face = edge_face_map.FindFromKey(native_edge).First() + + chamfer_builder.Add( + distance1, distance2, native_edge, TopoDS.Face_s(topo_face) + ) # NB: edge_face_map return a generic TopoDS_Shape + + try: + new_shape = self.__class__(chamfer_builder.Shape()) + if not new_shape.is_valid(): + raise Standard_Failure + except (StdFail_NotDone, Standard_Failure) as err: + raise ValueError( + "Failed creating a chamfer, try a smaller length value(s)" + ) from err + + return new_shape + + def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: + """Return center of object + + Find center of object + + Args: + center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. + + Raises: + ValueError: Center of GEOMETRY is not supported for this object + NotImplementedError: Unable to calculate center of mass of this object + + Returns: + Vector: center + """ + if center_of == CenterOf.GEOMETRY: + raise ValueError("Center of GEOMETRY is not supported for this object") + if center_of == CenterOf.MASS: + properties = GProp_GProps() + calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] + if calc_function: + calc_function(self.wrapped, properties) + middle = Vector(properties.CentreOfMass()) + else: + raise NotImplementedError + elif center_of == CenterOf.BOUNDING_BOX: + middle = self.bounding_box().center() + return middle + + def hollow( + self, + faces: Optional[Iterable[Face]], + thickness: float, + tolerance: float = 0.0001, + kind: Kind = Kind.ARC, + ) -> Solid: + """Hollow + + Return the outer shelled solid of self. + + Args: + faces (Optional[Iterable[Face]]): faces to be removed, + which must be part of the solid. Can be an empty list. + thickness (float): shell thickness - positive shells outwards, negative + shells inwards. + tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. + kind (Kind, optional): intersection type. Defaults to Kind.ARC. + + Raises: + ValueError: Kind.TANGENT not supported + + Returns: + Solid: A hollow solid. + """ + faces = list(faces) if faces else [] + if kind == Kind.TANGENT: + raise ValueError("Kind.TANGENT not supported") + + kind_dict = { + Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, + Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, + } + + occ_faces_list = TopTools_ListOfShape() + for face in faces: + occ_faces_list.Append(face.wrapped) + + shell_builder = BRepOffsetAPI_MakeThickSolid() + shell_builder.MakeThickSolidByJoin( + self.wrapped, + occ_faces_list, + thickness, + tolerance, + Intersection=True, + Join=kind_dict[kind], + ) + shell_builder.Build() + + if faces: + return_value = self.__class__(shell_builder.Shape()) + + else: # if no faces provided a watertight solid will be constructed + shell1 = self.__class__(shell_builder.Shape()).shells()[0].wrapped + shell2 = self.shells()[0].wrapped + + # s1 can be outer or inner shell depending on the thickness sign + if thickness > 0: + sol = BRepBuilderAPI_MakeSolid(shell1, shell2) + else: + sol = BRepBuilderAPI_MakeSolid(shell2, shell1) + + # fix needed for the orientations + return_value = self.__class__(sol.Shape()).fix() + + return return_value + + def offset_3d( + self, + openings: Optional[Iterable[Face]], + thickness: float, + tolerance: float = 0.0001, + kind: Kind = Kind.ARC, + ) -> Solid: + """Shell + + Make an offset solid of self. + + Args: + openings (Optional[Iterable[Face]]): faces to be removed, + which must be part of the solid. Can be an empty list. + thickness (float): offset amount - positive offset outwards, negative inwards + tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. + kind (Kind, optional): intersection type. Defaults to Kind.ARC. + + Raises: + ValueError: Kind.TANGENT not supported + + Returns: + Solid: A shelled solid. + """ + openings = list(openings) if openings else [] + if kind == Kind.TANGENT: + raise ValueError("Kind.TANGENT not supported") + + kind_dict = { + Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, + Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, + Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, + } + + occ_faces_list = TopTools_ListOfShape() + for face in openings: + occ_faces_list.Append(face.wrapped) + + offset_builder = BRepOffsetAPI_MakeThickSolid() + offset_builder.MakeThickSolidByJoin( + self.wrapped, + occ_faces_list, + thickness, + tolerance, + Intersection=True, + RemoveIntEdges=True, + Join=kind_dict[kind], + ) + offset_builder.Build() + + try: + offset_occt_solid = offset_builder.Shape() + except (StdFail_NotDone, Standard_Failure) as err: + raise RuntimeError( + "offset Error, an alternative kind may resolve this error" + ) from err + + offset_solid = self.__class__(offset_occt_solid) + + # The Solid can be inverted, if so reverse + if offset_solid.volume < 0: + offset_solid.wrapped.Reverse() + + return offset_solid + + def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: + """Returns whether or not the point is inside a solid or compound + object within the specified tolerance. + + Args: + point: tuple or Vector representing 3D point to be tested + tolerance: tolerance for inside determination, default=1.0e-6 + point: VectorLike: + tolerance: float: (Default value = 1.0e-6) + + Returns: + bool indicating whether or not point is within solid + + """ + solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) + solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) + + return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() + + def dprism( + self, + basis: Optional[Face], + bounds: list[Union[Face, Wire]], + depth: float = None, + taper: float = 0, + up_to_face: Face = None, + thru_all: bool = True, + additive: bool = True, + ) -> Solid: + """dprism + + Make a prismatic feature (additive or subtractive) + + Args: + basis (Optional[Face]): face to perform the operation on + bounds (list[Union[Face,Wire]]): list of profiles + depth (float, optional): depth of the cut or extrusion. Defaults to None. + taper (float, optional): in degrees. Defaults to 0. + up_to_face (Face, optional): a face to extrude until. Defaults to None. + thru_all (bool, optional): cut thru_all. Defaults to True. + additive (bool, optional): Defaults to True. + + Returns: + Solid: prismatic feature + """ + if isinstance(bounds[0], Wire): + sorted_profiles = sort_wires_by_build_order(bounds) + faces = [Face(p[0], p[1:]) for p in sorted_profiles] + else: + faces = bounds + + shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped + for face in faces: + feat = BRepFeat_MakeDPrism( + shape, + face.wrapped, + basis.wrapped if basis else TopoDS_Face(), + taper * DEG2RAD, + additive, + False, + ) + + if up_to_face is not None: + feat.Perform(up_to_face.wrapped) + elif thru_all or depth is None: + feat.PerformThruAll() + else: + feat.Perform(depth) + + shape = feat.Shape() + + return self.__class__(shape) + + class Compound(Mixin3D, Shape[TopoDS_Compound]): """A Compound in build123d is a topological entity representing a collection of geometric shapes grouped together within a single structure. It serves as a @@ -6057,7 +6023,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): parent (Compound, optional): assembly parent. Defaults to None. """ - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any): outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 if args: @@ -6107,7 +6073,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): self.created_on: Plane | None = None @property - def length(self) -> float: + def length(self) -> None | float: """length of planar face""" result = None if self.is_planar: @@ -6123,7 +6089,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return 0.0 @property - def width(self) -> float: + def width(self) -> None | float: """width of planar face""" result = None if self.is_planar: @@ -6134,17 +6100,17 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return result @property - def geometry(self) -> str: + def geometry(self) -> None | str: """geometry of planar face""" result = None if self.is_planar: - flat_face = Plane(self).to_local_coords(self) + flat_face: Face = Plane(self).to_local_coords(self) flat_face_edges = flat_face.edges() if all(e.geom_type == GeomType.LINE for e in flat_face_edges): flat_face_vertices = flat_face.vertices() result = "POLYGON" if len(flat_face_edges) == 4: - edge_pairs = [] + edge_pairs: list[list[Edge]] = [] for vertex in flat_face_vertices: edge_pairs.append( [e for e in flat_face_edges if vertex in e.vertices()] @@ -6223,7 +6189,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): Returns: Vector: surface normal direction """ - surface_point, u, v = (None,) * 3 + surface_point, u, v = None, -1.0, -1.0 if args: if isinstance(args[0], Sequence): @@ -6242,9 +6208,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): surface_point = kwargs.get("surface_point", surface_point) u = kwargs.get("u", u) v = kwargs.get("v", v) - if surface_point is None and u is None and v is None: + if surface_point is None and u < 0 and v < 0: u, v = 0.5, 0.5 - elif surface_point is None and sum(i is None for i in [u, v]) == 1: + elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: raise ValueError("Both u & v values must be specified") # get the geometry @@ -6416,9 +6382,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ... @classmethod - def make_surface_from_curves( - cls, curve1: Union[Edge, Wire], curve2: Union[Edge, Wire] - ) -> Face: + def make_surface_from_curves(cls, *args, **kwargs) -> Face: """make_surface_from_curves Create a ruled surface out of two edges or two wires. If wires are used then @@ -6431,6 +6395,28 @@ class Face(Mixin2D, Shape[TopoDS_Face]): Returns: Face: potentially non planar surface """ + curve1, curve2 = None, None + if args: + if len(args) != 2 or type(args[0]) is not type(args[1]): + raise TypeError( + "Both curves must be of the same type (both Edge or both Wire)." + ) + curve1, curve2 = args + + curve1 = kwargs.pop("edge1", curve1) + curve2 = kwargs.pop("edge2", curve2) + curve1 = kwargs.pop("wire1", curve1) + curve2 = kwargs.pop("wire2", curve2) + + # Handle unexpected kwargs + if kwargs: + raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + + if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): + raise TypeError( + "Both curves must be of the same type (both Edge or both Wire)." + ) + if isinstance(curve1, Wire): return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) else: @@ -6438,7 +6424,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return return_value @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> ShapeList[ShapeList[Face]]: + def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: """sew faces Group contiguous faces and return them in a list of ShapeList @@ -6450,12 +6436,12 @@ class Face(Mixin2D, Shape[TopoDS_Face]): RuntimeError: OCCT SewedShape generated unexpected output Returns: - ShapeList[ShapeList[Face]]: grouped contiguous faces + list[ShapeList[Face]]: grouped contiguous faces """ # Sew the faces sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces = ShapeList() + sewn_faces: list[ShapeList] = [] # For each of the top level shapes create a ShapeList of Face for top_level_shape in top_level_shapes: @@ -6608,14 +6594,14 @@ class Face(Mixin2D, Shape[TopoDS_Face]): raise ValueError("A weight must be provided for each control point") points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - for i, row in enumerate(points): - for j, point in enumerate(row): + for i, row_points in enumerate(points): + for j, point in enumerate(row_points): points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) if weights: weights_ = TColStd_HArray2OfReal(1, len(weights), 1, len(weights[0])) - for i, row in enumerate(weights): - for j, weight in enumerate(row): + for i, row_weights in enumerate(weights): + for j, weight in enumerate(row_weights): weights_.SetValue(i + 1, j + 1, float(weight)) bezier = Geom_BezierSurface(points_, weights_) else: @@ -6654,9 +6640,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): exterior = list(exterior) if isinstance(exterior, Iterable) else exterior # pylint: disable=too-many-branches if surface_points: - surface_points = [Vector(p) for p in surface_points] + surface_point_vectors = [Vector(p) for p in surface_points] else: - surface_points = None + surface_point_vectors = None # First, create the non-planar surface surface = BRepOffsetAPI_MakeFilling( @@ -6684,7 +6670,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): elif isinstance(exterior, Iterable) and all( isinstance(o, Edge) for o in exterior ): - outside_edges = exterior + outside_edges = ShapeList(exterior) else: raise ValueError("exterior must be a Wire or list of Edges") @@ -6703,8 +6689,8 @@ class Face(Mixin2D, Shape[TopoDS_Face]): raise RuntimeError( "Error building non-planar face with provided exterior" ) from err - if surface_points: - for point in surface_points: + if surface_point_vectors: + for point in surface_point_vectors: surface.Add(gp_Pnt(*point.to_tuple())) try: surface.Build() @@ -6849,7 +6835,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): self.wrapped, Vector(direction) * max_dimension ) - intersected_shapes = ShapeList() + intersected_shapes: ShapeList[Face | Shell] = ShapeList() if isinstance(target_object, Vertex): raise TypeError("projection to a vertex is not supported") if isinstance(target_object, Face): @@ -6869,9 +6855,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): intersected_shapes.append(Shell(topods_shell)) intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = [ + intersected_shapes = ShapeList( s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ] + ) return intersected_shapes def make_holes(self, interior_wires: list[Wire]) -> Face: @@ -6989,8 +6975,8 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): parent (Compound, optional): assembly parent. Defaults to None. """ obj = list(obj) if isinstance(obj, Iterable) else obj - if isinstance(obj, Iterable) and len(obj) == 1: - obj = obj[0] + if isinstance(obj, Iterable) and len(obj_list := list(obj)) == 1: + obj = obj_list[0] if isinstance(obj, Face): builder = BRepBuilderAPI_MakeShell( From ea3e8b3edc3d7ab6c5ec76f0f96eba1fc0e8b130 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 30 Dec 2024 14:54:50 -0500 Subject: [PATCH 052/518] Fixed three_d.py typing problems --- src/build123d/topology.py | 65 +++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index f5cc68b..beb83ba 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -4070,7 +4070,7 @@ class Mixin3D(Shape): length: float, length2: Optional[float], edge_list: Iterable[Edge], - face: Face = None, + face: Face | None = None, ) -> Self: """Chamfer @@ -4082,8 +4082,8 @@ class Mixin3D(Shape): chamfer. Should be `None` if not required. edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - face (Face): identifies the side where length is measured. The edge(s) must be - part of the face + face (Face, optional): identifies the side where length is measured. The edge(s) + must be part of the face Returns: Self: Chamfered solid @@ -4286,6 +4286,7 @@ class Mixin3D(Shape): ) from err offset_solid = self.__class__(offset_occt_solid) + assert offset_solid.wrapped is not None # The Solid can be inverted, if so reverse if offset_solid.volume < 0: @@ -4316,9 +4317,9 @@ class Mixin3D(Shape): self, basis: Optional[Face], bounds: list[Union[Face, Wire]], - depth: float = None, + depth: float | None = None, taper: float = 0, - up_to_face: Face = None, + up_to_face: Face | None = None, thru_all: bool = True, additive: bool = True, ) -> Solid: @@ -7442,15 +7443,17 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): flip = -1 if i > 0 and flip_inner else 1 local: Wire = Plane(profile).to_local_coords(wire) local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper = Plane(profile).from_local_coords(local_taper) - taper.move(Location(direction)) - taper_wires.append(taper) + taper_wire: Wire = Plane(profile).from_local_coords(local_taper) + taper_wire.move(Location(direction)) + taper_wires.append(taper_wire) solids = [ Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) ] if len(solids) > 1: - new_solid = solids[0].cut(*solids[1:]) + complex_solid = solids[0].cut(*solids[1:]) + assert isinstance(complex_solid, Solid) # Can't be a list + new_solid = complex_solid else: new_solid = solids[0] @@ -7605,39 +7608,47 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] if until == Until.NEXT: - extrusion = extrusion.cut(target_object) + trimmed_extrusion = extrusion.cut(target_object) + if isinstance(trimmed_extrusion, ShapeList): + closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] + else: + closest_extrusion = trimmed_extrusion for clipping_object in clipping_objects: # It's possible for clipping faces to self intersect when they are extruded # thus they could be non manifold which results failed boolean operations # - so skip these objects try: - extrusion = ( - extrusion.cut(clipping_object) - .solids() - .sort_by(direction_axis)[0] - ) + extrusion_shapes = closest_extrusion.cut(clipping_object) except Exception: warnings.warn( "clipping error - extrusion may be incorrect", stacklevel=2, ) else: - extrusion_parts = [extrusion.intersect(target_object)] + base_part = extrusion.intersect(target_object) + if isinstance(base_part, ShapeList): + extrusion_parts = base_part + elif base_part is None: + extrusion_parts = ShapeList() + else: + extrusion_parts = ShapeList([base_part]) for clipping_object in clipping_objects: try: - extrusion_parts.append( - extrusion.intersect(clipping_object) - .solids() - .sort_by(direction_axis)[0] - ) + clipped_extrusion = extrusion.intersect(clipping_object) + if clipped_extrusion is not None: + extrusion_parts.append( + clipped_extrusion.solids().sort_by(direction_axis)[0] + ) except Exception: warnings.warn( "clipping error - extrusion may be incorrect", stacklevel=2, ) - extrusion = Solid.fuse(*extrusion_parts) + extrusion_shapes = Solid.fuse(*extrusion_parts) - return extrusion + result = extrusion_shapes.solids().sort_by(direction_axis)[0] + + return result @classmethod def revolve( @@ -7754,12 +7765,14 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): shapes.append(Mixin3D.cast(builder.Shape())) - return_value, inner_shapes = shapes[0], shapes[1:] + outer_shape, inner_shapes = shapes[0], shapes[1:] if inner_shapes: - return_value = return_value.cut(*inner_shapes) + hollow_outer_shape = outer_shape.cut(*inner_shapes) + assert isinstance(hollow_outer_shape, Solid) + return hollow_outer_shape - return return_value + return outer_shape @classmethod def sweep_multi( From b77ed1a5e9b3316058cc212a90279772f8197f9b Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 30 Dec 2024 16:02:49 -0500 Subject: [PATCH 053/518] Fixed composite.py typing problems --- src/build123d/topology.py | 61 +++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index beb83ba..6199bc1 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -4383,7 +4383,9 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): project_to_viewport = Mixin1D.project_to_viewport @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: + def cast( + cls, obj: TopoDS_Shape + ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: "Returns the right type of wrapper, given a OCCT object" # define the shape lookup table for casting @@ -4429,10 +4431,14 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): """ if isinstance(obj, Iterable): - obj = _make_topods_compound_from_shapes(s.wrapped for s in obj) + topods_compound = _make_topods_compound_from_shapes( + [s.wrapped for s in obj] + ) + else: + topods_compound = obj super().__init__( - obj=obj, + obj=topods_compound, label=label, color=color, parent=parent, @@ -4502,7 +4508,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): logger.debug("Removing parent of %s (%s)", self.label, parent.label) if parent.children: parent.wrapped = _make_topods_compound_from_shapes( - c.wrapped for c in parent.children + [c.wrapped for c in parent.children] ) else: parent.wrapped = None @@ -4516,7 +4522,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): """Method call after attaching to `parent`.""" logger.debug("Updated parent of %s to %s", self.label, parent.label) parent.wrapped = _make_topods_compound_from_shapes( - c.wrapped for c in parent.children + [c.wrapped for c in parent.children] ) def _post_detach_children(self, children): @@ -4525,7 +4531,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): kids = ",".join([child.label for child in children]) logger.debug("Removing children %s from %s", kids, self.label) self.wrapped = _make_topods_compound_from_shapes( - c.wrapped for c in self.children + [c.wrapped for c in self.children] ) # else: # logger.debug("Removing no children from %s", self.label) @@ -4541,7 +4547,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): kids = ",".join([child.label for child in children]) logger.debug("Adding children %s to %s", kids, self.label) self.wrapped = _make_topods_compound_from_shapes( - c.wrapped for c in self.children + [c.wrapped for c in self.children] ) # else: # logger.debug("Adding no children to %s", self.label) @@ -4557,17 +4563,19 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) return curve + other - summands = [ + summands = ShapeList( shape for o in (other if isinstance(other, (list, tuple)) else [other]) if o is not None for shape in o.get_top_level_shapes() - ] + ) # If there is nothing to add return the original object if not summands: return self - summands = [s for s in self.get_top_level_shapes() + summands if s is not None] + summands = ShapeList( + s for s in self.get_top_level_shapes() + summands if s is not None + ) # Only fuse the parts if necessary if len(summands) <= 1: @@ -4576,10 +4584,12 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): fuse_op = BRepAlgoAPI_Fuse() fuse_op.SetFuzzyValue(TOLERANCE) self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(result, list): - result = Compound(result) + bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) + if isinstance(bool_result, list): + result = Compound(bool_result) self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) + else: + result = bool_result if SkipClean.clean: result = result.clean() @@ -4617,7 +4627,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): sub_compounds = [] return ShapeList(sub_compounds) - def compound(self) -> Compound: + def compound(self) -> Compound | None: """Return the Compound""" shape_list = self.compounds() entity_count = len(shape_list) @@ -4650,7 +4660,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): def do_children_intersect( self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape, Shape], float]: + ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: """Do Children Intersect Determine if any of the child objects within a Compound/assembly intersect by @@ -4701,7 +4711,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): ), common_volume, ) - return (False, (), 0.0) + return (False, (None, None), 0.0) @classmethod def make_text( @@ -4749,13 +4759,14 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): """ # pylint: disable=too-many-locals - def position_face(orig_face: "Face") -> "Face": + def position_face(orig_face: Face) -> Face: """ Reposition a face to the provided path Local coordinates are used to calculate the position of the face relative to the path. Global coordinates to position the face. """ + assert text_path is not None bbox = orig_face.bounding_box() face_bottom_center = Vector((bbox.min.X + bbox.max.X) / 2, 0, 0) relative_position_on_wire = ( @@ -4805,9 +4816,9 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) # Align the text from the bounding box - align = tuplify(align, 2) + align_text = tuplify(align, 2) text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align)) + Vector(*text_flat.bounding_box().to_align_offset(align_text)) ) if text_path is not None: @@ -4965,8 +4976,6 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): class Part(Compound): """A Compound containing 3D objects - aka Solids""" - _dim = 3 - @property def _dim(self) -> int: return 3 @@ -4975,8 +4984,6 @@ class Part(Compound): class Sketch(Compound): """A Compound containing 2D objects - aka Faces""" - _dim = 2 - @property def _dim(self) -> int: return 2 @@ -4985,13 +4992,11 @@ class Sketch(Compound): class Curve(Compound): """A Compound containing 1D objects - aka Edges""" - _dim = 1 - @property def _dim(self) -> int: return 1 - __add__ = Mixin1D.__add__ + __add__ = Mixin1D.__add__ # type: ignore def __matmul__(self, position: float) -> Vector: """Position on curve operator @ - only works if continuous""" @@ -5005,7 +5010,7 @@ class Curve(Compound): """Location on wire operator ^ - only works if continuous""" return Wire(self.edges()).location_at(position) - def wires(self) -> list[Wire]: + def wires(self) -> ShapeList[Wire]: # type: ignore """A list of wires created from the edges""" return Wire.combine(self.edges()) @@ -9570,7 +9575,7 @@ def _make_topods_compound_from_shapes( def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: """Return the maximum dimension of one or more shapes""" shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes(s.wrapped for s in shapes) + composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) return bbox.diagonal From 678b715e75531468a7440e0f276acaab40981ef6 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 30 Dec 2024 19:22:50 -0500 Subject: [PATCH 054/518] Fixed invalid references post file split --- src/build123d/topology.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 6199bc1..3cf6e8c 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -2393,7 +2393,9 @@ class ShapeList(list[T]): def axis_parallel_predicate(axis: Axis, tolerance: float): def pred(shape: Shape): if shape.is_planar_face: - assert shape.wrapped is not None and isinstance(shape, Face) + assert shape.wrapped is not None and isinstance( + shape.wrapped, TopoDS_Face + ) gp_pnt = gp_Pnt() surface_normal = gp_Vec() u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) @@ -2428,7 +2430,9 @@ class ShapeList(list[T]): def pred(shape: Shape): if shape.is_planar_face: - assert shape.wrapped is not None and isinstance(shape, Face) + assert shape.wrapped is not None and isinstance( + shape.wrapped, TopoDS_Face + ) gp_pnt: gp_Pnt = gp_Pnt() surface_normal: gp_Vec = gp_Vec() u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) From e5c976454eadcaff2c923a930f10c8689cd54e41 Mon Sep 17 00:00:00 2001 From: snoyer Date: Tue, 31 Dec 2024 17:18:23 +0400 Subject: [PATCH 055/518] deprecate param without breaking API yet --- src/build123d/importers.py | 9 +++++++++ tests/test_importers.py | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/build123d/importers.py b/src/build123d/importers.py index 1bb1693..5d85455 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -36,6 +36,7 @@ import unicodedata from math import degrees from pathlib import Path from typing import Optional, TextIO, Union +import warnings from OCP.BRep import BRep_Builder from OCP.BRepGProp import BRepGProp @@ -338,6 +339,7 @@ def import_svg( flip_y: bool = True, ignore_visibility: bool = False, label_by: str = "id", + is_inkscape_label: bool | None = None, # TODO remove for `1.0` release ) -> ShapeList[Union[Wire, Face]]: """import_svg @@ -355,6 +357,13 @@ def import_svg( Returns: ShapeList[Union[Wire, Face]]: objects contained in svg """ + if is_inkscape_label is not None: # TODO remove for `1.0` release + msg = "`is_inkscape_label` parameter is deprecated" + if is_inkscape_label: + label_by = "inkscape:" + label_by + msg += f", use `label_by={label_by!r}` instead" + warnings.warn(msg, stacklevel=2) + shapes = [] label_by = re.sub( r"^inkscape:(.+)", r"{http://www.inkscape.org/namespaces/inkscape}\1", label_by diff --git a/tests/test_importers.py b/tests/test_importers.py index 3e1155b..0fa7088 100644 --- a/tests/test_importers.py +++ b/tests/test_importers.py @@ -84,6 +84,24 @@ class ImportSVG(unittest.TestCase): self.assertEqual(len(list(hole_faces)), 2) self.assertEqual(len(list(test_wires)), 1) + def test_import_svg_deprecated_param(self): # TODO remove for `1.0` release + svg_file = Path(__file__).parent / "../tests/svg_import_test.svg" + + with self.assertWarns(UserWarning): + svg = import_svg(svg_file, label_by="label", is_inkscape_label=True) + + # Exact the shape of the plate & holes + base_faces = svg.filter_by(lambda f: "base" in f.label) + hole_faces = svg.filter_by(lambda f: "hole" in f.label) + test_wires = svg.filter_by(lambda f: "wire" in f.label) + + self.assertEqual(len(list(base_faces)), 1) + self.assertEqual(len(list(hole_faces)), 2) + self.assertEqual(len(list(test_wires)), 1) + + with self.assertWarns(UserWarning): + svg = import_svg(svg_file, is_inkscape_label=False) + def test_import_svg_colors(self): svg_file = StringIO( '' From ae15a95c9b3d5504fb8621598647a290a5cd5362 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 31 Dec 2024 15:40:01 -0500 Subject: [PATCH 056/518] Increased shape_core.py test coverage to 99% --- src/build123d/topology.py | 104 ++++++------- tests/test_direct_api.py | 302 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 341 insertions(+), 65 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 3cf6e8c..7015a8c 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -331,8 +331,6 @@ def topods_dim(topods: TopoDS_Shape) -> int | None: sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} return sub_dims.pop() if len(sub_dims) == 1 else None - return None - HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode @@ -588,7 +586,7 @@ class Shape(NodeMixin, Generic[TOPODS]): """ # Extract one or more (if a Compound) shape from self if self.wrapped is None: - shape_stack = [] + return False else: shape_stack = get_top_level_topods_shapes(self.wrapped) results = [] @@ -1156,29 +1154,29 @@ class Shape(NodeMixin, Generic[TOPODS]): return [] return _topods_entities(self.wrapped, topo_type) - def _entities_from( - self, child_type: Shapes, parent_type: Shapes - ) -> Dict[Shape, list[Shape]]: - """This function is very slow on M1 macs and is currently unused""" - if self.wrapped is None: - return {} + # def _entities_from( + # self, child_type: Shapes, parent_type: Shapes + # ) -> Dict[Shape, list[Shape]]: + # """This function is very slow on M1 macs and is currently unused""" + # if self.wrapped is None: + # return {} - res = TopTools_IndexedDataMapOfShapeListOfShape() + # res = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, - Shape.inverse_shape_LUT[child_type], - Shape.inverse_shape_LUT[parent_type], - res, - ) + # TopExp.MapShapesAndAncestors_s( + # self.wrapped, + # Shape.inverse_shape_LUT[child_type], + # Shape.inverse_shape_LUT[parent_type], + # res, + # ) - out: Dict[Shape, list[Shape]] = {} - for i in range(1, res.Extent() + 1): - out[self.__class__.cast(res.FindKey(i))] = [ - self.__class__.cast(el) for el in res.FindFromIndex(i) - ] + # out: Dict[Shape, list[Shape]] = {} + # for i in range(1, res.Extent() + 1): + # out[self.__class__.cast(res.FindKey(i))] = [ + # self.__class__.cast(el) for el in res.FindFromIndex(i) + # ] - return out + # return out def get_top_level_shapes(self) -> ShapeList[Shape]: """ @@ -1239,16 +1237,10 @@ class Shape(NodeMixin, Generic[TOPODS]): ) return shape_list[0] if shape_list else None - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape - subclasses may override""" - return ShapeList() - - def vertex(self) -> Vertex | None: - """Return the Vertex""" - return None + # Note all sub-classes have vertices and vertex methods def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" + """edges - all the edges in this Shape - subclasses may override""" return ShapeList() def edge(self) -> Edge | None: @@ -1423,9 +1415,9 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: copy of transformed shape with all objects keeping their type """ - new_shape = copy.deepcopy(self, None) if self.wrapped is None: - return new_shape + return self + new_shape = copy.deepcopy(self, None) transformed = downcast( BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() ) @@ -1450,9 +1442,9 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: a copy of the object, but with geometry transformed """ - new_shape = copy.deepcopy(self, None) if self.wrapped is None: - return new_shape + return self + new_shape = copy.deepcopy(self, None) transformed = downcast( BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() ) @@ -1962,8 +1954,8 @@ class Shape(NodeMixin, Generic[TOPODS]): def process_sides(sides): """Process sides to determine if it should be None, a single element, a Shell, or a ShapeList.""" - if not sides: - return None + # if not sides: + # return None if len(sides) == 1: return sides[0] # Attempt to create a shell @@ -2567,15 +2559,15 @@ class ShapeList(list[T]): tol_digits, ) - elif hasattr(group_by, "wrapped") and isinstance( - group_by.wrapped, (TopoDS_Edge, TopoDS_Wire) - ): + elif hasattr(group_by, "wrapped"): if group_by.wrapped is None: - raise ValueError("Cannot group by an empty Edge or Wire") + raise ValueError("Cannot group by an empty object") - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) + if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): + + def key_f(obj): + pnt1, _pnt2 = group_by.closest_points(obj.center()) + return round(group_by.param_at_point(pnt1), tol_digits) elif isinstance(group_by, SortBy): if group_by == SortBy.LENGTH: @@ -2637,22 +2629,22 @@ class ShapeList(list[T]): key=lambda o: (axis_as_location * Location(o.center())).position.Z, reverse=reverse, ) - elif hasattr(sort_by, "wrapped") and isinstance( - sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire) - ): + elif hasattr(sort_by, "wrapped"): if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty Edge or Wire") + raise ValueError("Cannot sort by an empty object") - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) + if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) + def u_of_closest_center(obj) -> float: + """u-value of closest point between object center and sort_by""" + assert not isinstance(sort_by, SortBy) + pnt1, _pnt2 = sort_by.closest_points(obj.center()) + return sort_by.param_at_point(pnt1) + + # pylint: disable=unnecessary-lambda + objects = sorted( + self, key=lambda o: u_of_closest_center(o), reverse=reverse + ) elif isinstance(sort_by, SortBy): if sort_by == SortBy.LENGTH: diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index a34f2f2..558e7a3 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -1,15 +1,18 @@ # system modules import copy import io +from io import StringIO import itertools import json import math import os import platform +import pprint import random import re from typing import Optional import unittest +from unittest.mock import patch, MagicMock from random import uniform from IPython.lib import pretty @@ -30,6 +33,10 @@ from OCP.gp import ( gp_XYZ, ) from OCP.GProp import GProp_GProps +from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain # Correct import + +from vtkmodules.vtkCommonDataModel import vtkPolyData +from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter from build123d.build_common import GridLocations, Locations, PolarLocations from build123d.build_enums import ( @@ -57,6 +64,7 @@ from build123d.objects_part import Box, Cylinder from build123d.objects_curve import CenterArc, EllipticalCenterArc, JernArc, Polyline from build123d.build_sketch import BuildSketch from build123d.build_line import BuildLine +from build123d.jupyter_tools import to_vtkpoly_string from build123d.objects_curve import Spline from build123d.objects_sketch import Circle, Rectangle, RegularPolygon from build123d.geometry import ( @@ -79,9 +87,11 @@ from build123d.topology import ( Compound, Edge, Face, + GroupBy, Shape, ShapeList, Shell, + SkipClean, Solid, Sketch, Vertex, @@ -680,6 +690,41 @@ class TestCadObjects(DirectApiTestCase): self.assertAlmostEqual(many_rad.radius, 1.0) +# TODO: Enable after the split of topology.py +# class TestCleanMethod(unittest.TestCase): +# def setUp(self): +# # Create a mock object +# self.solid = Solid() +# self.solid.wrapped = MagicMock() # Simulate a valid `wrapped` object + +# @patch("build123d.topology.shape_core.ShapeUpgrade_UnifySameDomain") +# def test_clean_warning_on_exception(self, mock_shape_upgrade): +# # Mock the upgrader +# mock_upgrader = mock_shape_upgrade.return_value +# mock_upgrader.Build.side_effect = Exception("Mocked Build failure") + +# # Capture warnings +# with self.assertWarns(Warning) as warn_context: +# self.solid.clean() + +# # Assert the warning message +# self.assertIn("Unable to clean", str(warn_context.warning)) + +# # Verify the upgrader was constructed with the correct arguments +# mock_shape_upgrade.assert_called_once_with(self.solid.wrapped, True, True, True) + +# # Verify the Build method was called +# mock_upgrader.Build.assert_called_once() + +# def test_clean_with_none_wrapped(self): +# # Set `wrapped` to None to simulate the error condition +# self.solid.wrapped = None + +# # Call clean and ensure it returns self +# result = self.solid.clean() +# self.assertIs(result, self.solid) # Ensure it returns the same object + + class TestColor(DirectApiTestCase): def test_name1(self): c = Color("blue") @@ -1604,6 +1649,38 @@ class TestFunctions(unittest.TestCase): self.assertTrue(isinstance(result, Compound)) +class TestGroupBy(unittest.TestCase): + + def setUp(self): + # Ensure the class variable is in its default state before each test + self.v = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) + + def test_str(self): + self.assertEqual( + str(self.v), + f"""[[Vertex(0.0, 0.0, 0.0), + Vertex(0.0, 1.0, 0.0), + Vertex(1.0, 0.0, 0.0), + Vertex(1.0, 1.0, 0.0)], + [Vertex(0.0, 0.0, 1.0), + Vertex(0.0, 1.0, 1.0), + Vertex(1.0, 0.0, 1.0), + Vertex(1.0, 1.0, 1.0)]]""", + ) + + def test_repr(self): + self.assertEqual( + repr(self.v), + "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", + ) + + def test_pp(self): + self.assertEqual( + pprint.pformat(self.v), + "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", + ) + + class TestImportExport(DirectApiTestCase): def test_import_export(self): original_box = Solid.make_box(1, 1, 1) @@ -1632,18 +1709,24 @@ class TestImportExport(DirectApiTestCase): self.assertVectorAlmostEquals(stl_box.position, (0, 0, 0), 5) -# class TestJupyter(DirectApiTestCase): -# def test_repr_javascript(self): -# shape = Solid.make_box(1, 1, 1) +class TestJupyter(DirectApiTestCase): + def test_repr_javascript(self): + shape = Solid.make_box(1, 1, 1) -# # Test no exception on rendering to js -# js1 = shape._repr_javascript_() + # Test no exception on rendering to js + js1 = shape._repr_javascript_() -# assert "function render" in js1 + assert "function render" in js1 -# def test_display_error(self): -# with self.assertRaises(AttributeError): -# display(Vector()) + def test_display_error(self): + with self.assertRaises(AttributeError): + display(Vector()) + + with self.assertRaises(ValueError): + to_vtkpoly_string("invalid") + + with self.assertRaises(ValueError): + display("invalid") class TestLocation(DirectApiTestCase): @@ -1943,6 +2026,8 @@ class TestLocation(DirectApiTestCase): i = e3.intersect(e4, e5) self.assertIsNone(i) + self.assertIsNone(b.intersect(b.moved(Pos(X=10)))) + class TestMatrix(DirectApiTestCase): def test_matrix_creation_and_access(self): @@ -3127,6 +3212,8 @@ class TestShape(DirectApiTestCase): square_projected.outer_wire(), Keep.OUTSIDE ) self.assertTrue(isinstance(outside2, Shell)) + inside2 = target2.split_by_perimeter(square_projected.outer_wire(), Keep.INSIDE) + self.assertTrue(isinstance(inside2, Face)) # Test 4 - invalid inputs with self.assertRaises(ValueError): @@ -3249,6 +3336,10 @@ class TestShape(DirectApiTestCase): positive_half, negative_half = [s.clean() for s in sphere.cut(divider).solids()] self.assertGreater(abs(positive_half.volume - negative_half.volume), 0, 1) + def test_clean_empty(self): + obj = Solid() + self.assertIs(obj, obj.clean()) + def test_relocate(self): box = Solid.make_box(10, 10, 10).move(Location((20, -5, -5))) cylinder = Solid.make_cylinder(2, 50).move(Location((0, 0, 0), (0, 90, 0))) @@ -3415,6 +3506,107 @@ class TestShape(DirectApiTestCase): self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.children, box.children))) self.assertEqual(blank.topo_parent, box2) + def test_empty_shape(self): + empty = Solid() + box = Solid.make_box(1, 1, 1) + self.assertIsNone(empty.location) + self.assertIsNone(empty.position) + self.assertIsNone(empty.orientation) + self.assertFalse(empty.is_manifold) + with self.assertRaises(ValueError): + empty.geom_type + self.assertIs(empty, empty.fix()) + self.assertEqual(empty.hash_code(), 0) + self.assertFalse(empty.is_same(Solid())) + self.assertFalse(empty.is_equal(Solid())) + self.assertTrue(empty.is_valid()) + empty_bbox = empty.bounding_box() + self.assertEqual(tuple(empty_bbox.size), (0, 0, 0)) + self.assertIs(empty, empty.mirror(Plane.XY)) + self.assertEqual(Shape.compute_mass(empty), 0) + self.assertEqual(empty.entities("Face"), []) + self.assertEqual(empty.area, 0) + self.assertIs(empty, empty.rotate(Axis.Z, 90)) + translate_matrix = [ + [1.0, 0.0, 0.0, 1.0], + [0.0, 1.0, 0.0, 2.0], + [0.0, 0.0, 1.0, 3.0], + [0.0, 0.0, 0.0, 1.0], + ] + self.assertIs(empty, empty.transform_shape(Matrix(translate_matrix))) + self.assertIs(empty, empty.transform_geometry(Matrix(translate_matrix))) + with self.assertRaises(ValueError): + empty.locate(Location()) + empty_loc = Location() + empty_loc.wrapped = None + with self.assertRaises(ValueError): + box.locate(empty_loc) + with self.assertRaises(ValueError): + empty.located(Location()) + with self.assertRaises(ValueError): + box.located(empty_loc) + with self.assertRaises(ValueError): + empty.move(Location()) + with self.assertRaises(ValueError): + box.move(empty_loc) + with self.assertRaises(ValueError): + empty.moved(Location()) + with self.assertRaises(ValueError): + box.moved(empty_loc) + with self.assertRaises(ValueError): + empty.relocate(Location()) + with self.assertRaises(ValueError): + box.relocate(empty_loc) + with self.assertRaises(ValueError): + empty.distance_to(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + empty.distance_to_with_closest_points(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + empty.distance_to(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + box.intersect(empty_loc) + self.assertEqual(empty._ocp_section(Vertex(1, 1, 1)), ([], [])) + self.assertEqual(empty.faces_intersected_by_axis(Axis.Z), ShapeList()) + with self.assertRaises(ValueError): + empty.split_by_perimeter(Circle(1).wire()) + with self.assertRaises(ValueError): + empty.distance(Vertex(1, 1, 1)) + with self.assertRaises(ValueError): + list(empty.distances(Vertex(0, 0, 0), Vertex(1, 1, 1))) + with self.assertRaises(ValueError): + list(box.distances(empty, Vertex(1, 1, 1))) + with self.assertRaises(ValueError): + empty.mesh(0.001) + with self.assertRaises(ValueError): + empty.tessellate(0.001) + with self.assertRaises(ValueError): + empty.to_splines() + empty_axis = Axis((0, 0, 0), (1, 0, 0)) + empty_axis.wrapped = None + with self.assertRaises(ValueError): + box.vertices().group_by(empty_axis) + empty_wire = Wire() + with self.assertRaises(ValueError): + box.vertices().group_by(empty_wire) + with self.assertRaises(ValueError): + box.vertices().sort_by(empty_axis) + with self.assertRaises(ValueError): + box.vertices().sort_by(empty_wire) + + def test_empty_selectors(self): + self.assertEqual(Vertex(1, 1, 1).edges(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).wires(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).faces(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).shells(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).solids(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).compounds(), ShapeList()) + self.assertIsNone(Vertex(1, 1, 1).edge()) + self.assertIsNone(Vertex(1, 1, 1).wire()) + self.assertIsNone(Vertex(1, 1, 1).face()) + self.assertIsNone(Vertex(1, 1, 1).shell()) + self.assertIsNone(Vertex(1, 1, 1).solid()) + self.assertIsNone(Vertex(1, 1, 1).compound()) + class TestShapeList(DirectApiTestCase): """Test ShapeList functionality""" @@ -3717,6 +3909,12 @@ class TestShapeList(DirectApiTestCase): self.assertNotEqual(sl, diff) self.assertNotEqual(sl, object()) + def test_center(self): + self.assertEqual(tuple(ShapeList().center()), (0, 0, 0)) + self.assertEqual( + tuple(ShapeList(Vertex(i, 0, 0) for i in range(3)).center()), (1, 0, 0) + ) + class TestShells(DirectApiTestCase): def test_shell_init(self): @@ -3966,6 +4164,39 @@ class TestSolid(DirectApiTestCase): Solid(foo="bar") +class TestSkipClean(unittest.TestCase): + def setUp(self): + # Ensure the class variable is in its default state before each test + SkipClean.clean = True + + def test_context_manager_sets_clean_false(self): + # Verify `clean` is initially True + self.assertTrue(SkipClean.clean) + + # Use the context manager + with SkipClean(): + # Within the context, `clean` should be False + self.assertFalse(SkipClean.clean) + + # After exiting the context, `clean` should revert to True + self.assertTrue(SkipClean.clean) + + def test_exception_handling_does_not_affect_clean(self): + # Verify `clean` is initially True + self.assertTrue(SkipClean.clean) + + # Use the context manager and raise an exception + try: + with SkipClean(): + self.assertFalse(SkipClean.clean) + raise ValueError("Test exception") + except ValueError: + pass + + # Ensure `clean` is restored to True after an exception + self.assertTrue(SkipClean.clean) + + class TestVector(DirectApiTestCase): """Test the Vector methods""" @@ -4206,6 +4437,9 @@ class TestVector(DirectApiTestCase): (v1 & Solid.make_box(2, 4, 5)).vertex(), (1, 2, 3), 5 ) self.assertIsNone(v1.intersect(Solid.make_box(0.5, 0.5, 0.5))) + self.assertIsNone( + Vertex(-10, -10, -10).intersect(Solid.make_box(0.5, 0.5, 0.5)) + ) class TestVectorLike(DirectApiTestCase): @@ -4299,6 +4533,56 @@ class TestVertex(DirectApiTestCase): Vertex(1, 2, 3) & Vertex(5, 6, 7) +class TestVTKPolyData(unittest.TestCase): + def setUp(self): + # Create a simple test object (e.g., a cylinder) + self.object_under_test = Solid.make_cylinder(1, 2) + + def test_to_vtk_poly_data(self): + # Generate VTK data + vtk_data = self.object_under_test.to_vtk_poly_data( + tolerance=0.1, angular_tolerance=0.2, normals=True + ) + + # Verify the result is of type vtkPolyData + self.assertIsInstance(vtk_data, vtkPolyData) + + # Further verification can include: + # - Checking the number of points, polygons, or cells + self.assertGreater( + vtk_data.GetNumberOfPoints(), 0, "VTK data should have points." + ) + self.assertGreater( + vtk_data.GetNumberOfCells(), 0, "VTK data should have cells." + ) + + # Optionally, compare the output with a known reference object + # (if available) by exporting or analyzing the VTK data + known_filter = vtkTriangleFilter() + known_filter.SetInputData(vtk_data) + known_filter.Update() + known_output = known_filter.GetOutput() + + self.assertEqual( + vtk_data.GetNumberOfPoints(), + known_output.GetNumberOfPoints(), + "Number of points in VTK data does not match the expected output.", + ) + self.assertEqual( + vtk_data.GetNumberOfCells(), + known_output.GetNumberOfCells(), + "Number of cells in VTK data does not match the expected output.", + ) + + def test_empty_shape(self): + # Test handling of empty shape + empty_object = Solid() # Create an empty object + with self.assertRaises(ValueError) as context: + empty_object.to_vtk_poly_data() + + self.assertEqual(str(context.exception), "Cannot convert an empty shape") + + class TestWire(DirectApiTestCase): def test_ellipse_arc(self): full_ellipse = Wire.make_ellipse(2, 1) From 1611ca81859b88ded0889f615bb4bdfb056de4e7 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 1 Jan 2025 13:16:39 -0500 Subject: [PATCH 057/518] Improving test coverage of three_d.py to 97% --- src/build123d/topology.py | 45 ++++++++++++------------ tests/test_direct_api.py | 72 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 23 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 7015a8c..847f194 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -331,6 +331,8 @@ def topods_dim(topods: TopoDS_Shape) -> int | None: sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} return sub_dims.pop() if len(sub_dims) == 1 else None + return None + HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode @@ -2143,7 +2145,7 @@ class Shape(NodeMixin, Generic[TOPODS]): params, ) - return self.__class__(result) + return self.__class__.cast(result) def to_vtk_poly_data( self, @@ -4148,11 +4150,8 @@ class Mixin3D(Shape): if center_of == CenterOf.MASS: properties = GProp_GProps() calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError + calc_function(self.wrapped, properties) + middle = Vector(properties.CentreOfMass()) elif center_of == CenterOf.BOUNDING_BOX: middle = self.bounding_box().center() return middle @@ -4207,10 +4206,10 @@ class Mixin3D(Shape): shell_builder.Build() if faces: - return_value = self.__class__(shell_builder.Shape()) + return_value = self.__class__.cast(shell_builder.Shape()) else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__(shell_builder.Shape()).shells()[0].wrapped + shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped shell2 = self.shells()[0].wrapped # s1 can be outer or inner shell depending on the thickness sign @@ -4220,7 +4219,7 @@ class Mixin3D(Shape): sol = BRepBuilderAPI_MakeSolid(shell2, shell1) # fix needed for the orientations - return_value = self.__class__(sol.Shape()).fix() + return_value = self.__class__.cast(sol.Shape()).fix() return return_value @@ -4281,7 +4280,7 @@ class Mixin3D(Shape): "offset Error, an alternative kind may resolve this error" ) from err - offset_solid = self.__class__(offset_occt_solid) + offset_solid = self.__class__.cast(offset_occt_solid) assert offset_solid.wrapped is not None # The Solid can be inverted, if so reverse @@ -6738,7 +6737,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): fillet_builder.Build() - return self.__class__(fillet_builder.Shape()) + return self.__class__.cast(fillet_builder.Shape()) def chamfer_2d( self, @@ -6794,7 +6793,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) chamfer_builder.Build() - return self.__class__(chamfer_builder.Shape()).fix() + return self.__class__.cast(chamfer_builder.Shape()).fix() def is_coplanar(self, plane: Plane) -> bool: """Is this planar face coplanar with the provided plane""" @@ -6943,7 +6942,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): if self.wrapped is None: raise ValueError("Cannot approximate an empty shape") - return self.__class__(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) + return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) class Shell(Mixin2D, Shape[TopoDS_Shell]): @@ -7693,18 +7692,18 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): cls, builder: BRepOffsetAPI_MakePipeShell, path: Union[Wire, Edge], - mode: Union[Vector, Wire, Edge], + binormal: Union[Vector, Wire, Edge], ) -> bool: rotate = False - if isinstance(mode, Vector): + if isinstance(binormal, Vector): coordinate_system = gp_Ax2() coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(mode.to_dir()) + coordinate_system.SetDirection(binormal.to_dir()) builder.SetMode(coordinate_system) rotate = True - elif isinstance(mode, (Wire, Edge)): - builder.SetMode(mode.to_wire().wrapped, True) + elif isinstance(binormal, (Wire, Edge)): + builder.SetMode(binormal.to_wire().wrapped, True) return rotate @@ -7782,7 +7781,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): path: Union[Wire, Edge], make_solid: bool = True, is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, + binormal: Union[Vector, Wire, Edge, None] = None, ) -> Solid: """Multi section sweep @@ -7793,7 +7792,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over make_solid (bool, optional): Solid or Shell. Defaults to True. is_frenet (bool, optional): Select frenet mode. Defaults to False. - mode (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. + binormal (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. Defaults to None. Returns: @@ -7806,8 +7805,8 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): translate = False rotate = False - if mode: - rotate = cls._set_sweep_mode(builder, path, mode) + if binormal: + rotate = cls._set_sweep_mode(builder, path, binormal) else: builder.SetMode(is_frenet) @@ -8641,7 +8640,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): wire_builder.Add(TopoDS.Wire_s(other.wrapped)) wire_builder.Build() - return self.__class__(wire_builder.Wire()) + return self.__class__.cast(wire_builder.Wire()) def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: """fillet_2d diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 558e7a3..bc17a35 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -2497,9 +2497,38 @@ class TestMixin3D(DirectApiTestCase): face = box.faces().sort_by(Axis.Z)[0] self.assertRaises(ValueError, box.chamfer, 0.1, None, edge, face=face) + @patch.object(Shape, "is_valid", return_value=False) + def test_chamfer_invalid_shape_raises_error(self, mock_is_valid): + box = Solid.make_box(1, 1, 1) + + # Assert that ValueError is raised + with self.assertRaises(ValueError) as chamfer_context: + max = box.chamfer(0.1, None, box.edges()) + + # Check the error message + self.assertEqual( + str(chamfer_context.exception), + "Failed creating a chamfer, try a smaller length value(s)", + ) + + # Verify is_valid was called + mock_is_valid.assert_called_once() + def test_hollow(self): shell_box = Solid.make_box(1, 1, 1).hollow([], thickness=-0.1) self.assertAlmostEqual(shell_box.volume, 1 - 0.8**3, 5) + + shell_box = Solid.make_box(1, 1, 1) + shell_box = shell_box.hollow( + shell_box.faces().filter_by(Axis.Z), thickness=0.1, kind=Kind.INTERSECTION + ) + self.assertAlmostEqual(shell_box.volume, 1 * 1.2**2 - 1**3, 5) + + shell_box = Solid.make_box(1, 1, 1).hollow( + [], thickness=0.1, kind=Kind.INTERSECTION + ) + self.assertAlmostEqual(shell_box.volume, 1.2**3 - 1**3, 5) + with self.assertRaises(ValueError): Solid.make_box(1, 1, 1).hollow([], thickness=0.1, kind=Kind.TANGENT) @@ -3252,6 +3281,20 @@ class TestShape(DirectApiTestCase): # invalid_object = box.fillet(0.75, box.edges()) # invalid_object.max_fillet(invalid_object.edges()) + @patch.object(Shape, "is_valid", return_value=False) + def test_max_fillet_invalid_shape_raises_error(self, mock_is_valid): + box = Solid.make_box(1, 1, 1) + + # Assert that ValueError is raised + with self.assertRaises(ValueError) as max_fillet_context: + max = box.max_fillet(box.edges()) + + # Check the error message + self.assertEqual(str(max_fillet_context.exception), "Invalid Shape") + + # Verify is_valid was called + mock_is_valid.assert_called_once() + def test_locate_bb(self): bounding_box = Solid.make_cone(1, 2, 1).bounding_box() relocated_bounding_box = Plane.XZ.from_local_coords(bounding_box) @@ -4146,6 +4189,11 @@ class TestSolid(DirectApiTestCase): extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.LAST) self.assertAlmostEqual(extrusion.volume, 4, 5) + square = Face.make_rect(1, 1) + box = Solid.make_box(4, 4, 1, Plane((-2, -2, -3))) + extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.PREVIOUS) + self.assertAlmostEqual(extrusion.volume, 2, 5) + def test_sweep(self): path = Edge.make_spline([(0, 0), (3, 5), (7, -2)]) section = Wire.make_circle(1, Plane(path @ 0, z_dir=path % 0)) @@ -4159,10 +4207,34 @@ class TestSolid(DirectApiTestCase): swept = Solid.sweep(section, path) self.assertAlmostEqual(swept.volume, 5 * (1 - 0.1**2), 5) + def test_sweep_multi(self): + f0 = Face.make_rect(1, 1) + f1 = Pos(X=10) * Circle(1).face() + path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (0, 0, -1))) + binormal = Edge.make_line((0, 1), (10, 1)) + swept = Solid.sweep_multi([f0, f1], path, is_frenet=True, binormal=binormal) + self.assertAlmostEqual(swept.volume, 23.78, 2) + + path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (1, 0, 0))) + swept = Solid.sweep_multi( + [f0, f1], path, is_frenet=True, binormal=Vector(5, 0, 1) + ) + self.assertAlmostEqual(swept.volume, 20.75, 2) + def test_constructor(self): with self.assertRaises(TypeError): Solid(foo="bar") + def test_offset_3d(self): + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).offset_3d(None, 0.1, kind=Kind.TANGENT) + + def test_revolve(self): + r = Solid.revolve( + Face.make_rect(1, 1, Plane((10, 0, 0))).wire(), 180, axis=Axis.Y + ) + self.assertEqual(len(r.faces()), 6) + class TestSkipClean(unittest.TestCase): def setUp(self): From 5571e9e2b873a156c3c3e136ab95eb6d7934312a Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 1 Jan 2025 13:38:33 -0500 Subject: [PATCH 058/518] Removing deprecated methods from docs --- docs/direct_api_reference.rst | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docs/direct_api_reference.rst b/docs/direct_api_reference.rst index 7243789..b54c86f 100644 --- a/docs/direct_api_reference.rst +++ b/docs/direct_api_reference.rst @@ -84,18 +84,6 @@ Import/Export ************* Methods and functions specific to exporting and importing build123d objects are defined below. -.. py:module:: topology - :noindex: - -.. automethod:: Shape.export_brep - :noindex: -.. automethod:: Shape.export_stl - :noindex: -.. automethod:: Shape.export_step - :noindex: -.. automethod:: Shape.export_stl - :noindex: - .. py:module:: importers :noindex: From de1edda231a8181c99a2eb5b528cf653cb9cd392 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 1 Jan 2025 15:27:11 -0500 Subject: [PATCH 059/518] Addressed last of review comments --- src/build123d/topology.py | 128 +++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 847f194..9a94a52 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -591,12 +591,10 @@ class Shape(NodeMixin, Generic[TOPODS]): return False else: shape_stack = get_top_level_topods_shapes(self.wrapped) - results = [] while shape_stack: shape = shape_stack.pop(0) - result = True # Create an empty indexed data map to store the edges and their corresponding faces. shape_map = TopTools_IndexedDataMapOfShapeListOfShape() @@ -631,11 +629,9 @@ class Shape(NodeMixin, Generic[TOPODS]): # it means the edge is not shared by exactly two faces, indicating that the # shape is not manifold. if shape_map.FindFromIndex(i + 1).Extent() != 2: - result = False - break - results.append(result) + return False - return all(results) + return True class _DisplayNode(NodeMixin): """Used to create anytree structures from TopoDS_Shapes""" @@ -785,15 +781,19 @@ class Shape(NodeMixin, Generic[TOPODS]): result = Shape._show_tree(tree[0], show_center) return result - def __add__(self, other: Shape | Iterable[Shape]) -> Self | ShapeList[Self]: + def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: """fuse shape to self operator +""" # Convert `other` to list of base objects and filter out None values - summands = [ - shape - for o in (other if isinstance(other, (list, tuple)) else [other]) - if o is not None - for shape in o.get_top_level_shapes() - ] + if other is None: + summands = [] + else: + summands = [ + shape + # for o in (other if isinstance(other, (list, tuple)) else [other]) + for o in ([other] if isinstance(other, Shape) else other) + if o is not None + for shape in o.get_top_level_shapes() + ] # If there is nothing to add return the original object if not summands: return self @@ -819,30 +819,36 @@ class Shape(NodeMixin, Generic[TOPODS]): return sum_shape - def __sub__(self, other: Union[Shape, Iterable[Shape]]) -> Self | ShapeList[Self]: + def __sub__( + self, other: Union[None, Shape, Iterable[Shape]] + ) -> Self | ShapeList[Self]: """cut shape from self operator -""" if self.wrapped is None: raise ValueError("Cannot subtract shape from empty compound") # Convert `other` to list of base objects and filter out None values - subtrahends = [ - shape - for o in (other if isinstance(other, (list, tuple)) else [other]) - if o is not None - for shape in o.get_top_level_shapes() - ] + if other is None: + subtrahends = [] + else: + subtrahends = [ + shape + # for o in (other if isinstance(other, (list, tuple)) else [other]) + for o in ([other] if isinstance(other, Shape) else other) + if o is not None + for shape in o.get_top_level_shapes() + ] # If there is nothing to subtract return the original object if not subtrahends: return self # Check that all dimensions are the same minuend_dim = self._dim - if minuend_dim is None: + if minuend_dim is None or any(s._dim is None for s in subtrahends): raise ValueError("Dimensions of objects to subtract from are inconsistent") # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends] + subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] if any(d < minuend_dim for d in subtrahend_dims): raise ValueError( f"Only shapes with equal or greater dimension can be subtracted: " @@ -2926,16 +2932,22 @@ class GroupBy(Generic[T, K]): class Mixin1D(Shape): """Methods to add to the Edge and Wire classes""" - def __add__(self, other: Shape | Iterable[Shape]) -> Edge | Wire | ShapeList[Edge]: + def __add__( + self, other: None | Shape | Iterable[Shape] + ) -> Edge | Wire | ShapeList[Edge]: """fuse shape to wire/edge operator +""" # Convert `other` to list of base topods objects and filter out None values - summands = [ - shape - for o in (other if isinstance(other, (list, tuple)) else [other]) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] + if other is None: + summands = [] + else: + summands = [ + shape + # for o in (other if isinstance(other, (list, tuple)) else [other]) + for o in ([other] if isinstance(other, Shape) else other) + if o is not None + for shape in get_top_level_topods_shapes(o.wrapped) + ] # If there is nothing to add return the original object if not summands: return self @@ -4547,7 +4559,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): # else: # logger.debug("Adding no children to %s", self.label) - def __add__(self, other: Shape | Iterable[Shape]) -> Compound: + def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: """Combine other to self `+` operator Note that if all of the objects are connected Edges/Wires the result @@ -4558,12 +4570,16 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) return curve + other - summands = ShapeList( - shape - for o in (other if isinstance(other, (list, tuple)) else [other]) - if o is not None - for shape in o.get_top_level_shapes() - ) + summands: ShapeList[Shape] + if other is None: + summands = ShapeList() + else: + summands = ShapeList( + shape + for o in ([other] if isinstance(other, Shape) else other) + if o is not None + for shape in o.get_top_level_shapes() + ) # If there is nothing to add return the original object if not summands: return self @@ -4591,7 +4607,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): return result - def __sub__(self, other: Shape | Iterable[Shape]) -> Compound: + def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: """Cut other to self `-` operator""" difference = Shape.__sub__(self, other) difference = Compound( @@ -6773,15 +6789,11 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) for v in vertices: - edges = vertex_edge_map.FindFromKey(v.wrapped) + edge_list = vertex_edge_map.FindFromKey(v.wrapped) # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs # Using First() and Last() to omit - edges = [edges.First(), edges.Last()] - - # Need to wrap in b3d objects for comparison to work - # ref.wrapped != edge.wrapped but ref == edge - edges = [Mixin2D.cast(e) for e in edges] + edges = (Edge(edge_list.First()), Edge(edge_list.Last())) edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) @@ -8698,15 +8710,11 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): ) for v in vertices: - edges = vertex_edge_map.FindFromKey(v.wrapped) + edge_list = vertex_edge_map.FindFromKey(v.wrapped) # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs # Using First() and Last() to omit - edges = [edges.First(), edges.Last()] - - # Need to wrap in b3d objects for comparison to work - # ref.wrapped != edge.wrapped but ref == edge - edges = [Edge(e) for e in edges] + edges = (Edge(edge_list.First()), Edge(edge_list.Last())) edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) @@ -8727,16 +8735,20 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return Wire(BRepTools.OuterWire_s(chamfered_face)) @staticmethod - def order_chamfer_edges(reference_edge, edges) -> tuple[Edge, Edge]: + def order_chamfer_edges( + reference_edge: Optional[Edge], edges: tuple[Edge, Edge] + ) -> tuple[Edge, Edge]: """Order the edges of a chamfer relative to a reference Edge""" if reference_edge: - if reference_edge not in edges: - raise ValueError("One or more vertices are not part of edge") - edge1 = reference_edge - edge2 = [x for x in edges if x != reference_edge][0] - else: edge1, edge2 = edges - return edge1, edge2 + if edge1 == reference_edge: + return edge1, edge2 + elif edge2 == reference_edge: + return edge2, edge1 + else: + raise ValueError("reference edge not in edges") + else: + return edges @classmethod def make_rect( @@ -9394,7 +9406,9 @@ def unwrap_topods_compound( return compound -def get_top_level_topods_shapes(topods_shape: TopoDS_Shape) -> list[TopoDS_Shape]: +def get_top_level_topods_shapes( + topods_shape: TopoDS_Shape | None, +) -> list[TopoDS_Shape]: """ Retrieve the first level of child shapes from the shape. From 835433d1d841361419e7a7245cc1aa4557b6f070 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 1 Jan 2025 18:34:42 -0500 Subject: [PATCH 060/518] Improving pylint --- src/build123d/topology.py | 47 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 9a94a52..1f91371 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -167,11 +167,11 @@ from OCP.Geom import ( Geom_Line, ) from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf, GeomAPI_IntCS from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType from OCP.GeomAPI import ( + GeomAPI_IntCS, GeomAPI_Interpolate, GeomAPI_PointsToBSpline, GeomAPI_PointsToBSplineSurface, @@ -589,8 +589,7 @@ class Shape(NodeMixin, Generic[TOPODS]): # Extract one or more (if a Compound) shape from self if self.wrapped is None: return False - else: - shape_stack = get_top_level_topods_shapes(self.wrapped) + shape_stack = get_top_level_topods_shapes(self.wrapped) while shape_stack: shape = shape_stack.pop(0) @@ -890,9 +889,11 @@ class Shape(NodeMixin, Generic[TOPODS]): ) return [loc * self for loc in other] - @abstractmethod - def center(self, *args, **kwargs) -> Vector: - """All of the derived classes from Shape need a center method""" + # Actually creating the abstract method causes the subclass to pass center_of + # even when not required - possibly this could be improved. + # @abstractmethod + # def center(self, center_of: CenterOf) -> Vector: + # """Compute the center with a specific type of calculation.""" def clean(self) -> Self: """clean @@ -1768,7 +1769,7 @@ class Shape(NodeMixin, Generic[TOPODS]): shape_intersections = self._bool_op((self,), objs, intersect_op) if isinstance(shape_intersections, ShapeList) and not shape_intersections: return None - elif ( + if ( not isinstance(shape_intersections, ShapeList) and shape_intersections.is_null() ): @@ -2929,7 +2930,7 @@ class GroupBy(Generic[T, K]): return self.group(self.key_f(shape)) -class Mixin1D(Shape): +class Mixin1D(Shape, ABC): """Methods to add to the Edge and Wire classes""" def __add__( @@ -3818,7 +3819,7 @@ class Mixin1D(Shape): return (visible_edges, hidden_edges) -class Mixin2D(Shape): +class Mixin2D(Shape, ABC): """Additional methods to add to Face and Shell class""" project_to_viewport = Mixin1D.project_to_viewport @@ -3924,7 +3925,7 @@ class Mixin2D(Shape): return result -class Mixin3D(Shape): +class Mixin3D(Shape, ABC): """Additional methods to add to 3D Shape classes""" project_to_viewport = Mixin1D.project_to_viewport @@ -5310,7 +5311,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): # Find edge intersections if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if edge_plane.z_dir == plane.z_dir or -edge_plane.z_dir == plane.z_dir: + if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): edges_common_to_planes.append(edge) edges.extend(edges_common_to_planes) @@ -6286,7 +6287,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) return Location(pln) - def center(self, center_of=CenterOf.GEOMETRY) -> Vector: + def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: """Center of Face Return the center based on center_of @@ -7992,7 +7993,7 @@ class Vertex(Shape[TopoDS_Vertex]): geom_point = BRep_Tool.Pnt_s(self.wrapped) return (geom_point.X(), geom_point.Y(), geom_point.Z()) - def center(self, *args, **kwargs) -> Vector: + def center(self) -> Vector: """The center of a vertex is itself!""" return Vector(self) @@ -8457,13 +8458,13 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): edges_uv_values.append((u, v, edge)) - new_edges = [] + trimmed_edges = [] for u, v, edge in edges_uv_values: if v < start or u > end: # Edge not needed continue if start <= u and v <= end: # keep whole Edge - new_edges.append(edge) + trimmed_edges.append(edge) elif start >= u and end <= v: # Wire trimmed to single Edge u_edge = edge.param_at_point(self.position_at(start)) @@ -8471,19 +8472,19 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): u_edge, v_edge = ( (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) ) - new_edges.append(edge.trim(u_edge, v_edge)) + trimmed_edges.append(edge.trim(u_edge, v_edge)) elif start <= u: # keep start of Edge u_edge = edge.param_at_point(self.position_at(end)) if u_edge != 0: - new_edges.append(edge.trim(0, u_edge)) + trimmed_edges.append(edge.trim(0, u_edge)) else: # v <= end keep end of Edge v_edge = edge.param_at_point(self.position_at(start)) if v_edge != 1: - new_edges.append(edge.trim(v_edge, 1)) + trimmed_edges.append(edge.trim(v_edge, 1)) - return Wire(new_edges) + return Wire(trimmed_edges) def order_edges(self) -> ShapeList[Edge]: """Return the edges in self ordered by wire direction and orientation""" @@ -8743,12 +8744,10 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): edge1, edge2 = edges if edge1 == reference_edge: return edge1, edge2 - elif edge2 == reference_edge: + if edge2 == reference_edge: return edge2, edge1 - else: - raise ValueError("reference edge not in edges") - else: - return edges + raise ValueError("reference edge not in edges") + return edges @classmethod def make_rect( From 19ec9dd4882c978854e01fb0eea78108af52c61b Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 2 Jan 2025 11:45:37 -0500 Subject: [PATCH 061/518] Fixed Method Resolution Order (MRO) conflict in Mixin*D --- src/build123d/topology.py | 62 ++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/src/build123d/topology.py b/src/build123d/topology.py index 1f91371..5986e08 100644 --- a/src/build123d/topology.py +++ b/src/build123d/topology.py @@ -2930,9 +2930,21 @@ class GroupBy(Generic[T, K]): return self.group(self.key_f(shape)) -class Mixin1D(Shape, ABC): +class Mixin1D(Shape): """Methods to add to the Edge and Wire classes""" + @classmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """Unused - only here because Mixin1D is a subclass of Shape""" + return NotImplemented + + @property + def _dim(self) -> int: + """Dimension of Edges and Wires""" + return 1 + def __add__( self, other: None | Shape | Iterable[Shape] ) -> Edge | Wire | ShapeList[Edge]: @@ -3819,9 +3831,21 @@ class Mixin1D(Shape, ABC): return (visible_edges, hidden_edges) -class Mixin2D(Shape, ABC): +class Mixin2D(Shape): """Additional methods to add to Face and Shell class""" + @classmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """Unused - only here because Mixin1D is a subclass of Shape""" + return NotImplemented + + @property + def _dim(self) -> int: + """Dimension of Faces and Shells""" + return 2 + project_to_viewport = Mixin1D.project_to_viewport split = Mixin1D.split @@ -3925,9 +3949,21 @@ class Mixin2D(Shape, ABC): return result -class Mixin3D(Shape, ABC): +class Mixin3D(Shape): """Additional methods to add to 3D Shape classes""" + @classmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """Unused - only here because Mixin1D is a subclass of Shape""" + return NotImplemented + + @property + def _dim(self) -> int | None: + """Dimension of Solids""" + return 3 + project_to_viewport = Mixin1D.project_to_viewport split = Mixin1D.split find_intersection_points = Mixin2D.find_intersection_points @@ -5040,10 +5076,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): order = 1.0 - @property - def _dim(self) -> int: - return 1 - def __init__( self, obj: Optional[TopoDS_Edge | Axis | None] = None, @@ -6001,10 +6033,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): order = 2.0 - @property - def _dim(self) -> int: - return 2 - @overload def __init__( self, @@ -6969,10 +6997,6 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): order = 2.5 - @property - def _dim(self) -> int: - return 2 - def __init__( self, obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, @@ -7107,10 +7131,6 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): order = 3.0 - @property - def _dim(self) -> int: - return 3 - def __init__( self, obj: TopoDS_Solid | Shell | None = None, @@ -8126,10 +8146,6 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): order = 1.5 - @property - def _dim(self) -> int: - return 1 - @overload def __init__( self, From ca5769cd25564c50dbfe26448a39f0d087b44929 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 2 Jan 2025 12:07:50 -0600 Subject: [PATCH 062/518] action.yml -> streamline pip installs --- .github/actions/setup/action.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 9a4af02..3dba669 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -7,16 +7,12 @@ inputs: runs: using: "composite" steps: - - name: python + - name: Setup Python uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - - name: install requirements + - name: Install Requirements shell: bash run: | - pip install wheel - pip install mypy - pip install pytest - pip install pytest-cov - pip install pylint + pip install wheel mypy pytest pytest-cov pylint pip install . From e14f739781aec1928c4b90d344493e558cf2f4a6 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 2 Jan 2025 12:09:46 -0600 Subject: [PATCH 063/518] mypy.yml -> cleanup and update to actions/checkout@v4 --- .github/workflows/mypy.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index ebf3b61..9008650 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -9,16 +9,17 @@ jobs: python-version: [ "3.10", # "3.11", - "3.12" + "3.12", ] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup + - uses: actions/checkout@v4 + - name: Setup + uses: ./.github/actions/setup with: python-version: ${{ matrix.python-version }} - - name: typecheck + - name: Typecheck run: | mypy --config-file mypy.ini src/build123d From b5396639dc462aaaa175c17aded7bdd028065d6c Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 4 Jan 2025 10:49:06 -0500 Subject: [PATCH 064/518] utils.py file was getting skipped --- tools/refactor_topo.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 9bccdfd..839fe8f 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -398,6 +398,7 @@ def write_topo_class_files( "two_d": ["Mixin2D", "Face", "Shell"], "three_d": ["Mixin3D", "Solid"], "composite": ["Compound", "Curve", "Sketch", "Part"], + "utils": [], } for group_name, class_names in class_groups.items(): @@ -443,8 +444,6 @@ license: group_classes = [ extracted_classes[name] for name in class_names if name in extracted_classes ] - if not group_classes: - continue # Add imports for base classes based on layer dependencies additional_imports = [] From 93513b1449a69fcb4941185ad3b898261b179d5d Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 4 Jan 2025 15:46:21 -0500 Subject: [PATCH 065/518] Order functions, methods and properties in a class by Python's conventional order --- tools/refactor_topo.py | 209 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 3 deletions(-) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 839fe8f..8aadbb1 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -233,6 +233,188 @@ interface for efficient and extensible CAD modeling workflows. } +def sort_class_methods_by_convention(class_def: cst.ClassDef) -> cst.ClassDef: + """Sort methods and properties in a class according to Python conventions.""" + methods, properties = extract_methods_and_properties(class_def) + sorted_body = order_methods_by_convention(methods, properties) + + other_statements = [ + stmt for stmt in class_def.body.body if not isinstance(stmt, cst.FunctionDef) + ] + final_body = cst.IndentedBlock(body=other_statements + sorted_body) + return class_def.with_changes(body=final_body) + + +def extract_methods_and_properties( + class_def: cst.ClassDef, +) -> tuple[List[cst.FunctionDef], List[List[cst.FunctionDef]]]: + """ + Extract methods and properties (with setters grouped together) from a class. + + Returns: + - methods: Regular methods in the class. + - properties: List of grouped properties, where each group contains a getter + and its associated setter, if present. + """ + methods = [] + properties = {} + + for stmt in class_def.body.body: + if isinstance(stmt, cst.FunctionDef): + for decorator in stmt.decorators: + # Handle @property + if ( + isinstance(decorator.decorator, cst.Name) + and decorator.decorator.value == "property" + ): + properties[stmt.name.value] = [stmt] # Initialize with getter + # Handle @property.setter + elif ( + isinstance(decorator.decorator, cst.Attribute) + and decorator.decorator.attr.value == "setter" + ): + base_name = decorator.decorator.value.value # Extract base name + if base_name in properties: + properties[base_name].append( + stmt + ) # Add setter to the property group + else: + # Setter appears before the getter + properties[base_name] = [None, stmt] + + # Add non-property methods + if not any( + isinstance(decorator.decorator, cst.Name) + and decorator.decorator.value == "property" + or isinstance(decorator.decorator, cst.Attribute) + and decorator.decorator.attr.value == "setter" + for decorator in stmt.decorators + ): + methods.append(stmt) + + # Convert property dictionary into a sorted list of grouped properties + sorted_properties = [group for _, group in sorted(properties.items())] + + return methods, sorted_properties + + +def order_methods_by_convention( + methods: List[cst.FunctionDef], properties: List[List[cst.FunctionDef]] +) -> List[cst.BaseStatement]: + """ + Order methods and properties in a class by Python's conventional order with section headers. + + Sections: + - Constructor + - Properties (grouped by getter and setter) + - Class Methods + - Static Methods + - Public and Private Instance Methods + """ + + def method_key(method: cst.FunctionDef) -> tuple[int, str]: + name = method.name.value + decorators = { + decorator.decorator.value + for decorator in method.decorators + if isinstance(decorator.decorator, cst.Name) + } + + if name == "__init__": + return (0, name) # Constructor always comes first + elif name.startswith("__") and name.endswith("__"): + return (1, name) # Dunder methods follow + elif any( + decorator == "property" or decorator.endswith(".setter") + for decorator in decorators + ): + return (2, name) # Properties and setters follow dunder methods + elif "classmethod" in decorators: + return (3, name) # Class methods follow properties + elif "staticmethod" in decorators: + return (4, name) # Static methods follow class methods + elif not name.startswith("_"): + return (5, name) # Public instance methods + else: + return (6, name) # Private methods last + + # Flatten properties into a single sorted list + flattened_properties = [ + prop for group in properties for prop in group if prop is not None + ] + + # Separate __init__, class methods, static methods, and instance methods + init_methods = [m for m in methods if m.name.value == "__init__"] + class_methods = [ + m + for m in methods + if any(decorator.decorator.value == "classmethod" for decorator in m.decorators) + ] + static_methods = [ + m + for m in methods + if any( + decorator.decorator.value == "staticmethod" for decorator in m.decorators + ) + ] + instance_methods = [ + m + for m in methods + if m.name.value != "__init__" + and not any( + decorator.decorator.value in {"classmethod", "staticmethod"} + for decorator in m.decorators + ) + ] + + # Sort properties and each method group alphabetically + sorted_properties = sorted(flattened_properties, key=lambda prop: prop.name.value) + sorted_class_methods = sorted(class_methods, key=lambda m: m.name.value) + sorted_static_methods = sorted(static_methods, key=lambda m: m.name.value) + sorted_instance_methods = sorted(instance_methods, key=lambda m: method_key(m)) + + # Combine all sections with headers + ordered_sections: List[cst.BaseStatement] = [] + + if init_methods: + ordered_sections.append( + cst.SimpleStatementLine([cst.Expr(cst.Comment("# ---- Constructor ----"))]) + ) + ordered_sections.extend(init_methods) + + if sorted_properties: + ordered_sections.append( + cst.SimpleStatementLine([cst.Expr(cst.Comment("# ---- Properties ----"))]) + ) + ordered_sections.extend(sorted_properties) + + if sorted_class_methods: + ordered_sections.append( + cst.SimpleStatementLine( + [cst.Expr(cst.Comment("# ---- Class Methods ----"))] + ) + ) + ordered_sections.extend(sorted_class_methods) + + if sorted_static_methods: + ordered_sections.append( + cst.SimpleStatementLine( + [cst.Expr(cst.Comment("# ---- Static Methods ----"))] + ) + ) + ordered_sections.extend(sorted_static_methods) + + if sorted_instance_methods: + ordered_sections.append( + cst.SimpleStatementLine( + [cst.Expr(cst.Comment("# ---- Instance Methods ----"))] + ) + ) + ordered_sections.extend(sorted_instance_methods) + + return ordered_sections + + class ImportCollector(cst.CSTVisitor): def __init__(self): self.imports: Set[str] = set() @@ -259,6 +441,22 @@ class ClassExtractor(cst.CSTVisitor): self.extracted_classes[node.name.value] = node +class ClassMethodExtractor(cst.CSTVisitor): + def __init__(self): + self.class_methods: Dict[str, List[cst.FunctionDef]] = {} + + def visit_ClassDef(self, node: cst.ClassDef) -> None: + class_name = node.name.value + self.class_methods[class_name] = [] + + for statement in node.body.body: + if isinstance(statement, cst.FunctionDef): + self.class_methods[class_name].append(statement) + + # Sort methods alphabetically by name + self.class_methods[class_name].sort(key=lambda method: method.name.value) + + class MixinClassExtractor(cst.CSTVisitor): def __init__(self): self.extracted_classes: Dict[str, cst.ClassDef] = {} @@ -285,6 +483,9 @@ class StandaloneFunctionAndVariableCollector(cst.CSTVisitor): if self.current_scope_level == 0: self.functions.append(node) + def get_sorted_functions(self) -> List[cst.FunctionDef]: + return sorted(self.functions, key=lambda func: func.name.value) + class GlobalVariableExtractor(cst.CSTVisitor): def __init__(self): @@ -402,6 +603,7 @@ def write_topo_class_files( } for group_name, class_names in class_groups.items(): + module_docstring = f""" build123d topology @@ -442,9 +644,10 @@ license: source_tree.visit(variable_collector) group_classes = [ - extracted_classes[name] for name in class_names if name in extracted_classes + sort_class_methods_by_convention(extracted_classes[name]) + for name in class_names + if name in extracted_classes ] - # Add imports for base classes based on layer dependencies additional_imports = [] if group_name != "shape_core": @@ -535,7 +738,7 @@ license: body.append(var) body.append(cst.EmptyLine(indent=False)) - for func in function_collector.functions: + for func in function_collector.get_sorted_functions(): if func.name.value in function_source[group_name]: body.append(func) class_module = cst.Module(body=body, header=header) From 3620eef7e1ada2bc1e0761af63234e864fde01c5 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:19 -0500 Subject: [PATCH 066/518] Step 1 - shape_core.py --- src/build123d/{topology.py => topology/shape_core.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/build123d/{topology.py => topology/shape_core.py} (100%) diff --git a/src/build123d/topology.py b/src/build123d/topology/shape_core.py similarity index 100% rename from src/build123d/topology.py rename to src/build123d/topology/shape_core.py From 393310d50ef05ca4af191877c4e1b6da3a762b11 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:29 -0500 Subject: [PATCH 067/518] Step 2 - utils.py --- src/build123d/{topology.py => topology/utils.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/build123d/{topology.py => topology/utils.py} (100%) diff --git a/src/build123d/topology.py b/src/build123d/topology/utils.py similarity index 100% rename from src/build123d/topology.py rename to src/build123d/topology/utils.py From e43aa07bfe6ae27c30fa896645f85d6e3e953c8c Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:29 -0500 Subject: [PATCH 068/518] Step 1b split - shape_core.py --- src/build123d/topology/shape_core.py | 9778 ++++---------------------- 1 file changed, 1554 insertions(+), 8224 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 5986e08..44b5d5d 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -1,17 +1,34 @@ """ build123d topology -name: topology.py +name: shape_core.py by: Gumyr -date: Oct 14, 2022 +date: January 07, 2025 desc: - This python module is a CAD library based on OpenCascade containing - the base Shape class and all of its derived classes. + +This module defines the foundational classes and methods for the build123d CAD library, enabling +detailed geometric operations and 3D modeling capabilities. It provides a hierarchy of classes +representing various geometric entities like vertices, edges, wires, faces, shells, solids, and +compounds. These classes are designed to work seamlessly with the OpenCascade Python bindings, +leveraging its robust CAD kernel. + +Key Features: +- **Shape Base Class:** Implements core functionalities such as transformations (rotation, + translation, scaling), geometric queries, and boolean operations (cut, fuse, intersect). +- **Custom Utilities:** Includes helper classes like `ShapeList` for advanced filtering, sorting, + and grouping of shapes, and `GroupBy` for organizing shapes by specific criteria. +- **Type Safety:** Extensive use of Python typing features ensures clarity and correctness in type + handling. +- **Advanced Geometry:** Supports operations like finding intersections, computing bounding boxes, + projecting faces, and generating triangulated meshes. + +The module is designed for extensibility, enabling developers to build complex 3D assemblies and +perform detailed CAD operations programmatically while maintaining a clean and structured API. license: - Copyright 2022 Gumyr + Copyright 2025 Gumyr Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,22 +46,12 @@ license: from __future__ import annotations -# pylint has trouble with the OCP imports -# pylint: disable=no-name-in-module, import-error -# pylint: disable=too-many-lines -# other pylint warning to temp remove: -# too-many-arguments, too-many-locals, too-many-public-methods, -# too-many-statements, too-many-instance-attributes, too-many-branches import copy import itertools -import os -import platform -import sys import warnings from abc import ABC, abstractmethod -from itertools import combinations -from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose from typing import ( + cast as tcast, Any, Callable, Dict, @@ -53,7 +60,6 @@ from typing import ( Iterator, Optional, Protocol, - Sequence, SupportsIndex, Tuple, Type, @@ -62,29 +68,14 @@ from typing import ( overload, TYPE_CHECKING, ) -from typing import cast as tcast -from typing_extensions import Self, Literal -from anytree import NodeMixin, PreOrderIter, RenderTree + +import OCP.GeomAbs as ga +import OCP.TopAbs as ta from IPython.lib.pretty import pretty, PrettyPrinter -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter - -import OCP.GeomAbs as ga # Geometry type enum -import OCP.TopAbs as ta # Topology type enum from OCP.Aspect import Aspect_TOL_SOLID -from OCP.Bnd import Bnd_Box from OCP.BOPAlgo import BOPAlgo_GlueEnum - from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import ( - BRepAdaptor_CompCurve, - BRepAdaptor_Curve, - BRepAdaptor_Surface, -) -from OCP.BRepAlgo import BRepAlgo +from OCP.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Surface from OCP.BRepAlgoAPI import ( BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Common, @@ -95,17 +86,10 @@ from OCP.BRepAlgoAPI import ( ) from OCP.BRepBuilderAPI import ( BRepBuilderAPI_Copy, - BRepBuilderAPI_DisconnectedWire, - BRepBuilderAPI_EmptyWire, BRepBuilderAPI_GTransform, BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeFace, - BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeShell, - BRepBuilderAPI_MakeSolid, BRepBuilderAPI_MakeVertex, - BRepBuilderAPI_MakeWire, - BRepBuilderAPI_NonManifoldWire, BRepBuilderAPI_RightCorner, BRepBuilderAPI_RoundCorner, BRepBuilderAPI_Sewing, @@ -113,146 +97,35 @@ from OCP.BRepBuilderAPI import ( BRepBuilderAPI_Transformed, ) from OCP.BRepCheck import BRepCheck_Analyzer -from OCP.BRepClass3d import BRepClass3d_SolidClassifier from OCP.BRepExtrema import BRepExtrema_DistShapeShape -from OCP.BRepFeat import BRepFeat_MakeDPrism, BRepFeat_SplitShape -from OCP.BRepFill import BRepFill -from OCP.BRepFilletAPI import ( - BRepFilletAPI_MakeChamfer, - BRepFilletAPI_MakeFillet, - BRepFilletAPI_MakeFillet2d, -) -from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation +from OCP.BRepFeat import BRepFeat_SplitShape +from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter -from OCP.BRepLib import BRepLib, BRepLib_FindSurface from OCP.BRepMesh import BRepMesh_IncrementalMesh -from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import ( - BRepOffsetAPI_MakeFilling, - BRepOffsetAPI_MakeOffset, - BRepOffsetAPI_MakePipeShell, - BRepOffsetAPI_MakeThickSolid, - BRepOffsetAPI_ThruSections, -) -from OCP.BRepPrimAPI import ( - BRepPrimAPI_MakeBox, - BRepPrimAPI_MakeCone, - BRepPrimAPI_MakeCylinder, - BRepPrimAPI_MakePrism, - BRepPrimAPI_MakeRevol, - BRepPrimAPI_MakeSphere, - BRepPrimAPI_MakeTorus, - BRepPrimAPI_MakeWedge, -) -from OCP.BRepProj import BRepProj_Projection from OCP.BRepTools import BRepTools -from OCP.Font import ( - Font_FA_Bold, - Font_FA_Italic, - Font_FA_Regular, - Font_FontMgr, - Font_SystemFont, -) -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse # geometry construction -from OCP.gce import gce_MakeLin -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import ( - Geom_BezierCurve, - Geom_BezierSurface, - Geom_ConicalSurface, - Geom_CylindricalSurface, - Geom_Plane, - Geom_Surface, - Geom_TrimmedCurve, - Geom_Line, -) -from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve -from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType -from OCP.GeomAPI import ( - GeomAPI_IntCS, - GeomAPI_Interpolate, - GeomAPI_PointsToBSpline, - GeomAPI_PointsToBSplineSurface, - GeomAPI_ProjectPointOnSurf, - GeomAPI_ProjectPointOnCurve, -) -from OCP.GeomFill import ( - GeomFill_CorrectedFrenet, - GeomFill_Frenet, - GeomFill_TrihedronLaw, -) -from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, -) - -# properties used to store mass calculation result +from OCP.Bnd import Bnd_Box from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape +from OCP.Geom import Geom_Line +from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf +from OCP.GeomLib import GeomLib_IsPlanarSurface from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher from OCP.IVtkVTK import IVtkVTK_ShapeData -from OCP.LocOpe import LocOpe_DPrism -from OCP.NCollection import NCollection_Utf8String -from OCP.Precision import Precision from OCP.Prs3d import Prs3d_IsoAspect from OCP.Quantity import Quantity_Color -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds, ShapeAnalysis_Curve +from OCP.ShapeAnalysis import ShapeAnalysis_Curve from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters -from OCP.ShapeFix import ( - ShapeFix_Face, - ShapeFix_Shape, - ShapeFix_Solid, - ShapeFix_Wireframe, -) +from OCP.ShapeFix import ShapeFix_Shape from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain - -# for catching exceptions -from OCP.Standard import ( - Standard_Failure, - Standard_NoSuchObject, - Standard_ConstructionError, -) -from OCP.StdFail import StdFail_NotDone -from OCP.StdPrs import StdPrs_BRepFont -from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder - -# Array of vectors (used for B-spline interpolation): -# Array of points (used for B-spline construction): -from OCP.TColgp import ( - TColgp_Array1OfPnt, - TColgp_Array1OfVec, - TColgp_HArray1OfPnt, - TColgp_HArray2OfPnt, -) -from OCP.TCollection import TCollection_AsciiString - -# Array of floats (used for B-spline interpolation): -# Array of booleans (used for B-spline interpolation): -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, - TColStd_HArray2OfReal, -) from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer # Topology explorer +from OCP.TopExp import TopExp, TopExp_Explorer from OCP.TopLoc import TopLoc_Location +from OCP.TopTools import ( + TopTools_IndexedDataMapOfShapeListOfShape, + TopTools_ListOfShape, + TopTools_SequenceOfShape, +) from OCP.TopoDS import ( TopoDS, - TopoDS_Builder, TopoDS_Compound, TopoDS_Face, TopoDS_Iterator, @@ -263,27 +136,10 @@ from OCP.TopoDS import ( TopoDS_Edge, TopoDS_Wire, ) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) -from build123d.build_enums import ( - Align, - AngularDirection, - CenterOf, - FontStyle, - FrameMethod, - GeomType, - Keep, - Kind, - PositionMode, - Side, - SortBy, - Transition, - Until, -) +from OCP.gce import gce_MakeLin +from OCP.gp import gp_Ax1, gp_Ax2, gp_Ax3, gp_Dir, gp_Pnt, gp_Trsf, gp_Vec +from anytree import NodeMixin, RenderTree +from build123d.build_enums import CenterOf, GeomType, Keep, SortBy, Transition from build123d.geometry import ( DEG2RAD, TOLERANCE, @@ -297,62 +153,20 @@ from build123d.geometry import ( VectorLike, logger, ) +from typing_extensions import Self, Literal +from vtkmodules.vtkCommonDataModel import vtkPolyData +from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter -def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: - """Find the normal at a point on surface""" - surface = BRep_Tool.Surface_s(face) - - # project point on surface - projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - -def topods_dim(topods: TopoDS_Shape) -> int | None: - """Return the dimension of this TopoDS_Shape""" - shape_dim_map = { - (TopoDS_Vertex,): 0, - (TopoDS_Edge, TopoDS_Wire): 1, - (TopoDS_Face, TopoDS_Shell): 2, - (TopoDS_Solid,): 3, - } - - for shape_types, dim in shape_dim_map.items(): - if isinstance(topods, shape_types): - return dim - - if isinstance(topods, TopoDS_Compound): - sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - return None - - -HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode - - +if TYPE_CHECKING: # pragma: no cover + from .zero_d import Vertex # pylint: disable=R0801 + from .one_d import Edge, Wire # pylint: disable=R0801 + from .two_d import Face, Shell # pylint: disable=R0801 + from .three_d import Solid # pylint: disable=R0801 + from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 +HASH_CODE_MAX = 2147483647 Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] - TrimmingTool = Union[Plane, "Shell", "Face"] - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) @@ -377,13 +191,6 @@ class Shape(NodeMixin, Generic[TOPODS]): """ - # pylint: disable=too-many-instance-attributes, too-many-public-methods - - @property - @abstractmethod - def _dim(self) -> int | None: - """Dimension of the object""" - shape_LUT = { ta.TopAbs_VERTEX: "Vertex", ta.TopAbs_EDGE: "Edge", @@ -449,6 +256,33 @@ class Shape(NodeMixin, Generic[TOPODS]): Transition.RIGHT: BRepBuilderAPI_RightCorner, } + class _DisplayNode(NodeMixin): + """Used to create anytree structures from TopoDS_Shapes""" + + def __init__( + self, + label: str = "", + address: int | None = None, + position: Vector | Location | None = None, + parent: Shape._DisplayNode | None = None, + ): + self.label = label + self.address = address + self.position = position + self.parent = parent + self.children: list[Shape] = [] + + _ordered_shapes = [ + TopAbs_ShapeEnum.TopAbs_COMPOUND, + TopAbs_ShapeEnum.TopAbs_SOLID, + TopAbs_ShapeEnum.TopAbs_SHELL, + TopAbs_ShapeEnum.TopAbs_FACE, + TopAbs_ShapeEnum.TopAbs_WIRE, + TopAbs_ShapeEnum.TopAbs_EDGE, + TopAbs_ShapeEnum.TopAbs_VERTEX, + ] + # ---- Constructor ---- + def __init__( self, obj: TopoDS_Shape | None = None, @@ -469,51 +303,27 @@ class Shape(NodeMixin, Generic[TOPODS]): # Extracted objects like Vertices and Edges may need to know where they came from self.topo_parent: Shape | None = None + # ---- Properties ---- + + # pylint: disable=too-many-instance-attributes, too-many-public-methods + @property - def location(self) -> Location | None: - """Get this Shape's Location""" + @abstractmethod + def _dim(self) -> int | None: + """Dimension of the object""" + + @property + def area(self) -> float: + """area -the surface area of all faces in this Shape""" if self.wrapped is None: - return None - return Location(self.wrapped.Location()) + return 0.0 + properties = GProp_GProps() + BRepGProp.SurfaceProperties_s(self.wrapped, properties) - @location.setter - def location(self, value: Location): - """Set Shape's Location to value""" - if self.wrapped is not None: - self.wrapped.Location(value.wrapped) + return properties.Mass() @property - def position(self) -> Vector | None: - """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: - return None - return self.location.position - - @position.setter - def position(self, value: VectorLike): - """Set the position component of this Shape's Location to value""" - loc = self.location - if loc is not None: - loc.position = Vector(value) - self.location = loc - - @property - def orientation(self) -> Vector | None: - """Get the orientation component of this Shape's Location""" - if self.location is None: - return None - return self.location.orientation - - @orientation.setter - def orientation(self, rotations: VectorLike): - """Set the orientation component of this Shape's Location to rotations""" - loc = self.location - if loc is not None: - loc.orientation = Vector(rotations) - self.location = loc - - @property - def color(self) -> Union[None, Color]: + def color(self) -> None | Color: """Get the shape's color. If it's None, get the color of the nearest ancestor, assign it to this Shape and return this value.""" # Find the correct color for this node @@ -537,44 +347,30 @@ class Shape(NodeMixin, Generic[TOPODS]): self._color = value @property - def is_planar_face(self) -> bool: - """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): - return False - surface = BRep_Tool.Surface_s(self.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() + def geom_type(self) -> GeomType: + """Gets the underlying geometry type. - def copy_attributes_to( - self, target: Shape, exceptions: Iterable[str] | None = None - ): - """Copy common object attributes to target + Returns: + GeomType: The geometry type of the shape - Note that preset attributes of target will not be overridden. - - Args: - target (Shape): object to gain attributes - exceptions (Iterable[str], optional): attributes not to copy - - Raises: - ValueError: invalid attribute """ - # Find common attributes and eliminate exceptions - attrs1 = set(self.__dict__.keys()) - attrs2 = set(target.__dict__.keys()) - common_attrs = attrs1 & attrs2 - if exceptions is not None: - common_attrs -= set(exceptions) + if self.wrapped is None: + raise ValueError("Cannot determine geometry type of an empty shape") - for attr in common_attrs: - # Copy the attribute only if the target's attribute not set - if not getattr(target, attr): - setattr(target, attr, getattr(self, attr)) - # Attach joints to the new part - if attr == "joints": - joint: Joint - for joint in target.joints.values(): - joint.parent = target + shape: TopAbs_ShapeEnum = shapetype(self.wrapped) + + if shape == ta.TopAbs_EDGE: + geom = Shape.geom_LUT_EDGE[ + BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() + ] + elif shape == ta.TopAbs_FACE: + geom = Shape.geom_LUT_FACE[ + BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() + ] + else: + geom = GeomType.OTHER + + return geom @property def is_manifold(self) -> bool: @@ -632,31 +428,91 @@ class Shape(NodeMixin, Generic[TOPODS]): return True - class _DisplayNode(NodeMixin): - """Used to create anytree structures from TopoDS_Shapes""" + @property + def is_planar_face(self) -> bool: + """Is the shape a planar face even though its geom_type may not be PLANE""" + if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): + return False + surface = BRep_Tool.Surface_s(self.wrapped) + is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) + return is_face_planar.IsPlanar() - def __init__( - self, - label: str = "", - address: int | None = None, - position: Union[Vector, Location, None] = None, - parent: Shape._DisplayNode | None = None, - ): - self.label = label - self.address = address - self.position = position - self.parent = parent - self.children: list[Shape] = [] + @property + def location(self) -> Location | None: + """Get this Shape's Location""" + if self.wrapped is None: + return None + return Location(self.wrapped.Location()) - _ordered_shapes = [ - TopAbs_ShapeEnum.TopAbs_COMPOUND, - TopAbs_ShapeEnum.TopAbs_SOLID, - TopAbs_ShapeEnum.TopAbs_SHELL, - TopAbs_ShapeEnum.TopAbs_FACE, - TopAbs_ShapeEnum.TopAbs_WIRE, - TopAbs_ShapeEnum.TopAbs_EDGE, - TopAbs_ShapeEnum.TopAbs_VERTEX, - ] + @location.setter + def location(self, value: Location): + """Set Shape's Location to value""" + if self.wrapped is not None: + self.wrapped.Location(value.wrapped) + + @property + def orientation(self) -> Vector | None: + """Get the orientation component of this Shape's Location""" + if self.location is None: + return None + return self.location.orientation + + @orientation.setter + def orientation(self, rotations: VectorLike): + """Set the orientation component of this Shape's Location to rotations""" + loc = self.location + if loc is not None: + loc.orientation = Vector(rotations) + self.location = loc + + @property + def position(self) -> Vector | None: + """Get the position component of this Shape's Location""" + if self.wrapped is None or self.location is None: + return None + return self.location.position + + @position.setter + def position(self, value: VectorLike): + """Set the position component of this Shape's Location to value""" + loc = self.location + if loc is not None: + loc.position = Vector(value) + self.location = loc + + # ---- Class Methods ---- + + @classmethod + @abstractmethod + def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: + """Returns the right type of wrapper, given a OCCT object""" + + @classmethod + @abstractmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """extrude + + Extrude a Shape in the provided direction. + * Vertices generate Edges + * Edges generate Faces + * Wires generate Shells + * Faces generate Solids + * Shells generate Compounds + + Args: + direction (VectorLike): direction and magnitude of extrusion + + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + + Returns: + Edge | Face | Shell | Solid | Compound: extruded shape + """ + + # ---- Static Methods ---- @staticmethod def _build_tree( @@ -730,360 +586,6 @@ class Shape(NodeMixin, Generic[TOPODS]): result += f"{treestr}{name}at {address:#x}, {loc}\n" return result - def show_topology( - self, - limit_class: Literal[ - "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" - ] = "Vertex", - show_center: bool | None = None, - ) -> str: - """Display internal topology - - Display the internal structure of a Compound 'assembly' or Shape. Example: - - .. code:: - - >>> c1.show_topology() - - c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) - ├── Solid at 0x7f4a4cafafd0, Location(...)) - ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) - │ ├── Solid at 0x7f4a4cafad00, Location(...)) - │ └── Solid at 0x7f4a11a52790, Location(...)) - └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) - ├── Solid at 0x7f4a11a52700, Location(...)) - └── Solid at 0x7f4a11a58550, Location(...)) - - Args: - limit_class: type of displayed leaf node. Defaults to 'Vertex'. - show_center (bool, optional): If None, shows the Location of Compound 'assemblies' - and the bounding box center of Shapes. True or False forces the display. - Defaults to None. - - Returns: - str: tree representation of internal structure - """ - if ( - self.wrapped is not None - and isinstance(self.wrapped, TopoDS_Compound) - and self.children - ): - show_center = False if show_center is None else show_center - result = Shape._show_tree(self, show_center) - else: - tree = Shape._build_tree( - tcast(TopoDS_Shape, self.wrapped), - tree=[], - limit=Shape.inverse_shape_LUT[limit_class], - ) - show_center = True if show_center is None else show_center - result = Shape._show_tree(tree[0], show_center) - return result - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: - """fuse shape to self operator +""" - # Convert `other` to list of base objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self - - # Check that all dimensions are the same - addend_dim = self._dim - if addend_dim is None: - raise ValueError("Dimensions of objects to add to are inconsistent") - - if not all(summand._dim == addend_dim for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - sum_shape = summands[0].fuse(*summands[1:]) - else: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - return sum_shape - - def __sub__( - self, other: Union[None, Shape, Iterable[Shape]] - ) -> Self | ShapeList[Self]: - """cut shape from self operator -""" - - if self.wrapped is None: - raise ValueError("Cannot subtract shape from empty compound") - - # Convert `other` to list of base objects and filter out None values - if other is None: - subtrahends = [] - else: - subtrahends = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to subtract return the original object - if not subtrahends: - return self - - # Check that all dimensions are the same - minuend_dim = self._dim - if minuend_dim is None or any(s._dim is None for s in subtrahends): - raise ValueError("Dimensions of objects to subtract from are inconsistent") - - # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] - if any(d < minuend_dim for d in subtrahend_dims): - raise ValueError( - f"Only shapes with equal or greater dimension can be subtracted: " - f"not {type(self).__name__} ({minuend_dim}D) and " - f"{type(other).__name__} ({min(subtrahend_dims)}D)" - ) - - # Do the actual cut operation - difference = self.cut(*subtrahends) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: - """intersect shape with self operator &""" - others = other if isinstance(other, (list, tuple)) else [other] - - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot intersect shape with empty compound") - new_shape = self.intersect(*others) - - if ( - not isinstance(new_shape, list) - and new_shape is not None - and new_shape.wrapped is not None - and SkipClean.clean - ): - new_shape = new_shape.clean() - - return new_shape - - def __rmul__(self, other): - """right multiply for positioning operator *""" - if not ( - isinstance(other, (list, tuple)) - and all(isinstance(o, (Location, Plane)) for o in other) - ): - raise ValueError( - "shapes can only be multiplied list of locations or planes" - ) - return [loc * self for loc in other] - - # Actually creating the abstract method causes the subclass to pass center_of - # even when not required - possibly this could be improved. - # @abstractmethod - # def center(self, center_of: CenterOf) -> Vector: - # """Compute the center with a specific type of calculation.""" - - def clean(self) -> Self: - """clean - - Remove internal edges - - Returns: - Shape: Original object with extraneous internal edges removed - """ - if self.wrapped is None: - return self - upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) - upgrader.AllowInternalEdges(False) - # upgrader.SetAngularTolerance(1e-5) - try: - upgrader.Build() - self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) - except Exception: - warnings.warn(f"Unable to clean {self}", stacklevel=2) - return self - - def fix(self) -> Self: - """fix - try to fix shape if not valid""" - if self.wrapped is None: - return self - if not self.is_valid(): - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) - - return shape_copy - - return self - - @classmethod - @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: - """Returns the right type of wrapper, given a OCCT object""" - - @property - def geom_type(self) -> GeomType: - """Gets the underlying geometry type. - - Returns: - GeomType: The geometry type of the shape - - """ - if self.wrapped is None: - raise ValueError("Cannot determine geometry type of an empty shape") - - shape: TopAbs_ShapeEnum = shapetype(self.wrapped) - - if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[ - BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() - ] - elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[ - BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() - ] - else: - geom = GeomType.OTHER - - return geom - - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - - def is_same(self, other: Shape) -> bool: - """Returns True if other and this shape are same, i.e. if they share the - same TShape with the same Locations. Orientations may differ. Also see - :py:meth:`is_equal` - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsSame(other.wrapped) - - def is_equal(self, other: Shape) -> bool: - """Returns True if two shapes are equal, i.e. if they share the same - TShape with the same Locations and Orientations. Also see - :py:meth:`is_same`. - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsEqual(other.wrapped) - - def __eq__(self, other) -> bool: - """Check if two shapes are the same. - - This method checks if the current shape is the same as the other shape. - Two shapes are considered the same if they share the same TShape with - the same Locations. Orientations may differ. - - Args: - other (Shape): The shape to compare with. - - Returns: - bool: True if the shapes are the same, False otherwise. - """ - if isinstance(other, Shape): - return self.is_same(other) - return NotImplemented - - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - - def bounding_box( - self, tolerance: float | None = None, optimal: bool = True - ) -> BoundBox: - """Create a bounding box for this Shape. - - Args: - tolerance (float, optional): Defaults to None. - - Returns: - BoundBox: A box sized to contain this Shape - """ - if self.wrapped is None: - return BoundBox(Bnd_Box()) - tolerance = TOLERANCE if tolerance is None else tolerance - return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - - def mirror(self, mirror_plane: Plane | None = None) -> Self: - """ - Applies a mirror transform to this Shape. Does not duplicate objects - about the plane. - - Args: - mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY - Returns: - The mirrored shape - """ - if not mirror_plane: - mirror_plane = Plane.XY - - if self.wrapped is None: - return self - transformation = gp_Trsf() - transformation.SetMirror( - gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) - ) - - return self._apply_transform(transformation) - @staticmethod def combined_center( objects: Iterable[Shape], center_of: CenterOf = CenterOf.MASS @@ -1153,9 +655,382 @@ class Shape(NodeMixin, Generic[TOPODS]): calc_function(obj.wrapped, properties) return properties.Mass() - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) + @staticmethod + def get_shape_list( + shape: Shape, + entity_type: Literal[ + "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" + ], + ) -> ShapeList: + """Helper to extract entities of a specific type from a shape.""" + if shape.wrapped is None: + return ShapeList() + shape_list = ShapeList( + [shape.__class__.cast(i) for i in shape.entities(entity_type)] + ) + for item in shape_list: + item.topo_parent = shape + return shape_list + + @staticmethod + def get_single_shape( + shape: Shape, + entity_type: Literal[ + "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" + ], + ) -> Shape: + """Helper to extract a single entity of a specific type from a shape, + with a warning if count != 1.""" + shape_list = Shape.get_shape_list(shape, entity_type) + entity_count = len(shape_list) + if entity_count != 1: + warnings.warn( + f"Found {entity_count} {entity_type.lower()}s, returning first", + stacklevel=3, + ) + return shape_list[0] if shape_list else None + + # ---- Instance Methods ---- + + def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: + """fuse shape to self operator +""" + # Convert `other` to list of base objects and filter out None values + if other is None: + summands = [] + else: + summands = [ + shape + # for o in (other if isinstance(other, (list, tuple)) else [other]) + for o in ([other] if isinstance(other, Shape) else other) + if o is not None + for shape in o.get_top_level_shapes() + ] + # If there is nothing to add return the original object + if not summands: + return self + + # Check that all dimensions are the same + addend_dim = self._dim + if addend_dim is None: + raise ValueError("Dimensions of objects to add to are inconsistent") + + if not all(summand._dim == addend_dim for summand in summands): + raise ValueError("Only shapes with the same dimension can be added") + + if self.wrapped is None: # an empty object + if len(summands) == 1: + sum_shape = summands[0] + else: + sum_shape = summands[0].fuse(*summands[1:]) + else: + sum_shape = self.fuse(*summands) + + if SkipClean.clean and not isinstance(sum_shape, list): + sum_shape = sum_shape.clean() + + return sum_shape + + def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: + """intersect shape with self operator &""" + others = other if isinstance(other, (list, tuple)) else [other] + + if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): + raise ValueError("Cannot intersect shape with empty compound") + new_shape = self.intersect(*others) + + if ( + not isinstance(new_shape, list) + and new_shape is not None + and new_shape.wrapped is not None + and SkipClean.clean + ): + new_shape = new_shape.clean() + + return new_shape + + def __copy__(self) -> Self: + """Return shallow copy or reference of self + + Create an copy of this Shape that shares the underlying TopoDS_TShape. + + Used when there is a need for many objects with the same CAD structure but at + different Locations, etc. - for examples fasteners in a larger assembly. By + sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. + + Changes to the CAD structure of the base object will be reflected in all instances. + """ + reference = copy.deepcopy(self) + if self.wrapped is not None: + assert ( + reference.wrapped is not None + ) # Ensure mypy knows reference.wrapped is not None + reference.wrapped.TShape(self.wrapped.TShape()) + return reference + + def __deepcopy__(self, memo) -> Self: + """Return deepcopy of self""" + # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied + # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this + # value already copied which causes deepcopy to skip it. + cls = self.__class__ + result = cls.__new__(cls) + memo[id(self)] = result + if self.wrapped is not None: + memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) + for key, value in self.__dict__.items(): + setattr(result, key, copy.deepcopy(value, memo)) + if key == "joints": + for joint in result.joints.values(): + joint.parent = result + return result + + def __eq__(self, other) -> bool: + """Check if two shapes are the same. + + This method checks if the current shape is the same as the other shape. + Two shapes are considered the same if they share the same TShape with + the same Locations. Orientations may differ. + + Args: + other (Shape): The shape to compare with. + + Returns: + bool: True if the shapes are the same, False otherwise. + """ + if isinstance(other, Shape): + return self.is_same(other) + return NotImplemented + + def __hash__(self) -> int: + """Return has code""" + return self.hash_code() + + def __rmul__(self, other): + """right multiply for positioning operator *""" + if not ( + isinstance(other, (list, tuple)) + and all(isinstance(o, (Location, Plane)) for o in other) + ): + raise ValueError( + "shapes can only be multiplied list of locations or planes" + ) + return [loc * self for loc in other] + + def __sub__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: + """cut shape from self operator -""" + + if self.wrapped is None: + raise ValueError("Cannot subtract shape from empty compound") + + # Convert `other` to list of base objects and filter out None values + if other is None: + subtrahends = [] + else: + subtrahends = [ + shape + # for o in (other if isinstance(other, (list, tuple)) else [other]) + for o in ([other] if isinstance(other, Shape) else other) + if o is not None + for shape in o.get_top_level_shapes() + ] + # If there is nothing to subtract return the original object + if not subtrahends: + return self + + # Check that all dimensions are the same + minuend_dim = self._dim + if minuend_dim is None or any(s._dim is None for s in subtrahends): + raise ValueError("Dimensions of objects to subtract from are inconsistent") + + # Check that the operation is valid + subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] + if any(d < minuend_dim for d in subtrahend_dims): + raise ValueError( + f"Only shapes with equal or greater dimension can be subtracted: " + f"not {type(self).__name__} ({minuend_dim}D) and " + f"{type(other).__name__} ({min(subtrahend_dims)}D)" + ) + + # Do the actual cut operation + difference = self.cut(*subtrahends) + + return difference + + def bounding_box( + self, tolerance: float | None = None, optimal: bool = True + ) -> BoundBox: + """Create a bounding box for this Shape. + + Args: + tolerance (float, optional): Defaults to None. + + Returns: + BoundBox: A box sized to contain this Shape + """ + if self.wrapped is None: + return BoundBox(Bnd_Box()) + tolerance = TOLERANCE if tolerance is None else tolerance + return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) + + # Actually creating the abstract method causes the subclass to pass center_of + # even when not required - possibly this could be improved. + # @abstractmethod + # def center(self, center_of: CenterOf) -> Vector: + # """Compute the center with a specific type of calculation.""" + + def clean(self) -> Self: + """clean + + Remove internal edges + + Returns: + Shape: Original object with extraneous internal edges removed + """ + if self.wrapped is None: + return self + upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) + upgrader.AllowInternalEdges(False) + # upgrader.SetAngularTolerance(1e-5) + try: + upgrader.Build() + self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) + except Exception: + warnings.warn(f"Unable to clean {self}", stacklevel=2) + return self + + def closest_points(self, other: Shape | VectorLike) -> tuple[Vector, Vector]: + """Points on two shapes where the distance between them is minimal""" + return self.distance_to_with_closest_points(other)[1:3] + + def compound(self) -> Compound | None: + """Return the Compound""" + return None + + def compounds(self) -> ShapeList[Compound]: + """compounds - all the compounds in this Shape""" + return ShapeList() + + def copy_attributes_to( + self, target: Shape, exceptions: Iterable[str] | None = None + ): + """Copy common object attributes to target + + Note that preset attributes of target will not be overridden. + + Args: + target (Shape): object to gain attributes + exceptions (Iterable[str], optional): attributes not to copy + + Raises: + ValueError: invalid attribute + """ + # Find common attributes and eliminate exceptions + attrs1 = set(self.__dict__.keys()) + attrs2 = set(target.__dict__.keys()) + common_attrs = attrs1 & attrs2 + if exceptions is not None: + common_attrs -= set(exceptions) + + for attr in common_attrs: + # Copy the attribute only if the target's attribute not set + if not getattr(target, attr): + setattr(target, attr, getattr(self, attr)) + # Attach joints to the new part + if attr == "joints": + joint: Joint + for joint in target.joints.values(): + joint.parent = target + + def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: + """Remove the positional arguments from this Shape. + + Args: + *to_cut: Shape: + + Returns: + Self | ShapeList[Self]: Resulting object may be of a different class than self + or a ShapeList if multiple non-Compound object created + """ + + cut_op = BRepAlgoAPI_Cut() + + return self._bool_op((self,), to_cut, cut_op) + + def distance(self, other: Shape) -> float: + """Minimal distance between two shapes + + Args: + other: Shape: + + Returns: + + """ + if self.wrapped is None or other.wrapped is None: + raise ValueError("Cannot calculate distance to or from an empty shape") + + return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() + + def distance_to(self, other: Shape | VectorLike) -> float: + """Minimal distance between two shapes""" + return self.distance_to_with_closest_points(other)[0] + + def distance_to_with_closest_points( + self, other: Shape | VectorLike + ) -> tuple[float, Vector, Vector]: + """Minimal distance between two shapes and the points on each shape""" + if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): + raise ValueError("Cannot calculate distance to or from an empty shape") + + if isinstance(other, Shape): + topods_shape = tcast(TopoDS_Shape, other.wrapped) + else: + vec = Vector(other) + topods_shape = BRepBuilderAPI_MakeVertex( + gp_Pnt(vec.X, vec.Y, vec.Z) + ).Vertex() + + dist_calc = BRepExtrema_DistShapeShape() + dist_calc.LoadS1(self.wrapped) + dist_calc.LoadS2(topods_shape) + dist_calc.Perform() + return ( + dist_calc.Value(), + Vector(dist_calc.PointOnShape1(1)), + Vector(dist_calc.PointOnShape2(1)), + ) + + def distances(self, *others: Shape) -> Iterator[float]: + """Minimal distances to between self and other shapes + + Args: + *others: Shape: + + Returns: + + """ + if self.wrapped is None: + raise ValueError("Cannot calculate distance to or from an empty shape") + + dist_calc = BRepExtrema_DistShapeShape() + dist_calc.LoadS1(self.wrapped) + + for other_shape in others: + if other_shape.wrapped is None: + raise ValueError("Cannot calculate distance to or from an empty shape") + dist_calc.LoadS2(other_shape.wrapped) + dist_calc.Perform() + + yield dist_calc.Value() + + def edge(self) -> Edge | None: + """Return the Edge""" + return None + + # Note all sub-classes have vertices and vertex methods + + def edges(self) -> ShapeList[Edge]: + """edges - all the edges in this Shape - subclasses may override""" + return ShapeList() def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: """Return all of the TopoDS sub entities of the given type""" @@ -1163,6 +1038,98 @@ class Shape(NodeMixin, Generic[TOPODS]): return [] return _topods_entities(self.wrapped, topo_type) + def face(self) -> Face | None: + """Return the Face""" + return None + + def faces(self) -> ShapeList[Face]: + """faces - all the faces in this Shape""" + return ShapeList() + + def faces_intersected_by_axis( + self, + axis: Axis, + tol: float = 1e-4, + ) -> ShapeList[Face]: + """Line Intersection + + Computes the intersections between the provided axis and the faces of this Shape + + Args: + axis (Axis): Axis on which the intersection line rests + tol (float, optional): Intersection tolerance. Defaults to 1e-4. + + Returns: + list[Face]: A list of intersected faces sorted by distance from axis.position + """ + if self.wrapped is None: + return ShapeList() + + line = gce_MakeLin(axis.wrapped).Value() + + intersect_maker = BRepIntCurveSurface_Inter() + intersect_maker.Init(self.wrapped, line, tol) + + faces_dist = [] # using a list instead of a dictionary to be able to sort it + while intersect_maker.More(): + inter_pt = intersect_maker.Pnt() + + distance = axis.position.to_pnt().SquareDistance(inter_pt) + + faces_dist.append( + ( + intersect_maker.Face(), + abs(distance), + ) + ) # will sort all intersected faces by distance whatever the direction is + + intersect_maker.Next() + + faces_dist.sort(key=lambda x: x[1]) + faces = [face[0] for face in faces_dist] + + return ShapeList([self.__class__.cast(face) for face in faces]) + + def fix(self) -> Self: + """fix - try to fix shape if not valid""" + if self.wrapped is None: + return self + if not self.is_valid(): + shape_copy: Shape = copy.deepcopy(self, None) + shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) + + return shape_copy + + return self + + def fuse( + self, *to_fuse: Shape, glue: bool = False, tol: float | None = None + ) -> Self | ShapeList[Self]: + """fuse + + Fuse a sequence of shapes into a single shape. + + Args: + to_fuse (sequence Shape): shapes to fuse + glue (bool, optional): performance improvement for some shapes. Defaults to False. + tol (float, optional): tolerance. Defaults to None. + + Returns: + Self | ShapeList[Self]: Resulting object may be of a different class than self + or a ShapeList if multiple non-Compound object created + + """ + + fuse_op = BRepAlgoAPI_Fuse() + if glue: + fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) + if tol: + fuse_op.SetFuzzyValue(tol) + + return_value = self._bool_op((self,), to_fuse, fuse_op) + + return return_value + # def _entities_from( # self, child_type: Shapes, parent_type: Shapes # ) -> Dict[Shape, list[Shape]]: @@ -1211,508 +1178,21 @@ class Shape(NodeMixin, Generic[TOPODS]): self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) ) - @staticmethod - def get_shape_list( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> ShapeList: - """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: - return ShapeList() - shape_list = ShapeList( - [shape.__class__.cast(i) for i in shape.entities(entity_type)] - ) - for item in shape_list: - item.topo_parent = shape - return shape_list - - @staticmethod - def get_single_shape( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> Shape: - """Helper to extract a single entity of a specific type from a shape, - with a warning if count != 1.""" - shape_list = Shape.get_shape_list(shape, entity_type) - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=3, - ) - return shape_list[0] if shape_list else None - - # Note all sub-classes have vertices and vertex methods - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() - - def edge(self) -> Edge | None: - """Return the Edge""" - return None - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return ShapeList() - - def wire(self) -> Wire | None: - """Return the Wire""" - return None - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return ShapeList() - - def face(self) -> Face | None: - """Return the Face""" - return None - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return ShapeList() - - def shell(self) -> Shell | None: - """Return the Shell""" - return None - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return ShapeList() - - def solid(self) -> Solid | None: - """Return the Solid""" - return None - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - return ShapeList() - - def compound(self) -> Compound | None: - """Return the Compound""" - return None - - @property - def area(self) -> float: - """area -the surface area of all faces in this Shape""" - if self.wrapped is None: - return 0.0 - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - - return properties.Mass() - - def _apply_transform(self, transformation: gp_Trsf) -> Self: - """Private Apply Transform - - Apply the provided transformation matrix to a copy of Shape + def hash_code(self) -> int: + """Returns a hashed value denoting this shape. It is computed from the + TShape and the Location. The Orientation is not used. Args: - transformation (gp_Trsf): transformation matrix - - Returns: - Shape: copy of transformed Shape - """ - if self.wrapped is None: - return self - shape_copy: Shape = copy.deepcopy(self, None) - transformed_shape = BRepBuilderAPI_Transform( - self.wrapped, - transformation, - True, - ).Shape() - shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) - return shape_copy - - def rotate(self, axis: Axis, angle: float) -> Self: - """rotate a copy - - Rotates a shape around an axis. - - Args: - axis (Axis): rotation Axis - angle (float): angle to rotate, in degrees - - Returns: - a copy of the shape, rotated - """ - transformation = gp_Trsf() - transformation.SetRotation(axis.wrapped, angle * DEG2RAD) - - return self._apply_transform(transformation) - - def translate(self, vector: VectorLike) -> Self: - """Translates this shape through a transformation. - - Args: - vector: VectorLike: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetTranslation(Vector(vector).wrapped) - - return self._apply_transform(transformation) - - def scale(self, factor: float) -> Self: - """Scales this shape through a transformation. - - Args: - factor: float: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetScale(gp_Pnt(), factor) - - return self._apply_transform(transformation) - - def __deepcopy__(self, memo) -> Self: - """Return deepcopy of self""" - # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied - # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this - # value already copied which causes deepcopy to skip it. - cls = self.__class__ - result = cls.__new__(cls) - memo[id(self)] = result - if self.wrapped is not None: - memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) - for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) - if key == "joints": - for joint in result.joints.values(): - joint.parent = result - return result - - def __copy__(self) -> Self: - """Return shallow copy or reference of self - - Create an copy of this Shape that shares the underlying TopoDS_TShape. - - Used when there is a need for many objects with the same CAD structure but at - different Locations, etc. - for examples fasteners in a larger assembly. By - sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. - - Changes to the CAD structure of the base object will be reflected in all instances. - """ - reference = copy.deepcopy(self) - if self.wrapped is not None: - assert ( - reference.wrapped is not None - ) # Ensure mypy knows reference.wrapped is not None - reference.wrapped.TShape(self.wrapped.TShape()) - return reference - - def transform_shape(self, t_matrix: Matrix) -> Self: - """Apply affine transform without changing type - - Transforms a copy of this Shape by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: copy of transformed shape with all objects keeping their type - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def transform_geometry(self, t_matrix: Matrix) -> Self: - """Apply affine transform - - WARNING: transform_geometry will sometimes convert lines and circles to - splines, but it also has the ability to handle skew and stretching - transformations. - - If your transformation is only translation and rotation, it is safer to - use :py:meth:`transform_shape`, which doesn't change the underlying type - of the geometry, but cannot handle skew transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: a copy of the object, but with geometry transformed - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def locate(self, loc: Location) -> Self: - """Apply a location in absolute sense to self - - Args: - loc: Location: Returns: """ if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - self.wrapped.Location(loc.wrapped) - - return self - - def located(self, loc: Location) -> Self: - """located - - Apply a location in absolute sense to a copy of self - - Args: - loc (Location): new absolute location - - Returns: - Shape: copy of Shape at location - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) # type: ignore - return shape_copy - - def move(self, loc: Location) -> Self: - """Apply a location in relative sense (i.e. update current location) to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - - self.wrapped.Move(loc.wrapped) - - return self - - def moved(self, loc: Location) -> Self: - """moved - - Apply a location in relative sense (i.e. update current location) to a copy of self - - Args: - loc (Location): new location relative to current location - - Returns: - Shape: copy of Shape moved to relative location - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) - return shape_copy - - def relocate(self, loc: Location): - """Change the location of self while keeping it geometrically similar - - Args: - loc (Location): new location to set for self - """ - if self.wrapped is None: - raise ValueError("Cannot relocate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot relocate a shape at an empty location") - - if self.location != loc: - old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore - - new_ax = gp_Ax3() - new_ax.Transform(loc.wrapped.Transformation()) - - trsf = gp_Trsf() - trsf.SetDisplacement(new_ax, old_ax) - builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - - self.wrapped = tcast(TOPODS, downcast(builder.Shape())) - self.wrapped.Location(loc.wrapped) - - def distance_to_with_closest_points( - self, other: Union[Shape, VectorLike] - ) -> tuple[float, Vector, Vector]: - """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot calculate distance to or from an empty shape") - - if isinstance(other, Shape): - topods_shape = tcast(TopoDS_Shape, other.wrapped) - else: - vec = Vector(other) - topods_shape = BRepBuilderAPI_MakeVertex( - gp_Pnt(vec.X, vec.Y, vec.Z) - ).Vertex() - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(topods_shape) - dist_calc.Perform() - return ( - dist_calc.Value(), - Vector(dist_calc.PointOnShape1(1)), - Vector(dist_calc.PointOnShape2(1)), - ) - - def distance_to(self, other: Union[Shape, VectorLike]) -> float: - """Minimal distance between two shapes""" - return self.distance_to_with_closest_points(other)[0] - - def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: - """Points on two shapes where the distance between them is minimal""" - return self.distance_to_with_closest_points(other)[1:3] - - def __hash__(self) -> int: - """Return has code""" - return self.hash_code() - - def _bool_op( - self, - args: Iterable[Shape], - tools: Iterable[Shape], - operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self | ShapeList[Self]: - """Generic boolean operation - - Args: - args: Iterable[Shape]: - tools: Iterable[Shape]: - operation: Union[BRepAlgoAPI_BooleanOperation: - BRepAlgoAPI_Splitter]: - - Returns: - - """ - args = list(args) - tools = list(tools) - # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} - highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] - - # The base of the operation - base = args[0] if isinstance(args, (list, tuple)) else args - - arg = TopTools_ListOfShape() - for obj in args: - if obj.wrapped is not None: - arg.Append(obj.wrapped) - - tool = TopTools_ListOfShape() - for obj in tools: - if obj.wrapped is not None: - tool.Append(obj.wrapped) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - topo_result = downcast(operation.Shape()) - - # Clean - if SkipClean.clean: - upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) - upgrader.AllowInternalEdges(False) - try: - upgrader.Build() - topo_result = downcast(upgrader.Shape()) - except Exception: - warnings.warn("Boolean operation unable to clean", stacklevel=2) - - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(topo_result, TopoDS_Compound): - topo_result = unwrap_topods_compound(topo_result, True) - - if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: - results = ShapeList( - highest_order[0].cast(s) - for s in get_top_level_topods_shapes(topo_result) - ) - for result in results: - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return results - - result = highest_order[0].cast(topo_result) - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - - return result - - def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: - """Remove the positional arguments from this Shape. - - Args: - *to_cut: Shape: - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - cut_op = BRepAlgoAPI_Cut() - - return self._bool_op((self,), to_cut, cut_op) - - def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float | None = None - ) -> Self | ShapeList[Self]: - """fuse - - Fuse a sequence of shapes into a single shape. - - Args: - to_fuse (sequence Shape): shapes to fuse - glue (bool, optional): performance improvement for some shapes. Defaults to False. - tol (float, optional): tolerance. Defaults to None. - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - return_value = self._bool_op((self,), to_fuse, fuse_op) - - return return_value + return 0 + return self.wrapped.HashCode(HASH_CODE_MAX) def intersect( - self, *to_intersect: Union[Shape, Axis, Plane] + self, *to_intersect: Shape | Axis | Plane ) -> None | Self | ShapeList[Self]: """Intersection of the arguments and this shape @@ -1776,137 +1256,384 @@ class Shape(NodeMixin, Generic[TOPODS]): return None return shape_intersections - @classmethod - @abstractmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds + def is_equal(self, other: Shape) -> bool: + """Returns True if two shapes are equal, i.e. if they share the same + TShape with the same Locations and Orientations. Also see + :py:meth:`is_same`. Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result + other: Shape: Returns: - Edge | Face | Shell | Solid | Compound: extruded shape - """ - def _ocp_section( - self: Shape, other: Union[Vertex, Edge, Wire, Face] - ) -> tuple[list[Vertex], list[Edge]]: - """_ocp_section - - Create a BRepAlgoAPI_Section object - - The algorithm is to build a Section operation between arguments and tools. - The result of Section operation consists of vertices and edges. The result - of Section operation contains: - - new vertices that are subjects of V/V, E/E, E/F, F/F interferences - - vertices that are subjects of V/E, V/F interferences - - new edges that are subjects of F/F interferences - - edges that are Common Blocks - - - Args: - other (Union[Vertex, Edge, Wire, Face]): shape to section with - - Returns: - tuple[list[Vertex], list[Edge]]: section results """ if self.wrapped is None or other.wrapped is None: - return ([], []) + return False + return self.wrapped.IsEqual(other.wrapped) - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation - section.Build() - - # Get the resulting shapes from the intersection - intersection_shape = section.Shape() - - vertices = [] - # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) - while explorer.More(): - vertices.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - edges = [] - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - edges.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - - return (vertices, edges) - - def faces_intersected_by_axis( - self, - axis: Axis, - tol: float = 1e-4, - ) -> ShapeList[Face]: - """Line Intersection - - Computes the intersections between the provided axis and the faces of this Shape + def is_null(self) -> bool: + """Returns true if this shape is null. In other words, it references no + underlying shape with the potential to be given a location and an + orientation. Args: - axis (Axis): Axis on which the intersection line rests - tol (float, optional): Intersection tolerance. Defaults to 1e-4. Returns: - list[Face]: A list of intersected faces sorted by distance from axis.position + + """ + return self.wrapped is None or self.wrapped.IsNull() + + def is_same(self, other: Shape) -> bool: + """Returns True if other and this shape are same, i.e. if they share the + same TShape with the same Locations. Orientations may differ. Also see + :py:meth:`is_equal` + + Args: + other: Shape: + + Returns: + + """ + if self.wrapped is None or other.wrapped is None: + return False + return self.wrapped.IsSame(other.wrapped) + + def is_valid(self) -> bool: + """Returns True if no defect is detected on the shape S or any of its + subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full + description of what is checked. + + Args: + + Returns: + """ if self.wrapped is None: - return ShapeList() + return True + chk = BRepCheck_Analyzer(self.wrapped) + chk.SetParallel(True) + return chk.IsValid() - line = gce_MakeLin(axis.wrapped).Value() + def locate(self, loc: Location) -> Self: + """Apply a location in absolute sense to self - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, line, tol) + Args: + loc: Location: - faces_dist = [] # using a list instead of a dictionary to be able to sort it - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() + Returns: - distance = axis.position.to_pnt().SquareDistance(inter_pt) + """ + if self.wrapped is None: + raise ValueError("Cannot locate an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot locate a shape at an empty location") + self.wrapped.Location(loc.wrapped) - faces_dist.append( - ( - intersect_maker.Face(), - abs(distance), - ) - ) # will sort all intersected faces by distance whatever the direction is + return self - intersect_maker.Next() + def located(self, loc: Location) -> Self: + """located - faces_dist.sort(key=lambda x: x[1]) - faces = [face[0] for face in faces_dist] + Apply a location in absolute sense to a copy of self - return ShapeList([self.__class__.cast(face) for face in faces]) + Args: + loc (Location): new absolute location + + Returns: + Shape: copy of Shape at location + """ + if self.wrapped is None: + raise ValueError("Cannot locate an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot locate a shape at an empty location") + shape_copy: Shape = copy.deepcopy(self, None) + shape_copy.wrapped.Location(loc.wrapped) # type: ignore + return shape_copy + + def mesh(self, tolerance: float, angular_tolerance: float = 0.1): + """Generate triangulation if none exists. + + Args: + tolerance: float: + angular_tolerance: float: (Default value = 0.1) + + Returns: + + """ + if self.wrapped is None: + raise ValueError("Cannot mesh an empty shape") + + if not BRepTools.Triangulation_s(self.wrapped, tolerance): + BRepMesh_IncrementalMesh( + self.wrapped, tolerance, True, angular_tolerance, True + ) + + def mirror(self, mirror_plane: Plane | None = None) -> Self: + """ + Applies a mirror transform to this Shape. Does not duplicate objects + about the plane. + + Args: + mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY + Returns: + The mirrored shape + """ + if not mirror_plane: + mirror_plane = Plane.XY + + if self.wrapped is None: + return self + transformation = gp_Trsf() + transformation.SetMirror( + gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) + ) + + return self._apply_transform(transformation) + + def move(self, loc: Location) -> Self: + """Apply a location in relative sense (i.e. update current location) to self + + Args: + loc: Location: + + Returns: + + """ + if self.wrapped is None: + raise ValueError("Cannot move an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot move a shape at an empty location") + + self.wrapped.Move(loc.wrapped) + + return self + + def moved(self, loc: Location) -> Self: + """moved + + Apply a location in relative sense (i.e. update current location) to a copy of self + + Args: + loc (Location): new location relative to current location + + Returns: + Shape: copy of Shape moved to relative location + """ + if self.wrapped is None: + raise ValueError("Cannot move an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot move a shape at an empty location") + shape_copy: Shape = copy.deepcopy(self, None) + shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) + return shape_copy + + def project_faces( + self, + faces: list[Face] | Compound, + path: Wire | Edge, + start: float = 0, + ) -> ShapeList[Face]: + """Projected Faces following the given path on Shape + + Project by positioning each face of to the shape along the path and + projecting onto the surface. + + Note that projection may result in distortion depending on + the shape at a position along the path. + + .. image:: projectText.png + + Args: + faces (Union[list[Face], Compound]): faces to project + path: Path on the Shape to follow + start: Relative location on path to start the faces. Defaults to 0. + + Returns: + The projected faces + + """ + # pylint: disable=too-many-locals + path_length = path.length + # The derived classes of Shape implement center + shape_center = self.center() # pylint: disable=no-member + + if ( + not isinstance(faces, (list, tuple)) + and faces.wrapped is not None + and isinstance(faces.wrapped, TopoDS_Compound) + ): + faces = faces.faces() + + first_face_min_x = faces[0].bounding_box().min.X + + logger.debug("projecting %d face(s)", len(faces)) + + # Position each face normal to the surface along the path and project to the surface + projected_faces = [] + for face in faces: + bbox = face.bounding_box() + face_center_x = (bbox.min.X + bbox.max.X) / 2 + relative_position_on_wire = ( + start + (face_center_x - first_face_min_x) / path_length + ) + path_position = path.position_at(relative_position_on_wire) + path_tangent = path.tangent_at(relative_position_on_wire) + projection_axis = Axis(path_position, shape_center - path_position) + (surface_point, surface_normal) = self.find_intersection_points( + projection_axis + )[0] + surface_normal_plane = Plane( + origin=surface_point, x_dir=path_tangent, z_dir=surface_normal + ) + projection_face: Face = surface_normal_plane.from_local_coords( + face.moved(Location((-face_center_x, 0, 0))) + ) + + logger.debug("projecting face at %0.2f", relative_position_on_wire) + projected_faces.append( + projection_face.project_to_shape(self, surface_normal * -1)[0] + ) + + logger.debug("finished projecting '%d' faces", len(faces)) + + return ShapeList(projected_faces) + + def relocate(self, loc: Location): + """Change the location of self while keeping it geometrically similar + + Args: + loc (Location): new location to set for self + """ + if self.wrapped is None: + raise ValueError("Cannot relocate an empty shape") + if loc.wrapped is None: + raise ValueError("Cannot relocate a shape at an empty location") + + if self.location != loc: + old_ax = gp_Ax3() + old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore + + new_ax = gp_Ax3() + new_ax.Transform(loc.wrapped.Transformation()) + + trsf = gp_Trsf() + trsf.SetDisplacement(new_ax, old_ax) + builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) + + self.wrapped = tcast(TOPODS, downcast(builder.Shape())) + self.wrapped.Location(loc.wrapped) + + def rotate(self, axis: Axis, angle: float) -> Self: + """rotate a copy + + Rotates a shape around an axis. + + Args: + axis (Axis): rotation Axis + angle (float): angle to rotate, in degrees + + Returns: + a copy of the shape, rotated + """ + transformation = gp_Trsf() + transformation.SetRotation(axis.wrapped, angle * DEG2RAD) + + return self._apply_transform(transformation) + + def scale(self, factor: float) -> Self: + """Scales this shape through a transformation. + + Args: + factor: float: + + Returns: + + """ + + transformation = gp_Trsf() + transformation.SetScale(gp_Pnt(), factor) + + return self._apply_transform(transformation) + + def shape_type(self) -> Shapes: + """Return the shape type string for this class""" + return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) + + def shell(self) -> Shell | None: + """Return the Shell""" + return None + + def shells(self) -> ShapeList[Shell]: + """shells - all the shells in this Shape""" + return ShapeList() + + def show_topology( + self, + limit_class: Literal[ + "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" + ] = "Vertex", + show_center: bool | None = None, + ) -> str: + """Display internal topology + + Display the internal structure of a Compound 'assembly' or Shape. Example: + + .. code:: + + >>> c1.show_topology() + + c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) + ├── Solid at 0x7f4a4cafafd0, Location(...)) + ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) + │ ├── Solid at 0x7f4a4cafad00, Location(...)) + │ └── Solid at 0x7f4a11a52790, Location(...)) + └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) + ├── Solid at 0x7f4a11a52700, Location(...)) + └── Solid at 0x7f4a11a58550, Location(...)) + + Args: + limit_class: type of displayed leaf node. Defaults to 'Vertex'. + show_center (bool, optional): If None, shows the Location of Compound 'assemblies' + and the bounding box center of Shapes. True or False forces the display. + Defaults to None. + + Returns: + str: tree representation of internal structure + """ + if ( + self.wrapped is not None + and isinstance(self.wrapped, TopoDS_Compound) + and self.children + ): + show_center = False if show_center is None else show_center + result = Shape._show_tree(self, show_center) + else: + tree = Shape._build_tree( + tcast(TopoDS_Shape, self.wrapped), + tree=[], + limit=Shape.inverse_shape_LUT[limit_class], + ) + show_center = True if show_center is None else show_center + result = Shape._show_tree(tree[0], show_center) + return result + + def solid(self) -> Solid | None: + """Return the Solid""" + return None + + def solids(self) -> ShapeList[Solid]: + """solids - all the solids in this Shape""" + return ShapeList() @overload def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] + self, perimeter: Edge | Wire, keep: Literal[Keep.INSIDE, Keep.OUTSIDE] ) -> Face | Shell | ShapeList[Face] | None: """split_by_perimeter and keep inside or outside""" @overload def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] + self, perimeter: Edge | Wire, keep: Literal[Keep.BOTH] ) -> tuple[ Face | Shell | ShapeList[Face] | None, Face | Shell | ShapeList[Face] | None, @@ -1915,13 +1642,11 @@ class Shape(NodeMixin, Generic[TOPODS]): @overload def split_by_perimeter( - self, perimeter: Union[Edge, Wire] + self, perimeter: Edge | Wire ) -> Face | Shell | ShapeList[Face] | None: """split_by_perimeter and keep inside (default)""" - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE - ): + def split_by_perimeter(self, perimeter: Edge | Wire, keep: Keep = Keep.INSIDE): """split_by_perimeter Divide the faces of this object into those within the perimeter @@ -2015,61 +1740,6 @@ class Shape(NodeMixin, Generic[TOPODS]): # keep == Keep.OUTSIDE: return right if left_inside else left - def distance(self, other: Shape) -> float: - """Minimal distance between two shapes - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() - - def distances(self, *others: Shape) -> Iterator[float]: - """Minimal distances to between self and other shapes - - Args: - *others: Shape: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - for other_shape in others: - if other_shape.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - dist_calc.LoadS2(other_shape.wrapped) - dist_calc.Perform() - - yield dist_calc.Value() - - def mesh(self, tolerance: float, angular_tolerance: float = 0.1): - """Generate triangulation if none exists. - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot mesh an empty shape") - - if not BRepTools.Triangulation_s(self.wrapped, tolerance): - BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - def tessellate( self, tolerance: float, angular_tolerance: float = 0.1 ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: @@ -2210,12 +1880,55 @@ class Shape(NodeMixin, Generic[TOPODS]): return return_value - def _repr_javascript_(self): - """Jupyter 3D representation support""" + def transform_geometry(self, t_matrix: Matrix) -> Self: + """Apply affine transform - from build123d.jupyter_tools import display + WARNING: transform_geometry will sometimes convert lines and circles to + splines, but it also has the ability to handle skew and stretching + transformations. - return display(self)._repr_javascript_() + If your transformation is only translation and rotation, it is safer to + use :py:meth:`transform_shape`, which doesn't change the underlying type + of the geometry, but cannot handle skew transformations. + + Args: + t_matrix (Matrix): affine transformation matrix + + Returns: + Shape: a copy of the object, but with geometry transformed + """ + if self.wrapped is None: + return self + new_shape = copy.deepcopy(self, None) + transformed = downcast( + BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() + ) + new_shape.wrapped = tcast(TOPODS, transformed) + + return new_shape + + def transform_shape(self, t_matrix: Matrix) -> Self: + """Apply affine transform without changing type + + Transforms a copy of this Shape by the provided 3D affine transformation matrix. + Note that not all transformation are supported - primarily designed for translation + and rotation. See :transform_geometry: for more comprehensive transformations. + + Args: + t_matrix (Matrix): affine transformation matrix + + Returns: + Shape: copy of transformed shape with all objects keeping their type + """ + if self.wrapped is None: + return self + new_shape = copy.deepcopy(self, None) + transformed = downcast( + BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() + ) + new_shape.wrapped = tcast(TOPODS, transformed) + + return new_shape def transformed( self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) @@ -2246,87 +1959,195 @@ class Shape(NodeMixin, Generic[TOPODS]): t_o.SetTranslation(Vector(offset).wrapped) return self._apply_transform(t_o * t_rx * t_ry * t_rz) - def project_faces( - self, - faces: Union[list[Face], Compound], - path: Union[Wire, Edge], - start: float = 0, - ) -> ShapeList[Face]: - """Projected Faces following the given path on Shape - - Project by positioning each face of to the shape along the path and - projecting onto the surface. - - Note that projection may result in distortion depending on - the shape at a position along the path. - - .. image:: projectText.png + def translate(self, vector: VectorLike) -> Self: + """Translates this shape through a transformation. Args: - faces (Union[list[Face], Compound]): faces to project - path: Path on the Shape to follow - start: Relative location on path to start the faces. Defaults to 0. + vector: VectorLike: Returns: - The projected faces """ - # pylint: disable=too-many-locals - path_length = path.length - # The derived classes of Shape implement center - shape_center = self.center() # pylint: disable=no-member - if ( - not isinstance(faces, (list, tuple)) - and faces.wrapped is not None - and isinstance(faces.wrapped, TopoDS_Compound) - ): - faces = faces.faces() + transformation = gp_Trsf() + transformation.SetTranslation(Vector(vector).wrapped) - first_face_min_x = faces[0].bounding_box().min.X + return self._apply_transform(transformation) - logger.debug("projecting %d face(s)", len(faces)) + def wire(self) -> Wire | None: + """Return the Wire""" + return None - # Position each face normal to the surface along the path and project to the surface - projected_faces = [] - for face in faces: - bbox = face.bounding_box() - face_center_x = (bbox.min.X + bbox.max.X) / 2 - relative_position_on_wire = ( - start + (face_center_x - first_face_min_x) / path_length - ) - path_position = path.position_at(relative_position_on_wire) - path_tangent = path.tangent_at(relative_position_on_wire) - projection_axis = Axis(path_position, shape_center - path_position) - (surface_point, surface_normal) = self.find_intersection_points( - projection_axis - )[0] - surface_normal_plane = Plane( - origin=surface_point, x_dir=path_tangent, z_dir=surface_normal - ) - projection_face: Face = surface_normal_plane.from_local_coords( - face.moved(Location((-face_center_x, 0, 0))) + def wires(self) -> ShapeList[Wire]: + """wires - all the wires in this Shape""" + return ShapeList() + + def _apply_transform(self, transformation: gp_Trsf) -> Self: + """Private Apply Transform + + Apply the provided transformation matrix to a copy of Shape + + Args: + transformation (gp_Trsf): transformation matrix + + Returns: + Shape: copy of transformed Shape + """ + if self.wrapped is None: + return self + shape_copy: Shape = copy.deepcopy(self, None) + transformed_shape = BRepBuilderAPI_Transform( + self.wrapped, + transformation, + True, + ).Shape() + shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) + return shape_copy + + def _bool_op( + self, + args: Iterable[Shape], + tools: Iterable[Shape], + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, + ) -> Self | ShapeList[Self]: + """Generic boolean operation + + Args: + args: Iterable[Shape]: + tools: Iterable[Shape]: + operation: Union[BRepAlgoAPI_BooleanOperation: + BRepAlgoAPI_Splitter]: + + Returns: + + """ + args = list(args) + tools = list(tools) + # Find the highest order class from all the inputs Solid > Vertex + order_dict = {type(s): type(s).order for s in [self] + args + tools} + highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] + + # The base of the operation + base = args[0] if isinstance(args, (list, tuple)) else args + + arg = TopTools_ListOfShape() + for obj in args: + if obj.wrapped is not None: + arg.Append(obj.wrapped) + + tool = TopTools_ListOfShape() + for obj in tools: + if obj.wrapped is not None: + tool.Append(obj.wrapped) + + operation.SetArguments(arg) + operation.SetTools(tool) + + operation.SetRunParallel(True) + operation.Build() + + topo_result = downcast(operation.Shape()) + + # Clean + if SkipClean.clean: + upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) + upgrader.AllowInternalEdges(False) + try: + upgrader.Build() + topo_result = downcast(upgrader.Shape()) + except Exception: + warnings.warn("Boolean operation unable to clean", stacklevel=2) + + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(topo_result, TopoDS_Compound): + topo_result = unwrap_topods_compound(topo_result, True) + + if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: + results = ShapeList( + highest_order[0].cast(s) + for s in get_top_level_topods_shapes(topo_result) ) + for result in results: + base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) + return results - logger.debug("projecting face at %0.2f", relative_position_on_wire) - projected_faces.append( - projection_face.project_to_shape(self, surface_normal * -1)[0] - ) + result = highest_order[0].cast(topo_result) + base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - logger.debug("finished projecting '%d' faces", len(faces)) + return result - return ShapeList(projected_faces) + def _ocp_section( + self: Shape, other: Vertex | Edge | Wire | Face + ) -> tuple[list[Vertex], list[Edge]]: + """_ocp_section + + Create a BRepAlgoAPI_Section object + + The algorithm is to build a Section operation between arguments and tools. + The result of Section operation consists of vertices and edges. The result + of Section operation contains: + - new vertices that are subjects of V/V, E/E, E/F, F/F interferences + - vertices that are subjects of V/E, V/F interferences + - new edges that are subjects of F/F interferences + - edges that are Common Blocks + + + Args: + other (Union[Vertex, Edge, Wire, Face]): shape to section with + + Returns: + tuple[list[Vertex], list[Edge]]: section results + """ + if self.wrapped is None or other.wrapped is None: + return ([], []) + + try: + section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) + except (TypeError, AttributeError): + try: + section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) + except (TypeError, AttributeError): + return ([], []) + + # Perform the intersection calculation + section.Build() + + # Get the resulting shapes from the intersection + intersection_shape = section.Shape() + + vertices = [] + # Iterate through the intersection shape to find intersection points/edges + explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) + while explorer.More(): + vertices.append(self.__class__.cast(downcast(explorer.Current()))) + explorer.Next() + edges = [] + explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) + while explorer.More(): + edges.append(self.__class__.cast(downcast(explorer.Current()))) + explorer.Next() + + return (vertices, edges) + + def _repr_javascript_(self): + """Jupyter 3D representation support""" + + from build123d.jupyter_tools import display + + return display(self)._repr_javascript_() class Comparable(ABC): """Abstract base class that requires comparison methods""" - @abstractmethod - def __lt__(self, other: Any) -> bool: ... + # ---- Instance Methods ---- @abstractmethod def __eq__(self, other: Any) -> bool: ... + @abstractmethod + def __lt__(self, other: Any) -> bool: ... + # This TypeVar allows IDEs to see the type of objects within the ShapeList T = TypeVar("T", bound=Union[Shape, Vector]) @@ -2336,12 +2157,88 @@ K = TypeVar("K", bound=Comparable) class ShapePredicate(Protocol): """Predicate for shape filters""" + # ---- Instance Methods ---- + def __call__(self, shape: Shape) -> bool: ... +class GroupBy(Generic[T, K]): + """Result of a Shape.groupby operation. Groups can be accessed by index or key""" + + # ---- Constructor ---- + + def __init__( + self, + key_f: Callable[[T], K], + shapelist: Iterable[T], + *, + reverse: bool = False, + ): + # can't be a dict because K may not be hashable + self.key_to_group_index: list[tuple[K, int]] = [] + self.groups: list[ShapeList[T]] = [] + self.key_f = key_f + + for i, (key, shapegroup) in enumerate( + itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) + ): + self.groups.append(ShapeList(shapegroup)) + self.key_to_group_index.append((key, i)) + + # ---- Instance Methods ---- + + def __getitem__(self, key: int): + return self.groups[key] + + def __iter__(self): + return iter(self.groups) + + def __len__(self): + return len(self.groups) + + def __repr__(self): + return repr(ShapeList(self)) + + def __str__(self): + return pretty(self) + + def group(self, key: K): + """Select group by key""" + for k, i in self.key_to_group_index: + if key == k: + return self.groups[i] + raise KeyError(key) + + def group_for(self, shape: T): + """Select group by shape""" + return self.group(self.key_f(shape)) + + def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: + """ + Render a formatted representation of the object for pretty-printing in + interactive environments. + + Args: + printer (PrettyPrinter): The pretty printer instance handling the output. + cycle (bool): Indicates if a reference cycle is detected to + prevent infinite recursion. + """ + if cycle: + printer.text("(...)") + else: + with printer.group(1, "[", "]"): + for idx, item in enumerate(self): + if idx: + printer.text(",") + printer.breakable() + printer.pretty(item) + + class ShapeList(list[T]): """Subclass of list with custom filter and sort methods appropriate to CAD""" + # ---- Properties ---- + # pylint: disable=too-many-public-methods @property @@ -2354,6 +2251,67 @@ class ShapeList(list[T]): """Last element in the ShapeList""" return self[-1] + # ---- Instance Methods ---- + + def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore + """Combine two ShapeLists together operator +""" + # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 + return ShapeList(list(self) + list(other)) + + def __and__(self, other: ShapeList) -> ShapeList[T]: + """Intersect two ShapeLists operator &""" + return ShapeList(set(self) & set(other)) + + def __eq__(self, other: object) -> bool: + """ShapeLists equality operator ==""" + return ( + set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore + ) + + @overload + def __getitem__(self, key: SupportsIndex) -> T: ... + + @overload + def __getitem__(self, key: slice) -> ShapeList[T]: ... + + def __getitem__(self, key: SupportsIndex | slice) -> T | ShapeList[T]: + """Return slices of ShapeList as ShapeList""" + if isinstance(key, slice): + return ShapeList(list(self).__getitem__(key)) + return list(self).__getitem__(key) + + def __gt__(self, sort_by: Axis | SortBy = Axis.Z) -> ShapeList[T]: # type: ignore + """Sort operator >""" + return self.sort_by(sort_by) + + def __lshift__(self, group_by: Axis | SortBy = Axis.Z) -> ShapeList[T]: + """Group and select smallest group operator <<""" + return self.group_by(group_by)[0] + + def __lt__(self, sort_by: Axis | SortBy = Axis.Z) -> ShapeList[T]: # type: ignore + """Reverse sort operator <""" + return self.sort_by(sort_by, reverse=True) + + # Normally implementing __eq__ is enough, but ShapeList subclasses list, + # which already implements __ne__, so we need to override it, too + def __ne__(self, other: ShapeList) -> bool: # type: ignore + """ShapeLists inequality operator !=""" + return ( + set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented + ) + + def __or__(self, filter_by: Axis | GeomType = Axis.Z) -> ShapeList[T]: + """Filter by axis or geomtype operator |""" + return self.filter_by(filter_by) + + def __rshift__(self, group_by: Axis | SortBy = Axis.Z) -> ShapeList[T]: + """Group and select largest group operator >>""" + return self.group_by(group_by)[-1] + + def __sub__(self, other: ShapeList) -> ShapeList[T]: + """Differences between two ShapeLists operator -""" + return ShapeList(set(self) - set(other)) + def center(self) -> Vector: """The average of the center of objects within the ShapeList""" if not self: @@ -2362,9 +2320,48 @@ class ShapeList(list[T]): total_center = sum((o.center() for o in self), Vector(0, 0, 0)) return total_center / len(self) + def compound(self) -> Compound: + """Return the Compound""" + compounds = self.compounds() + compound_count = len(compounds) + if compound_count != 1: + warnings.warn( + f"Found {compound_count} compounds, returning first", stacklevel=2 + ) + return compounds[0] + + def compounds(self) -> ShapeList[Compound]: + """compounds - all the compounds in this ShapeList""" + return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore + + def edge(self) -> Edge: + """Return the Edge""" + edges = self.edges() + edge_count = len(edges) + if edge_count != 1: + warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) + return edges[0] + + def edges(self) -> ShapeList[Edge]: + """edges - all the edges in this ShapeList""" + return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore + + def face(self) -> Face: + """Return the Face""" + faces = self.faces() + face_count = len(faces) + if face_count != 1: + msg = f"Found {face_count} faces, returning first" + warnings.warn(msg, stacklevel=2) + return faces[0] + + def faces(self) -> ShapeList[Face]: + """faces - all the faces in this ShapeList""" + return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore + def filter_by( self, - filter_by: Union[ShapePredicate, Axis, Plane, GeomType], + filter_by: ShapePredicate | Axis | Plane | GeomType, reverse: bool = False, tolerance: float = 1e-5, ) -> ShapeList[T]: @@ -2537,7 +2534,7 @@ class ShapeList(list[T]): def group_by( self, - group_by: Union[Callable[[Shape], K], Axis, Edge, Wire, SortBy] = Axis.Z, + group_by: Callable[[Shape], K] | Axis | Edge | Wire | SortBy = Axis.Z, reverse=False, tol_digits=6, ) -> GroupBy[T, K]: @@ -2612,8 +2609,32 @@ class ShapeList(list[T]): return GroupBy(key_f, self, reverse=reverse) + def shell(self) -> Shell: + """Return the Shell""" + shells = self.shells() + shell_count = len(shells) + if shell_count != 1: + warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) + return shells[0] + + def shells(self) -> ShapeList[Shell]: + """shells - all the shells in this ShapeList""" + return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore + + def solid(self) -> Solid: + """Return the Solid""" + solids = self.solids() + solid_count = len(solids) + if solid_count != 1: + warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) + return solids[0] + + def solids(self) -> ShapeList[Solid]: + """solids - all the solids in this ShapeList""" + return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore + def sort_by( - self, sort_by: Union[Axis, Edge, Wire, SortBy] = Axis.Z, reverse: bool = False + self, sort_by: Axis | Edge | Wire | SortBy = Axis.Z, reverse: bool = False ) -> ShapeList[T]: """sort by @@ -2693,7 +2714,7 @@ class ShapeList(list[T]): return ShapeList(objects) def sort_by_distance( - self, other: Union[Shape, VectorLike], reverse: bool = False + self, other: Shape | VectorLike, reverse: bool = False ) -> ShapeList[T]: """Sort by distance @@ -2713,10 +2734,6 @@ class ShapeList(list[T]): ) return ShapeList([obj[1] for obj in distances]) - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore - def vertex(self) -> Vertex: """Return the Vertex""" vertices = self.vertices() @@ -2727,21 +2744,9 @@ class ShapeList(list[T]): ) return vertices[0] - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore - - def edge(self) -> Edge: - """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) - return edges[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore + def vertices(self) -> ShapeList[Vertex]: + """vertices - all the vertices in this ShapeList""" + return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore def wire(self) -> Wire: """Return the Wire""" @@ -2751,6272 +2756,9 @@ class ShapeList(list[T]): warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) return wires[0] - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) - return solids[0] - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore - - def compound(self) -> Compound: - """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: - warnings.warn( - f"Found {compound_count} compounds, returning first", stacklevel=2 - ) - return compounds[0] - - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Sort operator >""" - return self.sort_by(sort_by) - - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Reverse sort operator <""" - return self.sort_by(sort_by, reverse=True) - - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select largest group operator >>""" - return self.group_by(group_by)[-1] - - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select smallest group operator <<""" - return self.group_by(group_by)[0] - - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: - """Filter by axis or geomtype operator |""" - return self.filter_by(filter_by) - - def __eq__(self, other: object) -> bool: - """ShapeLists equality operator ==""" - return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore - ) - - # Normally implementing __eq__ is enough, but ShapeList subclasses list, - # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList) -> bool: # type: ignore - """ShapeLists inequality operator !=""" - return ( - set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented - ) - - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) - - def __sub__(self, other: ShapeList) -> ShapeList[T]: - """Differences between two ShapeLists operator -""" - return ShapeList(set(self) - set(other)) - - def __and__(self, other: ShapeList) -> ShapeList[T]: - """Intersect two ShapeLists operator &""" - return ShapeList(set(self) & set(other)) - - @overload - def __getitem__(self, key: SupportsIndex) -> T: ... - - @overload - def __getitem__(self, key: slice) -> ShapeList[T]: ... - - def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: - """Return slices of ShapeList as ShapeList""" - if isinstance(key, slice): - return ShapeList(list(self).__getitem__(key)) - return list(self).__getitem__(key) - - -class GroupBy(Generic[T, K]): - """Result of a Shape.groupby operation. Groups can be accessed by index or key""" - - def __init__( - self, - key_f: Callable[[T], K], - shapelist: Iterable[T], - *, - reverse: bool = False, - ): - # can't be a dict because K may not be hashable - self.key_to_group_index: list[tuple[K, int]] = [] - self.groups: list[ShapeList[T]] = [] - self.key_f = key_f - - for i, (key, shapegroup) in enumerate( - itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) - ): - self.groups.append(ShapeList(shapegroup)) - self.key_to_group_index.append((key, i)) - - def __iter__(self): - return iter(self.groups) - - def __len__(self): - return len(self.groups) - - def __getitem__(self, key: int): - return self.groups[key] - - def __str__(self): - return pretty(self) - - def __repr__(self): - return repr(ShapeList(self)) - - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: - """ - Render a formatted representation of the object for pretty-printing in - interactive environments. - - Args: - printer (PrettyPrinter): The pretty printer instance handling the output. - cycle (bool): Indicates if a reference cycle is detected to - prevent infinite recursion. - """ - if cycle: - printer.text("(...)") - else: - with printer.group(1, "[", "]"): - for idx, item in enumerate(self): - if idx: - printer.text(",") - printer.breakable() - printer.pretty(item) - - def group(self, key: K): - """Select group by key""" - for k, i in self.key_to_group_index: - if key == k: - return self.groups[i] - raise KeyError(key) - - def group_for(self, shape: T): - """Select group by shape""" - return self.group(self.key_f(shape)) - - -class Mixin1D(Shape): - """Methods to add to the Edge and Wire classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Edges and Wires""" - return 1 - - def __add__( - self, other: None | Shape | Iterable[Shape] - ) -> Edge | Wire | ShapeList[Edge]: - """fuse shape to wire/edge operator +""" - - # Convert `other` to list of base topods objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] - # If there is nothing to add return the original object - if not summands: - return self - - if not all(topods_dim(summand) == 1 for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] - summand_edges = [e for summand in summands for e in summand.edges()] - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - try: - sum_shape = Wire(summand_edges) - except Exception: - sum_shape = summands[0].fuse(*summands[1:]) - if type(self).order == 4: - sum_shape = type(self)(sum_shape) - else: - try: - sum_shape = Wire(self.edges() + ShapeList(summand_edges)) - except Exception: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape - - return sum_shape - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" - - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of object - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - middle = self.position_at(0.5) - elif center_of == CenterOf.MASS: - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: - """common_plane - - Find the plane containing all the edges/wires (including self). If there - is no common plane return None. If the edges are coaxial, select one - of the infinite number of valid planes. - - Args: - lines (sequence of Union[Edge,Wire]): edges in common with self - - Returns: - Union[None, Plane]: Either the common plane or None - """ - # pylint: disable=too-many-locals - # Note: BRepLib_FindSurface is not helpful as it requires the - # Edges to form a surface perimeter. - points: list[Vector] = [] - all_lines: list[Edge | Wire] = [ - line for line in [self, *lines] if line is not None - ] - if any(not isinstance(line, (Edge, Wire)) for line in all_lines): - raise ValueError("Only Edges or Wires are valid") - - result = None - # Are they all co-axial - if so, select one of the infinite planes - all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all(e.geom_type == GeomType.LINE for e in all_edges): - as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): - origin = as_axis[0].position - x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir - c_plane = Plane(origin, z_dir=z_dir) - result = c_plane.shift_origin((0, 0)) - - if result is None: # not coaxial - # Shorten any infinite lines (from converted Axis) - normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) - infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] - all_lines = normal_lines + shortened_lines - - for line in all_lines: - num_points = 2 if line.geom_type == GeomType.LINE else 8 - points.extend( - [line.position_at(i / (num_points - 1)) for i in range(num_points)] - ) - points = list(set(points)) # unique points - extreme_areas = {} - for subset in combinations(points, 3): - vector1 = subset[1] - subset[0] - vector2 = subset[2] - subset[0] - area = 0.5 * (vector1.cross(vector2).length) - extreme_areas[area] = subset - # The points that create the largest area make the most accurate plane - extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] - - # Create a plane from these points - x_dir = (extremes[1] - extremes[0]).normalized() - z_dir = (extremes[2] - extremes[0]).cross(x_dir) - try: - c_plane = Plane( - origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir - ) - c_plane = c_plane.shift_origin((0, 0)) - except ValueError: - # There is no valid common plane - result = None - else: - # Are all of the points on the common plane - common = all(c_plane.contains(p) for p in points) - result = c_plane if common else None - - return result - - @property - def length(self) -> float: - """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) - - @property - def radius(self) -> float: - """Calculate the radius. - - Note that when applied to a Wire, the radius is simply the radius of the first edge. - - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] - - def location_at( - self, - distance: float, - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> Location: - """Locations along curve - - Generate a location along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - Location: A Location object representing local coordinate system - at the specified distance. - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - law: GeomFill_TrihedronLaw - if frame_method == FrameMethod.FRENET: - law = GeomFill_Frenet() - else: - law = GeomFill_CorrectedFrenet() - - law.SetCurve(curve) - - tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() - - law.D0(param, tangent, normal, binormal) - pnt = curve.Value(param) - - transformation = gp_Trsf() - if planar: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() - ) - else: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() - ) - - return Location(TopLoc_Location(transformation)) - - def locations( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> list[Location]: - """Locations along curve - - Generate location along the curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - list[Location]: A list of Location objects representing local coordinate - systems at the specified distances. - """ - return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances - ] - - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) - - def offset_2d( - self, - distance: float, - kind: Kind = Kind.ARC, - side: Side = Side.BOTH, - closed: bool = True, - ) -> Union[Edge, Wire]: - """2d Offset - - Offsets a planar edge/wire - - Args: - distance (float): distance from edge/wire to offset - kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. - side (Side, optional): side to place offset. Defaults to Side.BOTH. - closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT - offset. Defaults to True. - Raises: - RuntimeError: Multiple Wires generated - RuntimeError: Unexpected result type - - Returns: - Wire: offset wire - """ - # pylint: disable=too-many-branches, too-many-locals, too-many-statements - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - line = self if isinstance(self, Wire) else Wire([self]) - - # Avoiding a bug when the wire contains a single Edge - if len(line.edges()) == 1: - edge = line.edges()[0] - edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] - topods_wire = Wire(edges).wrapped - else: - topods_wire = line.wrapped - - offset_builder = BRepOffsetAPI_MakeOffset() - offset_builder.Init(kind_dict[kind]) - # offset_builder.SetApprox(True) - offset_builder.AddWire(topods_wire) - offset_builder.Perform(distance) - - obj = downcast(offset_builder.Shape()) - if isinstance(obj, TopoDS_Compound): - obj = unwrap_topods_compound(obj, fully=True) - if isinstance(obj, TopoDS_Wire): - offset_wire = Wire(obj) - else: # Likely multiple Wires were generated - raise RuntimeError("Unexpected result type") - - if side != Side.BOTH: - # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] - centers = [w.position_at(0.5) for w in wires] - angles = [ - line.tangent_at(0).get_signed_angle(c - line.position_at(0)) - for c in centers - ] - if side == Side.LEFT: - offset_wire = wires[int(angles[0] > angles[1])] - else: - offset_wire = wires[int(angles[0] <= angles[1])] - - if closed: - self0 = line.position_at(0) - self1 = line.position_at(1) - end0 = offset_wire.position_at(0) - end1 = offset_wire.position_at(1) - if (self0 - end0).length - abs(distance) <= TOLERANCE: - edge0 = Edge.make_line(self0, end0) - edge1 = Edge.make_line(self1, end1) - else: - edge0 = Edge.make_line(self0, end1) - edge1 = Edge.make_line(self1, end0) - offset_wire = Wire( - line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) - ) - - offset_edges = offset_wire.edges() - return offset_edges[0] if len(offset_edges) == 1 else offset_wire - - def perpendicular_line( - self, length: float, u_value: float, plane: Plane = Plane.XY - ) -> Edge: - """perpendicular_line - - Create a line on the given plane perpendicular to and centered on beginning of self - - Args: - length (float): line length - u_value (float): position along line between 0.0 and 1.0 - plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. - - Returns: - Edge: perpendicular line - """ - start = self.position_at(u_value) - local_plane = Plane( - origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir - ) - line = Edge.make_line( - start + local_plane.y_dir * length / 2, - start - local_plane.y_dir * length / 2, - ) - return line - - def project( - self, face: Face, direction: VectorLike, closest: bool = True - ) -> Edge | Wire | ShapeList[Edge | Wire]: - """Project onto a face along the specified direction - - Args: - face: Face: - direction: VectorLike: - closest: bool: (Default value = True) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") - - bldr = BRepProj_Projection( - self.wrapped, face.wrapped, Vector(direction).to_dir() - ) - shapes: TopoDS_Compound = bldr.Shape() - - # select the closest projection if requested - return_value: Edge | Wire | ShapeList[Edge | Wire] - - if closest: - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - min_dist = inf - - # for shape in shapes: - for shape in get_top_level_topods_shapes(shapes): - dist_calc.LoadS2(shape) - dist_calc.Perform() - dist = dist_calc.Value() - - if dist < min_dist: - min_dist = dist - return_value = Mixin1D.cast(shape) - - else: - return_value = ShapeList( - Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) - ) - - return return_value - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike | None = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - visible_edges = ShapeList(Edge(e) for e in visible_edges) - hidden_edges = ShapeList(Edge(e) for e in hidden_edges) - - return (visible_edges, hidden_edges) - - -class Mixin2D(Shape): - """Additional methods to add to Face and Shell class""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Faces and Shells""" - return 2 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") - - def __neg__(self) -> Self: - """Reverse normal operator -""" - if self.wrapped is None: - raise ValueError("Invalid Shape") - new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) - - return new_surface - - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - - def find_intersection_points( - self, other: Axis, tolerance: float = TOLERANCE - ) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape - - Args: - axis (Axis): axis defining the intersection line - - Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection - """ - if self.wrapped is None: - return [] - - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, tolerance) - - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) - ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - - -class Mixin3D(Shape): - """Additional methods to add to 3D Shape classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int | None: - """Dimension of Solids""" - return 3 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") - - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") - - def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: - """Fillet - - Fillets the specified edges of this solid. - - Args: - radius (float): float > 0, the radius of the fillet - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - - Returns: - Any: Filleted solid - """ - native_edges = [e.wrapped for e in edge_list] - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(radius, native_edge) - - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - f"Failed creating a fillet with radius of {radius}, try a smaller value" - f" or use max_fillet() to find the largest valid fillet radius" - ) from err - - return new_shape - - def max_fillet( - self, - edge_list: Iterable[Edge], - tolerance=0.1, - max_iterations: int = 10, - ) -> float: - """Find Maximum Fillet Size - - Find the largest fillet radius for the given Shape and edges with a - recursive binary search. - - Example: - - max_fillet_radius = my_shape.max_fillet(shape_edges) - max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) - - - Args: - edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid - tolerance (float, optional): maximum error from actual value. Defaults to 0.1. - max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. - - Raises: - RuntimeError: failed to find the max value - ValueError: the provided Shape is invalid - - Returns: - float: maximum fillet radius - """ - - def __max_fillet(window_min: float, window_max: float, current_iteration: int): - window_mid = (window_min + window_max) / 2 - - if current_iteration == max_iterations: - raise RuntimeError( - f"Failed to find the max value within {tolerance} in {max_iterations}" - ) - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(window_mid, native_edge) - - # Do these numbers work? - if not try with the smaller window - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise fillet_exception - except fillet_exception: - return __max_fillet(window_min, window_mid, current_iteration + 1) - - # These numbers work, are they close enough? - if not try larger window - if window_mid - window_min <= tolerance: - return_value = window_mid - else: - return_value = __max_fillet( - window_mid, window_max, current_iteration + 1 - ) - return return_value - - if not self.is_valid(): - raise ValueError("Invalid Shape") - - native_edges = [e.wrapped for e in edge_list] - - # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform - # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone - - max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) - - return max_radius - - def chamfer( - self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face | None = None, - ) -> Self: - """Chamfer - - Chamfers the specified edges of this solid. - - Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face, optional): identifies the side where length is measured. The edge(s) - must be part of the face - - Returns: - Self: Chamfered solid - """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") - - native_edges = [e.wrapped for e in edge_list] - - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__.cast(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) - else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__.cast(sol.Shape()).fix() - - return return_value - - def offset_3d( - self, - openings: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Shell - - Make an offset solid of self. - - Args: - openings (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): offset amount - positive offset outwards, negative inwards - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A shelled solid. - """ - openings = list(openings) if openings else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - - occ_faces_list = TopTools_ListOfShape() - for face in openings: - occ_faces_list.Append(face.wrapped) - - offset_builder = BRepOffsetAPI_MakeThickSolid() - offset_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - RemoveIntEdges=True, - Join=kind_dict[kind], - ) - offset_builder.Build() - - try: - offset_occt_solid = offset_builder.Shape() - except (StdFail_NotDone, Standard_Failure) as err: - raise RuntimeError( - "offset Error, an alternative kind may resolve this error" - ) from err - - offset_solid = self.__class__.cast(offset_occt_solid) - assert offset_solid.wrapped is not None - - # The Solid can be inverted, if so reverse - if offset_solid.volume < 0: - offset_solid.wrapped.Reverse() - - return offset_solid - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. - - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float | None = None, - taper: float = 0, - up_to_face: Face | None = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] - else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) - - -class Compound(Mixin3D, Shape[TopoDS_Compound]): - """A Compound in build123d is a topological entity representing a collection of - geometric shapes grouped together within a single structure. It serves as a - container for organizing diverse shapes like edges, faces, or solids. This - hierarchical arrangement facilitates the construction of complex models by - combining simpler shapes. Compound plays a pivotal role in managing the - composition and structure of intricate 3D models in computer-aided design - (CAD) applications, allowing engineers and designers to work with assemblies - of shapes as unified entities for efficient modeling and analysis.""" - - order = 4.0 - - project_to_viewport = Mixin1D.project_to_viewport - - @classmethod - def cast( - cls, obj: TopoDS_Shape - ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def _dim(self) -> Union[int, None]: - """The dimension of the shapes within the Compound - None if inconsistent""" - return topods_dim(self.wrapped) - - def __init__( - self, - obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - children: Sequence[Shape] | None = None, - ): - """Build a Compound from Shapes - - Args: - obj (TopoDS_Compound | Iterable[Shape], optional): OCCT Compound or shapes - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - children (Sequence[Shape], optional): assembly children. Defaults to None. - """ - - if isinstance(obj, Iterable): - topods_compound = _make_topods_compound_from_shapes( - [s.wrapped for s in obj] - ) - else: - topods_compound = obj - - super().__init__( - obj=topods_compound, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - self.children = [] if children is None else children - - def __repr__(self): - """Return Compound info as string""" - if hasattr(self, "label") and hasattr(self, "children"): - result = ( - f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " - + f"#children({len(self.children)})" - ) - else: - result = f"{self.__class__.__name__} at {id(self):#x}" - return result - - @property - def volume(self) -> float: - """volume - the volume of this Compound""" - # when density == 1, mass == volume - return sum(i.volume for i in [*self.get_type(Solid), *self.get_type(Shell)]) - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def _remove(self, shape: Shape) -> Compound: - """Return self with the specified shape removed. - - Args: - shape: Shape: - """ - comp_builder = TopoDS_Builder() - comp_builder.Remove(self.wrapped, shape.wrapped) - return self - - def _post_detach(self, parent: Compound): - """Method call after detaching from `parent`.""" - logger.debug("Removing parent of %s (%s)", self.label, parent.label) - if parent.children: - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - else: - parent.wrapped = None - - def _pre_attach(self, parent: Compound): - """Method call before attaching to `parent`.""" - if not isinstance(parent, Compound): - raise ValueError("`parent` must be of type Compound") - - def _post_attach(self, parent: Compound): - """Method call after attaching to `parent`.""" - logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - - def _post_detach_children(self, children): - """Method call before detaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Removing no children from %s", self.label) - - def _pre_attach_children(self, children): - """Method call before attaching `children`.""" - if not all(isinstance(child, Shape) for child in children): - raise ValueError("Each child must be of type Shape") - - def _post_attach_children(self, children: Iterable[Shape]): - """Method call after attaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Adding no children to %s", self.label) - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Combine other to self `+` operator - - Note that if all of the objects are connected Edges/Wires the result - will be a Wire, otherwise a Shape. - """ - if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other - - summands: ShapeList[Shape] - if other is None: - summands = ShapeList() - else: - summands = ShapeList( - shape - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ) - # If there is nothing to add return the original object - if not summands: - return self - - summands = ShapeList( - s for s in self.get_top_level_shapes() + summands if s is not None - ) - - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = Compound(summands[0:1]) - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(bool_result, list): - result = Compound(bool_result) - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - else: - result = bool_result - - if SkipClean.clean: - result = result.clean() - - return result - - def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Cut other to self `-` operator""" - difference = Shape.__sub__(self, other) - difference = Compound( - difference if isinstance(difference, list) else [difference] - ) - self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> Compound: - """Intersect other to self `&` operator""" - intersection = Shape.__and__(self, other) - intersection = Compound( - intersection if isinstance(intersection, list) else [intersection] - ) - self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) - return intersection - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) - - def compound(self) -> Compound | None: - """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None - - @classmethod - def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: - """extrude - - Extrude a Shell into a Compound. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Compound( - TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) - ) - - def do_children_intersect( - self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: - """Do Children Intersect - - Determine if any of the child objects within a Compound/assembly intersect by - intersecting each of the shapes with each other and checking for - a common volume. - - Args: - include_parent (bool, optional): check parent for intersections. Defaults to False. - tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. - - Returns: - tuple[bool, tuple[Shape, Shape], float]: - do the object intersect, intersecting objects, volume of intersection - """ - children: list[Shape] = list(PreOrderIter(self)) - if not include_parent: - children.pop(0) # remove parent - # children_bbox = [child.bounding_box().to_solid() for child in children] - children_bbox = [ - Solid.from_bounding_box(child.bounding_box()) for child in children - ] - child_index_pairs = [ - tuple(map(int, comb)) - for comb in combinations(list(range(len(children))), 2) - ] - for child_index_pair in child_index_pairs: - # First check for bounding box intersections .. - # .. then confirm with actual object intersections which could be complex - bbox_intersection = children_bbox[child_index_pair[0]].intersect( - children_bbox[child_index_pair[1]] - ) - if bbox_intersection is not None: - obj_intersection = children[child_index_pair[0]].intersect( - children[child_index_pair[1]] - ) - if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - ( - children[child_index_pair[0]], - children[child_index_pair[1]], - ), - common_volume, - ) - return (False, (None, None), 0.0) - - @classmethod - def make_text( - cls, - txt: str, - font_size: float, - font: str = "Arial", - font_path: Optional[str] = None, - font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), - position_on_path: float = 0.0, - text_path: Union[Edge, Wire, None] = None, - ) -> "Compound": - """2D Text that optionally follows a path. - - The text that is created can be combined as with other sketch features by specifying - a mode or rotated by the given angle. In addition, edges have been previously created - with arc or segment, the text will follow the path defined by these edges. The start - parameter can be used to shift the text along the path to achieve precise positioning. - - Args: - txt: text to be rendered - font_size: size of the font in model units - font: font name - font_path: path to font file - font_style: text style. Defaults to FontStyle.REGULAR. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max - of object. Defaults to (Align.CENTER, Align.CENTER). - position_on_path: the relative location on path to position the text, - between 0.0 and 1.0. Defaults to 0.0. - text_path: a path for the text to follows. Defaults to None - linear text. - - Returns: - a Compound object containing multiple Faces representing the text - - Examples:: - - fox = Compound.make_text( - txt="The quick brown fox jumped over the lazy dog", - font_size=10, - position_on_path=0.1, - text_path=jump_edge, - ) - - """ - # pylint: disable=too-many-locals - - def position_face(orig_face: Face) -> Face: - """ - Reposition a face to the provided path - - Local coordinates are used to calculate the position of the face - relative to the path. Global coordinates to position the face. - """ - assert text_path is not None - bbox = orig_face.bounding_box() - face_bottom_center = Vector((bbox.min.X + bbox.max.X) / 2, 0, 0) - relative_position_on_wire = ( - position_on_path + face_bottom_center.X / path_length - ) - wire_tangent = text_path.tangent_at(relative_position_on_wire) - wire_angle = Vector(1, 0, 0).get_signed_angle(wire_tangent) - wire_position = text_path.position_at(relative_position_on_wire) - - return orig_face.translate(wire_position - face_bottom_center).rotate( - Axis(wire_position, (0, 0, 1)), - -wire_angle, - ) - - if sys.platform.startswith("linux"): - os.environ["FONTCONFIG_FILE"] = "/etc/fonts/fonts.conf" - os.environ["FONTCONFIG_PATH"] = "/etc/fonts/" - - font_kind = { - FontStyle.REGULAR: Font_FA_Regular, - FontStyle.BOLD: Font_FA_Bold, - FontStyle.ITALIC: Font_FA_Italic, - }[font_style] - - mgr = Font_FontMgr.GetInstance_s() - - if font_path and mgr.CheckFont(TCollection_AsciiString(font_path).ToCString()): - font_t = Font_SystemFont(TCollection_AsciiString(font_path)) - font_t.SetFontPath(font_kind, TCollection_AsciiString(font_path)) - mgr.RegisterFont(font_t, True) - - else: - font_t = mgr.FindFont(TCollection_AsciiString(font), font_kind) - - logger.info( - "Creating text with font %s located at %s", - font_t.FontName().ToCString(), - font_t.FontPath(font_kind).ToCString(), - ) - - builder = Font_BRepTextBuilder() - font_i = StdPrs_BRepFont( - NCollection_Utf8String(font_t.FontName().ToCString()), - font_kind, - float(font_size), - ) - text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) - - # Align the text from the bounding box - align_text = tuplify(align, 2) - text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align_text)) - ) - - if text_path is not None: - path_length = text_path.length - text_flat = Compound([position_face(f) for f in text_flat.faces()]) - - return text_flat - - @classmethod - def make_triad(cls, axes_scale: float) -> Compound: - """The coordinate system triad (X, Y, Z axes)""" - x_axis = Edge.make_line((0, 0, 0), (axes_scale, 0, 0)) - y_axis = Edge.make_line((0, 0, 0), (0, axes_scale, 0)) - z_axis = Edge.make_line((0, 0, 0), (0, 0, axes_scale)) - arrow_arc = Edge.make_spline( - [(0, 0, 0), (-axes_scale / 20, axes_scale / 30, 0)], - [(-1, 0, 0), (-1, 1.5, 0)], - ) - arrow = Wire([arrow_arc, copy.copy(arrow_arc).mirror(Plane.XZ)]) - x_label = ( - Compound.make_text( - "X", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .move(Location(x_axis @ 1)) - .edges() - ) - y_label = ( - Compound.make_text( - "Y", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .rotate(Axis.Z, 90) - .move(Location(y_axis @ 1)) - .edges() - ) - z_label = ( - Compound.make_text( - "Z", font_size=axes_scale / 4, align=(Align.CENTER, Align.MIN) - ) - .rotate(Axis.Y, 90) - .rotate(Axis.X, 90) - .move(Location(z_axis @ 1)) - .edges() - ) - triad = Curve( - [ - x_axis, - y_axis, - z_axis, - arrow.moved(Location(x_axis @ 1)), - arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), - arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), - *x_label, - *y_label, - *z_label, - ] - ) - - return triad - - def __iter__(self) -> Iterator[Shape]: - """ - Iterate over subshapes. - - """ - - iterator = TopoDS_Iterator(self.wrapped) - - while iterator.More(): - yield Compound.cast(iterator.Value()) - iterator.Next() - - def __len__(self) -> int: - """Return the number of subshapes""" - count = 0 - if self.wrapped is not None: - for _ in self: - count += 1 - return count - - def __bool__(self) -> bool: - """ - Check if empty. - """ - - return TopoDS_Iterator(self.wrapped).More() - - def get_type( - self, - obj_type: Union[ - Type[Vertex], Type[Edge], Type[Face], Type[Shell], Type[Solid], Type[Wire] - ], - ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: - """get_type - - Extract the objects of the given type from a Compound. Note that this - isn't the same as Faces() etc. which will extract Faces from Solids. - - Args: - obj_type (Union[Vertex, Edge, Face, Shell, Solid, Wire]): Object types to extract - - Returns: - list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: Extracted objects - """ - - type_map = { - Vertex: TopAbs_ShapeEnum.TopAbs_VERTEX, - Edge: TopAbs_ShapeEnum.TopAbs_EDGE, - Face: TopAbs_ShapeEnum.TopAbs_FACE, - Shell: TopAbs_ShapeEnum.TopAbs_SHELL, - Solid: TopAbs_ShapeEnum.TopAbs_SOLID, - Wire: TopAbs_ShapeEnum.TopAbs_WIRE, - Compound: TopAbs_ShapeEnum.TopAbs_COMPOUND, - } - results = [] - for comp in self.compounds(): - iterator = TopoDS_Iterator() - iterator.Initialize(comp.wrapped) - while iterator.More(): - child = iterator.Value() - if child.ShapeType() == type_map[obj_type]: - results.append(obj_type(downcast(child))) - iterator.Next() - - return results - - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: - """Strip unnecessary Compound wrappers - - Args: - fully (bool, optional): return base shape without any Compound - wrappers (otherwise one Compound is left). Defaults to True. - - Returns: - Union[Self, Shape]: base shape - """ - if len(self) == 1: - single_element = next(iter(self)) - self.copy_attributes_to(single_element, ["wrapped", "_NodeMixin__children"]) - - # If the single element is another Compound, unwrap it recursively - if isinstance(single_element, Compound): - # Unwrap recursively and copy attributes down - unwrapped = single_element.unwrap(fully) - if not fully: - unwrapped = type(self)(unwrapped.wrapped) - self.copy_attributes_to(unwrapped, ["wrapped", "_NodeMixin__children"]) - return unwrapped - - return single_element if fully else self - - # If there are no elements or more than one element, return self - return self - - -class Part(Compound): - """A Compound containing 3D objects - aka Solids""" - - @property - def _dim(self) -> int: - return 3 - - -class Sketch(Compound): - """A Compound containing 2D objects - aka Faces""" - - @property - def _dim(self) -> int: - return 2 - - -class Curve(Compound): - """A Compound containing 1D objects - aka Edges""" - - @property - def _dim(self) -> int: - return 1 - - __add__ = Mixin1D.__add__ # type: ignore - - def __matmul__(self, position: float) -> Vector: - """Position on curve operator @ - only works if continuous""" - return Wire(self.edges()).position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator % - only works if continuous""" - return Wire(self.edges()).tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^ - only works if continuous""" - return Wire(self.edges()).location_at(position) - - def wires(self) -> ShapeList[Wire]: # type: ignore - """A list of wires created from the edges""" - return Wire.combine(self.edges()) - - -class Edge(Mixin1D, Shape[TopoDS_Edge]): - """An Edge in build123d is a fundamental element in the topological data structure - representing a one-dimensional geometric entity within a 3D model. It encapsulates - information about a curve, which could be a line, arc, or other parametrically - defined shape. Edge is crucial in for precise modeling and manipulation of curves, - facilitating operations like filleting, chamfering, and Boolean operations. It - serves as a building block for constructing complex structures, such as wires - and faces.""" - - # pylint: disable=too-many-public-methods - - order = 1.0 - - def __init__( - self, - obj: Optional[TopoDS_Edge | Axis | None] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge - - Args: - obj (TopoDS_Edge | Axis, optional): OCCT Edge or Axis. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Axis): - obj = BRepBuilderAPI_MakeEdge( - Geom_Line( - obj.position.to_pnt(), - obj.direction.to_dir(), - ) - ).Edge() - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_Curve: - """Return the Geom Curve from this Edge""" - return BRepAdaptor_Curve(self.wrapped) - - def close(self) -> Union[Edge, Wire]: - """Close an Edge""" - if not self.is_closed: - return_value = Wire([self]).close() - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Edge as Wire""" - return Wire([self]) - - @property - def arc_center(self) -> Vector: - """center of an underlying circle or ellipse geometry.""" - - geom_type = self.geom_type - geom_adaptor = self.geom_adaptor() - - if geom_type == GeomType.CIRCLE: - return_value = Vector(geom_adaptor.Circle().Position().Location()) - elif geom_type == GeomType.ELLIPSE: - return_value = Vector(geom_adaptor.Ellipse().Position().Location()) - else: - raise ValueError(f"{geom_type} has no arc center") - - return return_value - - def find_tangent( - self, - angle: float, - ) -> list[float]: - """find_tangent - - Find the parameter values of self where the tangent is equal to angle. - - Args: - angle (float): target angle in degrees - - Returns: - list[float]: u values between 0.0 and 1.0 - """ - angle = angle % 360 # angle needs to always be positive 0..360 - u_values: list[float] - - if self.geom_type == GeomType.LINE: - if self.tangent_angle_at(0) == angle: - u_values = [0] - else: - u_values = [] - else: - # Solve this problem geometrically by creating a tangent curve and finding intercepts - periodic = int(self.is_closed) # if closed don't include end point - tan_pnts: list[VectorLike] = [] - previous_tangent = None - - # When angles go from 360 to 0 a discontinuity is created so add 360 to these - # values and intercept another line - discontinuities = 0.0 - for i in range(101 - periodic): - tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 - if ( - previous_tangent is not None - and abs(previous_tangent - tangent) > 300 - ): - discontinuities = copysign(1.0, previous_tangent - tangent) - tangent += 360 * discontinuities - previous_tangent = tangent - tan_pnts.append((i / 100, tangent)) - - # Generate a first differential curve from the tangent points - tan_curve = Edge.make_spline(tan_pnts) - - # Use the bounding box to find the min and max values - tan_curve_bbox = tan_curve.bounding_box() - min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) - max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) - - # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts: list[Vector] = [] - for i in range(min_range, max_range + 1, 360): - line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) - intercept_pnts.extend(tan_curve.find_intersection_points(line)) - - u_values = [p.X for p in intercept_pnts] - - return u_values - - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - - def find_intersection_points( - self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE - ) -> ShapeList[Vector]: - """find_intersection_points - - Determine the points where a 2D edge crosses itself or another 2D edge - - Args: - other (Axis | Edge): curve to compare with - tolerance (float, optional): the precision of computing the intersection points. - Defaults to TOLERANCE. - - Returns: - ShapeList[Vector]: list of intersection points - """ - # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) - other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, - ) - # To determine the 2D plane to work on - plane = self.common_plane(other) - if plane is None: - raise ValueError("All objects must be on the same plane") - # Convert the plane into a Geom_Surface - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - edge_surface = BRep_Tool.Surface_s(pln_shape) - - self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - self.wrapped, - edge_surface, - TopLoc_Location(), - self.param_at(0), - self.param_at(1), - ) - if other is not None: - edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - other.wrapped, - edge_surface, - TopLoc_Location(), - other.param_at(0), - other.param_at(1), - ) - intersector = Geom2dAPI_InterCurveCurve( - self_2d_curve, edge_2d_curve, tolerance - ) - else: - intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) - - crosses = [ - Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) - for i in range(intersector.NbPoints()) - ] - # Convert back to global coordinates - crosses = [plane.from_local_coords(p) for p in crosses] - - # crosses may contain points beyond the ends of the edge so - # .. filter those out - valid_crosses = [] - for pnt in crosses: - try: - if other is not None: - if ( - self.distance_to(pnt) <= TOLERANCE - and other.distance_to(pnt) <= TOLERANCE - ): - valid_crosses.append(pnt) - else: - if self.distance_to(pnt) <= TOLERANCE: - valid_crosses.append(pnt) - except ValueError: - pass # skip invalid points - - return ShapeList(valid_crosses) - - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Union[Edge, Axis]): other object - - Returns: - Union[Shape, None]: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None - - @classmethod - def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: - """extrude - - Extrude a Vertex into an Edge. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) - - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" - reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge - return reversed_edge - - def trim(self, start: float, end: float) -> Edge: - """trim - - Create a new edge by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Edge: trimmed edge - """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") - - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) - trimmed_curve = Geom_TrimmedCurve( - new_curve, - parm_start, - parm_end, - ) - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def trim_to_length(self, start: float, length: float) -> Edge: - """trim_to_length - - Create a new edge starting at the given normalized parameter of a - given length. - - Args: - start (float): 0.0 <= start < 1.0 - length (float): target length - - Returns: - Edge: trimmed edge - """ - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - - # Create an adaptor for the curve - adaptor_curve = GeomAdaptor_Curve(new_curve) - - # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) - abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - - # Get the parameter at the desired length - parm_end = abscissa_point.Parameter() - - # Trim the curve to the desired length - trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" - - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) - - point = Vector(point) - - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") - - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length - - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value - - @classmethod - def make_bezier( - cls, *cntl_pnts: VectorLike, weights: list[float] | None = None - ) -> Edge: - """make_bezier - - Create a rational (with weights) or non-rational bezier curve. The first and last - control points represent the start and end of the curve respectively. If weights - are provided, there must be one provided for each control point. - - Args: - cntl_pnts (sequence[VectorLike]): points defining the curve - weights (list[float], optional): control point weights list. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Edge: bezier curve - """ - if len(cntl_pnts) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(cntl_pnts) > 25: - raise ValueError("The maximum number of control points is 25") - if weights: - if len(cntl_pnts) != len(weights): - raise ValueError("A weight must be provided for each control point") - - cntl_gp_pnts = [Vector(cntl_pnt).to_pnt() for cntl_pnt in cntl_pnts] - - # The poles are stored in an OCCT Array object - poles = TColgp_Array1OfPnt(1, len(cntl_gp_pnts)) - for i, cntl_gp_pnt in enumerate(cntl_gp_pnts): - poles.SetValue(i + 1, cntl_gp_pnt) - - if weights: - pole_weights = TColStd_Array1OfReal(1, len(weights)) - for i, weight in enumerate(weights): - pole_weights.SetValue(i + 1, float(weight)) - bezier_curve = Geom_BezierCurve(poles, pole_weights) - else: - bezier_curve = Geom_BezierCurve(poles) - - return cls(BRepBuilderAPI_MakeEdge(bezier_curve).Edge()) - - @classmethod - def make_circle( - cls, - radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make circle - - Create a circle centered on the origin of plane - - Args: - radius (float): circle radius - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): start of arc angle. Defaults to 360.0. - end_angle (float, optional): end of arc angle. Defaults to 360. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial circle - """ - circle_gp = gp_Circ(plane.to_gp_ax2(), radius) - - if start_angle == end_angle: # full circle case - return_value = cls(BRepBuilderAPI_MakeEdge(circle_gp).Edge()) - else: # arc case - ccw = angular_direction == AngularDirection.COUNTER_CLOCKWISE - if ccw: - start = radians(start_angle) - end = radians(end_angle) - else: - start = radians(end_angle) - end = radians(start_angle) - circle_geom = GC_MakeArcOfCircle(circle_gp, start, end, ccw).Value() - return_value = cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - return return_value - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): Defaults to 360.0. - end_angle (float, optional): Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial ellipse - """ - ax1 = gp_Ax1(plane.origin.to_pnt(), plane.z_dir.to_dir()) - - if y_radius > x_radius: - # swap x and y radius and rotate by 90° afterwards to create an ellipse - # with x_radius < y_radius - correction_angle = 90.0 * DEG2RAD - ellipse_gp = gp_Elips(plane.to_gp_ax2(), y_radius, x_radius).Rotated( - ax1, correction_angle - ) - else: - correction_angle = 0.0 - ellipse_gp = gp_Elips(plane.to_gp_ax2(), x_radius, y_radius) - - if start_angle == end_angle: # full ellipse case - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_gp).Edge()) - else: # arc case - # take correction_angle into account - ellipse_geom = GC_MakeArcOfEllipse( - ellipse_gp, - start_angle * DEG2RAD - correction_angle, - end_angle * DEG2RAD - correction_angle, - angular_direction == AngularDirection.COUNTER_CLOCKWISE, - ).Value() - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_geom).Edge()) - - return ellipse - - @classmethod - def make_mid_way(cls, first: Edge, second: Edge, middle: float = 0.5) -> Edge: - """make line between edges - - Create a new linear Edge between the two provided Edges. If the Edges are parallel - but in the opposite directions one Edge is flipped such that the mid way Edge isn't - truncated. - - Args: - first (Edge): first reference Edge - second (Edge): second reference Edge - middle (float, optional): factional distance between Edges. Defaults to 0.5. - - Returns: - Edge: linear Edge between two Edges - """ - flip = first.to_axis().is_opposite(second.to_axis()) - pnts = [ - Edge.make_line( - first.position_at(i), second.position_at(1 - i if flip else i) - ).position_at(middle) - for i in [0, 1] - ] - return Edge.make_line(*pnts) - - @classmethod - def make_spline( - cls, - points: list[VectorLike], - tangents: list[VectorLike] | None = None, - periodic: bool = False, - parameters: list[float] | None = None, - scale: bool = True, - tol: float = 1e-6, - ) -> Edge: - """Spline - - Interpolate a spline through the provided points. - - Args: - points (list[VectorLike]): the points defining the spline - tangents (list[VectorLike], optional): start and finish tangent. - Defaults to None. - periodic (bool, optional): creation of periodic curves. Defaults to False. - parameters (list[float], optional): the value of the parameter at each - interpolation point. (The interpolated curve is represented as a vector-valued - function of a scalar parameter.) If periodic == True, then len(parameters) - must be len(interpolation points) + 1, otherwise len(parameters) - must be equal to len(interpolation points). Defaults to None. - scale (bool, optional): whether to scale the specified tangent vectors before - interpolating. Each tangent is scaled, so it's length is equal to the derivative - of the Lagrange interpolated curve. I.e., set this to True, if you want to use - only the direction of the tangent vectors specified by `tangents` , but not - their magnitude. Defaults to True. - tol (float, optional): tolerance of the algorithm (consult OCC documentation). - Used to check that the specified points are not too close to each other, and - that tangent vectors are not too short. (In either case interpolation may fail.). - Defaults to 1e-6. - - Raises: - ValueError: Parameter for each interpolation point - ValueError: Tangent for each interpolation point - ValueError: B-spline interpolation failed - - Returns: - Edge: the spline - """ - # pylint: disable=too-many-locals - point_vectors = [Vector(point) for point in points] - if tangents: - tangent_vectors = tuple(Vector(v) for v in tangents) - pnts = TColgp_HArray1OfPnt(1, len(point_vectors)) - for i, point in enumerate(point_vectors): - pnts.SetValue(i + 1, point.to_pnt()) - - if parameters is None: - spline_builder = GeomAPI_Interpolate(pnts, periodic, tol) - else: - if len(parameters) != (len(point_vectors) + periodic): - raise ValueError( - "There must be one parameter for each interpolation point " - "(plus one if periodic), or none specified. Parameter count: " - f"{len(parameters)}, point count: {len(point_vectors)}" - ) - parameters_array = TColStd_HArray1OfReal(1, len(parameters)) - for p_index, p_value in enumerate(parameters): - parameters_array.SetValue(p_index + 1, p_value) - - spline_builder = GeomAPI_Interpolate(pnts, parameters_array, periodic, tol) - - if tangents: - if len(tangent_vectors) == 2 and len(point_vectors) != 2: - # Specify only initial and final tangent: - spline_builder.Load( - tangent_vectors[0].wrapped, tangent_vectors[1].wrapped, scale - ) - else: - if len(tangent_vectors) != len(point_vectors): - raise ValueError( - f"There must be one tangent for each interpolation point, " - f"or just two end point tangents. Tangent count: " - f"{len(tangent_vectors)}, point count: {len(point_vectors)}" - ) - - # Specify a tangent for each interpolation point: - tangents_array = TColgp_Array1OfVec(1, len(tangent_vectors)) - tangent_enabled_array = TColStd_HArray1OfBoolean( - 1, len(tangent_vectors) - ) - for t_index, t_value in enumerate(tangent_vectors): - tangent_enabled_array.SetValue(t_index + 1, t_value is not None) - tangent_vec = t_value if t_value is not None else Vector() - tangents_array.SetValue(t_index + 1, tangent_vec.wrapped) - - spline_builder.Load(tangents_array, tangent_enabled_array, scale) - - spline_builder.Perform() - if not spline_builder.IsDone(): - raise ValueError("B-spline interpolation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_spline_approx( - cls, - points: list[VectorLike], - tol: float = 1e-3, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 6, - ) -> Edge: - """make_spline_approx - - Approximate a spline through the provided points. - - Args: - points (list[Vector]): - tol (float, optional): tolerance of the algorithm. Defaults to 1e-3. - smoothing (Tuple[float, float, float], optional): optional tuple of 3 weights - use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when smoothing - is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 6. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Edge: spline - """ - pnts = TColgp_HArray1OfPnt(1, len(points)) - for i, point in enumerate(points): - pnts.SetValue(i + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSpline( - pnts, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSpline( - pnts, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_three_point_arc( - cls, point1: VectorLike, point2: VectorLike, point3: VectorLike - ) -> Edge: - """Three Point Arc - - Makes a three point arc through the provided points - - Args: - point1 (VectorLike): start point - point2 (VectorLike): middle point - point3 (VectorLike): end point - - Returns: - Edge: a circular arc through the three points - """ - circle_geom = GC_MakeArcOfCircle( - Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_tangent_arc( - cls, start: VectorLike, tangent: VectorLike, end: VectorLike - ) -> Edge: - """Tangent Arc - - Makes a tangent arc from point start, in the direction of tangent and ends at end. - - Args: - start (VectorLike): start point - tangent (VectorLike): start tangent - end (VectorLike): end point - - Returns: - Edge: circular arc - """ - circle_geom = GC_MakeArcOfCircle( - Vector(start).to_pnt(), Vector(tangent).wrapped, Vector(end).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: - """Create a line between two points - - Args: - point1: VectorLike: that represents the first point - point2: VectorLike: that represents the second point - - Returns: - A linear edge between the two provided points - - """ - return cls( - BRepBuilderAPI_MakeEdge( - Vector(point1).to_pnt(), Vector(point2).to_pnt() - ).Edge() - ) - - @classmethod - def make_helix( - cls, - pitch: float, - height: float, - radius: float, - center: VectorLike = (0, 0, 0), - normal: VectorLike = (0, 0, 1), - angle: float = 0.0, - lefthand: bool = False, - ) -> Wire: - """make_helix - - Make a helix with a given pitch, height and radius. By default a cylindrical surface is - used to create the helix. If the :angle: is set (the apex given in degree) a conical - surface is used instead. - - Args: - pitch (float): distance per revolution along normal - height (float): total height - radius (float): - center (VectorLike, optional): Defaults to (0, 0, 0). - normal (VectorLike, optional): Defaults to (0, 0, 1). - angle (float, optional): conical angle. Defaults to 0.0. - lefthand (bool, optional): Defaults to False. - - Returns: - Wire: helix - """ - # pylint: disable=too-many-locals - # 1. build underlying cylindrical/conical surface - if angle == 0.0: - geom_surf: Geom_Surface = Geom_CylindricalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius - ) - else: - geom_surf = Geom_ConicalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), - angle * DEG2RAD, - radius, - ) - - # 2. construct an segment in the u,v domain - - # Determine the length of the 2d line which will be wrapped around the surface - line_sign = -1 if lefthand else 1 - line_dir = Vector(line_sign * 2 * pi, pitch).normalized() - line_len = (height / line_dir.Y) / cos(radians(angle)) - - # Create an infinite 2d line in the direction of the helix - helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) - # Trim the line to the desired length - helix_curve = Geom2d_TrimmedCurve( - helix_line, 0, line_len, theAdjustPeriodic=True - ) - - # 3. Wrap the line around the surface - edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) - topods_edge = edge_builder.Edge() - - # 4. Convert the edge made with 2d geometry to 3d - BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) - - return cls(topods_edge) - - def distribute_locations( - self: Union[Wire, Edge], - count: int, - start: float = 0.0, - stop: float = 1.0, - positions_only: bool = False, - ) -> list[Location]: - """Distribute Locations - - Distribute locations along edge or wire. - - Args: - self: Union[Wire:Edge]: - count(int): Number of locations to generate - start(float): position along Edge|Wire to start. Defaults to 0.0. - stop(float): position along Edge|Wire to end. Defaults to 1.0. - positions_only(bool): only generate position not orientation. Defaults to False. - - Returns: - list[Location]: locations distributed along Edge|Wire - - Raises: - ValueError: count must be two or greater - - """ - if count < 2: - raise ValueError("count must be two or greater") - - t_values = [start + i * (stop - start) / (count - 1) for i in range(count)] - - locations = self.locations(t_values) - if positions_only: - for loc in locations: - loc.orientation = Vector(0, 0, 0) - - return locations - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Edge]: - """Project Edge - - Project an Edge onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected Edge(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - wire = Wire([self]) - projected_wires = wire.project_to_shape(target_object, direction, center) - projected_edges = [w.edges()[0] for w in projected_wires] - return projected_edges - - def to_axis(self) -> Axis: - """Translate a linear Edge to an Axis""" - if self.geom_type != GeomType.LINE: - raise ValueError( - f"to_axis is only valid for linear Edges not {self.geom_type}" - ) - return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) - - -class Face(Mixin2D, Shape[TopoDS_Face]): - """A Face in build123d represents a 3D bounded surface within the topological data - structure. It encapsulates geometric information, defining a face of a 3D shape. - These faces are integral components of complex structures, such as solids and - shells. Face enables precise modeling and manipulation of surfaces, supporting - operations like trimming, filleting, and Boolean operations.""" - - # pylint: disable=too-many-public-methods - - order = 2.0 - - @overload - def __init__( - self, - obj: TopoDS_Face, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face - - Args: - obj (TopoDS_Shape, optional): OCCT Face. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - outer_wire: Wire, - inner_wires: Iterable[Wire] | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a planar Face from a boundary Wire with optional hole Wires. - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (Iterable[Wire], optional): holes. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args: Any, **kwargs: Any): - outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - outer_wire, inner_wires, label, color, parent = args[:5] + (None,) * ( - 5 - l_a - ) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "outer_wire", - "inner_wires", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - outer_wire = kwargs.get("outer_wire", outer_wire) - inner_wires = kwargs.get("inner_wires", inner_wires) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if outer_wire is not None: - inner_topods_wires = ( - [w.wrapped for w in inner_wires] if inner_wires is not None else [] - ) - obj = _make_topods_face_from_wires(outer_wire.wrapped, inner_topods_wires) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - # Faces can optionally record the plane it was created on for later extrusion - self.created_on: Plane | None = None - - @property - def length(self) -> None | float: - """length of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.X) - result = face_vertices[-1].X - face_vertices[0].X - return result - - @property - def volume(self) -> float: - """volume - the volume of this Face, which is always zero""" - return 0.0 - - @property - def width(self) -> None | float: - """width of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.Y) - result = face_vertices[-1].Y - face_vertices[0].Y - return result - - @property - def geometry(self) -> None | str: - """geometry of planar face""" - result = None - if self.is_planar: - flat_face: Face = Plane(self).to_local_coords(self) - flat_face_edges = flat_face.edges() - if all(e.geom_type == GeomType.LINE for e in flat_face_edges): - flat_face_vertices = flat_face.vertices() - result = "POLYGON" - if len(flat_face_edges) == 4: - edge_pairs: list[list[Edge]] = [] - for vertex in flat_face_vertices: - edge_pairs.append( - [e for e in flat_face_edges if vertex in e.vertices()] - ) - edge_pair_directions = [ - [edge.tangent_at(0) for edge in pair] for pair in edge_pairs - ] - if all( - edge_directions[0].get_angle(edge_directions[1]) == 90 - for edge_directions in edge_pair_directions - ): - result = "RECTANGLE" - if len(flat_face_edges.group_by(SortBy.LENGTH)) == 1: - result = "SQUARE" - - return result - - @property - def center_location(self) -> Location: - """Location at the center of face""" - origin = self.position_at(0.5, 0.5) - return Plane(origin, z_dir=self.normal_at(origin)).location - - @property - def is_planar(self) -> bool: - """Is the face planar even though its geom_type may not be PLANE""" - return self.is_planar_face - - def geom_adaptor(self) -> Geom_Surface: - """Return the Geom Surface for this Face""" - return BRep_Tool.Surface_s(self.wrapped) - - def _uv_bounds(self) -> Tuple[float, float, float, float]: - """Return the u min, u max, v min, v max values""" - return BRepTools.UVBounds_s(self.wrapped) - - @overload - def normal_at(self, surface_point: VectorLike | None = None) -> Vector: - """normal_at point on surface - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where - the normal. Defaults to the center (None). - - Returns: - Vector: surface normal direction - """ - - @overload - def normal_at(self, u: float, v: float) -> Vector: - """normal_at u, v values on Face - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - Defaults to the center (None/None) - - Raises: - ValueError: Either neither or both u v values must be provided - - Returns: - Vector: surface normal direction - """ - - def normal_at(self, *args, **kwargs) -> Vector: - """normal_at - - Computes the normal vector at the desired location on the face. - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where the normal. - Defaults to None. - - Returns: - Vector: surface normal direction - """ - surface_point, u, v = None, -1.0, -1.0 - - if args: - if isinstance(args[0], Sequence): - surface_point = args[0] - elif isinstance(args[0], (int, float)): - u = args[0] - if len(args) == 2 and isinstance(args[1], (int, float)): - v = args[1] - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["surface_point", "u", "v"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - surface_point = kwargs.get("surface_point", surface_point) - u = kwargs.get("u", u) - v = kwargs.get("v", v) - if surface_point is None and u < 0 and v < 0: - u, v = 0.5, 0.5 - elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: - raise ValueError("Both u & v values must be specified") - - # get the geometry - surface = self.geom_adaptor() - - if surface_point is None: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) - else: - # project point on surface - projector = GeomAPI_ProjectPointOnSurf( - Vector(surface_point).to_pnt(), surface - ) - - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - def position_at(self, u: float, v: float) -> Vector: - """position_at - - Computes a point on the Face given u, v coordinates. - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - - Returns: - Vector: point on Face - """ - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u_val0 + u * (u_val1 - u_val0) - v_val = v_val0 + v * (v_val1 - v_val0) - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(gp_pnt) - - def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) - else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) - return Location(pln) - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of Face - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if (center_of == CenterOf.MASS) or ( - center_of == CenterOf.GEOMETRY and self.is_planar - ): - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - center_point = properties.CentreOfMass() - - elif center_of == CenterOf.BOUNDING_BOX: - center_point = self.bounding_box().center() - - elif center_of == CenterOf.GEOMETRY: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = 0.5 * (u_val0 + u_val1) - v_val = 0.5 * (v_val0 + v_val1) - - center_point = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) - - return Vector(center_point) - - def outer_wire(self) -> Wire: - """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) - - def inner_wires(self) -> ShapeList[Wire]: - """Extract the inner or hole wires from this Face""" - outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) - - def wire(self) -> Wire: - """Return the outerwire, generate a warning if inner_wires present""" - if self.inner_wires(): - warnings.warn( - "Found holes, returning outer_wire", - stacklevel=2, - ) - return self.outer_wire() - - @classmethod - def extrude(cls, obj: Edge, direction: VectorLike) -> Face: - """extrude - - Extrude an Edge into a Face. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Face: extruded shape - """ - return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: - """make_rect - - Make a Rectangle centered on center with the given normal - - Args: - width (float, optional): width (local x). - height (float, optional): height (local y). - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Face: The centered rectangle - """ - pln_shape = BRepBuilderAPI_MakeFace( - plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 - ).Face() - - return cls(pln_shape) - - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - - @overload - @classmethod - def make_surface_from_curves( - cls, edge1: Edge, edge2: Edge - ) -> Face: # pragma: no cover - ... - - @overload - @classmethod - def make_surface_from_curves( - cls, wire1: Wire, wire2: Wire - ) -> Face: # pragma: no cover - ... - - @classmethod - def make_surface_from_curves(cls, *args, **kwargs) -> Face: - """make_surface_from_curves - - Create a ruled surface out of two edges or two wires. If wires are used then - these must have the same number of edges. - - Args: - curve1 (Union[Edge,Wire]): side of surface - curve2 (Union[Edge,Wire]): opposite side of surface - - Returns: - Face: potentially non planar surface - """ - curve1, curve2 = None, None - if args: - if len(args) != 2 or type(args[0]) is not type(args[1]): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - curve1, curve2 = args - - curve1 = kwargs.pop("edge1", curve1) - curve2 = kwargs.pop("edge2", curve2) - curve1 = kwargs.pop("wire1", curve1) - curve2 = kwargs.pop("wire2", curve2) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - - if isinstance(curve1, Wire): - return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) - else: - return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) - return return_value - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: - """sew faces - - Group contiguous faces and return them in a list of ShapeList - - Args: - faces (Iterable[Face]): Faces to sew together - - Raises: - RuntimeError: OCCT SewedShape generated unexpected output - - Returns: - list[ShapeList[Face]]: grouped contiguous faces - """ - # Sew the faces - sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) - top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces: list[ShapeList] = [] - - # For each of the top level shapes create a ShapeList of Face - for top_level_shape in top_level_shapes: - if isinstance(top_level_shape, TopoDS_Face): - sewn_faces.append(ShapeList([Face(top_level_shape)])) - elif isinstance(top_level_shape, TopoDS_Shell): - sewn_faces.append(Shell(top_level_shape).faces()) - elif isinstance(top_level_shape, TopoDS_Solid): - sewn_faces.append( - ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") - ) - ) - else: - raise RuntimeError( - f"SewedShape returned a {type(top_level_shape)} which was unexpected" - ) - - return sewn_faces - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Face: - """sweep - - Sweep a 1D profile along a 1D path. Both the profile and path must be composed - of only 1 Edge. - - Args: - profile (Union[Curve,Edge,Wire]): the object to sweep - path (Union[Curve,Edge,Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Raises: - ValueError: Only 1 Edge allowed in profile & path - - Returns: - Face: resulting face, may be non-planar - """ - # Note: BRepOffsetAPI_MakePipe is an option here - # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) - # pipe_sweep.Build() - # return Face(pipe_sweep.Shape()) - - if len(profile.edges()) != 1 or len(path.edges()) != 1: - raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Face(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_surface_from_array_of_points( - cls, - points: list[list[VectorLike]], - tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 3, - ) -> Face: - """make_surface_from_array_of_points - - Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter - space of the face. The second dimension correspond to points on the horizontal - direction in the parameter space of the face. The 2 dimensions are U,V dimensions - of the parameter space of the face. - - Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V - parameters second is U parameters. - tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. - smoothing (Tuple[float, float, float], optional): optional tuple of - 3 weights use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when - smoothing is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 3. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Face: a potentially non-planar face defined by points - """ - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - - for i, point_row in enumerate(points): - for j, point in enumerate(point_row): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Surface() - - return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) - - @classmethod - def make_bezier_surface( - cls, - points: list[list[VectorLike]], - weights: list[list[float]] | None = None, - ) -> Face: - """make_bezier_surface - - Construct a Bézier surface from the provided 2d array of points. - - Args: - points (list[list[VectorLike]]): a 2D list of control points - weights (list[list[float]], optional): control point weights. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Face: a potentially non-planar face - """ - if len(points) < 2 or len(points[0]) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(points) > 25 or len(points[0]) > 25: - raise ValueError("The maximum number of control points is 25") - if weights and ( - len(points) != len(weights) or len(points[0]) != len(weights[0]) - ): - raise ValueError("A weight must be provided for each control point") - - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - for i, row_points in enumerate(points): - for j, point in enumerate(row_points): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if weights: - weights_ = TColStd_HArray2OfReal(1, len(weights), 1, len(weights[0])) - for i, row_weights in enumerate(weights): - for j, weight in enumerate(row_weights): - weights_.SetValue(i + 1, j + 1, float(weight)) - bezier = Geom_BezierSurface(points_, weights_) - else: - bezier = Geom_BezierSurface(points_) - - return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) - - @classmethod - def make_surface( - cls, - exterior: Union[Wire, Iterable[Edge]], - surface_points: Iterable[VectorLike] | None = None, - interior_wires: Iterable[Wire] | None = None, - ) -> Face: - """Create Non-Planar Face - - Create a potentially non-planar face bounded by exterior (wire or edges), - optionally refined by surface_points with optional holes defined by - interior_wires. - - Args: - exterior (Union[Wire, list[Edge]]): Perimeter of face - surface_points (list[VectorLike], optional): Points on the surface that - refine the shape. Defaults to None. - interior_wires (list[Wire], optional): Hole(s) in the face. Defaults to None. - - Raises: - RuntimeError: Internal error building face - RuntimeError: Error building non-planar face with provided surface_points - RuntimeError: Error adding interior hole - RuntimeError: Generated face is invalid - - Returns: - Face: Potentially non-planar face - """ - exterior = list(exterior) if isinstance(exterior, Iterable) else exterior - # pylint: disable=too-many-branches - if surface_points: - surface_point_vectors = [Vector(p) for p in surface_points] - else: - surface_point_vectors = None - - # First, create the non-planar surface - surface = BRepOffsetAPI_MakeFilling( - # order of energy criterion to minimize for computing the deformation of the surface - Degree=3, - # average number of points for discretisation of the edges - NbPtsOnCur=15, - NbIter=2, - Anisotropie=False, - # the maximum distance allowed between the support surface and the constraints - Tol2d=0.00001, - # the maximum distance allowed between the support surface and the constraints - Tol3d=0.0001, - # the maximum angle allowed between the normal of the surface and the constraints - TolAng=0.01, - # the maximum difference of curvature allowed between the surface and the constraint - TolCurv=0.1, - # the highest degree which the polynomial defining the filling surface can have - MaxDeg=8, - # the greatest number of segments which the filling surface can have - MaxSegments=9, - ) - if isinstance(exterior, Wire): - outside_edges = exterior.edges() - elif isinstance(exterior, Iterable) and all( - isinstance(o, Edge) for o in exterior - ): - outside_edges = ShapeList(exterior) - else: - raise ValueError("exterior must be a Wire or list of Edges") - - for edge in outside_edges: - surface.Add(edge.wrapped, GeomAbs_C0) - - try: - surface.Build() - surface_face = Face(surface.Shape()) - except ( - Standard_Failure, - StdFail_NotDone, - Standard_NoSuchObject, - Standard_ConstructionError, - ) as err: - raise RuntimeError( - "Error building non-planar face with provided exterior" - ) from err - if surface_point_vectors: - for point in surface_point_vectors: - surface.Add(gp_Pnt(*point.to_tuple())) - try: - surface.Build() - surface_face = Face(surface.Shape()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error building non-planar face with provided surface_points" - ) from err - - # Next, add wires that define interior holes - note these wires must be entirely interior - if interior_wires: - makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) - for wire in interior_wires: - makeface_object.Add(wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - if not surface_face.is_valid(): - raise RuntimeError("non planar face is invalid") - - return surface_face - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: - """Apply 2D fillet to a face - - Args: - radius: float: - vertices: Iterable[Vertex]: - - Returns: - - """ - - fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - - fillet_builder.Build() - - return self.__class__.cast(fillet_builder.Shape()) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Face: - """Apply 2D chamfer to a face - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Raises: - ValueError: Cannot chamfer at this location - ValueError: One or more vertices are not part of edge - - Returns: - Face: face with a chamfered corner(s) - - """ - reference_edge = edge - - chamfer_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - return self.__class__.cast(chamfer_builder.Shape()).fix() - - def is_coplanar(self, plane: Plane) -> bool: - """Is this planar face coplanar with the provided plane""" - u_val0, _u_val1, v_val0, _v_val1 = self._uv_bounds() - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val0, v_val0, gp_pnt, normal) - - return ( - plane.contains(Vector(gp_pnt)) - and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE - ) - - def project_to_shape( - self, target_object: Shape, direction: VectorLike - ) -> ShapeList[Face | Shell]: - """Project Face to target Object - - Project a Face onto a Shape generating new Face(s) on the surfaces of the object. - - A projection with no taper is illustrated below: - - .. image:: flatProjection.png - :alt: flatProjection - - Note that an array of faces is returned as the projection might result in faces - on the "front" and "back" of the object (or even more if there are intermediate - surfaces in the projection path). faces "behind" the projection are not - returned. - - Args: - target_object (Shape): Object to project onto - direction (VectorLike): projection direction - - Returns: - ShapeList[Face]: Face(s) projected on target object ordered by distance - """ - max_dimension = find_max_dimension([self, target_object]) - extruded_topods_self = _extrude_topods_shape( - self.wrapped, Vector(direction) * max_dimension - ) - - intersected_shapes: ShapeList[Face | Shell] = ShapeList() - if isinstance(target_object, Vertex): - raise TypeError("projection to a vertex is not supported") - if isinstance(target_object, Face): - topods_shape = _topods_bool_op( - (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() - ) - if not topods_shape.IsNull(): - intersected_shapes.append(Face(topods_shape)) - else: - for target_shell in target_object.shells(): - topods_shape = _topods_bool_op( - (extruded_topods_self,), - (target_shell.wrapped,), - BRepAlgoAPI_Common(), - ) - for topods_shell in get_top_level_topods_shapes(topods_shape): - intersected_shapes.append(Shell(topods_shell)) - - intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = ShapeList( - s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ) - return intersected_shapes - - def make_holes(self, interior_wires: list[Wire]) -> Face: - """Make Holes in Face - - Create holes in the Face 'self' from interior_wires which must be entirely interior. - Note that making holes in faces is more efficient than using boolean operations - with solid object. Also note that OCCT core may fail unless the orientation of the wire - is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. - - Example: - - For example, make a series of slots on the curved walls of a cylinder. - - .. image:: slotted_cylinder.png - - Args: - interior_wires: a list of hole outline wires - interior_wires: list[Wire]: - - Returns: - Face: 'self' with holes - - Raises: - RuntimeError: adding interior hole in non-planar face with provided interior_wires - RuntimeError: resulting face is not valid - - """ - # Add wires that define interior holes - note these wires must be entirely interior - makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) - for interior_wire in interior_wires: - makeface_object.Add(interior_wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - # if not surface_face.is_valid(): - # raise RuntimeError("non planar face is invalid") - - return surface_face - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Point inside Face - - Returns whether or not the point is inside a Face within the specified tolerance. - Points on the edge of the Face are considered inside. - - Args: - point(VectorLike): tuple or Vector representing 3D point to be tested - tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool: indicating whether or not point is within Face - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - return solid_classifier.IsOnAFace() - - # surface = BRep_Tool.Surface_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) - # return projector.LowerDistance() <= TOLERANCE - - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs - - Approximate planar face with arcs and straight line segments. - - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - - -class Shell(Mixin2D, Shape[TopoDS_Shell]): - """A Shell is a fundamental component in build123d's topological data structure - representing a connected set of faces forming a closed surface in 3D space. As - part of a geometric model, it defines a watertight enclosure, commonly encountered - in solid modeling. Shells group faces in a coherent manner, playing a crucial role - in representing complex shapes with voids and surfaces. This hierarchical structure - allows for efficient handling of surfaces within a model, supporting various - operations and analyses.""" - - order = 2.5 - - def __init__( - self, - obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell - - Args: - obj (TopoDS_Shape | Face | Iterable[Face], optional): OCCT Shell, Face or Faces. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - obj = list(obj) if isinstance(obj, Iterable) else obj - if isinstance(obj, Iterable) and len(obj_list := list(obj)) == 1: - obj = obj_list[0] - - if isinstance(obj, Face): - builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(obj.wrapped).Surface().Surface() - ) - obj = builder.Shape() - elif isinstance(obj, Iterable): - obj = _sew_topods_faces([f.wrapped for f in obj]) - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - @property - def volume(self) -> float: - """volume - the volume of this Shell if manifold, otherwise zero""" - if self.is_manifold: - solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] - calc_function(solid_shell, properties) - return properties.Mass() - return 0.0 - - def center(self) -> Vector: - """Center of mass of the shell""" - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - return Vector(properties.CentreOfMass()) - - @classmethod - def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: - """extrude - - Extrude a Wire into a Shell. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Shell: - """sweep - - Sweep a 1D profile along a 1D path - - Args: - profile (Union[Curve, Edge, Wire]): the object to sweep - path (Union[Curve, Edge, Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Shell: resulting Shell, may be non-planar - """ - profile = Wire(profile.edges()) - path = Wire(Wire(path.edges()).order_edges()) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Shell(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Shell: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list nor - between wires. Wires may be closed or opened. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Shell: Lofted object - """ - return cls(_make_loft(objs, False, ruled)) - - -class Solid(Mixin3D, Shape[TopoDS_Solid]): - """A Solid in build123d represents a three-dimensional solid geometry - in a topological structure. A solid is a closed and bounded volume, enclosing - a region in 3D space. It comprises faces, edges, and vertices connected in a - well-defined manner. Solid modeling operations, such as Boolean - operations (union, intersection, and difference), are often performed on - Solid objects to create or modify complex geometries.""" - - order = 3.0 - - def __init__( - self, - obj: TopoDS_Solid | Shell | None = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - ): - """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid - - Args: - obj (TopoDS_Shape | Shell, optional): OCCT Solid or Shell. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Shell): - obj = Solid._make_solid(obj) - - super().__init__( - obj=obj, - # label="" if label is None else label, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - - @property - def volume(self) -> float: - """volume - the volume of this Solid""" - # when density == 1, mass == volume - return Shape.compute_mass(self) - - @classmethod - def _make_solid(cls, shell: Shell) -> TopoDS_Solid: - """Create a Solid object from the surface shell""" - return ShapeFix_Solid().SolidFromShell(shell.wrapped) - - @classmethod - def extrude(cls, obj: Face, direction: VectorLike) -> Solid: - """extrude - - Extrude a Face into a Solid. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: - """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) - - @classmethod - def make_box( - cls, length: float, width: float, height: float, plane: Plane = Plane.XY - ) -> Solid: - """make box - - Make a box at the origin of plane extending in positive direction of each axis. - - Args: - length (float): - width (float): - height (float): - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Solid: Box - """ - return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() - ) - - @classmethod - def make_cone( - cls, - base_radius: float, - top_radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cone - - Make a cone with given radii and height - - Args: - base_radius (float): - top_radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cone - """ - return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_cylinder( - cls, - radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cylinder - - Make a cylinder with a given radius and height with the base center on plane origin. - - Args: - radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cylinder - """ - return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_torus( - cls, - major_radius: float, - minor_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 0, - end_angle: float = 360, - major_angle: float = 360, - ) -> Solid: - """make torus - - Make a torus with a given radii and angles - - Args: - major_radius (float): - minor_radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - start_angle (float, optional): start major arc. Defaults to 0. - end_angle (float, optional): end major arc. Defaults to 360. - - Returns: - Solid: Full or partial torus - """ - return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Solid: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Solid: Lofted object - """ - return cls(_make_loft(objs, True, ruled)) - - @classmethod - def make_wedge( - cls, - delta_x: float, - delta_y: float, - delta_z: float, - min_x: float, - min_z: float, - max_x: float, - max_z: float, - plane: Plane = Plane.XY, - ) -> Solid: - """Make a wedge - - Args: - delta_x (float): - delta_y (float): - delta_z (float): - min_x (float): - min_z (float): - max_x (float): - max_z (float): - plane (Plane): base plane. Defaults to Plane.XY. - - Returns: - Solid: wedge - """ - return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() - ) - - @classmethod - def make_sphere( - cls, - radius: float, - plane: Plane = Plane.XY, - angle1: float = -90, - angle2: float = 90, - angle3: float = 360, - ) -> Solid: - """Sphere - - Make a full or partial sphere - with a given radius center on the origin or plane. - - Args: - radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle1 (float, optional): Defaults to -90. - angle2 (float, optional): Defaults to 90. - angle3 (float, optional): Defaults to 360. - - Returns: - Solid: sphere - """ - return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() - ) - - @classmethod - def extrude_taper( - cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True - ) -> Solid: - """Extrude a cross section with a taper - - Extrude a cross section into a prismatic solid in the provided direction. - - Note that two difference algorithms are used. If direction aligns with - the profile normal (which must be positive), the taper is positive and the profile - contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most - accurate results. Otherwise, a loft is created between the profile and the profile - with a 2D offset set at the appropriate direction. - - Args: - section (Face]): cross section - normal (VectorLike): a vector along which to extrude the wires. The length - of the vector controls the length of the extrusion. - taper (float): taper angle in degrees. - flip_inner (bool, optional): outer and inner geometry have opposite tapers to - allow for part extraction when injection molding. - - Returns: - Solid: extruded cross section - """ - # pylint: disable=too-many-locals - direction = Vector(direction) - - if ( - direction.normalized() == profile.normal_at() - and Plane(profile).z_dir.Z > 0 - and taper > 0 - and not profile.inner_wires() - ): - prism_builder = LocOpe_DPrism( - profile.wrapped, - direction.length / cos(radians(taper)), - radians(taper), - ) - new_solid = Solid(prism_builder.Shape()) - else: - # Determine the offset to get the taper - offset_amt = -direction.length * tan(radians(taper)) - - outer = profile.outer_wire() - local_outer: Wire = Plane(profile).to_local_coords(outer) - local_taper_outer = local_outer.offset_2d( - offset_amt, kind=Kind.INTERSECTION - ) - taper_outer = Plane(profile).from_local_coords(local_taper_outer) - taper_outer.move(Location(direction)) - - profile_wires = [profile.outer_wire()] + profile.inner_wires() - - taper_wires = [] - for i, wire in enumerate(profile_wires): - flip = -1 if i > 0 and flip_inner else 1 - local: Wire = Plane(profile).to_local_coords(wire) - local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper_wire: Wire = Plane(profile).from_local_coords(local_taper) - taper_wire.move(Location(direction)) - taper_wires.append(taper_wire) - - solids = [ - Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) - ] - if len(solids) > 1: - complex_solid = solids[0].cut(*solids[1:]) - assert isinstance(complex_solid, Solid) # Can't be a list - new_solid = complex_solid - else: - new_solid = solids[0] - - return new_solid - - @classmethod - def extrude_linear_with_rotation( - cls, - section: Union[Face, Wire], - center: VectorLike, - normal: VectorLike, - angle: float, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Extrude with Rotation - - Creates a 'twisted prism' by extruding, while simultaneously rotating around the - extrusion vector. - - Args: - section (Union[Face,Wire]): cross section - vec_center (VectorLike): the center point about which to rotate - vec_normal (VectorLike): a vector along which to extrude the wires - angle (float): the angle to rotate through while extruding - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to None. - - Returns: - Solid: extruded object - """ - # Though the signature may appear to be similar enough to extrude to merit - # combining them, the construction methods used here are different enough that they - # should be separate. - - # At a high level, the steps followed are: - # (1) accept a set of wires - # (2) create another set of wires like this one, but which are transformed and rotated - # (3) create a ruledSurface between the sets of wires - # (4) create a shell and compute the resulting object - - inner_wires = inner_wires if inner_wires else [] - center = Vector(center) - normal = Vector(normal) - - def extrude_aux_spine( - wire: TopoDS_Wire, spine: TopoDS_Wire, aux_spine: TopoDS_Wire - ) -> TopoDS_Shape: - """Helper function""" - extrude_builder = BRepOffsetAPI_MakePipeShell(spine) - extrude_builder.SetMode(aux_spine, False) # auxiliary spine - extrude_builder.Add(wire) - extrude_builder.Build() - extrude_builder.MakeSolid() - return extrude_builder.Shape() - - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - - # make straight spine - straight_spine_e = Edge.make_line(center, center.add(normal)) - straight_spine_w = Wire.combine([straight_spine_e])[0].wrapped - - # make an auxiliary spine - pitch = 360.0 / angle * normal.length - aux_spine_w = Wire( - [Edge.make_helix(pitch, normal.length, 1, center=center, normal=normal)] - ).wrapped - - # extrude the outer wire - outer_solid = extrude_aux_spine( - outer_wire.wrapped, straight_spine_w, aux_spine_w - ) - - # extrude inner wires - inner_solids = [ - extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w) - for w in inner_wires - ] - - # combine the inner solids into compound - inner_comp = _make_topods_compound_from_shapes(inner_solids) - - # subtract from the outer solid - return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) - - @classmethod - def extrude_until( - cls, - section: Face, - target_object: Union[Compound, Solid], - direction: VectorLike, - until: Until = Until.NEXT, - ) -> Union[Compound, Solid]: - """extrude_until - - Extrude section in provided direction until it encounters either the - NEXT or LAST surface of target_object. Note that the bounding surface - must be larger than the extruded face where they contact. - - Args: - section (Face): Face to extrude - target_object (Union[Compound, Solid]): object to limit extrusion - direction (VectorLike): extrusion direction - until (Until, optional): surface to limit extrusion. Defaults to Until.NEXT. - - Raises: - ValueError: provided face does not intersect target_object - - Returns: - Union[Compound, Solid]: extruded Face - """ - direction = Vector(direction) - if until in [Until.PREVIOUS, Until.FIRST]: - direction *= -1 - until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - - max_dimension = find_max_dimension([section, target_object]) - clipping_direction = ( - direction * max_dimension - if until == Until.NEXT - else -direction * max_dimension - ) - direction_axis = Axis(section.center(), clipping_direction) - # Create a linear extrusion to start - extrusion = Solid.extrude(section, direction * max_dimension) - - # Project section onto the shape to generate faces that will clip the extrusion - # and exclude the planar faces normal to the direction of extrusion and these - # will have no volume when extruded - faces = [] - for face in section.project_to_shape(target_object, direction): - if isinstance(face, Face): - faces.append(face) - else: - faces += face.faces() - - clip_faces = [ - f - for f in faces - if not (f.is_planar and f.normal_at().dot(direction) == 0.0) - ] - if not clip_faces: - raise ValueError("provided face does not intersect target_object") - - # Create the objects that will clip the linear extrusion - clipping_objects = [ - Solid.extrude(f, clipping_direction).fix() for f in clip_faces - ] - clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] - - if until == Until.NEXT: - trimmed_extrusion = extrusion.cut(target_object) - if isinstance(trimmed_extrusion, ShapeList): - closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] - else: - closest_extrusion = trimmed_extrusion - for clipping_object in clipping_objects: - # It's possible for clipping faces to self intersect when they are extruded - # thus they could be non manifold which results failed boolean operations - # - so skip these objects - try: - extrusion_shapes = closest_extrusion.cut(clipping_object) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - else: - base_part = extrusion.intersect(target_object) - if isinstance(base_part, ShapeList): - extrusion_parts = base_part - elif base_part is None: - extrusion_parts = ShapeList() - else: - extrusion_parts = ShapeList([base_part]) - for clipping_object in clipping_objects: - try: - clipped_extrusion = extrusion.intersect(clipping_object) - if clipped_extrusion is not None: - extrusion_parts.append( - clipped_extrusion.solids().sort_by(direction_axis)[0] - ) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - extrusion_shapes = Solid.fuse(*extrusion_parts) - - result = extrusion_shapes.solids().sort_by(direction_axis)[0] - - return result - - @classmethod - def revolve( - cls, - section: Union[Face, Wire], - angle: float, - axis: Axis, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Revolve - - Revolve a cross section about the given Axis by the given angle. - - Args: - section (Union[Face,Wire]): cross section - angle (float): the angle to revolve through - axis (Axis): rotation Axis - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to []. - - Returns: - Solid: the revolved cross section - """ - inner_wires = inner_wires if inner_wires else [] - if isinstance(section, Wire): - section_face = Face(section, inner_wires) - else: - section_face = section - - revol_builder = BRepPrimAPI_MakeRevol( - section_face.wrapped, - axis.wrapped, - angle * DEG2RAD, - True, - ) - - return cls(revol_builder.Shape()) - - @classmethod - def _set_sweep_mode( - cls, - builder: BRepOffsetAPI_MakePipeShell, - path: Union[Wire, Edge], - binormal: Union[Vector, Wire, Edge], - ) -> bool: - rotate = False - - if isinstance(binormal, Vector): - coordinate_system = gp_Ax2() - coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(binormal.to_dir()) - builder.SetMode(coordinate_system) - rotate = True - elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) - - return rotate - - @classmethod - def sweep( - cls, - section: Union[Face, Wire], - path: Union[Wire, Edge], - inner_wires: list[Wire] | None = None, - make_solid: bool = True, - is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, - transition: Transition = Transition.TRANSFORMED, - ) -> Solid: - """Sweep - - Sweep the given cross section into a prismatic solid along the provided path - - Args: - section (Union[Face, Wire]): cross section to sweep - path (Union[Wire, Edge]): sweep path - inner_wires (list[Wire]): holes - only used if section is a wire - make_solid (bool, optional): return Solid or Shell. Defaults to True. - is_frenet (bool, optional): Frenet mode. Defaults to False. - mode (Union[Vector, Wire, Edge, None], optional): additional sweep - mode parameters. Defaults to None. - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Solid: the swept cross section - """ - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - inner_wires = inner_wires if inner_wires else [] - - shapes = [] - for wire in [outer_wire] + inner_wires: - builder = BRepOffsetAPI_MakePipeShell(path.to_wire().wrapped) - - rotate = False - - # handle sweep mode - if mode: - rotate = Solid._set_sweep_mode(builder, path, mode) - else: - builder.SetMode(is_frenet) - - builder.SetTransitionMode(Shape._transModeDict[transition]) - - builder.Add(wire.wrapped, False, rotate) - - builder.Build() - if make_solid: - builder.MakeSolid() - - shapes.append(Mixin3D.cast(builder.Shape())) - - outer_shape, inner_shapes = shapes[0], shapes[1:] - - if inner_shapes: - hollow_outer_shape = outer_shape.cut(*inner_shapes) - assert isinstance(hollow_outer_shape, Solid) - return hollow_outer_shape - - return outer_shape - - @classmethod - def sweep_multi( - cls, - profiles: Iterable[Union[Wire, Face]], - path: Union[Wire, Edge], - make_solid: bool = True, - is_frenet: bool = False, - binormal: Union[Vector, Wire, Edge, None] = None, - ) -> Solid: - """Multi section sweep - - Sweep through a sequence of profiles following a path. - - Args: - profiles (Iterable[Union[Wire, Face]]): list of profiles - path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over - make_solid (bool, optional): Solid or Shell. Defaults to True. - is_frenet (bool, optional): Select frenet mode. Defaults to False. - binormal (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. - Defaults to None. - - Returns: - Solid: swept object - """ - path_as_wire = path.to_wire().wrapped - - builder = BRepOffsetAPI_MakePipeShell(path_as_wire) - - translate = False - rotate = False - - if binormal: - rotate = cls._set_sweep_mode(builder, path, binormal) - else: - builder.SetMode(is_frenet) - - for profile in profiles: - path_as_wire = ( - profile.wrapped - if isinstance(profile, Wire) - else profile.outer_wire().wrapped - ) - builder.Add(path_as_wire, translate, rotate) - - builder.Build() - - if make_solid: - builder.MakeSolid() - - return cls(builder.Shape()) - - @classmethod - def thicken( - cls, - surface: Face | Shell, - depth: float, - normal_override: Optional[VectorLike] = None, - ) -> Solid: - """Thicken Face or Shell - - Create a solid from a potentially non planar face or shell by thickening along - the normals. - - .. image:: thickenFace.png - - Non-planar faces are thickened both towards and away from the center of the sphere. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - normal_override (Vector, optional): Face only. The normal_override vector can be - used to indicate which way is 'up', potentially flipping the face normal - direction such that many faces with different normals all go in the same - direction (direction need only be +/- 90 degrees from the face normal). - Defaults to None. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - # Check to see if the normal needs to be flipped - adjusted_depth = depth - if isinstance(surface, Face) and normal_override is not None: - surface_center = surface.center() - surface_normal = surface.normal_at(surface_center).normalized() - if surface_normal.dot(Vector(normal_override).normalized()) < 0: - adjusted_depth = -depth - - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - surface.wrapped, - Offset=adjusted_depth, - Tol=1.0e-5, - Mode=BRepOffset_Skin, - # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both - # sides of the surface but doesn't seem to work - Intersection=True, - SelfInter=False, - Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection - Thickening=True, - RemoveIntEdges=True, - ) - offset_builder.MakeOffsetShape() - try: - result = Solid(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error applying thicken to given surface") from err - - return result - - -class Vertex(Shape[TopoDS_Vertex]): - """A Vertex in build123d represents a zero-dimensional point in the topological - data structure. It marks the endpoints of edges within a 3D model, defining precise - locations in space. Vertices play a crucial role in defining the geometry of objects - and the connectivity between edges, facilitating accurate representation and - manipulation of 3D shapes. They hold coordinate information and are essential - for constructing complex structures like wires, faces, and solids.""" - - order = 0.0 - - @property - def _dim(self) -> int: - return 0 - - @overload - def __init__(self): # pragma: no cover - """Default Vertext at the origin""" - - @overload - def __init__(self, ocp_vx: TopoDS_Vertex): # pragma: no cover - """Vertex from OCCT TopoDS_Vertex object""" - - @overload - def __init__(self, X: float, Y: float, Z: float): # pragma: no cover - """Vertex from three float values""" - - @overload - def __init__(self, v: Iterable[float]): - """Vertex from Vector or other iterators""" - - def __init__(self, *args, **kwargs): - self.vertex_index = 0 - - ocp_vx = kwargs.pop("ocp_vx", None) - v = kwargs.pop("v", None) - x = kwargs.pop("X", 0) - y = kwargs.pop("Y", 0) - z = kwargs.pop("Z", 0) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if args: - if isinstance(args[0], TopoDS_Vertex): - ocp_vx = args[0] - elif isinstance(args[0], Iterable): - v = args[0] - else: - x, y, z = args[:3] + (0,) * (3 - len(args)) - - if v is not None: - x, y, z = itertools.islice(itertools.chain(v, [0, 0, 0]), 3) - - ocp_vx = ( - downcast(BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z)).Vertex()) - if ocp_vx is None - else ocp_vx - ) - - super().__init__(ocp_vx) - self.X, self.Y, self.Z = self.to_tuple() - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def volume(self) -> float: - """volume - the volume of this Vertex, which is always zero""" - return 0.0 - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return ShapeList((self,)) # Vertex is an iterable - - def vertex(self) -> Vertex: - """Return the Vertex""" - return self - - def to_tuple(self) -> tuple[float, float, float]: - """Return vertex as three tuple of floats""" - geom_point = BRep_Tool.Pnt_s(self.wrapped) - return (geom_point.X(), geom_point.Y(), geom_point.Z()) - - def center(self) -> Vector: - """The center of a vertex is itself!""" - return Vector(self) - - def __add__( # type: ignore - self, other: Vertex | Vector | tuple[float, float, float] - ) -> Vertex: - """Add - - Add to a Vertex with a Vertex, Vector or Tuple - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" Vertex: # type: ignore - """Subtract - - Substract a Vertex with a Vertex, Vector or Tuple from self - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" str: - """To String - - Convert Vertex to String for display - - Returns: - Vertex as String - """ - return f"Vertex({self.X}, {self.Y}, {self.Z})" - - def __iter__(self): - """Initialize to beginning""" - self.vertex_index = 0 - return self - - def __next__(self): - """return the next value""" - if self.vertex_index == 0: - self.vertex_index += 1 - value = self.X - elif self.vertex_index == 1: - self.vertex_index += 1 - value = self.Y - elif self.vertex_index == 2: - self.vertex_index += 1 - value = self.Z - else: - raise StopIteration - return value - - def transform_shape(self, t_matrix: Matrix) -> Vertex: - """Apply affine transform without changing type - - Transforms a copy of this Vertex by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Vertex: copy of transformed shape with all objects keeping their type - """ - return Vertex(*t_matrix.multiply(Vector(self))) - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: - """extrude - invalid operation for Vertex""" - raise NotImplementedError("Vertices can't be created by extrusion") - - -class Wire(Mixin1D, Shape[TopoDS_Wire]): - """A Wire in build123d is a topological entity representing a connected sequence - of edges forming a continuous curve or path in 3D space. Wires are essential - components in modeling complex objects, defining boundaries for surfaces or - solids. They store information about the connectivity and order of edges, - allowing precise definition of paths within a 3D model.""" - - order = 1.5 - - @overload - def __init__( - self, - obj: TopoDS_Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from an OCCT TopoDS_Wire - - Args: - obj (TopoDS_Wire, optional): OCCT Wire. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edge: Edge, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Edge - - Args: - edge (Edge): Edge to convert to Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Wire - used when the input could be an Edge or Wire. - - Args: - wire (Wire): Wire to convert to another Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Curve, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Curve. - - Args: - curve (Curve): Curve to convert to a Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edges: Iterable[Edge], - sequenced: bool = False, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from Edges - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - curve, edge, edges, wire, sequenced, obj, label, color, parent = (None,) * 9 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Wire): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Edge): - edge, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - # elif isinstance(args[0], Curve): - elif ( - hasattr(args[0], "wrapped") - and isinstance(args[0].wrapped, TopoDS_Compound) - and topods_dim(args[0].wrapped) == 1 - ): # Curve - curve, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Iterable): - edges, sequenced, label, color, parent = args[:5] + (None,) * (5 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "curve", - "wire", - "edge", - "edges", - "sequenced", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - edge = kwargs.get("edge", edge) - edges = kwargs.get("edges", edges) - sequenced = kwargs.get("sequenced", sequenced) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - wire = kwargs.get("wire", wire) - curve = kwargs.get("curve", curve) - - if edge is not None: - edges = [edge] - elif curve is not None: - edges = curve.edges() - if wire is not None: - obj = wire.wrapped - elif edges: - obj = Wire._make_wire(edges, False if sequenced is None else sequenced) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_CompCurve: - """Return the Geom Comp Curve for this Wire""" - return BRepAdaptor_CompCurve(self.wrapped) - - def close(self) -> Wire: - """Close a Wire""" - if not self.is_closed: - edge = Edge.make_line(self.end_point(), self.start_point()) - return_value = Wire.combine((self, edge))[0] - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" - return self - - @classmethod - def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 - ) -> ShapeList[Wire]: - """combine - - Combine a list of wires and edges into a list of Wires. - - Args: - wires (Iterable[Union[Wire, Edge]]): unsorted - tol (float, optional): tolerance. Defaults to 1e-9. - - Returns: - ShapeList[Wire]: Wires - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) - - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires = ShapeList() - for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) - - return wires - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: - """extrude - invalid operation for Wire""" - raise NotImplementedError("Wires can't be created by extrusion") - - def fix_degenerate_edges(self, precision: float) -> Wire: - """fix_degenerate_edges - - Fix a Wire that contains degenerate (very small) edges - - Args: - precision (float): minimum value edge length - - Returns: - Wire: fixed wire - """ - sf_w = ShapeFix_Wireframe(self.wrapped) - sf_w.SetPrecision(precision) - sf_w.SetMaxTolerance(1e-6) - sf_w.FixSmallEdges() - sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) - - def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" - - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. - - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False - - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) - - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length - break - distance += edge.length - - if not found: - raise ValueError(f"{point} not on wire") - - return distance / wire_length - - def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Wire: trimmed wire - """ - - # pylint: disable=too-many-branches - if start >= end: - raise ValueError("start must be less than end") - - edges = self.edges() - - # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) - - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) - - trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue - - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) - - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) - - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) - - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) - - return Wire(trimmed_edges) - - def order_edges(self) -> ShapeList[Edge]: - """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) - - @classmethod - def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: - """_make_wire - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - - Raises: - ValueError: Edges are disconnected and can't be sequenced. - RuntimeError: Wire is empty - - Returns: - Wire: assembled edges - """ - - def closest_to_end(current: Wire, unplaced_edges: list[Edge]) -> Edge: - """Return the Edge closest to the end of last_edge""" - target_point = current.position_at(1) - - sorted_edges = sorted( - unplaced_edges, - key=lambda e: min( - (target_point - e.position_at(0)).length, - (target_point - e.position_at(1)).length, - ), - ) - return sorted_edges[0] - - edges = list(edges) - if sequenced: - placed_edges = [edges.pop(0)] - unplaced_edges = edges - - while unplaced_edges: - next_edge = closest_to_end(Wire(placed_edges), unplaced_edges) - next_edge_index = unplaced_edges.index(next_edge) - placed_edges.append(unplaced_edges.pop(next_edge_index)) - - edges = placed_edges - - wire_builder = BRepBuilderAPI_MakeWire() - combined_edges = TopTools_ListOfShape() - for edge in edges: - combined_edges.Append(edge.wrapped) - wire_builder.Add(combined_edges) - - wire_builder.Build() - if not wire_builder.IsDone(): - if wire_builder.Error() == BRepBuilderAPI_NonManifoldWire: - warnings.warn( - "Wire is non manifold (e.g. branching, self intersecting)", - stacklevel=2, - ) - elif wire_builder.Error() == BRepBuilderAPI_EmptyWire: - raise RuntimeError("Wire is empty") - elif wire_builder.Error() == BRepBuilderAPI_DisconnectedWire: - raise ValueError("Edges are disconnected") - - return wire_builder.Wire() - - @classmethod - def make_circle(cls, radius: float, plane: Plane = Plane.XY) -> Wire: - """make_circle - - Makes a circle centered at the origin of plane - - Args: - radius (float): circle radius - plane (Plane): base plane. Defaults to Plane.XY - - Returns: - Wire: a circle - """ - circle_edge = Edge.make_circle(radius, plane=plane) - return Wire([circle_edge]) - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - closed: bool = True, - ) -> Wire: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): _description_. Defaults to 360.0. - end_angle (float, optional): _description_. Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - closed (bool, optional): close the arc. Defaults to True. - - Returns: - Wire: an ellipse - """ - ellipse_edge = Edge.make_ellipse( - x_radius, y_radius, plane, start_angle, end_angle, angular_direction - ) - - if start_angle != end_angle and closed: - line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) - wire = Wire([ellipse_edge, line]) - else: - wire = Wire([ellipse_edge]) - - return wire - - @classmethod - def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: - """make_polygon - - Create an irregular polygon by defining vertices - - Args: - vertices (Iterable[VectorLike]): - close (bool, optional): close the polygon. Defaults to True. - - Returns: - Wire: an irregular polygon - """ - vectors = [Vector(v) for v in vertices] - if (vectors[0] - vectors[-1]).length > TOLERANCE and close: - vectors.append(vectors[0]) - - wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vectors: - wire_builder.Add(vertex.to_pnt()) - - return cls(wire_builder.Wire()) - - def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires - - Args: - other: Wire: - - Returns: - - """ - - wire_builder = BRepBuilderAPI_MakeWire() - wire_builder.Add(TopoDS.Wire_s(self.wrapped)) - wire_builder.Add(TopoDS.Wire_s(other.wrapped)) - wire_builder.Build() - - return self.__class__.cast(wire_builder.Wire()) - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: - """fillet_2d - - Apply 2D fillet to a wire - - Args: - radius (float): - vertices (Iterable[Vertex]): vertices to fillet - - Returns: - Wire: filleted wire - """ - # Create a face to fillet - unfilleted_face = _make_topods_face_from_wires(self.wrapped) - # Fillet the face - fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - fillet_builder.Build() - filleted_face = downcast(fillet_builder.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(filleted_face)) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Wire: - """chamfer_2d - - Apply 2D chamfer to a wire - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Returns: - Wire: chamfered wire - """ - reference_edge = edge - - # Create a face to chamfer - unchamfered_face = _make_topods_face_from_wires(self.wrapped) - chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - chamfered_face = chamfer_builder.Shape() - # Fix the shape - shape_fix = ShapeFix_Shape(chamfered_face) - shape_fix.Perform() - chamfered_face = downcast(shape_fix.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(chamfered_face)) - - @staticmethod - def order_chamfer_edges( - reference_edge: Optional[Edge], edges: tuple[Edge, Edge] - ) -> tuple[Edge, Edge]: - """Order the edges of a chamfer relative to a reference Edge""" - if reference_edge: - edge1, edge2 = edges - if edge1 == reference_edge: - return edge1, edge2 - if edge2 == reference_edge: - return edge2, edge1 - raise ValueError("reference edge not in edges") - return edges - - @classmethod - def make_rect( - cls, - width: float, - height: float, - plane: Plane = Plane.XY, - ) -> Wire: - """Make Rectangle - - Make a Rectangle centered on center with the given normal - - Args: - width (float): width (local x) - height (float): height (local y) - plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. - - Returns: - Wire: The centered rectangle - """ - corners_local = [ - (width / 2, height / 2), - (width / 2, height / -2), - (width / -2, height / -2), - (width / -2, height / 2), - ] - corners_world = [plane.from_local_coords(c) for c in corners_local] - return Wire.make_polygon(corners_world, close=True) - - @classmethod - def make_convex_hull(cls, edges: Iterable[Edge], tolerance: float = 1e-3) -> Wire: - """make_convex_hull - - Create a wire of minimum length enclosing all of the provided edges. - - Note that edges can't overlap each other. - - Args: - edges (Iterable[Edge]): edges defining the convex hull - tolerance (float): allowable error as a fraction of each edge length. - Defaults to 1e-3. - - Raises: - ValueError: edges overlap - - Returns: - Wire: convex hull perimeter - """ - # pylint: disable=too-many-branches, too-many-locals - # Algorithm: - # 1) create a cloud of points along all edges - # 2) create a convex hull which returns facets/simplices as pairs of point indices - # 3) find facets that are within an edge but not adjacent and store trim and - # new connecting edge data - # 4) find facets between edges and store trim and new connecting edge data - # 5) post process the trim data to remove duplicates and store in pairs - # 6) create connecting edges - # 7) create trim edges from the original edges and the trim data - # 8) return a wire version of all the edges - - # Possible enhancement: The accuracy of the result could be improved and the - # execution time reduced by adaptively placing more points around where the - # connecting edges contact the arc. - - # if any( - # [ - # edge_pair[0].overlaps(edge_pair[1]) - # for edge_pair in combinations(edges, 2) - # ] - # ): - # raise ValueError("edges overlap") - edges = list(edges) - fragments_per_edge = int(2 / tolerance) - points_lookup = {} # lookup from point index to edge/position on edge - points = [] # convex hull point cloud - - # Create points along each edge and the lookup structure - for edge_index, edge in enumerate(edges): - for i in range(fragments_per_edge): - param = i / (fragments_per_edge - 1) - points.append(edge.position_at(param).to_tuple()[:2]) - points_lookup[edge_index * fragments_per_edge + i] = (edge_index, param) - - convex_hull = ConvexHull(points) - - # Filter the fragments - connecting_edge_data = [] - trim_points: dict[int, list[int]] = {} - for simplice in convex_hull.simplices: - edge0 = points_lookup[simplice[0]][0] - edge1 = points_lookup[simplice[1]][0] - # Look for connecting edges between edges - if edge0 != edge1: - if edge0 not in trim_points: - trim_points[edge0] = [simplice[0]] - else: - trim_points[edge0].append(simplice[0]) - if edge1 not in trim_points: - trim_points[edge1] = [simplice[1]] - else: - trim_points[edge1].append(simplice[1]) - connecting_edge_data.append( - ( - (edge0, points_lookup[simplice[0]][1], simplice[0]), - (edge1, points_lookup[simplice[1]][1], simplice[1]), - ) - ) - # Look for connecting edges within an edge - elif abs(simplice[0] - simplice[1]) != 1: - start_pnt = min(simplice.tolist()) - end_pnt = max(simplice.tolist()) - if edge0 not in trim_points: - trim_points[edge0] = [start_pnt, end_pnt] - else: - trim_points[edge0].extend([start_pnt, end_pnt]) - connecting_edge_data.append( - ( - (edge0, points_lookup[start_pnt][1], start_pnt), - (edge0, points_lookup[end_pnt][1], end_pnt), - ) - ) - - trim_data = {} - for edge_index, start_end_pnts in trim_points.items(): - s_points = sorted(start_end_pnts) - f_points = [] - for i in range(0, len(s_points) - 1, 2): - if s_points[i] != s_points[i + 1]: - f_points.append(tuple(s_points[i : i + 2])) - trim_data[edge_index] = f_points - - connecting_edges = [ - Edge.make_line( - edges[line[0][0]] @ line[0][1], edges[line[1][0]] @ line[1][1] - ) - for line in connecting_edge_data - ] - trimmed_edges = [ - edges[edge_index].trim( - points_lookup[trim_pair[0]][1], points_lookup[trim_pair[1]][1] - ) - for edge_index, trim_pairs in trim_data.items() - for trim_pair in trim_pairs - ] - hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) - return hull_wire - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Wire]: - """Project Wire - - Project a Wire onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected wire(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - # pylint: disable=too-many-branches - if self.wrapped is None or target_object.wrapped is None: - raise ValueError("Can't project empty Wires or to empty Shapes") - - if not (direction is None) ^ (center is None): - raise ValueError("One of either direction or center must be provided") - if direction is not None: - direction_vector = Vector(direction).normalized() - center_point = Vector() # for typing, never used - else: - direction_vector = None - center_point = Vector(center) - - # Project the wire on the target object - if direction_vector is not None: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Dir(*direction_vector.to_tuple()), - ) - else: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Pnt(*center_point.to_tuple()), - ) - - # Generate a list of the projected wires with aligned orientation - output_wires = [] - target_orientation = self.wrapped.Orientation() - while projection_object.More(): - projected_wire = projection_object.Current() - if target_orientation == projected_wire.Orientation(): - output_wires.append(Wire(projected_wire)) - else: - output_wires.append(Wire(projected_wire.Reversed())) - projection_object.Next() - - logger.debug("wire generated %d projected wires", len(output_wires)) - - # BRepProj_Projection is inconsistent in the order that it returns projected - # wires, sometimes front first and sometimes back - so sort this out by sorting - # by distance from the original planar wire - if len(output_wires) > 1: - output_wires_distances = [] - planar_wire_center = self.center() - for output_wire in output_wires: - output_wire_center = output_wire.center() - if direction_vector is not None: - output_wire_direction = ( - output_wire_center - planar_wire_center - ).normalized() - if output_wire_direction.dot(direction_vector) >= 0: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - planar_wire_center).length, - ) - ) - else: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - center_point).length, - ) - ) - - output_wires_distances.sort(key=lambda x: x[1]) - logger.debug( - "projected, filtered and sorted wire list is of length %d", - len(output_wires_distances), - ) - output_wires = [w[0] for w in output_wires_distances] - - return output_wires + """wires - all the wires in this ShapeList""" + return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore class Joint(ABC): @@ -9034,11 +2776,35 @@ class Joint(ABC): """ - def __init__(self, label: str, parent: Union[Solid, Compound]): + # ---- Constructor ---- + + def __init__(self, label: str, parent: Solid | Compound): self.label = label self.parent = parent self.connected_to: Joint | None = None + # ---- Properties ---- + + @property + @abstractmethod + def location(self) -> Location: + """Location of joint""" + + @property + @abstractmethod + def symbol(self) -> Compound: + """A CAD object positioned in global space to illustrate the joint""" + + # ---- Instance Methods ---- + + @abstractmethod + def connect_to(self, other: Joint): + """All derived classes must provide a connect_to method""" + + @abstractmethod + def relative_to(self, other: Joint) -> Location: + """Return relative location to another joint""" + def _connect_to(self, other: Joint, **kwargs): # pragma: no cover """Connect Joint self by repositioning other""" @@ -9050,87 +2816,58 @@ class Joint(ABC): other.parent.locate(self.parent.location * relative_location) self.connected_to = other - @abstractmethod - def connect_to(self, other: Joint): - """All derived classes must provide a connect_to method""" - @abstractmethod - def relative_to(self, other: Joint) -> Location: - """Return relative location to another joint""" +class SkipClean: + """Skip clean context for use in operator driven code where clean=False wouldn't work""" - @property - @abstractmethod - def location(self) -> Location: - """Location of joint""" + clean = True + # ---- Instance Methods ---- - @property - @abstractmethod - def symbol(self) -> Compound: - """A CAD object positioned in global space to illustrate the joint""" + def __enter__(self): + SkipClean.clean = False + + def __exit__(self, exception_type, exception_value, traceback): + SkipClean.clean = True -def _make_loft( - objs: Iterable[Union[Vertex, Wire]], - filled: bool, - ruled: bool = False, -) -> TopoDS_Shape: - """make loft +def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: + """Sew faces into a shell if possible""" + shell_builder = BRepBuilderAPI_Sewing() + for face in faces: + shell_builder.Add(face) + shell_builder.Perform() + return downcast(shell_builder.SewedShape()) - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - Args: - wires (list[Wire]): section perimeters - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). +def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: + """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" + out = {} # using dict to prevent duplicates - Raises: - ValueError: Too few wires + explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - Returns: - TopoDS_Shape: Lofted object - """ - objs = list(objs) # To determine its length - if len(objs) < 2: - raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] - vertex_count = len(vertices) - - if vertex_count > 2: - raise ValueError("Only two vertices are allowed") - - if vertex_count == 1 and not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - or isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertex must be either at the beginning or end of the list" + while explorer.More(): + item = explorer.Current() + out[item.HashCode(HASH_CODE_MAX)] = ( + item # needed to avoid pseudo-duplicate entities ) + explorer.Next() - if vertex_count == 2: - if len(objs) == 2: - raise ValueError( - "You can't have only 2 vertices to loft; try adding some wires" - ) - if not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - and isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertices must be at the beginning and end of the list" - ) + return list(out.values()) - loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) - for obj in objs: - if isinstance(obj.wrapped, TopoDS_Vertex): - loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj.wrapped, TopoDS_Wire): - loft_builder.AddWire(obj.wrapped) +def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: + """Find the normal at a point on surface""" + surface = BRep_Tool.Surface_s(face) - loft_builder.Build() + # project point on surface + projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) + u_val, v_val = projector.LowerDistanceParameters() - return loft_builder.Shape() + gp_pnt = gp_Pnt() + normal = gp_Vec() + BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) + + return Vector(normal).normalized() def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: @@ -9149,33 +2886,6 @@ def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: return return_value -def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: - """Convert edges to a list of wires. - - Args: - edges: Iterable[Edge]: - tol: float: (Default value = 1e-6) - - Returns: - - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in edges: - if edge.wrapped is not None: - edges_in.Append(edge.wrapped) - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires: ShapeList[Wire] = ShapeList() - for i in range(wires_out.Length()): - # wires.append(Wire(downcast(wires_out.Value(i + 1)))) - wires.append(Wire(TopoDS.Wire_s(wires_out.Value(i + 1)))) - - return wires - - def fix(obj: TopoDS_Shape) -> TopoDS_Shape: """Fix a TopoDS object to suitable specialized type @@ -9192,235 +2902,6 @@ def fix(obj: TopoDS_Shape) -> TopoDS_Shape: return downcast(shape_fix.Shape()) -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: - """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj is None or obj.IsNull(): - raise ValueError("Null TopoDS_Shape object") - - return obj.ShapeType() - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) - if len(shapetypes) == 1: - result = shapetypes.pop() - else: - result = shapetype(obj) - else: - result = shapetype(obj.wrapped) - return result - - -def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: - """Tries to determine how wires should be combined into faces. - - Assume: - The wires make up one or more faces, which could have 'holes' - Outer wires are listed ahead of inner wires - there are no wires inside wires inside wires - ( IE, islands -- we can deal with that later on ) - none of the wires are construction wires - - Compute: - one or more sets of wires, with the outer wire listed first, and inner - ones - - Returns, list of lists. - - Args: - wire_list: list[Wire]: - - Returns: - - """ - - # check if we have something to sort at all - if len(wire_list) < 2: - return [ - wire_list, - ] - - # make a Face, NB: this might return a compound of faces - faces = Face(wire_list[0], wire_list[1:]) - - return_value = [] - for face in faces.faces(): - return_value.append( - [ - face.outer_wire(), - ] - + face.inner_wires() - ) - - return return_value - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - -def topo_explore_connected_edges( - edge: Edge, parent: Shape | None = None -) -> ShapeList[Edge]: - """Given an edge extracted from a Shape, return the edges connected to it""" - - parent = parent if parent is not None else edge.topo_parent - if parent is None: - raise ValueError("edge has no valid parent") - given_topods_edge = edge.wrapped - if given_topods_edge is None: - raise ValueError("edge is empty") - connected_edges = set() - - # Find all the TopoDS_Edges for this Shape - topods_edges = [e.wrapped for e in parent.edges() if e.wrapped is not None] - - for topods_edge in topods_edges: - # # Don't match with the given edge - if given_topods_edge.IsSame(topods_edge): - continue - # If the edge shares a vertex with the given edge they are connected - if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: - connected_edges.add(topods_edge) - - return ShapeList(Edge(e) for e in connected_edges) - - -def topo_explore_common_vertex( - edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge -) -> Optional[Vertex]: - """Given two edges, find the common vertex""" - topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped - topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped - - if topods_edge1 is None or topods_edge2 is None: - raise ValueError("edge is empty") - - # Explore vertices of the first edge - vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) - while vert_exp.More(): - vertex1 = vert_exp.Current() - - # Explore vertices of the second edge - explorer2 = TopExp_Explorer(topods_edge2, ta.TopAbs_VERTEX) - while explorer2.More(): - vertex2 = explorer2.Current() - - # Check if the vertices are the same - if vertex1.IsSame(vertex2): - return Vertex(TopoDS.Vertex_s(vertex1)) # Common vertex found - - explorer2.Next() - vert_exp.Next() - - return None # No common vertex found - - -def unwrap_topods_compound( - compound: TopoDS_Compound, fully: bool = True -) -> TopoDS_Compound | TopoDS_Shape: - """Strip unnecessary Compound wrappers - - Args: - compound (TopoDS_Compound): The TopoDS_Compound to unwrap. - fully (bool, optional): return base shape without any TopoDS_Compound - wrappers (otherwise one TopoDS_Compound is left). Defaults to True. - - Returns: - TopoDS_Compound | TopoDS_Shape: base shape - """ - if compound.NbChildren() == 1: - iterator = TopoDS_Iterator(compound) - single_element = downcast(iterator.Value()) - - # If the single element is another TopoDS_Compound, unwrap it recursively - if isinstance(single_element, TopoDS_Compound): - return unwrap_topods_compound(single_element, fully) - - return single_element if fully else compound - - # If there are no elements or more than one element, return TopoDS_Compound - return compound - - def get_top_level_topods_shapes( topods_shape: TopoDS_Shape | None, ) -> list[TopoDS_Shape]: @@ -9467,207 +2948,56 @@ def get_top_level_topods_shapes( return first_level_shapes -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes +def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: + """Return TopoDS_Shape's TopAbs_ShapeEnum""" + if obj is None or obj.IsNull(): + raise ValueError("Null TopoDS_Shape object") + + return obj.ShapeType() + + +def topods_dim(topods: TopoDS_Shape) -> int | None: + """Return the dimension of this TopoDS_Shape""" + shape_dim_map = { + (TopoDS_Vertex,): 0, + (TopoDS_Edge, TopoDS_Wire): 1, + (TopoDS_Face, TopoDS_Shell): 2, + (TopoDS_Solid,): 3, + } + + for shape_types, dim in shape_dim_map.items(): + if isinstance(topods, shape_types): + return dim + + if isinstance(topods, TopoDS_Compound): + sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} + return sub_dims.pop() if len(sub_dims) == 1 else None + + return None + + +def unwrap_topods_compound( + compound: TopoDS_Compound, fully: bool = True +) -> TopoDS_Compound | TopoDS_Shape: + """Strip unnecessary Compound wrappers Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - -def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None -) -> TopoDS_Face: - """_make_topods_face_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error + compound (TopoDS_Compound): The TopoDS_Compound to unwrap. + fully (bool, optional): return base shape without any TopoDS_Compound + wrappers (otherwise one TopoDS_Compound is left). Defaults to True. Returns: - TopoDS_Face: planar face potentially with holes + TopoDS_Compound | TopoDS_Shape: base shape """ - if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = list(inner_wires) if inner_wires else [] + if compound.NbChildren() == 1: + iterator = TopoDS_Iterator(compound) + single_element = downcast(iterator.Value()) - # check if wires are coplanar - verification_compound = _make_topods_compound_from_shapes( - [outer_wire] + inner_wires - ) - if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): - raise ValueError("Cannot build face(s): wires not planar") + # If the single element is another TopoDS_Compound, unwrap it recursively + if isinstance(single_element, TopoDS_Compound): + return unwrap_topods_compound(single_element, fully) - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) + return single_element if fully else compound - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) - - for inner_wire in inner_wires: - if not BRep_Tool.IsClosed_s(inner_wire): - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) - - face_builder.Build() - - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") - - face = face_builder.Face() - - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() - - return TopoDS.Face_s(sf_f.Result()) - - -def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: - """Sew faces into a shell if possible""" - shell_builder = BRepBuilderAPI_Sewing() - for face in faces: - shell_builder.Add(face) - shell_builder.Perform() - return downcast(shell_builder.SewedShape()) - - -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound - """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) - - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) - - return comp - - -def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: - """Return the maximum dimension of one or more shapes""" - shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) - bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) - return bbox.diagonal - - -def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) - - -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - TopoDS_Shape: extruded shape - """ - direction = Vector(direction) - - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") - - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion - - -class SkipClean: - """Skip clean context for use in operator driven code where clean=False wouldn't work""" - - clean = True - - def __enter__(self): - SkipClean.clean = False - - def __exit__(self, exception_type, exception_value, traceback): - SkipClean.clean = True + # If there are no elements or more than one element, return TopoDS_Compound + return compound From 6a43a52e0a2ef1c45f362ff1bbd3b00abf642e1e Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:38 -0500 Subject: [PATCH 069/518] Step 3 - zero_d.py --- src/build123d/{topology.py => topology/zero_d.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/build123d/{topology.py => topology/zero_d.py} (100%) diff --git a/src/build123d/topology.py b/src/build123d/topology/zero_d.py similarity index 100% rename from src/build123d/topology.py rename to src/build123d/topology/zero_d.py From c4504e7b0e4f918df727e9a9ecea6b6cabbc12be Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:38 -0500 Subject: [PATCH 070/518] Step 2b split - utils.py --- src/build123d/topology/utils.py | 9668 +------------------------------ 1 file changed, 213 insertions(+), 9455 deletions(-) diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index 5986e08..2cc51a8 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -1,17 +1,41 @@ """ build123d topology -name: topology.py +name: utils.py by: Gumyr -date: Oct 14, 2022 +date: January 07, 2025 desc: - This python module is a CAD library based on OpenCascade containing - the base Shape class and all of its derived classes. + +This module provides utility functions and helper classes for the build123d CAD library, enabling +advanced geometric operations and facilitating the use of the OpenCascade CAD kernel. It complements +the core library by offering reusable and modular tools for manipulating shapes, performing Boolean +operations, and validating geometry. + +Key Features: +- **Geometric Utilities**: + - `polar`: Converts polar coordinates to Cartesian. + - `tuplify`: Normalizes inputs into consistent tuples. + - `find_max_dimension`: Computes the maximum bounding dimension of shapes. + +- **Shape Creation**: + - `_make_loft`: Creates lofted shapes from wires and vertices. + - `_make_topods_compound_from_shapes`: Constructs compounds from multiple shapes. + - `_make_topods_face_from_wires`: Generates planar faces with optional holes. + +- **Boolean Operations**: + - `_topods_bool_op`: Generic Boolean operations for TopoDS_Shapes. + - `new_edges`: Identifies newly created edges from combined shapes. + +- **Enhanced Math**: + - `isclose_b`: Overrides `math.isclose` with a stricter absolute tolerance. + +This module is a critical component of build123d, supporting complex CAD workflows and geometric +transformations while maintaining a clean, extensible API. license: - Copyright 2022 Gumyr + Copyright 2025 Gumyr Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,9044 +53,86 @@ license: from __future__ import annotations -# pylint has trouble with the OCP imports -# pylint: disable=no-name-in-module, import-error -# pylint: disable=too-many-lines -# other pylint warning to temp remove: -# too-many-arguments, too-many-locals, too-many-public-methods, -# too-many-statements, too-many-instance-attributes, too-many-branches -import copy -import itertools -import os -import platform -import sys -import warnings -from abc import ABC, abstractmethod -from itertools import combinations -from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose -from typing import ( - Any, - Callable, - Dict, - Generic, - Iterable, - Iterator, - Optional, - Protocol, - Sequence, - SupportsIndex, - Tuple, - Type, - TypeVar, - Union, - overload, - TYPE_CHECKING, -) -from typing import cast as tcast -from typing_extensions import Self, Literal -from anytree import NodeMixin, PreOrderIter, RenderTree -from IPython.lib.pretty import pretty, PrettyPrinter -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter - -import OCP.GeomAbs as ga # Geometry type enum -import OCP.TopAbs as ta # Topology type enum -from OCP.Aspect import Aspect_TOL_SOLID -from OCP.Bnd import Bnd_Box -from OCP.BOPAlgo import BOPAlgo_GlueEnum +from math import radians, sin, cos, isclose +from typing import Any, Iterable, Union, TYPE_CHECKING from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import ( - BRepAdaptor_CompCurve, - BRepAdaptor_Curve, - BRepAdaptor_Surface, -) -from OCP.BRepAlgo import BRepAlgo from OCP.BRepAlgoAPI import ( BRepAlgoAPI_BooleanOperation, - BRepAlgoAPI_Common, BRepAlgoAPI_Cut, - BRepAlgoAPI_Fuse, - BRepAlgoAPI_Section, BRepAlgoAPI_Splitter, ) -from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_Copy, - BRepBuilderAPI_DisconnectedWire, - BRepBuilderAPI_EmptyWire, - BRepBuilderAPI_GTransform, - BRepBuilderAPI_MakeEdge, - BRepBuilderAPI_MakeFace, - BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeShell, - BRepBuilderAPI_MakeSolid, - BRepBuilderAPI_MakeVertex, - BRepBuilderAPI_MakeWire, - BRepBuilderAPI_NonManifoldWire, - BRepBuilderAPI_RightCorner, - BRepBuilderAPI_RoundCorner, - BRepBuilderAPI_Sewing, - BRepBuilderAPI_Transform, - BRepBuilderAPI_Transformed, -) -from OCP.BRepCheck import BRepCheck_Analyzer -from OCP.BRepClass3d import BRepClass3d_SolidClassifier -from OCP.BRepExtrema import BRepExtrema_DistShapeShape -from OCP.BRepFeat import BRepFeat_MakeDPrism, BRepFeat_SplitShape -from OCP.BRepFill import BRepFill -from OCP.BRepFilletAPI import ( - BRepFilletAPI_MakeChamfer, - BRepFilletAPI_MakeFillet, - BRepFilletAPI_MakeFillet2d, -) -from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation -from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter -from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepMesh import BRepMesh_IncrementalMesh -from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import ( - BRepOffsetAPI_MakeFilling, - BRepOffsetAPI_MakeOffset, - BRepOffsetAPI_MakePipeShell, - BRepOffsetAPI_MakeThickSolid, - BRepOffsetAPI_ThruSections, -) -from OCP.BRepPrimAPI import ( - BRepPrimAPI_MakeBox, - BRepPrimAPI_MakeCone, - BRepPrimAPI_MakeCylinder, - BRepPrimAPI_MakePrism, - BRepPrimAPI_MakeRevol, - BRepPrimAPI_MakeSphere, - BRepPrimAPI_MakeTorus, - BRepPrimAPI_MakeWedge, -) -from OCP.BRepProj import BRepProj_Projection -from OCP.BRepTools import BRepTools -from OCP.Font import ( - Font_FA_Bold, - Font_FA_Italic, - Font_FA_Regular, - Font_FontMgr, - Font_SystemFont, -) -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse # geometry construction -from OCP.gce import gce_MakeLin -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import ( - Geom_BezierCurve, - Geom_BezierSurface, - Geom_ConicalSurface, - Geom_CylindricalSurface, - Geom_Plane, - Geom_Surface, - Geom_TrimmedCurve, - Geom_Line, -) -from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve -from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType -from OCP.GeomAPI import ( - GeomAPI_IntCS, - GeomAPI_Interpolate, - GeomAPI_PointsToBSpline, - GeomAPI_PointsToBSplineSurface, - GeomAPI_ProjectPointOnSurf, - GeomAPI_ProjectPointOnCurve, -) -from OCP.GeomFill import ( - GeomFill_CorrectedFrenet, - GeomFill_Frenet, - GeomFill_TrihedronLaw, -) -from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, -) - -# properties used to store mass calculation result -from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher -from OCP.IVtkVTK import IVtkVTK_ShapeData -from OCP.LocOpe import LocOpe_DPrism -from OCP.NCollection import NCollection_Utf8String -from OCP.Precision import Precision -from OCP.Prs3d import Prs3d_IsoAspect -from OCP.Quantity import Quantity_Color -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds, ShapeAnalysis_Curve -from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters -from OCP.ShapeFix import ( - ShapeFix_Face, - ShapeFix_Shape, - ShapeFix_Solid, - ShapeFix_Wireframe, -) -from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain - -# for catching exceptions -from OCP.Standard import ( - Standard_Failure, - Standard_NoSuchObject, - Standard_ConstructionError, -) -from OCP.StdFail import StdFail_NotDone -from OCP.StdPrs import StdPrs_BRepFont -from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder - -# Array of vectors (used for B-spline interpolation): -# Array of points (used for B-spline construction): -from OCP.TColgp import ( - TColgp_Array1OfPnt, - TColgp_Array1OfVec, - TColgp_HArray1OfPnt, - TColgp_HArray2OfPnt, -) -from OCP.TCollection import TCollection_AsciiString - -# Array of floats (used for B-spline interpolation): -# Array of booleans (used for B-spline interpolation): -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, - TColStd_HArray2OfReal, -) -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer # Topology explorer -from OCP.TopLoc import TopLoc_Location +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeFace +from OCP.BRepLib import BRepLib_FindSurface +from OCP.BRepOffsetAPI import BRepOffsetAPI_ThruSections +from OCP.BRepPrimAPI import BRepPrimAPI_MakePrism +from OCP.ShapeFix import ShapeFix_Face, ShapeFix_Shape +from OCP.TopAbs import TopAbs_ShapeEnum +from OCP.TopExp import TopExp_Explorer +from OCP.TopTools import TopTools_ListOfShape from OCP.TopoDS import ( TopoDS, TopoDS_Builder, TopoDS_Compound, TopoDS_Face, - TopoDS_Iterator, TopoDS_Shape, TopoDS_Shell, - TopoDS_Solid, TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, ) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) -from build123d.build_enums import ( - Align, - AngularDirection, - CenterOf, - FontStyle, - FrameMethod, - GeomType, - Keep, - Kind, - PositionMode, - Side, - SortBy, - Transition, - Until, -) -from build123d.geometry import ( - DEG2RAD, - TOLERANCE, - Axis, - BoundBox, - Color, - Location, - Matrix, - Plane, - Vector, - VectorLike, - logger, -) +from build123d.geometry import TOLERANCE, BoundBox, Vector, VectorLike + +from .shape_core import Shape, ShapeList, downcast, shapetype, unwrap_topods_compound -def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: - """Find the normal at a point on surface""" - surface = BRep_Tool.Surface_s(face) - - # project point on surface - projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() +if TYPE_CHECKING: # pragma: no cover + from .zero_d import Vertex # pylint: disable=R0801 + from .one_d import Edge, Wire # pylint: disable=R0801 + from .two_d import Face, Shell # pylint: disable=R0801 + from .three_d import Solid # pylint: disable=R0801 + from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 -def topods_dim(topods: TopoDS_Shape) -> int | None: - """Return the dimension of this TopoDS_Shape""" - shape_dim_map = { - (TopoDS_Vertex,): 0, - (TopoDS_Edge, TopoDS_Wire): 1, - (TopoDS_Face, TopoDS_Shell): 2, - (TopoDS_Solid,): 3, - } +def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: + """extrude - for shape_types, dim in shape_dim_map.items(): - if isinstance(topods, shape_types): - return dim - - if isinstance(topods, TopoDS_Compound): - sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - return None - - -HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode - - -Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] - -TrimmingTool = Union[Plane, "Shell", "Face"] - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - -TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) - - -class Shape(NodeMixin, Generic[TOPODS]): - """Shape - - Base class for all CAD objects such as Edge, Face, Solid, etc. + Extrude a Shape in the provided direction. + * Vertices generate Edges + * Edges generate Faces + * Wires generate Shells + * Faces generate Solids + * Shells generate Compounds Args: - obj (TopoDS_Shape, optional): OCCT object. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. + direction (VectorLike): direction and magnitude of extrusion - Attributes: - wrapped (TopoDS_Shape): the OCP object - label (str): user assigned label - color (Color): object color - joints (dict[str:Joint]): dictionary of joints bound to this object (Solid only) - children (Shape): list of assembly children of this object (Compound only) - topo_parent (Shape): assembly parent of this object + Raises: + ValueError: Unsupported class + RuntimeError: Generated invalid result + Returns: + TopoDS_Shape: extruded shape """ + direction = Vector(direction) - # pylint: disable=too-many-instance-attributes, too-many-public-methods - - @property - @abstractmethod - def _dim(self) -> int | None: - """Dimension of the object""" - - shape_LUT = { - ta.TopAbs_VERTEX: "Vertex", - ta.TopAbs_EDGE: "Edge", - ta.TopAbs_WIRE: "Wire", - ta.TopAbs_FACE: "Face", - ta.TopAbs_SHELL: "Shell", - ta.TopAbs_SOLID: "Solid", - ta.TopAbs_COMPOUND: "Compound", - ta.TopAbs_COMPSOLID: "CompSolid", - } - - shape_properties_LUT = { - ta.TopAbs_VERTEX: None, - ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, - ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, - ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, - } - - inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} - - downcast_LUT = { - ta.TopAbs_VERTEX: TopoDS.Vertex_s, - ta.TopAbs_EDGE: TopoDS.Edge_s, - ta.TopAbs_WIRE: TopoDS.Wire_s, - ta.TopAbs_FACE: TopoDS.Face_s, - ta.TopAbs_SHELL: TopoDS.Shell_s, - ta.TopAbs_SOLID: TopoDS.Solid_s, - ta.TopAbs_COMPOUND: TopoDS.Compound_s, - ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, - } - - geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { - ga.GeomAbs_Line: GeomType.LINE, - ga.GeomAbs_Circle: GeomType.CIRCLE, - ga.GeomAbs_Ellipse: GeomType.ELLIPSE, - ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, - ga.GeomAbs_Parabola: GeomType.PARABOLA, - ga.GeomAbs_BezierCurve: GeomType.BEZIER, - ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, - ga.GeomAbs_OffsetCurve: GeomType.OFFSET, - ga.GeomAbs_OtherCurve: GeomType.OTHER, - } - geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { - ga.GeomAbs_Plane: GeomType.PLANE, - ga.GeomAbs_Cylinder: GeomType.CYLINDER, - ga.GeomAbs_Cone: GeomType.CONE, - ga.GeomAbs_Sphere: GeomType.SPHERE, - ga.GeomAbs_Torus: GeomType.TORUS, - ga.GeomAbs_BezierSurface: GeomType.BEZIER, - ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, - ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, - ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, - ga.GeomAbs_OffsetSurface: GeomType.OFFSET, - ga.GeomAbs_OtherSurface: GeomType.OTHER, - } - _transModeDict = { - Transition.TRANSFORMED: BRepBuilderAPI_Transformed, - Transition.ROUND: BRepBuilderAPI_RoundCorner, - Transition.RIGHT: BRepBuilderAPI_RightCorner, - } - - def __init__( - self, - obj: TopoDS_Shape | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, + if obj is None or not isinstance( + obj, + (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), ): - self.wrapped: TOPODS | None = ( - tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None - ) - self.for_construction = False - self.label = label - self._color = color - - # parent must be set following children as post install accesses children - self.parent = parent - - # Extracted objects like Vertices and Edges may need to know where they came from - self.topo_parent: Shape | None = None - - @property - def location(self) -> Location | None: - """Get this Shape's Location""" - if self.wrapped is None: - return None - return Location(self.wrapped.Location()) - - @location.setter - def location(self, value: Location): - """Set Shape's Location to value""" - if self.wrapped is not None: - self.wrapped.Location(value.wrapped) - - @property - def position(self) -> Vector | None: - """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: - return None - return self.location.position - - @position.setter - def position(self, value: VectorLike): - """Set the position component of this Shape's Location to value""" - loc = self.location - if loc is not None: - loc.position = Vector(value) - self.location = loc - - @property - def orientation(self) -> Vector | None: - """Get the orientation component of this Shape's Location""" - if self.location is None: - return None - return self.location.orientation - - @orientation.setter - def orientation(self, rotations: VectorLike): - """Set the orientation component of this Shape's Location to rotations""" - loc = self.location - if loc is not None: - loc.orientation = Vector(rotations) - self.location = loc - - @property - def color(self) -> Union[None, Color]: - """Get the shape's color. If it's None, get the color of the nearest - ancestor, assign it to this Shape and return this value.""" - # Find the correct color for this node - if self._color is None: - # Find parent color - current_node: Compound | Shape | None = self - while current_node is not None: - parent_color = current_node._color - if parent_color is not None: - break - current_node = current_node.parent - node_color = parent_color - else: - node_color = self._color - self._color = node_color # Set the node's color for next time - return node_color - - @color.setter - def color(self, value): - """Set the shape's color""" - self._color = value - - @property - def is_planar_face(self) -> bool: - """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): - return False - surface = BRep_Tool.Surface_s(self.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() - - def copy_attributes_to( - self, target: Shape, exceptions: Iterable[str] | None = None - ): - """Copy common object attributes to target - - Note that preset attributes of target will not be overridden. - - Args: - target (Shape): object to gain attributes - exceptions (Iterable[str], optional): attributes not to copy - - Raises: - ValueError: invalid attribute - """ - # Find common attributes and eliminate exceptions - attrs1 = set(self.__dict__.keys()) - attrs2 = set(target.__dict__.keys()) - common_attrs = attrs1 & attrs2 - if exceptions is not None: - common_attrs -= set(exceptions) - - for attr in common_attrs: - # Copy the attribute only if the target's attribute not set - if not getattr(target, attr): - setattr(target, attr, getattr(self, attr)) - # Attach joints to the new part - if attr == "joints": - joint: Joint - for joint in target.joints.values(): - joint.parent = target - - @property - def is_manifold(self) -> bool: - """is_manifold - - Check if each edge in the given Shape has exactly two faces associated with it - (skipping degenerate edges). If so, the shape is manifold. - - Returns: - bool: is the shape manifold or water tight - """ - # Extract one or more (if a Compound) shape from self - if self.wrapped is None: - return False - shape_stack = get_top_level_topods_shapes(self.wrapped) - - while shape_stack: - shape = shape_stack.pop(0) - - # Create an empty indexed data map to store the edges and their corresponding faces. - shape_map = TopTools_IndexedDataMapOfShapeListOfShape() - - # Fill the map with edges and their associated faces in the given shape. Each edge in - # the map is associated with a list of faces that share that edge. - TopExp.MapShapesAndAncestors_s( - # shape.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map - shape, - ta.TopAbs_EDGE, - ta.TopAbs_FACE, - shape_map, - ) - - # Iterate over the edges in the map and checks if each edge is non-degenerate and has - # exactly two faces associated with it. - for i in range(shape_map.Extent()): - # Access each edge in the map sequentially - edge = TopoDS.Edge_s(shape_map.FindKey(i + 1)) - - vertex0 = TopoDS_Vertex() - vertex1 = TopoDS_Vertex() - - # Extract the two vertices of the current edge and stores them in vertex0/1. - TopExp.Vertices_s(edge, vertex0, vertex1) - - # Check if both vertices are null and if they are the same vertex. If so, the - # edge is considered degenerate (i.e., has zero length), and it is skipped. - if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): - continue - - # Check if the current edge has exactly two faces associated with it. If not, - # it means the edge is not shared by exactly two faces, indicating that the - # shape is not manifold. - if shape_map.FindFromIndex(i + 1).Extent() != 2: - return False - - return True - - class _DisplayNode(NodeMixin): - """Used to create anytree structures from TopoDS_Shapes""" - - def __init__( - self, - label: str = "", - address: int | None = None, - position: Union[Vector, Location, None] = None, - parent: Shape._DisplayNode | None = None, - ): - self.label = label - self.address = address - self.position = position - self.parent = parent - self.children: list[Shape] = [] - - _ordered_shapes = [ - TopAbs_ShapeEnum.TopAbs_COMPOUND, - TopAbs_ShapeEnum.TopAbs_SOLID, - TopAbs_ShapeEnum.TopAbs_SHELL, - TopAbs_ShapeEnum.TopAbs_FACE, - TopAbs_ShapeEnum.TopAbs_WIRE, - TopAbs_ShapeEnum.TopAbs_EDGE, - TopAbs_ShapeEnum.TopAbs_VERTEX, - ] - - @staticmethod - def _build_tree( - shape: TopoDS_Shape, - tree: list[_DisplayNode], - parent: _DisplayNode | None = None, - limit: TopAbs_ShapeEnum = TopAbs_ShapeEnum.TopAbs_VERTEX, - show_center: bool = True, - ) -> list[_DisplayNode]: - """Create an anytree copy of the TopoDS_Shape structure""" - - obj_type = Shape.shape_LUT[shape.ShapeType()] - loc: Vector | Location - if show_center: - loc = Shape(shape).bounding_box().center() - else: - loc = Location(shape.Location()) - tree.append(Shape._DisplayNode(obj_type, id(shape), loc, parent)) - iterator = TopoDS_Iterator() - iterator.Initialize(shape) - parent_node = tree[-1] - while iterator.More(): - child = iterator.Value() - if Shape._ordered_shapes.index( - child.ShapeType() - ) <= Shape._ordered_shapes.index(limit): - Shape._build_tree(child, tree, parent_node, limit) - iterator.Next() - return tree - - @staticmethod - def _show_tree(root_node, show_center: bool) -> str: - """Display an assembly or TopoDS_Shape anytree structure""" - - # Calculate the size of the tree labels - size_tuples = [(node.height, len(node.label)) for node in root_node.descendants] - size_tuples.append((root_node.height, len(root_node.label))) - # pylint: disable=cell-var-from-loop - size_tuples_per_level = [ - list(filter(lambda ll: ll[0] == l, size_tuples)) - for l in range(root_node.height + 1) - ] - max_sizes_per_level = [ - max(4, max(l[1] for l in level)) for level in size_tuples_per_level - ] - level_sizes_per_level = [ - l + i * 4 for i, l in enumerate(reversed(max_sizes_per_level)) - ] - tree_label_width = max(level_sizes_per_level) + 1 - - # Build the tree line by line - result = "" - for pre, _fill, node in RenderTree(root_node): - treestr = f"{pre}{node.label}".ljust(tree_label_width) - if hasattr(root_node, "address"): - address = node.address - name = "" - loc = ( - "Center" + str(node.position.to_tuple()) - if show_center - else "Position" + str(node.position.to_tuple()) - ) - else: - address = id(node) - name = node.__class__.__name__.ljust(9) - loc = ( - "Center" + str(node.center().to_tuple()) - if show_center - else "Location" + repr(node.location) - ) - result += f"{treestr}{name}at {address:#x}, {loc}\n" - return result - - def show_topology( - self, - limit_class: Literal[ - "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" - ] = "Vertex", - show_center: bool | None = None, - ) -> str: - """Display internal topology - - Display the internal structure of a Compound 'assembly' or Shape. Example: - - .. code:: - - >>> c1.show_topology() - - c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) - ├── Solid at 0x7f4a4cafafd0, Location(...)) - ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) - │ ├── Solid at 0x7f4a4cafad00, Location(...)) - │ └── Solid at 0x7f4a11a52790, Location(...)) - └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) - ├── Solid at 0x7f4a11a52700, Location(...)) - └── Solid at 0x7f4a11a58550, Location(...)) - - Args: - limit_class: type of displayed leaf node. Defaults to 'Vertex'. - show_center (bool, optional): If None, shows the Location of Compound 'assemblies' - and the bounding box center of Shapes. True or False forces the display. - Defaults to None. - - Returns: - str: tree representation of internal structure - """ - if ( - self.wrapped is not None - and isinstance(self.wrapped, TopoDS_Compound) - and self.children - ): - show_center = False if show_center is None else show_center - result = Shape._show_tree(self, show_center) - else: - tree = Shape._build_tree( - tcast(TopoDS_Shape, self.wrapped), - tree=[], - limit=Shape.inverse_shape_LUT[limit_class], - ) - show_center = True if show_center is None else show_center - result = Shape._show_tree(tree[0], show_center) - return result - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: - """fuse shape to self operator +""" - # Convert `other` to list of base objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self - - # Check that all dimensions are the same - addend_dim = self._dim - if addend_dim is None: - raise ValueError("Dimensions of objects to add to are inconsistent") - - if not all(summand._dim == addend_dim for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - sum_shape = summands[0].fuse(*summands[1:]) - else: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - return sum_shape - - def __sub__( - self, other: Union[None, Shape, Iterable[Shape]] - ) -> Self | ShapeList[Self]: - """cut shape from self operator -""" - - if self.wrapped is None: - raise ValueError("Cannot subtract shape from empty compound") - - # Convert `other` to list of base objects and filter out None values - if other is None: - subtrahends = [] - else: - subtrahends = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to subtract return the original object - if not subtrahends: - return self - - # Check that all dimensions are the same - minuend_dim = self._dim - if minuend_dim is None or any(s._dim is None for s in subtrahends): - raise ValueError("Dimensions of objects to subtract from are inconsistent") - - # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] - if any(d < minuend_dim for d in subtrahend_dims): - raise ValueError( - f"Only shapes with equal or greater dimension can be subtracted: " - f"not {type(self).__name__} ({minuend_dim}D) and " - f"{type(other).__name__} ({min(subtrahend_dims)}D)" - ) - - # Do the actual cut operation - difference = self.cut(*subtrahends) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: - """intersect shape with self operator &""" - others = other if isinstance(other, (list, tuple)) else [other] - - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot intersect shape with empty compound") - new_shape = self.intersect(*others) - - if ( - not isinstance(new_shape, list) - and new_shape is not None - and new_shape.wrapped is not None - and SkipClean.clean - ): - new_shape = new_shape.clean() - - return new_shape - - def __rmul__(self, other): - """right multiply for positioning operator *""" - if not ( - isinstance(other, (list, tuple)) - and all(isinstance(o, (Location, Plane)) for o in other) - ): - raise ValueError( - "shapes can only be multiplied list of locations or planes" - ) - return [loc * self for loc in other] - - # Actually creating the abstract method causes the subclass to pass center_of - # even when not required - possibly this could be improved. - # @abstractmethod - # def center(self, center_of: CenterOf) -> Vector: - # """Compute the center with a specific type of calculation.""" - - def clean(self) -> Self: - """clean - - Remove internal edges - - Returns: - Shape: Original object with extraneous internal edges removed - """ - if self.wrapped is None: - return self - upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) - upgrader.AllowInternalEdges(False) - # upgrader.SetAngularTolerance(1e-5) - try: - upgrader.Build() - self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) - except Exception: - warnings.warn(f"Unable to clean {self}", stacklevel=2) - return self - - def fix(self) -> Self: - """fix - try to fix shape if not valid""" - if self.wrapped is None: - return self - if not self.is_valid(): - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) - - return shape_copy - - return self - - @classmethod - @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: - """Returns the right type of wrapper, given a OCCT object""" - - @property - def geom_type(self) -> GeomType: - """Gets the underlying geometry type. - - Returns: - GeomType: The geometry type of the shape - - """ - if self.wrapped is None: - raise ValueError("Cannot determine geometry type of an empty shape") - - shape: TopAbs_ShapeEnum = shapetype(self.wrapped) - - if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[ - BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() - ] - elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[ - BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() - ] - else: - geom = GeomType.OTHER - - return geom - - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - - def is_same(self, other: Shape) -> bool: - """Returns True if other and this shape are same, i.e. if they share the - same TShape with the same Locations. Orientations may differ. Also see - :py:meth:`is_equal` - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsSame(other.wrapped) - - def is_equal(self, other: Shape) -> bool: - """Returns True if two shapes are equal, i.e. if they share the same - TShape with the same Locations and Orientations. Also see - :py:meth:`is_same`. - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsEqual(other.wrapped) - - def __eq__(self, other) -> bool: - """Check if two shapes are the same. - - This method checks if the current shape is the same as the other shape. - Two shapes are considered the same if they share the same TShape with - the same Locations. Orientations may differ. - - Args: - other (Shape): The shape to compare with. - - Returns: - bool: True if the shapes are the same, False otherwise. - """ - if isinstance(other, Shape): - return self.is_same(other) - return NotImplemented - - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - - def bounding_box( - self, tolerance: float | None = None, optimal: bool = True - ) -> BoundBox: - """Create a bounding box for this Shape. - - Args: - tolerance (float, optional): Defaults to None. - - Returns: - BoundBox: A box sized to contain this Shape - """ - if self.wrapped is None: - return BoundBox(Bnd_Box()) - tolerance = TOLERANCE if tolerance is None else tolerance - return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - - def mirror(self, mirror_plane: Plane | None = None) -> Self: - """ - Applies a mirror transform to this Shape. Does not duplicate objects - about the plane. - - Args: - mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY - Returns: - The mirrored shape - """ - if not mirror_plane: - mirror_plane = Plane.XY - - if self.wrapped is None: - return self - transformation = gp_Trsf() - transformation.SetMirror( - gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) - ) - - return self._apply_transform(transformation) - - @staticmethod - def combined_center( - objects: Iterable[Shape], center_of: CenterOf = CenterOf.MASS - ) -> Vector: - """combined center - - Calculates the center of a multiple objects. - - Args: - objects (Iterable[Shape]): list of objects - center_of (CenterOf, optional): centering option. Defaults to CenterOf.MASS. - - Raises: - ValueError: CenterOf.GEOMETRY not implemented - - Returns: - Vector: center of multiple objects - """ - objects = list(objects) - if center_of == CenterOf.MASS: - total_mass = sum(Shape.compute_mass(o) for o in objects) - weighted_centers = [ - o.center(CenterOf.MASS).multiply(Shape.compute_mass(o)) for o in objects - ] - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - elif center_of == CenterOf.BOUNDING_BOX: - total_mass = len(list(objects)) - - weighted_centers = [] - for obj in objects: - weighted_centers.append(obj.bounding_box().center()) - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - else: - raise ValueError("CenterOf.GEOMETRY not implemented") - - return middle - - @staticmethod - def compute_mass(obj: Shape) -> float: - """Calculates the 'mass' of an object. - - Args: - obj: Compute the mass of this object - obj: Shape: - - Returns: - - """ - if obj.wrapped is None: - return 0.0 - - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] - - if not calc_function: - raise NotImplementedError - - calc_function(obj.wrapped, properties) - return properties.Mass() - - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - - def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return all of the TopoDS sub entities of the given type""" - if self.wrapped is None: - return [] - return _topods_entities(self.wrapped, topo_type) - - # def _entities_from( - # self, child_type: Shapes, parent_type: Shapes - # ) -> Dict[Shape, list[Shape]]: - # """This function is very slow on M1 macs and is currently unused""" - # if self.wrapped is None: - # return {} - - # res = TopTools_IndexedDataMapOfShapeListOfShape() - - # TopExp.MapShapesAndAncestors_s( - # self.wrapped, - # Shape.inverse_shape_LUT[child_type], - # Shape.inverse_shape_LUT[parent_type], - # res, - # ) - - # out: Dict[Shape, list[Shape]] = {} - # for i in range(1, res.Extent() + 1): - # out[self.__class__.cast(res.FindKey(i))] = [ - # self.__class__.cast(el) for el in res.FindFromIndex(i) - # ] - - # return out - - def get_top_level_shapes(self) -> ShapeList[Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - ShapeList[Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if self.wrapped is None: - return ShapeList() - return ShapeList( - self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) - ) - - @staticmethod - def get_shape_list( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> ShapeList: - """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: - return ShapeList() - shape_list = ShapeList( - [shape.__class__.cast(i) for i in shape.entities(entity_type)] - ) - for item in shape_list: - item.topo_parent = shape - return shape_list - - @staticmethod - def get_single_shape( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> Shape: - """Helper to extract a single entity of a specific type from a shape, - with a warning if count != 1.""" - shape_list = Shape.get_shape_list(shape, entity_type) - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=3, - ) - return shape_list[0] if shape_list else None - - # Note all sub-classes have vertices and vertex methods - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() - - def edge(self) -> Edge | None: - """Return the Edge""" - return None - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return ShapeList() - - def wire(self) -> Wire | None: - """Return the Wire""" - return None - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return ShapeList() - - def face(self) -> Face | None: - """Return the Face""" - return None - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return ShapeList() - - def shell(self) -> Shell | None: - """Return the Shell""" - return None - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return ShapeList() - - def solid(self) -> Solid | None: - """Return the Solid""" - return None - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - return ShapeList() - - def compound(self) -> Compound | None: - """Return the Compound""" - return None - - @property - def area(self) -> float: - """area -the surface area of all faces in this Shape""" - if self.wrapped is None: - return 0.0 - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - - return properties.Mass() - - def _apply_transform(self, transformation: gp_Trsf) -> Self: - """Private Apply Transform - - Apply the provided transformation matrix to a copy of Shape - - Args: - transformation (gp_Trsf): transformation matrix - - Returns: - Shape: copy of transformed Shape - """ - if self.wrapped is None: - return self - shape_copy: Shape = copy.deepcopy(self, None) - transformed_shape = BRepBuilderAPI_Transform( - self.wrapped, - transformation, - True, - ).Shape() - shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) - return shape_copy - - def rotate(self, axis: Axis, angle: float) -> Self: - """rotate a copy - - Rotates a shape around an axis. - - Args: - axis (Axis): rotation Axis - angle (float): angle to rotate, in degrees - - Returns: - a copy of the shape, rotated - """ - transformation = gp_Trsf() - transformation.SetRotation(axis.wrapped, angle * DEG2RAD) - - return self._apply_transform(transformation) - - def translate(self, vector: VectorLike) -> Self: - """Translates this shape through a transformation. - - Args: - vector: VectorLike: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetTranslation(Vector(vector).wrapped) - - return self._apply_transform(transformation) - - def scale(self, factor: float) -> Self: - """Scales this shape through a transformation. - - Args: - factor: float: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetScale(gp_Pnt(), factor) - - return self._apply_transform(transformation) - - def __deepcopy__(self, memo) -> Self: - """Return deepcopy of self""" - # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied - # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this - # value already copied which causes deepcopy to skip it. - cls = self.__class__ - result = cls.__new__(cls) - memo[id(self)] = result - if self.wrapped is not None: - memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) - for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) - if key == "joints": - for joint in result.joints.values(): - joint.parent = result - return result - - def __copy__(self) -> Self: - """Return shallow copy or reference of self - - Create an copy of this Shape that shares the underlying TopoDS_TShape. - - Used when there is a need for many objects with the same CAD structure but at - different Locations, etc. - for examples fasteners in a larger assembly. By - sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. - - Changes to the CAD structure of the base object will be reflected in all instances. - """ - reference = copy.deepcopy(self) - if self.wrapped is not None: - assert ( - reference.wrapped is not None - ) # Ensure mypy knows reference.wrapped is not None - reference.wrapped.TShape(self.wrapped.TShape()) - return reference - - def transform_shape(self, t_matrix: Matrix) -> Self: - """Apply affine transform without changing type - - Transforms a copy of this Shape by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: copy of transformed shape with all objects keeping their type - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def transform_geometry(self, t_matrix: Matrix) -> Self: - """Apply affine transform - - WARNING: transform_geometry will sometimes convert lines and circles to - splines, but it also has the ability to handle skew and stretching - transformations. - - If your transformation is only translation and rotation, it is safer to - use :py:meth:`transform_shape`, which doesn't change the underlying type - of the geometry, but cannot handle skew transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: a copy of the object, but with geometry transformed - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def locate(self, loc: Location) -> Self: - """Apply a location in absolute sense to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - self.wrapped.Location(loc.wrapped) - - return self - - def located(self, loc: Location) -> Self: - """located - - Apply a location in absolute sense to a copy of self - - Args: - loc (Location): new absolute location - - Returns: - Shape: copy of Shape at location - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) # type: ignore - return shape_copy - - def move(self, loc: Location) -> Self: - """Apply a location in relative sense (i.e. update current location) to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - - self.wrapped.Move(loc.wrapped) - - return self - - def moved(self, loc: Location) -> Self: - """moved - - Apply a location in relative sense (i.e. update current location) to a copy of self - - Args: - loc (Location): new location relative to current location - - Returns: - Shape: copy of Shape moved to relative location - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) - return shape_copy - - def relocate(self, loc: Location): - """Change the location of self while keeping it geometrically similar - - Args: - loc (Location): new location to set for self - """ - if self.wrapped is None: - raise ValueError("Cannot relocate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot relocate a shape at an empty location") - - if self.location != loc: - old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore - - new_ax = gp_Ax3() - new_ax.Transform(loc.wrapped.Transformation()) - - trsf = gp_Trsf() - trsf.SetDisplacement(new_ax, old_ax) - builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - - self.wrapped = tcast(TOPODS, downcast(builder.Shape())) - self.wrapped.Location(loc.wrapped) - - def distance_to_with_closest_points( - self, other: Union[Shape, VectorLike] - ) -> tuple[float, Vector, Vector]: - """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot calculate distance to or from an empty shape") - - if isinstance(other, Shape): - topods_shape = tcast(TopoDS_Shape, other.wrapped) - else: - vec = Vector(other) - topods_shape = BRepBuilderAPI_MakeVertex( - gp_Pnt(vec.X, vec.Y, vec.Z) - ).Vertex() - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(topods_shape) - dist_calc.Perform() - return ( - dist_calc.Value(), - Vector(dist_calc.PointOnShape1(1)), - Vector(dist_calc.PointOnShape2(1)), - ) - - def distance_to(self, other: Union[Shape, VectorLike]) -> float: - """Minimal distance between two shapes""" - return self.distance_to_with_closest_points(other)[0] - - def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: - """Points on two shapes where the distance between them is minimal""" - return self.distance_to_with_closest_points(other)[1:3] - - def __hash__(self) -> int: - """Return has code""" - return self.hash_code() - - def _bool_op( - self, - args: Iterable[Shape], - tools: Iterable[Shape], - operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self | ShapeList[Self]: - """Generic boolean operation - - Args: - args: Iterable[Shape]: - tools: Iterable[Shape]: - operation: Union[BRepAlgoAPI_BooleanOperation: - BRepAlgoAPI_Splitter]: - - Returns: - - """ - args = list(args) - tools = list(tools) - # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} - highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] - - # The base of the operation - base = args[0] if isinstance(args, (list, tuple)) else args - - arg = TopTools_ListOfShape() - for obj in args: - if obj.wrapped is not None: - arg.Append(obj.wrapped) - - tool = TopTools_ListOfShape() - for obj in tools: - if obj.wrapped is not None: - tool.Append(obj.wrapped) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - topo_result = downcast(operation.Shape()) - - # Clean - if SkipClean.clean: - upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) - upgrader.AllowInternalEdges(False) - try: - upgrader.Build() - topo_result = downcast(upgrader.Shape()) - except Exception: - warnings.warn("Boolean operation unable to clean", stacklevel=2) - - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(topo_result, TopoDS_Compound): - topo_result = unwrap_topods_compound(topo_result, True) - - if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: - results = ShapeList( - highest_order[0].cast(s) - for s in get_top_level_topods_shapes(topo_result) - ) - for result in results: - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return results - - result = highest_order[0].cast(topo_result) - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - - return result - - def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: - """Remove the positional arguments from this Shape. - - Args: - *to_cut: Shape: - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - cut_op = BRepAlgoAPI_Cut() - - return self._bool_op((self,), to_cut, cut_op) - - def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float | None = None - ) -> Self | ShapeList[Self]: - """fuse - - Fuse a sequence of shapes into a single shape. - - Args: - to_fuse (sequence Shape): shapes to fuse - glue (bool, optional): performance improvement for some shapes. Defaults to False. - tol (float, optional): tolerance. Defaults to None. - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - return_value = self._bool_op((self,), to_fuse, fuse_op) - - return return_value - - def intersect( - self, *to_intersect: Union[Shape, Axis, Plane] - ) -> None | Self | ShapeList[Self]: - """Intersection of the arguments and this shape - - Args: - to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to - intersect with - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - def _to_vertex(vec: Vector) -> Vertex: - """Helper method to convert vector to shape""" - return self.__class__.cast( - downcast( - BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() - ) - ) - - def _to_edge(axis: Axis) -> Edge: - """Helper method to convert axis to shape""" - return self.__class__.cast( - BRepBuilderAPI_MakeEdge( - Geom_Line( - axis.position.to_pnt(), - axis.direction.to_dir(), - ) - ).Edge() - ) - - def _to_face(plane: Plane) -> Face: - """Helper method to convert plane to shape""" - return self.__class__.cast(BRepBuilderAPI_MakeFace(plane.wrapped).Face()) - - # Convert any geometry objects into their respective topology objects - objs = [] - for obj in to_intersect: - if isinstance(obj, Vector): - objs.append(_to_vertex(obj)) - elif isinstance(obj, Axis): - objs.append(_to_edge(obj)) - elif isinstance(obj, Plane): - objs.append(_to_face(obj)) - elif isinstance(obj, Location): - if obj.wrapped is None: - raise ValueError("Cannot intersect with an empty location") - objs.append(_to_vertex(tcast(Vector, obj.position))) - else: - objs.append(obj) - - # Find the shape intersections - intersect_op = BRepAlgoAPI_Common() - shape_intersections = self._bool_op((self,), objs, intersect_op) - if isinstance(shape_intersections, ShapeList) and not shape_intersections: - return None - if ( - not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null() - ): - return None - return shape_intersections - - @classmethod - @abstractmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge | Face | Shell | Solid | Compound: extruded shape - """ - - def _ocp_section( - self: Shape, other: Union[Vertex, Edge, Wire, Face] - ) -> tuple[list[Vertex], list[Edge]]: - """_ocp_section - - Create a BRepAlgoAPI_Section object - - The algorithm is to build a Section operation between arguments and tools. - The result of Section operation consists of vertices and edges. The result - of Section operation contains: - - new vertices that are subjects of V/V, E/E, E/F, F/F interferences - - vertices that are subjects of V/E, V/F interferences - - new edges that are subjects of F/F interferences - - edges that are Common Blocks - - - Args: - other (Union[Vertex, Edge, Wire, Face]): shape to section with - - Returns: - tuple[list[Vertex], list[Edge]]: section results - """ - if self.wrapped is None or other.wrapped is None: - return ([], []) - - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation - section.Build() - - # Get the resulting shapes from the intersection - intersection_shape = section.Shape() - - vertices = [] - # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) + raise ValueError(f"extrude not supported for {type(obj)}") + + prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) + extrusion = downcast(prism_builder.Shape()) + shape_type = extrusion.ShapeType() + if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: + solids = [] + explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) while explorer.More(): - vertices.append(self.__class__.cast(downcast(explorer.Current()))) + solids.append(downcast(explorer.Current())) explorer.Next() - edges = [] - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - edges.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - - return (vertices, edges) - - def faces_intersected_by_axis( - self, - axis: Axis, - tol: float = 1e-4, - ) -> ShapeList[Face]: - """Line Intersection - - Computes the intersections between the provided axis and the faces of this Shape - - Args: - axis (Axis): Axis on which the intersection line rests - tol (float, optional): Intersection tolerance. Defaults to 1e-4. - - Returns: - list[Face]: A list of intersected faces sorted by distance from axis.position - """ - if self.wrapped is None: - return ShapeList() - - line = gce_MakeLin(axis.wrapped).Value() - - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, line, tol) - - faces_dist = [] # using a list instead of a dictionary to be able to sort it - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - - distance = axis.position.to_pnt().SquareDistance(inter_pt) - - faces_dist.append( - ( - intersect_maker.Face(), - abs(distance), - ) - ) # will sort all intersected faces by distance whatever the direction is - - intersect_maker.Next() - - faces_dist.sort(key=lambda x: x[1]) - faces = [face[0] for face in faces_dist] - - return ShapeList([self.__class__.cast(face) for face in faces]) - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside or outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] - ) -> tuple[ - Face | Shell | ShapeList[Face] | None, - Face | Shell | ShapeList[Face] | None, - ]: - """split_by_perimeter and keep inside and outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside (default)""" - - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE - ): - """split_by_perimeter - - Divide the faces of this object into those within the perimeter - and those outside the perimeter. - - Note: this method may fail if the perimeter intersects shape edges. - - Args: - perimeter (Union[Edge,Wire]): closed perimeter - keep (Keep, optional): which object(s) to return. Defaults to Keep.INSIDE. - - Raises: - ValueError: perimeter must be closed - ValueError: keep must be one of Keep.INSIDE|OUTSIDE|BOTH - - Returns: - Union[Face | Shell | ShapeList[Face] | None, - Tuple[Face | Shell | ShapeList[Face] | None]: The result of the split operation. - - - **Keep.INSIDE**: Returns the inside part as a `Shell` or `Face`, or `None` - if no inside part is found. - - **Keep.OUTSIDE**: Returns the outside part as a `Shell` or `Face`, or `None` - if no outside part is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Shell`, `Face`, or `None` if no corresponding part is found. - - """ - - def get(los: TopTools_ListOfShape) -> list: - """Return objects from TopTools_ListOfShape as list""" - shapes = [] - for _ in range(los.Size()): - first = los.First() - if not first.IsNull(): - shapes.append(self.__class__.cast(first)) - los.RemoveFirst() - return shapes - - def process_sides(sides): - """Process sides to determine if it should be None, a single element, - a Shell, or a ShapeList.""" - # if not sides: - # return None - if len(sides) == 1: - return sides[0] - # Attempt to create a shell - potential_shell = _sew_topods_faces([s.wrapped for s in sides]) - if isinstance(potential_shell, TopoDS_Shell): - return self.__class__.cast(potential_shell) - return ShapeList(sides) - - if keep not in {Keep.INSIDE, Keep.OUTSIDE, Keep.BOTH}: - raise ValueError( - "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" - ) - - if self.wrapped is None: - raise ValueError("Cannot split an empty shape") - - # Process the perimeter - if not perimeter.is_closed: - raise ValueError("perimeter must be a closed Wire or Edge") - perimeter_edges = TopTools_SequenceOfShape() - for perimeter_edge in perimeter.edges(): - perimeter_edges.Append(perimeter_edge.wrapped) - - # Split the shells by the perimeter edges - lefts: list[Shell] = [] - rights: list[Shell] = [] - for target_shell in self.shells(): - constructor = BRepFeat_SplitShape(target_shell.wrapped) - constructor.Add(perimeter_edges) - constructor.Build() - lefts.extend(get(constructor.Left())) - rights.extend(get(constructor.Right())) - - left = process_sides(lefts) - right = process_sides(rights) - - # Is left or right the inside? - perimeter_length = perimeter.length - left_perimeter_length = sum(e.length for e in left.edges()) if left else 0 - right_perimeter_length = sum(e.length for e in right.edges()) if right else 0 - left_inside = abs(perimeter_length - left_perimeter_length) < abs( - perimeter_length - right_perimeter_length - ) - if keep == Keep.BOTH: - return (left, right) if left_inside else (right, left) - if keep == Keep.INSIDE: - return left if left_inside else right - # keep == Keep.OUTSIDE: - return right if left_inside else left - - def distance(self, other: Shape) -> float: - """Minimal distance between two shapes - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() - - def distances(self, *others: Shape) -> Iterator[float]: - """Minimal distances to between self and other shapes - - Args: - *others: Shape: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - for other_shape in others: - if other_shape.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - dist_calc.LoadS2(other_shape.wrapped) - dist_calc.Perform() - - yield dist_calc.Value() - - def mesh(self, tolerance: float, angular_tolerance: float = 0.1): - """Generate triangulation if none exists. - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot mesh an empty shape") - - if not BRepTools.Triangulation_s(self.wrapped, tolerance): - BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - - def tessellate( - self, tolerance: float, angular_tolerance: float = 0.1 - ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: - """General triangulated approximation""" - if self.wrapped is None: - raise ValueError("Cannot tessellate an empty shape") - - self.mesh(tolerance, angular_tolerance) - - vertices: list[Vector] = [] - triangles: list[Tuple[int, int, int]] = [] - offset = 0 - - for face in self.faces(): - assert face.wrapped is not None - loc = TopLoc_Location() - poly = BRep_Tool.Triangulation_s(face.wrapped, loc) - trsf = loc.Transformation() - reverse = face.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED - - # add vertices - vertices += [ - Vector(v.X(), v.Y(), v.Z()) - for v in ( - poly.Node(i).Transformed(trsf) for i in range(1, poly.NbNodes() + 1) - ) - ] - # add triangles - triangles += [ - ( - ( - t.Value(1) + offset - 1, - t.Value(3) + offset - 1, - t.Value(2) + offset - 1, - ) - if reverse - else ( - t.Value(1) + offset - 1, - t.Value(2) + offset - 1, - t.Value(3) + offset - 1, - ) - ) - for t in poly.Triangles() - ] - - offset += poly.NbNodes() - - return vertices, triangles - - def to_splines( - self, degree: int = 3, tolerance: float = 1e-3, nurbs: bool = False - ) -> Self: - """to_splines - - Approximate shape with b-splines of the specified degree. - - Args: - degree (int, optional): Maximum degree. Defaults to 3. - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - nurbs (bool, optional): Use rational splines. Defaults to False. - - Returns: - Self: Approximated shape - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - params = ShapeCustom_RestrictionParameters() - - result = ShapeCustom.BSplineRestriction_s( - self.wrapped, - tolerance, # 3D tolerance - tolerance, # 2D tolerance - degree, - 1, # dummy value, degree is leading - ga.GeomAbs_C0, - ga.GeomAbs_C0, - True, # set degree to be leading - not nurbs, - params, - ) - - return self.__class__.cast(result) - - def to_vtk_poly_data( - self, - tolerance: float | None = None, - angular_tolerance: float | None = None, - normals: bool = False, - ) -> vtkPolyData: - """Convert shape to vtkPolyData - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - normals: bool: (Default value = True) - - Returns: data object in VTK consisting of points, vertices, lines, and polygons - """ - if self.wrapped is None: - raise ValueError("Cannot convert an empty shape") - - vtk_shape = IVtkOCC_Shape(self.wrapped) - shape_data = IVtkVTK_ShapeData() - shape_mesher = IVtkOCC_ShapeMesher() - - drawer = vtk_shape.Attributes() - drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - - if tolerance: - drawer.SetDeviationCoefficient(tolerance) - - if angular_tolerance: - drawer.SetDeviationAngle(angular_tolerance) - - shape_mesher.Build(vtk_shape, shape_data) - - vtk_poly_data = shape_data.getVtkPolyData() - - # convert to triangles and split edges - t_filter = vtkTriangleFilter() - t_filter.SetInputData(vtk_poly_data) - t_filter.Update() - - return_value = t_filter.GetOutput() - - # compute normals - if normals: - n_filter = vtkPolyDataNormals() - n_filter.SetComputePointNormals(True) - n_filter.SetComputeCellNormals(True) - n_filter.SetFeatureAngle(360) - n_filter.SetInputData(return_value) - n_filter.Update() - - return_value = n_filter.GetOutput() - - return return_value - - def _repr_javascript_(self): - """Jupyter 3D representation support""" - - from build123d.jupyter_tools import display - - return display(self)._repr_javascript_() - - def transformed( - self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) - ) -> Self: - """Transform Shape - - Rotate and translate the Shape by the three angles (in degrees) and offset. - - Args: - rotate (VectorLike, optional): 3-tuple of angles to rotate, in degrees. - Defaults to (0, 0, 0). - offset (VectorLike, optional): 3-tuple to offset. Defaults to (0, 0, 0). - - Returns: - Shape: transformed object - - """ - # Convert to a Vector of radians - rotate_vector = Vector(rotate).multiply(DEG2RAD) - # Compute rotation matrix. - t_rx = gp_Trsf() - t_rx.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), rotate_vector.X) - t_ry = gp_Trsf() - t_ry.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), rotate_vector.Y) - t_rz = gp_Trsf() - t_rz.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), rotate_vector.Z) - t_o = gp_Trsf() - t_o.SetTranslation(Vector(offset).wrapped) - return self._apply_transform(t_o * t_rx * t_ry * t_rz) - - def project_faces( - self, - faces: Union[list[Face], Compound], - path: Union[Wire, Edge], - start: float = 0, - ) -> ShapeList[Face]: - """Projected Faces following the given path on Shape - - Project by positioning each face of to the shape along the path and - projecting onto the surface. - - Note that projection may result in distortion depending on - the shape at a position along the path. - - .. image:: projectText.png - - Args: - faces (Union[list[Face], Compound]): faces to project - path: Path on the Shape to follow - start: Relative location on path to start the faces. Defaults to 0. - - Returns: - The projected faces - - """ - # pylint: disable=too-many-locals - path_length = path.length - # The derived classes of Shape implement center - shape_center = self.center() # pylint: disable=no-member - - if ( - not isinstance(faces, (list, tuple)) - and faces.wrapped is not None - and isinstance(faces.wrapped, TopoDS_Compound) - ): - faces = faces.faces() - - first_face_min_x = faces[0].bounding_box().min.X - - logger.debug("projecting %d face(s)", len(faces)) - - # Position each face normal to the surface along the path and project to the surface - projected_faces = [] - for face in faces: - bbox = face.bounding_box() - face_center_x = (bbox.min.X + bbox.max.X) / 2 - relative_position_on_wire = ( - start + (face_center_x - first_face_min_x) / path_length - ) - path_position = path.position_at(relative_position_on_wire) - path_tangent = path.tangent_at(relative_position_on_wire) - projection_axis = Axis(path_position, shape_center - path_position) - (surface_point, surface_normal) = self.find_intersection_points( - projection_axis - )[0] - surface_normal_plane = Plane( - origin=surface_point, x_dir=path_tangent, z_dir=surface_normal - ) - projection_face: Face = surface_normal_plane.from_local_coords( - face.moved(Location((-face_center_x, 0, 0))) - ) - - logger.debug("projecting face at %0.2f", relative_position_on_wire) - projected_faces.append( - projection_face.project_to_shape(self, surface_normal * -1)[0] - ) - - logger.debug("finished projecting '%d' faces", len(faces)) - - return ShapeList(projected_faces) - - -class Comparable(ABC): - """Abstract base class that requires comparison methods""" - - @abstractmethod - def __lt__(self, other: Any) -> bool: ... - - @abstractmethod - def __eq__(self, other: Any) -> bool: ... - - -# This TypeVar allows IDEs to see the type of objects within the ShapeList -T = TypeVar("T", bound=Union[Shape, Vector]) -K = TypeVar("K", bound=Comparable) - - -class ShapePredicate(Protocol): - """Predicate for shape filters""" - - def __call__(self, shape: Shape) -> bool: ... - - -class ShapeList(list[T]): - """Subclass of list with custom filter and sort methods appropriate to CAD""" - - # pylint: disable=too-many-public-methods - - @property - def first(self) -> T: - """First element in the ShapeList""" - return self[0] - - @property - def last(self) -> T: - """Last element in the ShapeList""" - return self[-1] - - def center(self) -> Vector: - """The average of the center of objects within the ShapeList""" - if not self: - return Vector(0, 0, 0) - - total_center = sum((o.center() for o in self), Vector(0, 0, 0)) - return total_center / len(self) - - def filter_by( - self, - filter_by: Union[ShapePredicate, Axis, Plane, GeomType], - reverse: bool = False, - tolerance: float = 1e-5, - ) -> ShapeList[T]: - """filter by Axis, Plane, or GeomType - - Either: - - filter objects of type planar Face or linear Edge by their normal or tangent - (respectively) and sort the results by the given axis, or - - filter the objects by the provided type. Note that not all types apply to all - objects. - - Args: - filter_by (Union[Axis,Plane,GeomType]): axis, plane, or geom type to filter - and possibly sort by. Filtering by a plane returns faces/edges parallel - to that plane. - reverse (bool, optional): invert the geom type filter. Defaults to False. - tolerance (float, optional): maximum deviation from axis. Defaults to 1e-5. - - Raises: - ValueError: Invalid filter_by type - - Returns: - ShapeList: filtered list of objects - """ - - # could be moved out maybe? - def axis_parallel_predicate(axis: Axis, tolerance: float): - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt = gp_Pnt() - surface_normal = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector( - surface_normal.X(), surface_normal.Y(), surface_normal.Z() - ).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - elif ( - isinstance(shape.wrapped, TopoDS_Edge) - and shape.geom_type == GeomType.LINE - ): - curve = shape.geom_adaptor() - umin = curve.FirstParameter() - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(umin, tmp, res) - start_pos = Vector(tmp) - start_dir = Vector(gp_Dir(res)) - shape_axis = Axis(start_pos, start_dir) - else: - return False - return axis.is_parallel(shape_axis, tolerance) - - return pred - - def plane_parallel_predicate(plane: Plane, tolerance: float): - plane_axis = Axis(plane.origin, plane.z_dir) - plane_xyz = plane.z_dir.wrapped.XYZ() - - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt: gp_Pnt = gp_Pnt() - surface_normal: gp_Vec = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector(surface_normal).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - return plane_axis.is_parallel(shape_axis, tolerance) - if isinstance(shape.wrapped, TopoDS_Wire): - return all(pred(e) for e in shape.edges()) - if isinstance(shape.wrapped, TopoDS_Edge): - for curve in shape.wrapped.TShape().Curves(): - if curve.IsCurve3D(): - return ShapeAnalysis_Curve.IsPlanar_s( - curve.Curve3D(), plane_xyz, tolerance - ) - return False - return False - - return pred - - # convert input to callable predicate - if callable(filter_by): - predicate = filter_by - elif isinstance(filter_by, Axis): - predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, Plane): - predicate = plane_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, GeomType): - - def predicate(obj): - return obj.geom_type == filter_by - - else: - raise ValueError(f"Unsupported filter_by predicate: {filter_by}") - - # final predicate is negated if `reverse=True` - if reverse: - - def actual_predicate(shape): - return not predicate(shape) - - else: - actual_predicate = predicate - - return ShapeList(filter(actual_predicate, self)) - - def filter_by_position( - self, - axis: Axis, - minimum: float, - maximum: float, - inclusive: tuple[bool, bool] = (True, True), - ) -> ShapeList[T]: - """filter by position - - Filter and sort objects by the position of their centers along given axis. - min and max values can be inclusive or exclusive depending on the inclusive tuple. - - Args: - axis (Axis): axis to sort by - minimum (float): minimum value - maximum (float): maximum value - inclusive (tuple[bool, bool], optional): include min,max values. - Defaults to (True, True). - - Returns: - ShapeList: filtered object list - """ - if inclusive == (True, True): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (True, False): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - elif inclusive == (False, True): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (False, False): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - - return ShapeList(objects).sort_by(axis) - - def group_by( - self, - group_by: Union[Callable[[Shape], K], Axis, Edge, Wire, SortBy] = Axis.Z, - reverse=False, - tol_digits=6, - ) -> GroupBy[T, K]: - """group by - - Group objects by provided criteria and then sort the groups according to the criteria. - Note that not all group_by criteria apply to all objects. - - Args: - group_by (SortBy, optional): group and sort criteria. Defaults to Axis.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - tol_digits (int, optional): Tolerance for building the group keys by - round(key, tol_digits) - - Returns: - GroupBy[K, ShapeList]: sorted list of ShapeLists - """ - - if isinstance(group_by, Axis): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty axis") - assert group_by.location is not None - axis_as_location = group_by.location.inverse() - - def key_f(obj): - return round( - (axis_as_location * Location(obj.center())).position.Z, - tol_digits, - ) - - elif hasattr(group_by, "wrapped"): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty object") - - if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) - - elif isinstance(group_by, SortBy): - if group_by == SortBy.LENGTH: - - def key_f(obj): - return round(obj.length, tol_digits) - - elif group_by == SortBy.RADIUS: - - def key_f(obj): - return round(obj.radius, tol_digits) - - elif group_by == SortBy.DISTANCE: - - def key_f(obj): - return round(obj.center().length, tol_digits) - - elif group_by == SortBy.AREA: - - def key_f(obj): - return round(obj.area, tol_digits) - - elif group_by == SortBy.VOLUME: - - def key_f(obj): - return round(obj.volume, tol_digits) - - elif callable(group_by): - key_f = group_by - - else: - raise ValueError(f"Unsupported group_by function: {group_by}") - - return GroupBy(key_f, self, reverse=reverse) - - def sort_by( - self, sort_by: Union[Axis, Edge, Wire, SortBy] = Axis.Z, reverse: bool = False - ) -> ShapeList[T]: - """sort by - - Sort objects by provided criteria. Note that not all sort_by criteria apply to all - objects. - - Args: - sort_by (SortBy, optional): sort criteria. Defaults to SortBy.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: sorted list of objects - """ - - if isinstance(sort_by, Axis): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty axis") - assert sort_by.location is not None - axis_as_location = sort_by.location.inverse() - objects = sorted( - self, - key=lambda o: (axis_as_location * Location(o.center())).position.Z, - reverse=reverse, - ) - elif hasattr(sort_by, "wrapped"): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty object") - - if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) - - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) - - elif isinstance(sort_by, SortBy): - if sort_by == SortBy.LENGTH: - objects = sorted( - self, - key=lambda obj: obj.length, - reverse=reverse, - ) - elif sort_by == SortBy.RADIUS: - with_radius = [obj for obj in self if hasattr(obj, "radius")] - objects = sorted( - with_radius, - key=lambda obj: obj.radius, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.DISTANCE: - objects = sorted( - self, - key=lambda obj: obj.center().length, - reverse=reverse, - ) - elif sort_by == SortBy.AREA: - with_area = [obj for obj in self if hasattr(obj, "area")] - objects = sorted( - with_area, - key=lambda obj: obj.area, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.VOLUME: - with_volume = [obj for obj in self if hasattr(obj, "volume")] - objects = sorted( - with_volume, - key=lambda obj: obj.volume, # type: ignore - reverse=reverse, - ) - - return ShapeList(objects) - - def sort_by_distance( - self, other: Union[Shape, VectorLike], reverse: bool = False - ) -> ShapeList[T]: - """Sort by distance - - Sort by minimal distance between objects and other - - Args: - other (Union[Shape,VectorLike]): reference object - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: Sorted shapes - """ - distances = sorted( - [(obj.distance_to(other), obj) for obj in self], # type: ignore - key=lambda obj: obj[0], - reverse=reverse, - ) - return ShapeList([obj[1] for obj in distances]) - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore - - def vertex(self) -> Vertex: - """Return the Vertex""" - vertices = self.vertices() - vertex_count = len(vertices) - if vertex_count != 1: - warnings.warn( - f"Found {vertex_count} vertices, returning first", stacklevel=2 - ) - return vertices[0] - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore - - def edge(self) -> Edge: - """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) - return edges[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore - - def wire(self) -> Wire: - """Return the Wire""" - wires = self.wires() - wire_count = len(wires) - if wire_count != 1: - warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) - return wires[0] - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) - return solids[0] - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore - - def compound(self) -> Compound: - """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: - warnings.warn( - f"Found {compound_count} compounds, returning first", stacklevel=2 - ) - return compounds[0] - - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Sort operator >""" - return self.sort_by(sort_by) - - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Reverse sort operator <""" - return self.sort_by(sort_by, reverse=True) - - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select largest group operator >>""" - return self.group_by(group_by)[-1] - - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select smallest group operator <<""" - return self.group_by(group_by)[0] - - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: - """Filter by axis or geomtype operator |""" - return self.filter_by(filter_by) - - def __eq__(self, other: object) -> bool: - """ShapeLists equality operator ==""" - return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore - ) - - # Normally implementing __eq__ is enough, but ShapeList subclasses list, - # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList) -> bool: # type: ignore - """ShapeLists inequality operator !=""" - return ( - set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented - ) - - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) - - def __sub__(self, other: ShapeList) -> ShapeList[T]: - """Differences between two ShapeLists operator -""" - return ShapeList(set(self) - set(other)) - - def __and__(self, other: ShapeList) -> ShapeList[T]: - """Intersect two ShapeLists operator &""" - return ShapeList(set(self) & set(other)) - - @overload - def __getitem__(self, key: SupportsIndex) -> T: ... - - @overload - def __getitem__(self, key: slice) -> ShapeList[T]: ... - - def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: - """Return slices of ShapeList as ShapeList""" - if isinstance(key, slice): - return ShapeList(list(self).__getitem__(key)) - return list(self).__getitem__(key) - - -class GroupBy(Generic[T, K]): - """Result of a Shape.groupby operation. Groups can be accessed by index or key""" - - def __init__( - self, - key_f: Callable[[T], K], - shapelist: Iterable[T], - *, - reverse: bool = False, - ): - # can't be a dict because K may not be hashable - self.key_to_group_index: list[tuple[K, int]] = [] - self.groups: list[ShapeList[T]] = [] - self.key_f = key_f - - for i, (key, shapegroup) in enumerate( - itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) - ): - self.groups.append(ShapeList(shapegroup)) - self.key_to_group_index.append((key, i)) - - def __iter__(self): - return iter(self.groups) - - def __len__(self): - return len(self.groups) - - def __getitem__(self, key: int): - return self.groups[key] - - def __str__(self): - return pretty(self) - - def __repr__(self): - return repr(ShapeList(self)) - - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: - """ - Render a formatted representation of the object for pretty-printing in - interactive environments. - - Args: - printer (PrettyPrinter): The pretty printer instance handling the output. - cycle (bool): Indicates if a reference cycle is detected to - prevent infinite recursion. - """ - if cycle: - printer.text("(...)") - else: - with printer.group(1, "[", "]"): - for idx, item in enumerate(self): - if idx: - printer.text(",") - printer.breakable() - printer.pretty(item) - - def group(self, key: K): - """Select group by key""" - for k, i in self.key_to_group_index: - if key == k: - return self.groups[i] - raise KeyError(key) - - def group_for(self, shape: T): - """Select group by shape""" - return self.group(self.key_f(shape)) - - -class Mixin1D(Shape): - """Methods to add to the Edge and Wire classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Edges and Wires""" - return 1 - - def __add__( - self, other: None | Shape | Iterable[Shape] - ) -> Edge | Wire | ShapeList[Edge]: - """fuse shape to wire/edge operator +""" - - # Convert `other` to list of base topods objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] - # If there is nothing to add return the original object - if not summands: - return self - - if not all(topods_dim(summand) == 1 for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] - summand_edges = [e for summand in summands for e in summand.edges()] - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - try: - sum_shape = Wire(summand_edges) - except Exception: - sum_shape = summands[0].fuse(*summands[1:]) - if type(self).order == 4: - sum_shape = type(self)(sum_shape) - else: - try: - sum_shape = Wire(self.edges() + ShapeList(summand_edges)) - except Exception: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape - - return sum_shape - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" - - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of object - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - middle = self.position_at(0.5) - elif center_of == CenterOf.MASS: - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: - """common_plane - - Find the plane containing all the edges/wires (including self). If there - is no common plane return None. If the edges are coaxial, select one - of the infinite number of valid planes. - - Args: - lines (sequence of Union[Edge,Wire]): edges in common with self - - Returns: - Union[None, Plane]: Either the common plane or None - """ - # pylint: disable=too-many-locals - # Note: BRepLib_FindSurface is not helpful as it requires the - # Edges to form a surface perimeter. - points: list[Vector] = [] - all_lines: list[Edge | Wire] = [ - line for line in [self, *lines] if line is not None - ] - if any(not isinstance(line, (Edge, Wire)) for line in all_lines): - raise ValueError("Only Edges or Wires are valid") - - result = None - # Are they all co-axial - if so, select one of the infinite planes - all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all(e.geom_type == GeomType.LINE for e in all_edges): - as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): - origin = as_axis[0].position - x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir - c_plane = Plane(origin, z_dir=z_dir) - result = c_plane.shift_origin((0, 0)) - - if result is None: # not coaxial - # Shorten any infinite lines (from converted Axis) - normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) - infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] - all_lines = normal_lines + shortened_lines - - for line in all_lines: - num_points = 2 if line.geom_type == GeomType.LINE else 8 - points.extend( - [line.position_at(i / (num_points - 1)) for i in range(num_points)] - ) - points = list(set(points)) # unique points - extreme_areas = {} - for subset in combinations(points, 3): - vector1 = subset[1] - subset[0] - vector2 = subset[2] - subset[0] - area = 0.5 * (vector1.cross(vector2).length) - extreme_areas[area] = subset - # The points that create the largest area make the most accurate plane - extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] - - # Create a plane from these points - x_dir = (extremes[1] - extremes[0]).normalized() - z_dir = (extremes[2] - extremes[0]).cross(x_dir) - try: - c_plane = Plane( - origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir - ) - c_plane = c_plane.shift_origin((0, 0)) - except ValueError: - # There is no valid common plane - result = None - else: - # Are all of the points on the common plane - common = all(c_plane.contains(p) for p in points) - result = c_plane if common else None - - return result - - @property - def length(self) -> float: - """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) - - @property - def radius(self) -> float: - """Calculate the radius. - - Note that when applied to a Wire, the radius is simply the radius of the first edge. - - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] - - def location_at( - self, - distance: float, - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> Location: - """Locations along curve - - Generate a location along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - Location: A Location object representing local coordinate system - at the specified distance. - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - law: GeomFill_TrihedronLaw - if frame_method == FrameMethod.FRENET: - law = GeomFill_Frenet() - else: - law = GeomFill_CorrectedFrenet() - - law.SetCurve(curve) - - tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() - - law.D0(param, tangent, normal, binormal) - pnt = curve.Value(param) - - transformation = gp_Trsf() - if planar: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() - ) - else: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() - ) - - return Location(TopLoc_Location(transformation)) - - def locations( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> list[Location]: - """Locations along curve - - Generate location along the curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - list[Location]: A list of Location objects representing local coordinate - systems at the specified distances. - """ - return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances - ] - - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) - - def offset_2d( - self, - distance: float, - kind: Kind = Kind.ARC, - side: Side = Side.BOTH, - closed: bool = True, - ) -> Union[Edge, Wire]: - """2d Offset - - Offsets a planar edge/wire - - Args: - distance (float): distance from edge/wire to offset - kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. - side (Side, optional): side to place offset. Defaults to Side.BOTH. - closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT - offset. Defaults to True. - Raises: - RuntimeError: Multiple Wires generated - RuntimeError: Unexpected result type - - Returns: - Wire: offset wire - """ - # pylint: disable=too-many-branches, too-many-locals, too-many-statements - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - line = self if isinstance(self, Wire) else Wire([self]) - - # Avoiding a bug when the wire contains a single Edge - if len(line.edges()) == 1: - edge = line.edges()[0] - edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] - topods_wire = Wire(edges).wrapped - else: - topods_wire = line.wrapped - - offset_builder = BRepOffsetAPI_MakeOffset() - offset_builder.Init(kind_dict[kind]) - # offset_builder.SetApprox(True) - offset_builder.AddWire(topods_wire) - offset_builder.Perform(distance) - - obj = downcast(offset_builder.Shape()) - if isinstance(obj, TopoDS_Compound): - obj = unwrap_topods_compound(obj, fully=True) - if isinstance(obj, TopoDS_Wire): - offset_wire = Wire(obj) - else: # Likely multiple Wires were generated - raise RuntimeError("Unexpected result type") - - if side != Side.BOTH: - # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] - centers = [w.position_at(0.5) for w in wires] - angles = [ - line.tangent_at(0).get_signed_angle(c - line.position_at(0)) - for c in centers - ] - if side == Side.LEFT: - offset_wire = wires[int(angles[0] > angles[1])] - else: - offset_wire = wires[int(angles[0] <= angles[1])] - - if closed: - self0 = line.position_at(0) - self1 = line.position_at(1) - end0 = offset_wire.position_at(0) - end1 = offset_wire.position_at(1) - if (self0 - end0).length - abs(distance) <= TOLERANCE: - edge0 = Edge.make_line(self0, end0) - edge1 = Edge.make_line(self1, end1) - else: - edge0 = Edge.make_line(self0, end1) - edge1 = Edge.make_line(self1, end0) - offset_wire = Wire( - line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) - ) - - offset_edges = offset_wire.edges() - return offset_edges[0] if len(offset_edges) == 1 else offset_wire - - def perpendicular_line( - self, length: float, u_value: float, plane: Plane = Plane.XY - ) -> Edge: - """perpendicular_line - - Create a line on the given plane perpendicular to and centered on beginning of self - - Args: - length (float): line length - u_value (float): position along line between 0.0 and 1.0 - plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. - - Returns: - Edge: perpendicular line - """ - start = self.position_at(u_value) - local_plane = Plane( - origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir - ) - line = Edge.make_line( - start + local_plane.y_dir * length / 2, - start - local_plane.y_dir * length / 2, - ) - return line - - def project( - self, face: Face, direction: VectorLike, closest: bool = True - ) -> Edge | Wire | ShapeList[Edge | Wire]: - """Project onto a face along the specified direction - - Args: - face: Face: - direction: VectorLike: - closest: bool: (Default value = True) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") - - bldr = BRepProj_Projection( - self.wrapped, face.wrapped, Vector(direction).to_dir() - ) - shapes: TopoDS_Compound = bldr.Shape() - - # select the closest projection if requested - return_value: Edge | Wire | ShapeList[Edge | Wire] - - if closest: - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - min_dist = inf - - # for shape in shapes: - for shape in get_top_level_topods_shapes(shapes): - dist_calc.LoadS2(shape) - dist_calc.Perform() - dist = dist_calc.Value() - - if dist < min_dist: - min_dist = dist - return_value = Mixin1D.cast(shape) - - else: - return_value = ShapeList( - Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) - ) - - return return_value - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike | None = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - visible_edges = ShapeList(Edge(e) for e in visible_edges) - hidden_edges = ShapeList(Edge(e) for e in hidden_edges) - - return (visible_edges, hidden_edges) - - -class Mixin2D(Shape): - """Additional methods to add to Face and Shell class""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Faces and Shells""" - return 2 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") - - def __neg__(self) -> Self: - """Reverse normal operator -""" - if self.wrapped is None: - raise ValueError("Invalid Shape") - new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) - - return new_surface - - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - - def find_intersection_points( - self, other: Axis, tolerance: float = TOLERANCE - ) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape - - Args: - axis (Axis): axis defining the intersection line - - Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection - """ - if self.wrapped is None: - return [] - - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, tolerance) - - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) - ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - - -class Mixin3D(Shape): - """Additional methods to add to 3D Shape classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int | None: - """Dimension of Solids""" - return 3 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") - - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") - - def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: - """Fillet - - Fillets the specified edges of this solid. - - Args: - radius (float): float > 0, the radius of the fillet - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - - Returns: - Any: Filleted solid - """ - native_edges = [e.wrapped for e in edge_list] - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(radius, native_edge) - - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - f"Failed creating a fillet with radius of {radius}, try a smaller value" - f" or use max_fillet() to find the largest valid fillet radius" - ) from err - - return new_shape - - def max_fillet( - self, - edge_list: Iterable[Edge], - tolerance=0.1, - max_iterations: int = 10, - ) -> float: - """Find Maximum Fillet Size - - Find the largest fillet radius for the given Shape and edges with a - recursive binary search. - - Example: - - max_fillet_radius = my_shape.max_fillet(shape_edges) - max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) - - - Args: - edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid - tolerance (float, optional): maximum error from actual value. Defaults to 0.1. - max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. - - Raises: - RuntimeError: failed to find the max value - ValueError: the provided Shape is invalid - - Returns: - float: maximum fillet radius - """ - - def __max_fillet(window_min: float, window_max: float, current_iteration: int): - window_mid = (window_min + window_max) / 2 - - if current_iteration == max_iterations: - raise RuntimeError( - f"Failed to find the max value within {tolerance} in {max_iterations}" - ) - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(window_mid, native_edge) - - # Do these numbers work? - if not try with the smaller window - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise fillet_exception - except fillet_exception: - return __max_fillet(window_min, window_mid, current_iteration + 1) - - # These numbers work, are they close enough? - if not try larger window - if window_mid - window_min <= tolerance: - return_value = window_mid - else: - return_value = __max_fillet( - window_mid, window_max, current_iteration + 1 - ) - return return_value - - if not self.is_valid(): - raise ValueError("Invalid Shape") - - native_edges = [e.wrapped for e in edge_list] - - # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform - # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone - - max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) - - return max_radius - - def chamfer( - self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face | None = None, - ) -> Self: - """Chamfer - - Chamfers the specified edges of this solid. - - Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face, optional): identifies the side where length is measured. The edge(s) - must be part of the face - - Returns: - Self: Chamfered solid - """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") - - native_edges = [e.wrapped for e in edge_list] - - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__.cast(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) - else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__.cast(sol.Shape()).fix() - - return return_value - - def offset_3d( - self, - openings: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Shell - - Make an offset solid of self. - - Args: - openings (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): offset amount - positive offset outwards, negative inwards - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A shelled solid. - """ - openings = list(openings) if openings else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - - occ_faces_list = TopTools_ListOfShape() - for face in openings: - occ_faces_list.Append(face.wrapped) - - offset_builder = BRepOffsetAPI_MakeThickSolid() - offset_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - RemoveIntEdges=True, - Join=kind_dict[kind], - ) - offset_builder.Build() - - try: - offset_occt_solid = offset_builder.Shape() - except (StdFail_NotDone, Standard_Failure) as err: - raise RuntimeError( - "offset Error, an alternative kind may resolve this error" - ) from err - - offset_solid = self.__class__.cast(offset_occt_solid) - assert offset_solid.wrapped is not None - - # The Solid can be inverted, if so reverse - if offset_solid.volume < 0: - offset_solid.wrapped.Reverse() - - return offset_solid - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. - - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float | None = None, - taper: float = 0, - up_to_face: Face | None = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] - else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) - - -class Compound(Mixin3D, Shape[TopoDS_Compound]): - """A Compound in build123d is a topological entity representing a collection of - geometric shapes grouped together within a single structure. It serves as a - container for organizing diverse shapes like edges, faces, or solids. This - hierarchical arrangement facilitates the construction of complex models by - combining simpler shapes. Compound plays a pivotal role in managing the - composition and structure of intricate 3D models in computer-aided design - (CAD) applications, allowing engineers and designers to work with assemblies - of shapes as unified entities for efficient modeling and analysis.""" - - order = 4.0 - - project_to_viewport = Mixin1D.project_to_viewport - - @classmethod - def cast( - cls, obj: TopoDS_Shape - ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def _dim(self) -> Union[int, None]: - """The dimension of the shapes within the Compound - None if inconsistent""" - return topods_dim(self.wrapped) - - def __init__( - self, - obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - children: Sequence[Shape] | None = None, - ): - """Build a Compound from Shapes - - Args: - obj (TopoDS_Compound | Iterable[Shape], optional): OCCT Compound or shapes - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - children (Sequence[Shape], optional): assembly children. Defaults to None. - """ - - if isinstance(obj, Iterable): - topods_compound = _make_topods_compound_from_shapes( - [s.wrapped for s in obj] - ) - else: - topods_compound = obj - - super().__init__( - obj=topods_compound, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - self.children = [] if children is None else children - - def __repr__(self): - """Return Compound info as string""" - if hasattr(self, "label") and hasattr(self, "children"): - result = ( - f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " - + f"#children({len(self.children)})" - ) - else: - result = f"{self.__class__.__name__} at {id(self):#x}" - return result - - @property - def volume(self) -> float: - """volume - the volume of this Compound""" - # when density == 1, mass == volume - return sum(i.volume for i in [*self.get_type(Solid), *self.get_type(Shell)]) - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def _remove(self, shape: Shape) -> Compound: - """Return self with the specified shape removed. - - Args: - shape: Shape: - """ - comp_builder = TopoDS_Builder() - comp_builder.Remove(self.wrapped, shape.wrapped) - return self - - def _post_detach(self, parent: Compound): - """Method call after detaching from `parent`.""" - logger.debug("Removing parent of %s (%s)", self.label, parent.label) - if parent.children: - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - else: - parent.wrapped = None - - def _pre_attach(self, parent: Compound): - """Method call before attaching to `parent`.""" - if not isinstance(parent, Compound): - raise ValueError("`parent` must be of type Compound") - - def _post_attach(self, parent: Compound): - """Method call after attaching to `parent`.""" - logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - - def _post_detach_children(self, children): - """Method call before detaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Removing no children from %s", self.label) - - def _pre_attach_children(self, children): - """Method call before attaching `children`.""" - if not all(isinstance(child, Shape) for child in children): - raise ValueError("Each child must be of type Shape") - - def _post_attach_children(self, children: Iterable[Shape]): - """Method call after attaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Adding no children to %s", self.label) - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Combine other to self `+` operator - - Note that if all of the objects are connected Edges/Wires the result - will be a Wire, otherwise a Shape. - """ - if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other - - summands: ShapeList[Shape] - if other is None: - summands = ShapeList() - else: - summands = ShapeList( - shape - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ) - # If there is nothing to add return the original object - if not summands: - return self - - summands = ShapeList( - s for s in self.get_top_level_shapes() + summands if s is not None - ) - - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = Compound(summands[0:1]) - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(bool_result, list): - result = Compound(bool_result) - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - else: - result = bool_result - - if SkipClean.clean: - result = result.clean() - - return result - - def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Cut other to self `-` operator""" - difference = Shape.__sub__(self, other) - difference = Compound( - difference if isinstance(difference, list) else [difference] - ) - self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> Compound: - """Intersect other to self `&` operator""" - intersection = Shape.__and__(self, other) - intersection = Compound( - intersection if isinstance(intersection, list) else [intersection] - ) - self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) - return intersection - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) - - def compound(self) -> Compound | None: - """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None - - @classmethod - def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: - """extrude - - Extrude a Shell into a Compound. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Compound( - TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) - ) - - def do_children_intersect( - self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: - """Do Children Intersect - - Determine if any of the child objects within a Compound/assembly intersect by - intersecting each of the shapes with each other and checking for - a common volume. - - Args: - include_parent (bool, optional): check parent for intersections. Defaults to False. - tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. - - Returns: - tuple[bool, tuple[Shape, Shape], float]: - do the object intersect, intersecting objects, volume of intersection - """ - children: list[Shape] = list(PreOrderIter(self)) - if not include_parent: - children.pop(0) # remove parent - # children_bbox = [child.bounding_box().to_solid() for child in children] - children_bbox = [ - Solid.from_bounding_box(child.bounding_box()) for child in children - ] - child_index_pairs = [ - tuple(map(int, comb)) - for comb in combinations(list(range(len(children))), 2) - ] - for child_index_pair in child_index_pairs: - # First check for bounding box intersections .. - # .. then confirm with actual object intersections which could be complex - bbox_intersection = children_bbox[child_index_pair[0]].intersect( - children_bbox[child_index_pair[1]] - ) - if bbox_intersection is not None: - obj_intersection = children[child_index_pair[0]].intersect( - children[child_index_pair[1]] - ) - if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - ( - children[child_index_pair[0]], - children[child_index_pair[1]], - ), - common_volume, - ) - return (False, (None, None), 0.0) - - @classmethod - def make_text( - cls, - txt: str, - font_size: float, - font: str = "Arial", - font_path: Optional[str] = None, - font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), - position_on_path: float = 0.0, - text_path: Union[Edge, Wire, None] = None, - ) -> "Compound": - """2D Text that optionally follows a path. - - The text that is created can be combined as with other sketch features by specifying - a mode or rotated by the given angle. In addition, edges have been previously created - with arc or segment, the text will follow the path defined by these edges. The start - parameter can be used to shift the text along the path to achieve precise positioning. - - Args: - txt: text to be rendered - font_size: size of the font in model units - font: font name - font_path: path to font file - font_style: text style. Defaults to FontStyle.REGULAR. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max - of object. Defaults to (Align.CENTER, Align.CENTER). - position_on_path: the relative location on path to position the text, - between 0.0 and 1.0. Defaults to 0.0. - text_path: a path for the text to follows. Defaults to None - linear text. - - Returns: - a Compound object containing multiple Faces representing the text - - Examples:: - - fox = Compound.make_text( - txt="The quick brown fox jumped over the lazy dog", - font_size=10, - position_on_path=0.1, - text_path=jump_edge, - ) - - """ - # pylint: disable=too-many-locals - - def position_face(orig_face: Face) -> Face: - """ - Reposition a face to the provided path - - Local coordinates are used to calculate the position of the face - relative to the path. Global coordinates to position the face. - """ - assert text_path is not None - bbox = orig_face.bounding_box() - face_bottom_center = Vector((bbox.min.X + bbox.max.X) / 2, 0, 0) - relative_position_on_wire = ( - position_on_path + face_bottom_center.X / path_length - ) - wire_tangent = text_path.tangent_at(relative_position_on_wire) - wire_angle = Vector(1, 0, 0).get_signed_angle(wire_tangent) - wire_position = text_path.position_at(relative_position_on_wire) - - return orig_face.translate(wire_position - face_bottom_center).rotate( - Axis(wire_position, (0, 0, 1)), - -wire_angle, - ) - - if sys.platform.startswith("linux"): - os.environ["FONTCONFIG_FILE"] = "/etc/fonts/fonts.conf" - os.environ["FONTCONFIG_PATH"] = "/etc/fonts/" - - font_kind = { - FontStyle.REGULAR: Font_FA_Regular, - FontStyle.BOLD: Font_FA_Bold, - FontStyle.ITALIC: Font_FA_Italic, - }[font_style] - - mgr = Font_FontMgr.GetInstance_s() - - if font_path and mgr.CheckFont(TCollection_AsciiString(font_path).ToCString()): - font_t = Font_SystemFont(TCollection_AsciiString(font_path)) - font_t.SetFontPath(font_kind, TCollection_AsciiString(font_path)) - mgr.RegisterFont(font_t, True) - - else: - font_t = mgr.FindFont(TCollection_AsciiString(font), font_kind) - - logger.info( - "Creating text with font %s located at %s", - font_t.FontName().ToCString(), - font_t.FontPath(font_kind).ToCString(), - ) - - builder = Font_BRepTextBuilder() - font_i = StdPrs_BRepFont( - NCollection_Utf8String(font_t.FontName().ToCString()), - font_kind, - float(font_size), - ) - text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) - - # Align the text from the bounding box - align_text = tuplify(align, 2) - text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align_text)) - ) - - if text_path is not None: - path_length = text_path.length - text_flat = Compound([position_face(f) for f in text_flat.faces()]) - - return text_flat - - @classmethod - def make_triad(cls, axes_scale: float) -> Compound: - """The coordinate system triad (X, Y, Z axes)""" - x_axis = Edge.make_line((0, 0, 0), (axes_scale, 0, 0)) - y_axis = Edge.make_line((0, 0, 0), (0, axes_scale, 0)) - z_axis = Edge.make_line((0, 0, 0), (0, 0, axes_scale)) - arrow_arc = Edge.make_spline( - [(0, 0, 0), (-axes_scale / 20, axes_scale / 30, 0)], - [(-1, 0, 0), (-1, 1.5, 0)], - ) - arrow = Wire([arrow_arc, copy.copy(arrow_arc).mirror(Plane.XZ)]) - x_label = ( - Compound.make_text( - "X", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .move(Location(x_axis @ 1)) - .edges() - ) - y_label = ( - Compound.make_text( - "Y", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .rotate(Axis.Z, 90) - .move(Location(y_axis @ 1)) - .edges() - ) - z_label = ( - Compound.make_text( - "Z", font_size=axes_scale / 4, align=(Align.CENTER, Align.MIN) - ) - .rotate(Axis.Y, 90) - .rotate(Axis.X, 90) - .move(Location(z_axis @ 1)) - .edges() - ) - triad = Curve( - [ - x_axis, - y_axis, - z_axis, - arrow.moved(Location(x_axis @ 1)), - arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), - arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), - *x_label, - *y_label, - *z_label, - ] - ) - - return triad - - def __iter__(self) -> Iterator[Shape]: - """ - Iterate over subshapes. - - """ - - iterator = TopoDS_Iterator(self.wrapped) - - while iterator.More(): - yield Compound.cast(iterator.Value()) - iterator.Next() - - def __len__(self) -> int: - """Return the number of subshapes""" - count = 0 - if self.wrapped is not None: - for _ in self: - count += 1 - return count - - def __bool__(self) -> bool: - """ - Check if empty. - """ - - return TopoDS_Iterator(self.wrapped).More() - - def get_type( - self, - obj_type: Union[ - Type[Vertex], Type[Edge], Type[Face], Type[Shell], Type[Solid], Type[Wire] - ], - ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: - """get_type - - Extract the objects of the given type from a Compound. Note that this - isn't the same as Faces() etc. which will extract Faces from Solids. - - Args: - obj_type (Union[Vertex, Edge, Face, Shell, Solid, Wire]): Object types to extract - - Returns: - list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: Extracted objects - """ - - type_map = { - Vertex: TopAbs_ShapeEnum.TopAbs_VERTEX, - Edge: TopAbs_ShapeEnum.TopAbs_EDGE, - Face: TopAbs_ShapeEnum.TopAbs_FACE, - Shell: TopAbs_ShapeEnum.TopAbs_SHELL, - Solid: TopAbs_ShapeEnum.TopAbs_SOLID, - Wire: TopAbs_ShapeEnum.TopAbs_WIRE, - Compound: TopAbs_ShapeEnum.TopAbs_COMPOUND, - } - results = [] - for comp in self.compounds(): - iterator = TopoDS_Iterator() - iterator.Initialize(comp.wrapped) - while iterator.More(): - child = iterator.Value() - if child.ShapeType() == type_map[obj_type]: - results.append(obj_type(downcast(child))) - iterator.Next() - - return results - - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: - """Strip unnecessary Compound wrappers - - Args: - fully (bool, optional): return base shape without any Compound - wrappers (otherwise one Compound is left). Defaults to True. - - Returns: - Union[Self, Shape]: base shape - """ - if len(self) == 1: - single_element = next(iter(self)) - self.copy_attributes_to(single_element, ["wrapped", "_NodeMixin__children"]) - - # If the single element is another Compound, unwrap it recursively - if isinstance(single_element, Compound): - # Unwrap recursively and copy attributes down - unwrapped = single_element.unwrap(fully) - if not fully: - unwrapped = type(self)(unwrapped.wrapped) - self.copy_attributes_to(unwrapped, ["wrapped", "_NodeMixin__children"]) - return unwrapped - - return single_element if fully else self - - # If there are no elements or more than one element, return self - return self - - -class Part(Compound): - """A Compound containing 3D objects - aka Solids""" - - @property - def _dim(self) -> int: - return 3 - - -class Sketch(Compound): - """A Compound containing 2D objects - aka Faces""" - - @property - def _dim(self) -> int: - return 2 - - -class Curve(Compound): - """A Compound containing 1D objects - aka Edges""" - - @property - def _dim(self) -> int: - return 1 - - __add__ = Mixin1D.__add__ # type: ignore - - def __matmul__(self, position: float) -> Vector: - """Position on curve operator @ - only works if continuous""" - return Wire(self.edges()).position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator % - only works if continuous""" - return Wire(self.edges()).tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^ - only works if continuous""" - return Wire(self.edges()).location_at(position) - - def wires(self) -> ShapeList[Wire]: # type: ignore - """A list of wires created from the edges""" - return Wire.combine(self.edges()) - - -class Edge(Mixin1D, Shape[TopoDS_Edge]): - """An Edge in build123d is a fundamental element in the topological data structure - representing a one-dimensional geometric entity within a 3D model. It encapsulates - information about a curve, which could be a line, arc, or other parametrically - defined shape. Edge is crucial in for precise modeling and manipulation of curves, - facilitating operations like filleting, chamfering, and Boolean operations. It - serves as a building block for constructing complex structures, such as wires - and faces.""" - - # pylint: disable=too-many-public-methods - - order = 1.0 - - def __init__( - self, - obj: Optional[TopoDS_Edge | Axis | None] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge - - Args: - obj (TopoDS_Edge | Axis, optional): OCCT Edge or Axis. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Axis): - obj = BRepBuilderAPI_MakeEdge( - Geom_Line( - obj.position.to_pnt(), - obj.direction.to_dir(), - ) - ).Edge() - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_Curve: - """Return the Geom Curve from this Edge""" - return BRepAdaptor_Curve(self.wrapped) - - def close(self) -> Union[Edge, Wire]: - """Close an Edge""" - if not self.is_closed: - return_value = Wire([self]).close() - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Edge as Wire""" - return Wire([self]) - - @property - def arc_center(self) -> Vector: - """center of an underlying circle or ellipse geometry.""" - - geom_type = self.geom_type - geom_adaptor = self.geom_adaptor() - - if geom_type == GeomType.CIRCLE: - return_value = Vector(geom_adaptor.Circle().Position().Location()) - elif geom_type == GeomType.ELLIPSE: - return_value = Vector(geom_adaptor.Ellipse().Position().Location()) - else: - raise ValueError(f"{geom_type} has no arc center") - - return return_value - - def find_tangent( - self, - angle: float, - ) -> list[float]: - """find_tangent - - Find the parameter values of self where the tangent is equal to angle. - - Args: - angle (float): target angle in degrees - - Returns: - list[float]: u values between 0.0 and 1.0 - """ - angle = angle % 360 # angle needs to always be positive 0..360 - u_values: list[float] - - if self.geom_type == GeomType.LINE: - if self.tangent_angle_at(0) == angle: - u_values = [0] - else: - u_values = [] - else: - # Solve this problem geometrically by creating a tangent curve and finding intercepts - periodic = int(self.is_closed) # if closed don't include end point - tan_pnts: list[VectorLike] = [] - previous_tangent = None - - # When angles go from 360 to 0 a discontinuity is created so add 360 to these - # values and intercept another line - discontinuities = 0.0 - for i in range(101 - periodic): - tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 - if ( - previous_tangent is not None - and abs(previous_tangent - tangent) > 300 - ): - discontinuities = copysign(1.0, previous_tangent - tangent) - tangent += 360 * discontinuities - previous_tangent = tangent - tan_pnts.append((i / 100, tangent)) - - # Generate a first differential curve from the tangent points - tan_curve = Edge.make_spline(tan_pnts) - - # Use the bounding box to find the min and max values - tan_curve_bbox = tan_curve.bounding_box() - min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) - max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) - - # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts: list[Vector] = [] - for i in range(min_range, max_range + 1, 360): - line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) - intercept_pnts.extend(tan_curve.find_intersection_points(line)) - - u_values = [p.X for p in intercept_pnts] - - return u_values - - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - - def find_intersection_points( - self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE - ) -> ShapeList[Vector]: - """find_intersection_points - - Determine the points where a 2D edge crosses itself or another 2D edge - - Args: - other (Axis | Edge): curve to compare with - tolerance (float, optional): the precision of computing the intersection points. - Defaults to TOLERANCE. - - Returns: - ShapeList[Vector]: list of intersection points - """ - # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) - other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, - ) - # To determine the 2D plane to work on - plane = self.common_plane(other) - if plane is None: - raise ValueError("All objects must be on the same plane") - # Convert the plane into a Geom_Surface - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - edge_surface = BRep_Tool.Surface_s(pln_shape) - - self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - self.wrapped, - edge_surface, - TopLoc_Location(), - self.param_at(0), - self.param_at(1), - ) - if other is not None: - edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - other.wrapped, - edge_surface, - TopLoc_Location(), - other.param_at(0), - other.param_at(1), - ) - intersector = Geom2dAPI_InterCurveCurve( - self_2d_curve, edge_2d_curve, tolerance - ) - else: - intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) - - crosses = [ - Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) - for i in range(intersector.NbPoints()) - ] - # Convert back to global coordinates - crosses = [plane.from_local_coords(p) for p in crosses] - - # crosses may contain points beyond the ends of the edge so - # .. filter those out - valid_crosses = [] - for pnt in crosses: - try: - if other is not None: - if ( - self.distance_to(pnt) <= TOLERANCE - and other.distance_to(pnt) <= TOLERANCE - ): - valid_crosses.append(pnt) - else: - if self.distance_to(pnt) <= TOLERANCE: - valid_crosses.append(pnt) - except ValueError: - pass # skip invalid points - - return ShapeList(valid_crosses) - - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Union[Edge, Axis]): other object - - Returns: - Union[Shape, None]: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None - - @classmethod - def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: - """extrude - - Extrude a Vertex into an Edge. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) - - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" - reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge - return reversed_edge - - def trim(self, start: float, end: float) -> Edge: - """trim - - Create a new edge by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Edge: trimmed edge - """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") - - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) - trimmed_curve = Geom_TrimmedCurve( - new_curve, - parm_start, - parm_end, - ) - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def trim_to_length(self, start: float, length: float) -> Edge: - """trim_to_length - - Create a new edge starting at the given normalized parameter of a - given length. - - Args: - start (float): 0.0 <= start < 1.0 - length (float): target length - - Returns: - Edge: trimmed edge - """ - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - - # Create an adaptor for the curve - adaptor_curve = GeomAdaptor_Curve(new_curve) - - # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) - abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - - # Get the parameter at the desired length - parm_end = abscissa_point.Parameter() - - # Trim the curve to the desired length - trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" - - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) - - point = Vector(point) - - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") - - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length - - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value - - @classmethod - def make_bezier( - cls, *cntl_pnts: VectorLike, weights: list[float] | None = None - ) -> Edge: - """make_bezier - - Create a rational (with weights) or non-rational bezier curve. The first and last - control points represent the start and end of the curve respectively. If weights - are provided, there must be one provided for each control point. - - Args: - cntl_pnts (sequence[VectorLike]): points defining the curve - weights (list[float], optional): control point weights list. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Edge: bezier curve - """ - if len(cntl_pnts) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(cntl_pnts) > 25: - raise ValueError("The maximum number of control points is 25") - if weights: - if len(cntl_pnts) != len(weights): - raise ValueError("A weight must be provided for each control point") - - cntl_gp_pnts = [Vector(cntl_pnt).to_pnt() for cntl_pnt in cntl_pnts] - - # The poles are stored in an OCCT Array object - poles = TColgp_Array1OfPnt(1, len(cntl_gp_pnts)) - for i, cntl_gp_pnt in enumerate(cntl_gp_pnts): - poles.SetValue(i + 1, cntl_gp_pnt) - - if weights: - pole_weights = TColStd_Array1OfReal(1, len(weights)) - for i, weight in enumerate(weights): - pole_weights.SetValue(i + 1, float(weight)) - bezier_curve = Geom_BezierCurve(poles, pole_weights) - else: - bezier_curve = Geom_BezierCurve(poles) - - return cls(BRepBuilderAPI_MakeEdge(bezier_curve).Edge()) - - @classmethod - def make_circle( - cls, - radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make circle - - Create a circle centered on the origin of plane - - Args: - radius (float): circle radius - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): start of arc angle. Defaults to 360.0. - end_angle (float, optional): end of arc angle. Defaults to 360. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial circle - """ - circle_gp = gp_Circ(plane.to_gp_ax2(), radius) - - if start_angle == end_angle: # full circle case - return_value = cls(BRepBuilderAPI_MakeEdge(circle_gp).Edge()) - else: # arc case - ccw = angular_direction == AngularDirection.COUNTER_CLOCKWISE - if ccw: - start = radians(start_angle) - end = radians(end_angle) - else: - start = radians(end_angle) - end = radians(start_angle) - circle_geom = GC_MakeArcOfCircle(circle_gp, start, end, ccw).Value() - return_value = cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - return return_value - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): Defaults to 360.0. - end_angle (float, optional): Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial ellipse - """ - ax1 = gp_Ax1(plane.origin.to_pnt(), plane.z_dir.to_dir()) - - if y_radius > x_radius: - # swap x and y radius and rotate by 90° afterwards to create an ellipse - # with x_radius < y_radius - correction_angle = 90.0 * DEG2RAD - ellipse_gp = gp_Elips(plane.to_gp_ax2(), y_radius, x_radius).Rotated( - ax1, correction_angle - ) - else: - correction_angle = 0.0 - ellipse_gp = gp_Elips(plane.to_gp_ax2(), x_radius, y_radius) - - if start_angle == end_angle: # full ellipse case - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_gp).Edge()) - else: # arc case - # take correction_angle into account - ellipse_geom = GC_MakeArcOfEllipse( - ellipse_gp, - start_angle * DEG2RAD - correction_angle, - end_angle * DEG2RAD - correction_angle, - angular_direction == AngularDirection.COUNTER_CLOCKWISE, - ).Value() - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_geom).Edge()) - - return ellipse - - @classmethod - def make_mid_way(cls, first: Edge, second: Edge, middle: float = 0.5) -> Edge: - """make line between edges - - Create a new linear Edge between the two provided Edges. If the Edges are parallel - but in the opposite directions one Edge is flipped such that the mid way Edge isn't - truncated. - - Args: - first (Edge): first reference Edge - second (Edge): second reference Edge - middle (float, optional): factional distance between Edges. Defaults to 0.5. - - Returns: - Edge: linear Edge between two Edges - """ - flip = first.to_axis().is_opposite(second.to_axis()) - pnts = [ - Edge.make_line( - first.position_at(i), second.position_at(1 - i if flip else i) - ).position_at(middle) - for i in [0, 1] - ] - return Edge.make_line(*pnts) - - @classmethod - def make_spline( - cls, - points: list[VectorLike], - tangents: list[VectorLike] | None = None, - periodic: bool = False, - parameters: list[float] | None = None, - scale: bool = True, - tol: float = 1e-6, - ) -> Edge: - """Spline - - Interpolate a spline through the provided points. - - Args: - points (list[VectorLike]): the points defining the spline - tangents (list[VectorLike], optional): start and finish tangent. - Defaults to None. - periodic (bool, optional): creation of periodic curves. Defaults to False. - parameters (list[float], optional): the value of the parameter at each - interpolation point. (The interpolated curve is represented as a vector-valued - function of a scalar parameter.) If periodic == True, then len(parameters) - must be len(interpolation points) + 1, otherwise len(parameters) - must be equal to len(interpolation points). Defaults to None. - scale (bool, optional): whether to scale the specified tangent vectors before - interpolating. Each tangent is scaled, so it's length is equal to the derivative - of the Lagrange interpolated curve. I.e., set this to True, if you want to use - only the direction of the tangent vectors specified by `tangents` , but not - their magnitude. Defaults to True. - tol (float, optional): tolerance of the algorithm (consult OCC documentation). - Used to check that the specified points are not too close to each other, and - that tangent vectors are not too short. (In either case interpolation may fail.). - Defaults to 1e-6. - - Raises: - ValueError: Parameter for each interpolation point - ValueError: Tangent for each interpolation point - ValueError: B-spline interpolation failed - - Returns: - Edge: the spline - """ - # pylint: disable=too-many-locals - point_vectors = [Vector(point) for point in points] - if tangents: - tangent_vectors = tuple(Vector(v) for v in tangents) - pnts = TColgp_HArray1OfPnt(1, len(point_vectors)) - for i, point in enumerate(point_vectors): - pnts.SetValue(i + 1, point.to_pnt()) - - if parameters is None: - spline_builder = GeomAPI_Interpolate(pnts, periodic, tol) - else: - if len(parameters) != (len(point_vectors) + periodic): - raise ValueError( - "There must be one parameter for each interpolation point " - "(plus one if periodic), or none specified. Parameter count: " - f"{len(parameters)}, point count: {len(point_vectors)}" - ) - parameters_array = TColStd_HArray1OfReal(1, len(parameters)) - for p_index, p_value in enumerate(parameters): - parameters_array.SetValue(p_index + 1, p_value) - - spline_builder = GeomAPI_Interpolate(pnts, parameters_array, periodic, tol) - - if tangents: - if len(tangent_vectors) == 2 and len(point_vectors) != 2: - # Specify only initial and final tangent: - spline_builder.Load( - tangent_vectors[0].wrapped, tangent_vectors[1].wrapped, scale - ) - else: - if len(tangent_vectors) != len(point_vectors): - raise ValueError( - f"There must be one tangent for each interpolation point, " - f"or just two end point tangents. Tangent count: " - f"{len(tangent_vectors)}, point count: {len(point_vectors)}" - ) - - # Specify a tangent for each interpolation point: - tangents_array = TColgp_Array1OfVec(1, len(tangent_vectors)) - tangent_enabled_array = TColStd_HArray1OfBoolean( - 1, len(tangent_vectors) - ) - for t_index, t_value in enumerate(tangent_vectors): - tangent_enabled_array.SetValue(t_index + 1, t_value is not None) - tangent_vec = t_value if t_value is not None else Vector() - tangents_array.SetValue(t_index + 1, tangent_vec.wrapped) - - spline_builder.Load(tangents_array, tangent_enabled_array, scale) - - spline_builder.Perform() - if not spline_builder.IsDone(): - raise ValueError("B-spline interpolation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_spline_approx( - cls, - points: list[VectorLike], - tol: float = 1e-3, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 6, - ) -> Edge: - """make_spline_approx - - Approximate a spline through the provided points. - - Args: - points (list[Vector]): - tol (float, optional): tolerance of the algorithm. Defaults to 1e-3. - smoothing (Tuple[float, float, float], optional): optional tuple of 3 weights - use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when smoothing - is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 6. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Edge: spline - """ - pnts = TColgp_HArray1OfPnt(1, len(points)) - for i, point in enumerate(points): - pnts.SetValue(i + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSpline( - pnts, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSpline( - pnts, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_three_point_arc( - cls, point1: VectorLike, point2: VectorLike, point3: VectorLike - ) -> Edge: - """Three Point Arc - - Makes a three point arc through the provided points - - Args: - point1 (VectorLike): start point - point2 (VectorLike): middle point - point3 (VectorLike): end point - - Returns: - Edge: a circular arc through the three points - """ - circle_geom = GC_MakeArcOfCircle( - Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_tangent_arc( - cls, start: VectorLike, tangent: VectorLike, end: VectorLike - ) -> Edge: - """Tangent Arc - - Makes a tangent arc from point start, in the direction of tangent and ends at end. - - Args: - start (VectorLike): start point - tangent (VectorLike): start tangent - end (VectorLike): end point - - Returns: - Edge: circular arc - """ - circle_geom = GC_MakeArcOfCircle( - Vector(start).to_pnt(), Vector(tangent).wrapped, Vector(end).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: - """Create a line between two points - - Args: - point1: VectorLike: that represents the first point - point2: VectorLike: that represents the second point - - Returns: - A linear edge between the two provided points - - """ - return cls( - BRepBuilderAPI_MakeEdge( - Vector(point1).to_pnt(), Vector(point2).to_pnt() - ).Edge() - ) - - @classmethod - def make_helix( - cls, - pitch: float, - height: float, - radius: float, - center: VectorLike = (0, 0, 0), - normal: VectorLike = (0, 0, 1), - angle: float = 0.0, - lefthand: bool = False, - ) -> Wire: - """make_helix - - Make a helix with a given pitch, height and radius. By default a cylindrical surface is - used to create the helix. If the :angle: is set (the apex given in degree) a conical - surface is used instead. - - Args: - pitch (float): distance per revolution along normal - height (float): total height - radius (float): - center (VectorLike, optional): Defaults to (0, 0, 0). - normal (VectorLike, optional): Defaults to (0, 0, 1). - angle (float, optional): conical angle. Defaults to 0.0. - lefthand (bool, optional): Defaults to False. - - Returns: - Wire: helix - """ - # pylint: disable=too-many-locals - # 1. build underlying cylindrical/conical surface - if angle == 0.0: - geom_surf: Geom_Surface = Geom_CylindricalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius - ) - else: - geom_surf = Geom_ConicalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), - angle * DEG2RAD, - radius, - ) - - # 2. construct an segment in the u,v domain - - # Determine the length of the 2d line which will be wrapped around the surface - line_sign = -1 if lefthand else 1 - line_dir = Vector(line_sign * 2 * pi, pitch).normalized() - line_len = (height / line_dir.Y) / cos(radians(angle)) - - # Create an infinite 2d line in the direction of the helix - helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) - # Trim the line to the desired length - helix_curve = Geom2d_TrimmedCurve( - helix_line, 0, line_len, theAdjustPeriodic=True - ) - - # 3. Wrap the line around the surface - edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) - topods_edge = edge_builder.Edge() - - # 4. Convert the edge made with 2d geometry to 3d - BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) - - return cls(topods_edge) - - def distribute_locations( - self: Union[Wire, Edge], - count: int, - start: float = 0.0, - stop: float = 1.0, - positions_only: bool = False, - ) -> list[Location]: - """Distribute Locations - - Distribute locations along edge or wire. - - Args: - self: Union[Wire:Edge]: - count(int): Number of locations to generate - start(float): position along Edge|Wire to start. Defaults to 0.0. - stop(float): position along Edge|Wire to end. Defaults to 1.0. - positions_only(bool): only generate position not orientation. Defaults to False. - - Returns: - list[Location]: locations distributed along Edge|Wire - - Raises: - ValueError: count must be two or greater - - """ - if count < 2: - raise ValueError("count must be two or greater") - - t_values = [start + i * (stop - start) / (count - 1) for i in range(count)] - - locations = self.locations(t_values) - if positions_only: - for loc in locations: - loc.orientation = Vector(0, 0, 0) - - return locations - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Edge]: - """Project Edge - - Project an Edge onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected Edge(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - wire = Wire([self]) - projected_wires = wire.project_to_shape(target_object, direction, center) - projected_edges = [w.edges()[0] for w in projected_wires] - return projected_edges - - def to_axis(self) -> Axis: - """Translate a linear Edge to an Axis""" - if self.geom_type != GeomType.LINE: - raise ValueError( - f"to_axis is only valid for linear Edges not {self.geom_type}" - ) - return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) - - -class Face(Mixin2D, Shape[TopoDS_Face]): - """A Face in build123d represents a 3D bounded surface within the topological data - structure. It encapsulates geometric information, defining a face of a 3D shape. - These faces are integral components of complex structures, such as solids and - shells. Face enables precise modeling and manipulation of surfaces, supporting - operations like trimming, filleting, and Boolean operations.""" - - # pylint: disable=too-many-public-methods - - order = 2.0 - - @overload - def __init__( - self, - obj: TopoDS_Face, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face - - Args: - obj (TopoDS_Shape, optional): OCCT Face. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - outer_wire: Wire, - inner_wires: Iterable[Wire] | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a planar Face from a boundary Wire with optional hole Wires. - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (Iterable[Wire], optional): holes. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args: Any, **kwargs: Any): - outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - outer_wire, inner_wires, label, color, parent = args[:5] + (None,) * ( - 5 - l_a - ) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "outer_wire", - "inner_wires", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - outer_wire = kwargs.get("outer_wire", outer_wire) - inner_wires = kwargs.get("inner_wires", inner_wires) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if outer_wire is not None: - inner_topods_wires = ( - [w.wrapped for w in inner_wires] if inner_wires is not None else [] - ) - obj = _make_topods_face_from_wires(outer_wire.wrapped, inner_topods_wires) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - # Faces can optionally record the plane it was created on for later extrusion - self.created_on: Plane | None = None - - @property - def length(self) -> None | float: - """length of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.X) - result = face_vertices[-1].X - face_vertices[0].X - return result - - @property - def volume(self) -> float: - """volume - the volume of this Face, which is always zero""" - return 0.0 - - @property - def width(self) -> None | float: - """width of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.Y) - result = face_vertices[-1].Y - face_vertices[0].Y - return result - - @property - def geometry(self) -> None | str: - """geometry of planar face""" - result = None - if self.is_planar: - flat_face: Face = Plane(self).to_local_coords(self) - flat_face_edges = flat_face.edges() - if all(e.geom_type == GeomType.LINE for e in flat_face_edges): - flat_face_vertices = flat_face.vertices() - result = "POLYGON" - if len(flat_face_edges) == 4: - edge_pairs: list[list[Edge]] = [] - for vertex in flat_face_vertices: - edge_pairs.append( - [e for e in flat_face_edges if vertex in e.vertices()] - ) - edge_pair_directions = [ - [edge.tangent_at(0) for edge in pair] for pair in edge_pairs - ] - if all( - edge_directions[0].get_angle(edge_directions[1]) == 90 - for edge_directions in edge_pair_directions - ): - result = "RECTANGLE" - if len(flat_face_edges.group_by(SortBy.LENGTH)) == 1: - result = "SQUARE" - - return result - - @property - def center_location(self) -> Location: - """Location at the center of face""" - origin = self.position_at(0.5, 0.5) - return Plane(origin, z_dir=self.normal_at(origin)).location - - @property - def is_planar(self) -> bool: - """Is the face planar even though its geom_type may not be PLANE""" - return self.is_planar_face - - def geom_adaptor(self) -> Geom_Surface: - """Return the Geom Surface for this Face""" - return BRep_Tool.Surface_s(self.wrapped) - - def _uv_bounds(self) -> Tuple[float, float, float, float]: - """Return the u min, u max, v min, v max values""" - return BRepTools.UVBounds_s(self.wrapped) - - @overload - def normal_at(self, surface_point: VectorLike | None = None) -> Vector: - """normal_at point on surface - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where - the normal. Defaults to the center (None). - - Returns: - Vector: surface normal direction - """ - - @overload - def normal_at(self, u: float, v: float) -> Vector: - """normal_at u, v values on Face - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - Defaults to the center (None/None) - - Raises: - ValueError: Either neither or both u v values must be provided - - Returns: - Vector: surface normal direction - """ - - def normal_at(self, *args, **kwargs) -> Vector: - """normal_at - - Computes the normal vector at the desired location on the face. - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where the normal. - Defaults to None. - - Returns: - Vector: surface normal direction - """ - surface_point, u, v = None, -1.0, -1.0 - - if args: - if isinstance(args[0], Sequence): - surface_point = args[0] - elif isinstance(args[0], (int, float)): - u = args[0] - if len(args) == 2 and isinstance(args[1], (int, float)): - v = args[1] - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["surface_point", "u", "v"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - surface_point = kwargs.get("surface_point", surface_point) - u = kwargs.get("u", u) - v = kwargs.get("v", v) - if surface_point is None and u < 0 and v < 0: - u, v = 0.5, 0.5 - elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: - raise ValueError("Both u & v values must be specified") - - # get the geometry - surface = self.geom_adaptor() - - if surface_point is None: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) - else: - # project point on surface - projector = GeomAPI_ProjectPointOnSurf( - Vector(surface_point).to_pnt(), surface - ) - - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - def position_at(self, u: float, v: float) -> Vector: - """position_at - - Computes a point on the Face given u, v coordinates. - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - - Returns: - Vector: point on Face - """ - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u_val0 + u * (u_val1 - u_val0) - v_val = v_val0 + v * (v_val1 - v_val0) - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(gp_pnt) - - def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) - else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) - return Location(pln) - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of Face - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if (center_of == CenterOf.MASS) or ( - center_of == CenterOf.GEOMETRY and self.is_planar - ): - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - center_point = properties.CentreOfMass() - - elif center_of == CenterOf.BOUNDING_BOX: - center_point = self.bounding_box().center() - - elif center_of == CenterOf.GEOMETRY: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = 0.5 * (u_val0 + u_val1) - v_val = 0.5 * (v_val0 + v_val1) - - center_point = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) - - return Vector(center_point) - - def outer_wire(self) -> Wire: - """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) - - def inner_wires(self) -> ShapeList[Wire]: - """Extract the inner or hole wires from this Face""" - outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) - - def wire(self) -> Wire: - """Return the outerwire, generate a warning if inner_wires present""" - if self.inner_wires(): - warnings.warn( - "Found holes, returning outer_wire", - stacklevel=2, - ) - return self.outer_wire() - - @classmethod - def extrude(cls, obj: Edge, direction: VectorLike) -> Face: - """extrude - - Extrude an Edge into a Face. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Face: extruded shape - """ - return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: - """make_rect - - Make a Rectangle centered on center with the given normal - - Args: - width (float, optional): width (local x). - height (float, optional): height (local y). - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Face: The centered rectangle - """ - pln_shape = BRepBuilderAPI_MakeFace( - plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 - ).Face() - - return cls(pln_shape) - - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - - @overload - @classmethod - def make_surface_from_curves( - cls, edge1: Edge, edge2: Edge - ) -> Face: # pragma: no cover - ... - - @overload - @classmethod - def make_surface_from_curves( - cls, wire1: Wire, wire2: Wire - ) -> Face: # pragma: no cover - ... - - @classmethod - def make_surface_from_curves(cls, *args, **kwargs) -> Face: - """make_surface_from_curves - - Create a ruled surface out of two edges or two wires. If wires are used then - these must have the same number of edges. - - Args: - curve1 (Union[Edge,Wire]): side of surface - curve2 (Union[Edge,Wire]): opposite side of surface - - Returns: - Face: potentially non planar surface - """ - curve1, curve2 = None, None - if args: - if len(args) != 2 or type(args[0]) is not type(args[1]): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - curve1, curve2 = args - - curve1 = kwargs.pop("edge1", curve1) - curve2 = kwargs.pop("edge2", curve2) - curve1 = kwargs.pop("wire1", curve1) - curve2 = kwargs.pop("wire2", curve2) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - - if isinstance(curve1, Wire): - return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) - else: - return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) - return return_value - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: - """sew faces - - Group contiguous faces and return them in a list of ShapeList - - Args: - faces (Iterable[Face]): Faces to sew together - - Raises: - RuntimeError: OCCT SewedShape generated unexpected output - - Returns: - list[ShapeList[Face]]: grouped contiguous faces - """ - # Sew the faces - sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) - top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces: list[ShapeList] = [] - - # For each of the top level shapes create a ShapeList of Face - for top_level_shape in top_level_shapes: - if isinstance(top_level_shape, TopoDS_Face): - sewn_faces.append(ShapeList([Face(top_level_shape)])) - elif isinstance(top_level_shape, TopoDS_Shell): - sewn_faces.append(Shell(top_level_shape).faces()) - elif isinstance(top_level_shape, TopoDS_Solid): - sewn_faces.append( - ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") - ) - ) - else: - raise RuntimeError( - f"SewedShape returned a {type(top_level_shape)} which was unexpected" - ) - - return sewn_faces - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Face: - """sweep - - Sweep a 1D profile along a 1D path. Both the profile and path must be composed - of only 1 Edge. - - Args: - profile (Union[Curve,Edge,Wire]): the object to sweep - path (Union[Curve,Edge,Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Raises: - ValueError: Only 1 Edge allowed in profile & path - - Returns: - Face: resulting face, may be non-planar - """ - # Note: BRepOffsetAPI_MakePipe is an option here - # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) - # pipe_sweep.Build() - # return Face(pipe_sweep.Shape()) - - if len(profile.edges()) != 1 or len(path.edges()) != 1: - raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Face(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_surface_from_array_of_points( - cls, - points: list[list[VectorLike]], - tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 3, - ) -> Face: - """make_surface_from_array_of_points - - Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter - space of the face. The second dimension correspond to points on the horizontal - direction in the parameter space of the face. The 2 dimensions are U,V dimensions - of the parameter space of the face. - - Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V - parameters second is U parameters. - tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. - smoothing (Tuple[float, float, float], optional): optional tuple of - 3 weights use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when - smoothing is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 3. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Face: a potentially non-planar face defined by points - """ - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - - for i, point_row in enumerate(points): - for j, point in enumerate(point_row): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Surface() - - return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) - - @classmethod - def make_bezier_surface( - cls, - points: list[list[VectorLike]], - weights: list[list[float]] | None = None, - ) -> Face: - """make_bezier_surface - - Construct a Bézier surface from the provided 2d array of points. - - Args: - points (list[list[VectorLike]]): a 2D list of control points - weights (list[list[float]], optional): control point weights. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Face: a potentially non-planar face - """ - if len(points) < 2 or len(points[0]) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(points) > 25 or len(points[0]) > 25: - raise ValueError("The maximum number of control points is 25") - if weights and ( - len(points) != len(weights) or len(points[0]) != len(weights[0]) - ): - raise ValueError("A weight must be provided for each control point") - - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - for i, row_points in enumerate(points): - for j, point in enumerate(row_points): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if weights: - weights_ = TColStd_HArray2OfReal(1, len(weights), 1, len(weights[0])) - for i, row_weights in enumerate(weights): - for j, weight in enumerate(row_weights): - weights_.SetValue(i + 1, j + 1, float(weight)) - bezier = Geom_BezierSurface(points_, weights_) - else: - bezier = Geom_BezierSurface(points_) - - return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) - - @classmethod - def make_surface( - cls, - exterior: Union[Wire, Iterable[Edge]], - surface_points: Iterable[VectorLike] | None = None, - interior_wires: Iterable[Wire] | None = None, - ) -> Face: - """Create Non-Planar Face - - Create a potentially non-planar face bounded by exterior (wire or edges), - optionally refined by surface_points with optional holes defined by - interior_wires. - - Args: - exterior (Union[Wire, list[Edge]]): Perimeter of face - surface_points (list[VectorLike], optional): Points on the surface that - refine the shape. Defaults to None. - interior_wires (list[Wire], optional): Hole(s) in the face. Defaults to None. - - Raises: - RuntimeError: Internal error building face - RuntimeError: Error building non-planar face with provided surface_points - RuntimeError: Error adding interior hole - RuntimeError: Generated face is invalid - - Returns: - Face: Potentially non-planar face - """ - exterior = list(exterior) if isinstance(exterior, Iterable) else exterior - # pylint: disable=too-many-branches - if surface_points: - surface_point_vectors = [Vector(p) for p in surface_points] - else: - surface_point_vectors = None - - # First, create the non-planar surface - surface = BRepOffsetAPI_MakeFilling( - # order of energy criterion to minimize for computing the deformation of the surface - Degree=3, - # average number of points for discretisation of the edges - NbPtsOnCur=15, - NbIter=2, - Anisotropie=False, - # the maximum distance allowed between the support surface and the constraints - Tol2d=0.00001, - # the maximum distance allowed between the support surface and the constraints - Tol3d=0.0001, - # the maximum angle allowed between the normal of the surface and the constraints - TolAng=0.01, - # the maximum difference of curvature allowed between the surface and the constraint - TolCurv=0.1, - # the highest degree which the polynomial defining the filling surface can have - MaxDeg=8, - # the greatest number of segments which the filling surface can have - MaxSegments=9, - ) - if isinstance(exterior, Wire): - outside_edges = exterior.edges() - elif isinstance(exterior, Iterable) and all( - isinstance(o, Edge) for o in exterior - ): - outside_edges = ShapeList(exterior) - else: - raise ValueError("exterior must be a Wire or list of Edges") - - for edge in outside_edges: - surface.Add(edge.wrapped, GeomAbs_C0) - - try: - surface.Build() - surface_face = Face(surface.Shape()) - except ( - Standard_Failure, - StdFail_NotDone, - Standard_NoSuchObject, - Standard_ConstructionError, - ) as err: - raise RuntimeError( - "Error building non-planar face with provided exterior" - ) from err - if surface_point_vectors: - for point in surface_point_vectors: - surface.Add(gp_Pnt(*point.to_tuple())) - try: - surface.Build() - surface_face = Face(surface.Shape()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error building non-planar face with provided surface_points" - ) from err - - # Next, add wires that define interior holes - note these wires must be entirely interior - if interior_wires: - makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) - for wire in interior_wires: - makeface_object.Add(wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - if not surface_face.is_valid(): - raise RuntimeError("non planar face is invalid") - - return surface_face - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: - """Apply 2D fillet to a face - - Args: - radius: float: - vertices: Iterable[Vertex]: - - Returns: - - """ - - fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - - fillet_builder.Build() - - return self.__class__.cast(fillet_builder.Shape()) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Face: - """Apply 2D chamfer to a face - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Raises: - ValueError: Cannot chamfer at this location - ValueError: One or more vertices are not part of edge - - Returns: - Face: face with a chamfered corner(s) - - """ - reference_edge = edge - - chamfer_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - return self.__class__.cast(chamfer_builder.Shape()).fix() - - def is_coplanar(self, plane: Plane) -> bool: - """Is this planar face coplanar with the provided plane""" - u_val0, _u_val1, v_val0, _v_val1 = self._uv_bounds() - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val0, v_val0, gp_pnt, normal) - - return ( - plane.contains(Vector(gp_pnt)) - and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE - ) - - def project_to_shape( - self, target_object: Shape, direction: VectorLike - ) -> ShapeList[Face | Shell]: - """Project Face to target Object - - Project a Face onto a Shape generating new Face(s) on the surfaces of the object. - - A projection with no taper is illustrated below: - - .. image:: flatProjection.png - :alt: flatProjection - - Note that an array of faces is returned as the projection might result in faces - on the "front" and "back" of the object (or even more if there are intermediate - surfaces in the projection path). faces "behind" the projection are not - returned. - - Args: - target_object (Shape): Object to project onto - direction (VectorLike): projection direction - - Returns: - ShapeList[Face]: Face(s) projected on target object ordered by distance - """ - max_dimension = find_max_dimension([self, target_object]) - extruded_topods_self = _extrude_topods_shape( - self.wrapped, Vector(direction) * max_dimension - ) - - intersected_shapes: ShapeList[Face | Shell] = ShapeList() - if isinstance(target_object, Vertex): - raise TypeError("projection to a vertex is not supported") - if isinstance(target_object, Face): - topods_shape = _topods_bool_op( - (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() - ) - if not topods_shape.IsNull(): - intersected_shapes.append(Face(topods_shape)) - else: - for target_shell in target_object.shells(): - topods_shape = _topods_bool_op( - (extruded_topods_self,), - (target_shell.wrapped,), - BRepAlgoAPI_Common(), - ) - for topods_shell in get_top_level_topods_shapes(topods_shape): - intersected_shapes.append(Shell(topods_shell)) - - intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = ShapeList( - s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ) - return intersected_shapes - - def make_holes(self, interior_wires: list[Wire]) -> Face: - """Make Holes in Face - - Create holes in the Face 'self' from interior_wires which must be entirely interior. - Note that making holes in faces is more efficient than using boolean operations - with solid object. Also note that OCCT core may fail unless the orientation of the wire - is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. - - Example: - - For example, make a series of slots on the curved walls of a cylinder. - - .. image:: slotted_cylinder.png - - Args: - interior_wires: a list of hole outline wires - interior_wires: list[Wire]: - - Returns: - Face: 'self' with holes - - Raises: - RuntimeError: adding interior hole in non-planar face with provided interior_wires - RuntimeError: resulting face is not valid - - """ - # Add wires that define interior holes - note these wires must be entirely interior - makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) - for interior_wire in interior_wires: - makeface_object.Add(interior_wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - # if not surface_face.is_valid(): - # raise RuntimeError("non planar face is invalid") - - return surface_face - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Point inside Face - - Returns whether or not the point is inside a Face within the specified tolerance. - Points on the edge of the Face are considered inside. - - Args: - point(VectorLike): tuple or Vector representing 3D point to be tested - tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool: indicating whether or not point is within Face - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - return solid_classifier.IsOnAFace() - - # surface = BRep_Tool.Surface_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) - # return projector.LowerDistance() <= TOLERANCE - - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs - - Approximate planar face with arcs and straight line segments. - - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - - -class Shell(Mixin2D, Shape[TopoDS_Shell]): - """A Shell is a fundamental component in build123d's topological data structure - representing a connected set of faces forming a closed surface in 3D space. As - part of a geometric model, it defines a watertight enclosure, commonly encountered - in solid modeling. Shells group faces in a coherent manner, playing a crucial role - in representing complex shapes with voids and surfaces. This hierarchical structure - allows for efficient handling of surfaces within a model, supporting various - operations and analyses.""" - - order = 2.5 - - def __init__( - self, - obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell - - Args: - obj (TopoDS_Shape | Face | Iterable[Face], optional): OCCT Shell, Face or Faces. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - obj = list(obj) if isinstance(obj, Iterable) else obj - if isinstance(obj, Iterable) and len(obj_list := list(obj)) == 1: - obj = obj_list[0] - - if isinstance(obj, Face): - builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(obj.wrapped).Surface().Surface() - ) - obj = builder.Shape() - elif isinstance(obj, Iterable): - obj = _sew_topods_faces([f.wrapped for f in obj]) - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - @property - def volume(self) -> float: - """volume - the volume of this Shell if manifold, otherwise zero""" - if self.is_manifold: - solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] - calc_function(solid_shell, properties) - return properties.Mass() - return 0.0 - - def center(self) -> Vector: - """Center of mass of the shell""" - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - return Vector(properties.CentreOfMass()) - - @classmethod - def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: - """extrude - - Extrude a Wire into a Shell. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Shell: - """sweep - - Sweep a 1D profile along a 1D path - - Args: - profile (Union[Curve, Edge, Wire]): the object to sweep - path (Union[Curve, Edge, Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Shell: resulting Shell, may be non-planar - """ - profile = Wire(profile.edges()) - path = Wire(Wire(path.edges()).order_edges()) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Shell(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Shell: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list nor - between wires. Wires may be closed or opened. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Shell: Lofted object - """ - return cls(_make_loft(objs, False, ruled)) - - -class Solid(Mixin3D, Shape[TopoDS_Solid]): - """A Solid in build123d represents a three-dimensional solid geometry - in a topological structure. A solid is a closed and bounded volume, enclosing - a region in 3D space. It comprises faces, edges, and vertices connected in a - well-defined manner. Solid modeling operations, such as Boolean - operations (union, intersection, and difference), are often performed on - Solid objects to create or modify complex geometries.""" - - order = 3.0 - - def __init__( - self, - obj: TopoDS_Solid | Shell | None = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - ): - """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid - - Args: - obj (TopoDS_Shape | Shell, optional): OCCT Solid or Shell. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Shell): - obj = Solid._make_solid(obj) - - super().__init__( - obj=obj, - # label="" if label is None else label, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - - @property - def volume(self) -> float: - """volume - the volume of this Solid""" - # when density == 1, mass == volume - return Shape.compute_mass(self) - - @classmethod - def _make_solid(cls, shell: Shell) -> TopoDS_Solid: - """Create a Solid object from the surface shell""" - return ShapeFix_Solid().SolidFromShell(shell.wrapped) - - @classmethod - def extrude(cls, obj: Face, direction: VectorLike) -> Solid: - """extrude - - Extrude a Face into a Solid. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: - """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) - - @classmethod - def make_box( - cls, length: float, width: float, height: float, plane: Plane = Plane.XY - ) -> Solid: - """make box - - Make a box at the origin of plane extending in positive direction of each axis. - - Args: - length (float): - width (float): - height (float): - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Solid: Box - """ - return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() - ) - - @classmethod - def make_cone( - cls, - base_radius: float, - top_radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cone - - Make a cone with given radii and height - - Args: - base_radius (float): - top_radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cone - """ - return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_cylinder( - cls, - radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cylinder - - Make a cylinder with a given radius and height with the base center on plane origin. - - Args: - radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cylinder - """ - return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_torus( - cls, - major_radius: float, - minor_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 0, - end_angle: float = 360, - major_angle: float = 360, - ) -> Solid: - """make torus - - Make a torus with a given radii and angles - - Args: - major_radius (float): - minor_radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - start_angle (float, optional): start major arc. Defaults to 0. - end_angle (float, optional): end major arc. Defaults to 360. - - Returns: - Solid: Full or partial torus - """ - return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Solid: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Solid: Lofted object - """ - return cls(_make_loft(objs, True, ruled)) - - @classmethod - def make_wedge( - cls, - delta_x: float, - delta_y: float, - delta_z: float, - min_x: float, - min_z: float, - max_x: float, - max_z: float, - plane: Plane = Plane.XY, - ) -> Solid: - """Make a wedge - - Args: - delta_x (float): - delta_y (float): - delta_z (float): - min_x (float): - min_z (float): - max_x (float): - max_z (float): - plane (Plane): base plane. Defaults to Plane.XY. - - Returns: - Solid: wedge - """ - return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() - ) - - @classmethod - def make_sphere( - cls, - radius: float, - plane: Plane = Plane.XY, - angle1: float = -90, - angle2: float = 90, - angle3: float = 360, - ) -> Solid: - """Sphere - - Make a full or partial sphere - with a given radius center on the origin or plane. - - Args: - radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle1 (float, optional): Defaults to -90. - angle2 (float, optional): Defaults to 90. - angle3 (float, optional): Defaults to 360. - - Returns: - Solid: sphere - """ - return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() - ) - - @classmethod - def extrude_taper( - cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True - ) -> Solid: - """Extrude a cross section with a taper - - Extrude a cross section into a prismatic solid in the provided direction. - - Note that two difference algorithms are used. If direction aligns with - the profile normal (which must be positive), the taper is positive and the profile - contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most - accurate results. Otherwise, a loft is created between the profile and the profile - with a 2D offset set at the appropriate direction. - - Args: - section (Face]): cross section - normal (VectorLike): a vector along which to extrude the wires. The length - of the vector controls the length of the extrusion. - taper (float): taper angle in degrees. - flip_inner (bool, optional): outer and inner geometry have opposite tapers to - allow for part extraction when injection molding. - - Returns: - Solid: extruded cross section - """ - # pylint: disable=too-many-locals - direction = Vector(direction) - - if ( - direction.normalized() == profile.normal_at() - and Plane(profile).z_dir.Z > 0 - and taper > 0 - and not profile.inner_wires() - ): - prism_builder = LocOpe_DPrism( - profile.wrapped, - direction.length / cos(radians(taper)), - radians(taper), - ) - new_solid = Solid(prism_builder.Shape()) - else: - # Determine the offset to get the taper - offset_amt = -direction.length * tan(radians(taper)) - - outer = profile.outer_wire() - local_outer: Wire = Plane(profile).to_local_coords(outer) - local_taper_outer = local_outer.offset_2d( - offset_amt, kind=Kind.INTERSECTION - ) - taper_outer = Plane(profile).from_local_coords(local_taper_outer) - taper_outer.move(Location(direction)) - - profile_wires = [profile.outer_wire()] + profile.inner_wires() - - taper_wires = [] - for i, wire in enumerate(profile_wires): - flip = -1 if i > 0 and flip_inner else 1 - local: Wire = Plane(profile).to_local_coords(wire) - local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper_wire: Wire = Plane(profile).from_local_coords(local_taper) - taper_wire.move(Location(direction)) - taper_wires.append(taper_wire) - - solids = [ - Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) - ] - if len(solids) > 1: - complex_solid = solids[0].cut(*solids[1:]) - assert isinstance(complex_solid, Solid) # Can't be a list - new_solid = complex_solid - else: - new_solid = solids[0] - - return new_solid - - @classmethod - def extrude_linear_with_rotation( - cls, - section: Union[Face, Wire], - center: VectorLike, - normal: VectorLike, - angle: float, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Extrude with Rotation - - Creates a 'twisted prism' by extruding, while simultaneously rotating around the - extrusion vector. - - Args: - section (Union[Face,Wire]): cross section - vec_center (VectorLike): the center point about which to rotate - vec_normal (VectorLike): a vector along which to extrude the wires - angle (float): the angle to rotate through while extruding - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to None. - - Returns: - Solid: extruded object - """ - # Though the signature may appear to be similar enough to extrude to merit - # combining them, the construction methods used here are different enough that they - # should be separate. - - # At a high level, the steps followed are: - # (1) accept a set of wires - # (2) create another set of wires like this one, but which are transformed and rotated - # (3) create a ruledSurface between the sets of wires - # (4) create a shell and compute the resulting object - - inner_wires = inner_wires if inner_wires else [] - center = Vector(center) - normal = Vector(normal) - - def extrude_aux_spine( - wire: TopoDS_Wire, spine: TopoDS_Wire, aux_spine: TopoDS_Wire - ) -> TopoDS_Shape: - """Helper function""" - extrude_builder = BRepOffsetAPI_MakePipeShell(spine) - extrude_builder.SetMode(aux_spine, False) # auxiliary spine - extrude_builder.Add(wire) - extrude_builder.Build() - extrude_builder.MakeSolid() - return extrude_builder.Shape() - - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - - # make straight spine - straight_spine_e = Edge.make_line(center, center.add(normal)) - straight_spine_w = Wire.combine([straight_spine_e])[0].wrapped - - # make an auxiliary spine - pitch = 360.0 / angle * normal.length - aux_spine_w = Wire( - [Edge.make_helix(pitch, normal.length, 1, center=center, normal=normal)] - ).wrapped - - # extrude the outer wire - outer_solid = extrude_aux_spine( - outer_wire.wrapped, straight_spine_w, aux_spine_w - ) - - # extrude inner wires - inner_solids = [ - extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w) - for w in inner_wires - ] - - # combine the inner solids into compound - inner_comp = _make_topods_compound_from_shapes(inner_solids) - - # subtract from the outer solid - return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) - - @classmethod - def extrude_until( - cls, - section: Face, - target_object: Union[Compound, Solid], - direction: VectorLike, - until: Until = Until.NEXT, - ) -> Union[Compound, Solid]: - """extrude_until - - Extrude section in provided direction until it encounters either the - NEXT or LAST surface of target_object. Note that the bounding surface - must be larger than the extruded face where they contact. - - Args: - section (Face): Face to extrude - target_object (Union[Compound, Solid]): object to limit extrusion - direction (VectorLike): extrusion direction - until (Until, optional): surface to limit extrusion. Defaults to Until.NEXT. - - Raises: - ValueError: provided face does not intersect target_object - - Returns: - Union[Compound, Solid]: extruded Face - """ - direction = Vector(direction) - if until in [Until.PREVIOUS, Until.FIRST]: - direction *= -1 - until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - - max_dimension = find_max_dimension([section, target_object]) - clipping_direction = ( - direction * max_dimension - if until == Until.NEXT - else -direction * max_dimension - ) - direction_axis = Axis(section.center(), clipping_direction) - # Create a linear extrusion to start - extrusion = Solid.extrude(section, direction * max_dimension) - - # Project section onto the shape to generate faces that will clip the extrusion - # and exclude the planar faces normal to the direction of extrusion and these - # will have no volume when extruded - faces = [] - for face in section.project_to_shape(target_object, direction): - if isinstance(face, Face): - faces.append(face) - else: - faces += face.faces() - - clip_faces = [ - f - for f in faces - if not (f.is_planar and f.normal_at().dot(direction) == 0.0) - ] - if not clip_faces: - raise ValueError("provided face does not intersect target_object") - - # Create the objects that will clip the linear extrusion - clipping_objects = [ - Solid.extrude(f, clipping_direction).fix() for f in clip_faces - ] - clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] - - if until == Until.NEXT: - trimmed_extrusion = extrusion.cut(target_object) - if isinstance(trimmed_extrusion, ShapeList): - closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] - else: - closest_extrusion = trimmed_extrusion - for clipping_object in clipping_objects: - # It's possible for clipping faces to self intersect when they are extruded - # thus they could be non manifold which results failed boolean operations - # - so skip these objects - try: - extrusion_shapes = closest_extrusion.cut(clipping_object) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - else: - base_part = extrusion.intersect(target_object) - if isinstance(base_part, ShapeList): - extrusion_parts = base_part - elif base_part is None: - extrusion_parts = ShapeList() - else: - extrusion_parts = ShapeList([base_part]) - for clipping_object in clipping_objects: - try: - clipped_extrusion = extrusion.intersect(clipping_object) - if clipped_extrusion is not None: - extrusion_parts.append( - clipped_extrusion.solids().sort_by(direction_axis)[0] - ) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - extrusion_shapes = Solid.fuse(*extrusion_parts) - - result = extrusion_shapes.solids().sort_by(direction_axis)[0] - - return result - - @classmethod - def revolve( - cls, - section: Union[Face, Wire], - angle: float, - axis: Axis, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Revolve - - Revolve a cross section about the given Axis by the given angle. - - Args: - section (Union[Face,Wire]): cross section - angle (float): the angle to revolve through - axis (Axis): rotation Axis - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to []. - - Returns: - Solid: the revolved cross section - """ - inner_wires = inner_wires if inner_wires else [] - if isinstance(section, Wire): - section_face = Face(section, inner_wires) - else: - section_face = section - - revol_builder = BRepPrimAPI_MakeRevol( - section_face.wrapped, - axis.wrapped, - angle * DEG2RAD, - True, - ) - - return cls(revol_builder.Shape()) - - @classmethod - def _set_sweep_mode( - cls, - builder: BRepOffsetAPI_MakePipeShell, - path: Union[Wire, Edge], - binormal: Union[Vector, Wire, Edge], - ) -> bool: - rotate = False - - if isinstance(binormal, Vector): - coordinate_system = gp_Ax2() - coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(binormal.to_dir()) - builder.SetMode(coordinate_system) - rotate = True - elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) - - return rotate - - @classmethod - def sweep( - cls, - section: Union[Face, Wire], - path: Union[Wire, Edge], - inner_wires: list[Wire] | None = None, - make_solid: bool = True, - is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, - transition: Transition = Transition.TRANSFORMED, - ) -> Solid: - """Sweep - - Sweep the given cross section into a prismatic solid along the provided path - - Args: - section (Union[Face, Wire]): cross section to sweep - path (Union[Wire, Edge]): sweep path - inner_wires (list[Wire]): holes - only used if section is a wire - make_solid (bool, optional): return Solid or Shell. Defaults to True. - is_frenet (bool, optional): Frenet mode. Defaults to False. - mode (Union[Vector, Wire, Edge, None], optional): additional sweep - mode parameters. Defaults to None. - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Solid: the swept cross section - """ - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - inner_wires = inner_wires if inner_wires else [] - - shapes = [] - for wire in [outer_wire] + inner_wires: - builder = BRepOffsetAPI_MakePipeShell(path.to_wire().wrapped) - - rotate = False - - # handle sweep mode - if mode: - rotate = Solid._set_sweep_mode(builder, path, mode) - else: - builder.SetMode(is_frenet) - - builder.SetTransitionMode(Shape._transModeDict[transition]) - - builder.Add(wire.wrapped, False, rotate) - - builder.Build() - if make_solid: - builder.MakeSolid() - - shapes.append(Mixin3D.cast(builder.Shape())) - - outer_shape, inner_shapes = shapes[0], shapes[1:] - - if inner_shapes: - hollow_outer_shape = outer_shape.cut(*inner_shapes) - assert isinstance(hollow_outer_shape, Solid) - return hollow_outer_shape - - return outer_shape - - @classmethod - def sweep_multi( - cls, - profiles: Iterable[Union[Wire, Face]], - path: Union[Wire, Edge], - make_solid: bool = True, - is_frenet: bool = False, - binormal: Union[Vector, Wire, Edge, None] = None, - ) -> Solid: - """Multi section sweep - - Sweep through a sequence of profiles following a path. - - Args: - profiles (Iterable[Union[Wire, Face]]): list of profiles - path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over - make_solid (bool, optional): Solid or Shell. Defaults to True. - is_frenet (bool, optional): Select frenet mode. Defaults to False. - binormal (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. - Defaults to None. - - Returns: - Solid: swept object - """ - path_as_wire = path.to_wire().wrapped - - builder = BRepOffsetAPI_MakePipeShell(path_as_wire) - - translate = False - rotate = False - - if binormal: - rotate = cls._set_sweep_mode(builder, path, binormal) - else: - builder.SetMode(is_frenet) - - for profile in profiles: - path_as_wire = ( - profile.wrapped - if isinstance(profile, Wire) - else profile.outer_wire().wrapped - ) - builder.Add(path_as_wire, translate, rotate) - - builder.Build() - - if make_solid: - builder.MakeSolid() - - return cls(builder.Shape()) - - @classmethod - def thicken( - cls, - surface: Face | Shell, - depth: float, - normal_override: Optional[VectorLike] = None, - ) -> Solid: - """Thicken Face or Shell - - Create a solid from a potentially non planar face or shell by thickening along - the normals. - - .. image:: thickenFace.png - - Non-planar faces are thickened both towards and away from the center of the sphere. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - normal_override (Vector, optional): Face only. The normal_override vector can be - used to indicate which way is 'up', potentially flipping the face normal - direction such that many faces with different normals all go in the same - direction (direction need only be +/- 90 degrees from the face normal). - Defaults to None. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - # Check to see if the normal needs to be flipped - adjusted_depth = depth - if isinstance(surface, Face) and normal_override is not None: - surface_center = surface.center() - surface_normal = surface.normal_at(surface_center).normalized() - if surface_normal.dot(Vector(normal_override).normalized()) < 0: - adjusted_depth = -depth - - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - surface.wrapped, - Offset=adjusted_depth, - Tol=1.0e-5, - Mode=BRepOffset_Skin, - # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both - # sides of the surface but doesn't seem to work - Intersection=True, - SelfInter=False, - Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection - Thickening=True, - RemoveIntEdges=True, - ) - offset_builder.MakeOffsetShape() - try: - result = Solid(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error applying thicken to given surface") from err - - return result - - -class Vertex(Shape[TopoDS_Vertex]): - """A Vertex in build123d represents a zero-dimensional point in the topological - data structure. It marks the endpoints of edges within a 3D model, defining precise - locations in space. Vertices play a crucial role in defining the geometry of objects - and the connectivity between edges, facilitating accurate representation and - manipulation of 3D shapes. They hold coordinate information and are essential - for constructing complex structures like wires, faces, and solids.""" - - order = 0.0 - - @property - def _dim(self) -> int: - return 0 - - @overload - def __init__(self): # pragma: no cover - """Default Vertext at the origin""" - - @overload - def __init__(self, ocp_vx: TopoDS_Vertex): # pragma: no cover - """Vertex from OCCT TopoDS_Vertex object""" - - @overload - def __init__(self, X: float, Y: float, Z: float): # pragma: no cover - """Vertex from three float values""" - - @overload - def __init__(self, v: Iterable[float]): - """Vertex from Vector or other iterators""" - - def __init__(self, *args, **kwargs): - self.vertex_index = 0 - - ocp_vx = kwargs.pop("ocp_vx", None) - v = kwargs.pop("v", None) - x = kwargs.pop("X", 0) - y = kwargs.pop("Y", 0) - z = kwargs.pop("Z", 0) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if args: - if isinstance(args[0], TopoDS_Vertex): - ocp_vx = args[0] - elif isinstance(args[0], Iterable): - v = args[0] - else: - x, y, z = args[:3] + (0,) * (3 - len(args)) - - if v is not None: - x, y, z = itertools.islice(itertools.chain(v, [0, 0, 0]), 3) - - ocp_vx = ( - downcast(BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z)).Vertex()) - if ocp_vx is None - else ocp_vx - ) - - super().__init__(ocp_vx) - self.X, self.Y, self.Z = self.to_tuple() - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def volume(self) -> float: - """volume - the volume of this Vertex, which is always zero""" - return 0.0 - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return ShapeList((self,)) # Vertex is an iterable - - def vertex(self) -> Vertex: - """Return the Vertex""" - return self - - def to_tuple(self) -> tuple[float, float, float]: - """Return vertex as three tuple of floats""" - geom_point = BRep_Tool.Pnt_s(self.wrapped) - return (geom_point.X(), geom_point.Y(), geom_point.Z()) - - def center(self) -> Vector: - """The center of a vertex is itself!""" - return Vector(self) - - def __add__( # type: ignore - self, other: Vertex | Vector | tuple[float, float, float] - ) -> Vertex: - """Add - - Add to a Vertex with a Vertex, Vector or Tuple - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" Vertex: # type: ignore - """Subtract - - Substract a Vertex with a Vertex, Vector or Tuple from self - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" str: - """To String - - Convert Vertex to String for display - - Returns: - Vertex as String - """ - return f"Vertex({self.X}, {self.Y}, {self.Z})" - - def __iter__(self): - """Initialize to beginning""" - self.vertex_index = 0 - return self - - def __next__(self): - """return the next value""" - if self.vertex_index == 0: - self.vertex_index += 1 - value = self.X - elif self.vertex_index == 1: - self.vertex_index += 1 - value = self.Y - elif self.vertex_index == 2: - self.vertex_index += 1 - value = self.Z - else: - raise StopIteration - return value - - def transform_shape(self, t_matrix: Matrix) -> Vertex: - """Apply affine transform without changing type - - Transforms a copy of this Vertex by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Vertex: copy of transformed shape with all objects keeping their type - """ - return Vertex(*t_matrix.multiply(Vector(self))) - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: - """extrude - invalid operation for Vertex""" - raise NotImplementedError("Vertices can't be created by extrusion") - - -class Wire(Mixin1D, Shape[TopoDS_Wire]): - """A Wire in build123d is a topological entity representing a connected sequence - of edges forming a continuous curve or path in 3D space. Wires are essential - components in modeling complex objects, defining boundaries for surfaces or - solids. They store information about the connectivity and order of edges, - allowing precise definition of paths within a 3D model.""" - - order = 1.5 - - @overload - def __init__( - self, - obj: TopoDS_Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from an OCCT TopoDS_Wire - - Args: - obj (TopoDS_Wire, optional): OCCT Wire. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edge: Edge, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Edge - - Args: - edge (Edge): Edge to convert to Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Wire - used when the input could be an Edge or Wire. - - Args: - wire (Wire): Wire to convert to another Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Curve, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Curve. - - Args: - curve (Curve): Curve to convert to a Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edges: Iterable[Edge], - sequenced: bool = False, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from Edges - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - curve, edge, edges, wire, sequenced, obj, label, color, parent = (None,) * 9 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Wire): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Edge): - edge, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - # elif isinstance(args[0], Curve): - elif ( - hasattr(args[0], "wrapped") - and isinstance(args[0].wrapped, TopoDS_Compound) - and topods_dim(args[0].wrapped) == 1 - ): # Curve - curve, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Iterable): - edges, sequenced, label, color, parent = args[:5] + (None,) * (5 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "curve", - "wire", - "edge", - "edges", - "sequenced", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - edge = kwargs.get("edge", edge) - edges = kwargs.get("edges", edges) - sequenced = kwargs.get("sequenced", sequenced) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - wire = kwargs.get("wire", wire) - curve = kwargs.get("curve", curve) - - if edge is not None: - edges = [edge] - elif curve is not None: - edges = curve.edges() - if wire is not None: - obj = wire.wrapped - elif edges: - obj = Wire._make_wire(edges, False if sequenced is None else sequenced) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_CompCurve: - """Return the Geom Comp Curve for this Wire""" - return BRepAdaptor_CompCurve(self.wrapped) - - def close(self) -> Wire: - """Close a Wire""" - if not self.is_closed: - edge = Edge.make_line(self.end_point(), self.start_point()) - return_value = Wire.combine((self, edge))[0] - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" - return self - - @classmethod - def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 - ) -> ShapeList[Wire]: - """combine - - Combine a list of wires and edges into a list of Wires. - - Args: - wires (Iterable[Union[Wire, Edge]]): unsorted - tol (float, optional): tolerance. Defaults to 1e-9. - - Returns: - ShapeList[Wire]: Wires - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) - - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires = ShapeList() - for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) - - return wires - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: - """extrude - invalid operation for Wire""" - raise NotImplementedError("Wires can't be created by extrusion") - - def fix_degenerate_edges(self, precision: float) -> Wire: - """fix_degenerate_edges - - Fix a Wire that contains degenerate (very small) edges - - Args: - precision (float): minimum value edge length - - Returns: - Wire: fixed wire - """ - sf_w = ShapeFix_Wireframe(self.wrapped) - sf_w.SetPrecision(precision) - sf_w.SetMaxTolerance(1e-6) - sf_w.FixSmallEdges() - sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) - - def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" - - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. - - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False - - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) - - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length - break - distance += edge.length - - if not found: - raise ValueError(f"{point} not on wire") - - return distance / wire_length - - def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Wire: trimmed wire - """ - - # pylint: disable=too-many-branches - if start >= end: - raise ValueError("start must be less than end") - - edges = self.edges() - - # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) - - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) - - trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue - - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) - - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) - - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) - - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) - - return Wire(trimmed_edges) - - def order_edges(self) -> ShapeList[Edge]: - """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) - - @classmethod - def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: - """_make_wire - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - - Raises: - ValueError: Edges are disconnected and can't be sequenced. - RuntimeError: Wire is empty - - Returns: - Wire: assembled edges - """ - - def closest_to_end(current: Wire, unplaced_edges: list[Edge]) -> Edge: - """Return the Edge closest to the end of last_edge""" - target_point = current.position_at(1) - - sorted_edges = sorted( - unplaced_edges, - key=lambda e: min( - (target_point - e.position_at(0)).length, - (target_point - e.position_at(1)).length, - ), - ) - return sorted_edges[0] - - edges = list(edges) - if sequenced: - placed_edges = [edges.pop(0)] - unplaced_edges = edges - - while unplaced_edges: - next_edge = closest_to_end(Wire(placed_edges), unplaced_edges) - next_edge_index = unplaced_edges.index(next_edge) - placed_edges.append(unplaced_edges.pop(next_edge_index)) - - edges = placed_edges - - wire_builder = BRepBuilderAPI_MakeWire() - combined_edges = TopTools_ListOfShape() - for edge in edges: - combined_edges.Append(edge.wrapped) - wire_builder.Add(combined_edges) - - wire_builder.Build() - if not wire_builder.IsDone(): - if wire_builder.Error() == BRepBuilderAPI_NonManifoldWire: - warnings.warn( - "Wire is non manifold (e.g. branching, self intersecting)", - stacklevel=2, - ) - elif wire_builder.Error() == BRepBuilderAPI_EmptyWire: - raise RuntimeError("Wire is empty") - elif wire_builder.Error() == BRepBuilderAPI_DisconnectedWire: - raise ValueError("Edges are disconnected") - - return wire_builder.Wire() - - @classmethod - def make_circle(cls, radius: float, plane: Plane = Plane.XY) -> Wire: - """make_circle - - Makes a circle centered at the origin of plane - - Args: - radius (float): circle radius - plane (Plane): base plane. Defaults to Plane.XY - - Returns: - Wire: a circle - """ - circle_edge = Edge.make_circle(radius, plane=plane) - return Wire([circle_edge]) - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - closed: bool = True, - ) -> Wire: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): _description_. Defaults to 360.0. - end_angle (float, optional): _description_. Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - closed (bool, optional): close the arc. Defaults to True. - - Returns: - Wire: an ellipse - """ - ellipse_edge = Edge.make_ellipse( - x_radius, y_radius, plane, start_angle, end_angle, angular_direction - ) - - if start_angle != end_angle and closed: - line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) - wire = Wire([ellipse_edge, line]) - else: - wire = Wire([ellipse_edge]) - - return wire - - @classmethod - def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: - """make_polygon - - Create an irregular polygon by defining vertices - - Args: - vertices (Iterable[VectorLike]): - close (bool, optional): close the polygon. Defaults to True. - - Returns: - Wire: an irregular polygon - """ - vectors = [Vector(v) for v in vertices] - if (vectors[0] - vectors[-1]).length > TOLERANCE and close: - vectors.append(vectors[0]) - - wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vectors: - wire_builder.Add(vertex.to_pnt()) - - return cls(wire_builder.Wire()) - - def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires - - Args: - other: Wire: - - Returns: - - """ - - wire_builder = BRepBuilderAPI_MakeWire() - wire_builder.Add(TopoDS.Wire_s(self.wrapped)) - wire_builder.Add(TopoDS.Wire_s(other.wrapped)) - wire_builder.Build() - - return self.__class__.cast(wire_builder.Wire()) - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: - """fillet_2d - - Apply 2D fillet to a wire - - Args: - radius (float): - vertices (Iterable[Vertex]): vertices to fillet - - Returns: - Wire: filleted wire - """ - # Create a face to fillet - unfilleted_face = _make_topods_face_from_wires(self.wrapped) - # Fillet the face - fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - fillet_builder.Build() - filleted_face = downcast(fillet_builder.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(filleted_face)) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Wire: - """chamfer_2d - - Apply 2D chamfer to a wire - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Returns: - Wire: chamfered wire - """ - reference_edge = edge - - # Create a face to chamfer - unchamfered_face = _make_topods_face_from_wires(self.wrapped) - chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - chamfered_face = chamfer_builder.Shape() - # Fix the shape - shape_fix = ShapeFix_Shape(chamfered_face) - shape_fix.Perform() - chamfered_face = downcast(shape_fix.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(chamfered_face)) - - @staticmethod - def order_chamfer_edges( - reference_edge: Optional[Edge], edges: tuple[Edge, Edge] - ) -> tuple[Edge, Edge]: - """Order the edges of a chamfer relative to a reference Edge""" - if reference_edge: - edge1, edge2 = edges - if edge1 == reference_edge: - return edge1, edge2 - if edge2 == reference_edge: - return edge2, edge1 - raise ValueError("reference edge not in edges") - return edges - - @classmethod - def make_rect( - cls, - width: float, - height: float, - plane: Plane = Plane.XY, - ) -> Wire: - """Make Rectangle - - Make a Rectangle centered on center with the given normal - - Args: - width (float): width (local x) - height (float): height (local y) - plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. - - Returns: - Wire: The centered rectangle - """ - corners_local = [ - (width / 2, height / 2), - (width / 2, height / -2), - (width / -2, height / -2), - (width / -2, height / 2), - ] - corners_world = [plane.from_local_coords(c) for c in corners_local] - return Wire.make_polygon(corners_world, close=True) - - @classmethod - def make_convex_hull(cls, edges: Iterable[Edge], tolerance: float = 1e-3) -> Wire: - """make_convex_hull - - Create a wire of minimum length enclosing all of the provided edges. - - Note that edges can't overlap each other. - - Args: - edges (Iterable[Edge]): edges defining the convex hull - tolerance (float): allowable error as a fraction of each edge length. - Defaults to 1e-3. - - Raises: - ValueError: edges overlap - - Returns: - Wire: convex hull perimeter - """ - # pylint: disable=too-many-branches, too-many-locals - # Algorithm: - # 1) create a cloud of points along all edges - # 2) create a convex hull which returns facets/simplices as pairs of point indices - # 3) find facets that are within an edge but not adjacent and store trim and - # new connecting edge data - # 4) find facets between edges and store trim and new connecting edge data - # 5) post process the trim data to remove duplicates and store in pairs - # 6) create connecting edges - # 7) create trim edges from the original edges and the trim data - # 8) return a wire version of all the edges - - # Possible enhancement: The accuracy of the result could be improved and the - # execution time reduced by adaptively placing more points around where the - # connecting edges contact the arc. - - # if any( - # [ - # edge_pair[0].overlaps(edge_pair[1]) - # for edge_pair in combinations(edges, 2) - # ] - # ): - # raise ValueError("edges overlap") - edges = list(edges) - fragments_per_edge = int(2 / tolerance) - points_lookup = {} # lookup from point index to edge/position on edge - points = [] # convex hull point cloud - - # Create points along each edge and the lookup structure - for edge_index, edge in enumerate(edges): - for i in range(fragments_per_edge): - param = i / (fragments_per_edge - 1) - points.append(edge.position_at(param).to_tuple()[:2]) - points_lookup[edge_index * fragments_per_edge + i] = (edge_index, param) - - convex_hull = ConvexHull(points) - - # Filter the fragments - connecting_edge_data = [] - trim_points: dict[int, list[int]] = {} - for simplice in convex_hull.simplices: - edge0 = points_lookup[simplice[0]][0] - edge1 = points_lookup[simplice[1]][0] - # Look for connecting edges between edges - if edge0 != edge1: - if edge0 not in trim_points: - trim_points[edge0] = [simplice[0]] - else: - trim_points[edge0].append(simplice[0]) - if edge1 not in trim_points: - trim_points[edge1] = [simplice[1]] - else: - trim_points[edge1].append(simplice[1]) - connecting_edge_data.append( - ( - (edge0, points_lookup[simplice[0]][1], simplice[0]), - (edge1, points_lookup[simplice[1]][1], simplice[1]), - ) - ) - # Look for connecting edges within an edge - elif abs(simplice[0] - simplice[1]) != 1: - start_pnt = min(simplice.tolist()) - end_pnt = max(simplice.tolist()) - if edge0 not in trim_points: - trim_points[edge0] = [start_pnt, end_pnt] - else: - trim_points[edge0].extend([start_pnt, end_pnt]) - connecting_edge_data.append( - ( - (edge0, points_lookup[start_pnt][1], start_pnt), - (edge0, points_lookup[end_pnt][1], end_pnt), - ) - ) - - trim_data = {} - for edge_index, start_end_pnts in trim_points.items(): - s_points = sorted(start_end_pnts) - f_points = [] - for i in range(0, len(s_points) - 1, 2): - if s_points[i] != s_points[i + 1]: - f_points.append(tuple(s_points[i : i + 2])) - trim_data[edge_index] = f_points - - connecting_edges = [ - Edge.make_line( - edges[line[0][0]] @ line[0][1], edges[line[1][0]] @ line[1][1] - ) - for line in connecting_edge_data - ] - trimmed_edges = [ - edges[edge_index].trim( - points_lookup[trim_pair[0]][1], points_lookup[trim_pair[1]][1] - ) - for edge_index, trim_pairs in trim_data.items() - for trim_pair in trim_pairs - ] - hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) - return hull_wire - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Wire]: - """Project Wire - - Project a Wire onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected wire(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - # pylint: disable=too-many-branches - if self.wrapped is None or target_object.wrapped is None: - raise ValueError("Can't project empty Wires or to empty Shapes") - - if not (direction is None) ^ (center is None): - raise ValueError("One of either direction or center must be provided") - if direction is not None: - direction_vector = Vector(direction).normalized() - center_point = Vector() # for typing, never used - else: - direction_vector = None - center_point = Vector(center) - - # Project the wire on the target object - if direction_vector is not None: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Dir(*direction_vector.to_tuple()), - ) - else: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Pnt(*center_point.to_tuple()), - ) - - # Generate a list of the projected wires with aligned orientation - output_wires = [] - target_orientation = self.wrapped.Orientation() - while projection_object.More(): - projected_wire = projection_object.Current() - if target_orientation == projected_wire.Orientation(): - output_wires.append(Wire(projected_wire)) - else: - output_wires.append(Wire(projected_wire.Reversed())) - projection_object.Next() - - logger.debug("wire generated %d projected wires", len(output_wires)) - - # BRepProj_Projection is inconsistent in the order that it returns projected - # wires, sometimes front first and sometimes back - so sort this out by sorting - # by distance from the original planar wire - if len(output_wires) > 1: - output_wires_distances = [] - planar_wire_center = self.center() - for output_wire in output_wires: - output_wire_center = output_wire.center() - if direction_vector is not None: - output_wire_direction = ( - output_wire_center - planar_wire_center - ).normalized() - if output_wire_direction.dot(direction_vector) >= 0: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - planar_wire_center).length, - ) - ) - else: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - center_point).length, - ) - ) - - output_wires_distances.sort(key=lambda x: x[1]) - logger.debug( - "projected, filtered and sorted wire list is of length %d", - len(output_wires_distances), - ) - output_wires = [w[0] for w in output_wires_distances] - - return output_wires - - -class Joint(ABC): - """Joint - - Abstract Base Joint class - used to join two components together - - Args: - parent (Union[Solid, Compound]): object that joint to bound to - - Attributes: - label (str): user assigned label - parent (Shape): object joint is bound to - connected_to (Joint): joint that is connect to this joint - - """ - - def __init__(self, label: str, parent: Union[Solid, Compound]): - self.label = label - self.parent = parent - self.connected_to: Joint | None = None - - def _connect_to(self, other: Joint, **kwargs): # pragma: no cover - """Connect Joint self by repositioning other""" - - if not isinstance(other, Joint): - raise TypeError(f"other must of type Joint not {type(other)}") - if self.parent.location is None: - raise ValueError("Parent location is not set") - relative_location = self.relative_to(other, **kwargs) - other.parent.locate(self.parent.location * relative_location) - self.connected_to = other - - @abstractmethod - def connect_to(self, other: Joint): - """All derived classes must provide a connect_to method""" - - @abstractmethod - def relative_to(self, other: Joint) -> Location: - """Return relative location to another joint""" - - @property - @abstractmethod - def location(self) -> Location: - """Location of joint""" - - @property - @abstractmethod - def symbol(self) -> Compound: - """A CAD object positioned in global space to illustrate the joint""" + extrusion = _make_topods_compound_from_shapes(solids) + return extrusion def _make_loft( @@ -9133,381 +199,32 @@ def _make_loft( return loft_builder.Shape() -def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: - """Downcasts a TopoDS object to suitable specialized type +def _make_topods_compound_from_shapes( + occt_shapes: Iterable[TopoDS_Shape | None], +) -> TopoDS_Compound: + """Create an OCCT TopoDS_Compound + + Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects Args: - obj: TopoDS_Shape: + occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes Returns: - + TopoDS_Compound: OCCT compound """ + comp = TopoDS_Compound() + comp_builder = TopoDS_Builder() + comp_builder.MakeCompound(comp) - f_downcast: Any = Shape.downcast_LUT[shapetype(obj)] - return_value = f_downcast(obj) + for shape in occt_shapes: + if shape is not None: + comp_builder.Add(comp, shape) - return return_value - - -def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: - """Convert edges to a list of wires. - - Args: - edges: Iterable[Edge]: - tol: float: (Default value = 1e-6) - - Returns: - - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in edges: - if edge.wrapped is not None: - edges_in.Append(edge.wrapped) - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires: ShapeList[Wire] = ShapeList() - for i in range(wires_out.Length()): - # wires.append(Wire(downcast(wires_out.Value(i + 1)))) - wires.append(Wire(TopoDS.Wire_s(wires_out.Value(i + 1)))) - - return wires - - -def fix(obj: TopoDS_Shape) -> TopoDS_Shape: - """Fix a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - shape_fix = ShapeFix_Shape(obj) - shape_fix.Perform() - - return downcast(shape_fix.Shape()) - - -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: - """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj is None or obj.IsNull(): - raise ValueError("Null TopoDS_Shape object") - - return obj.ShapeType() - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) - if len(shapetypes) == 1: - result = shapetypes.pop() - else: - result = shapetype(obj) - else: - result = shapetype(obj.wrapped) - return result - - -def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: - """Tries to determine how wires should be combined into faces. - - Assume: - The wires make up one or more faces, which could have 'holes' - Outer wires are listed ahead of inner wires - there are no wires inside wires inside wires - ( IE, islands -- we can deal with that later on ) - none of the wires are construction wires - - Compute: - one or more sets of wires, with the outer wire listed first, and inner - ones - - Returns, list of lists. - - Args: - wire_list: list[Wire]: - - Returns: - - """ - - # check if we have something to sort at all - if len(wire_list) < 2: - return [ - wire_list, - ] - - # make a Face, NB: this might return a compound of faces - faces = Face(wire_list[0], wire_list[1:]) - - return_value = [] - for face in faces.faces(): - return_value.append( - [ - face.outer_wire(), - ] - + face.inner_wires() - ) - - return return_value - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - -def topo_explore_connected_edges( - edge: Edge, parent: Shape | None = None -) -> ShapeList[Edge]: - """Given an edge extracted from a Shape, return the edges connected to it""" - - parent = parent if parent is not None else edge.topo_parent - if parent is None: - raise ValueError("edge has no valid parent") - given_topods_edge = edge.wrapped - if given_topods_edge is None: - raise ValueError("edge is empty") - connected_edges = set() - - # Find all the TopoDS_Edges for this Shape - topods_edges = [e.wrapped for e in parent.edges() if e.wrapped is not None] - - for topods_edge in topods_edges: - # # Don't match with the given edge - if given_topods_edge.IsSame(topods_edge): - continue - # If the edge shares a vertex with the given edge they are connected - if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: - connected_edges.add(topods_edge) - - return ShapeList(Edge(e) for e in connected_edges) - - -def topo_explore_common_vertex( - edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge -) -> Optional[Vertex]: - """Given two edges, find the common vertex""" - topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped - topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped - - if topods_edge1 is None or topods_edge2 is None: - raise ValueError("edge is empty") - - # Explore vertices of the first edge - vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) - while vert_exp.More(): - vertex1 = vert_exp.Current() - - # Explore vertices of the second edge - explorer2 = TopExp_Explorer(topods_edge2, ta.TopAbs_VERTEX) - while explorer2.More(): - vertex2 = explorer2.Current() - - # Check if the vertices are the same - if vertex1.IsSame(vertex2): - return Vertex(TopoDS.Vertex_s(vertex1)) # Common vertex found - - explorer2.Next() - vert_exp.Next() - - return None # No common vertex found - - -def unwrap_topods_compound( - compound: TopoDS_Compound, fully: bool = True -) -> TopoDS_Compound | TopoDS_Shape: - """Strip unnecessary Compound wrappers - - Args: - compound (TopoDS_Compound): The TopoDS_Compound to unwrap. - fully (bool, optional): return base shape without any TopoDS_Compound - wrappers (otherwise one TopoDS_Compound is left). Defaults to True. - - Returns: - TopoDS_Compound | TopoDS_Shape: base shape - """ - if compound.NbChildren() == 1: - iterator = TopoDS_Iterator(compound) - single_element = downcast(iterator.Value()) - - # If the single element is another TopoDS_Compound, unwrap it recursively - if isinstance(single_element, TopoDS_Compound): - return unwrap_topods_compound(single_element, fully) - - return single_element if fully else compound - - # If there are no elements or more than one element, return TopoDS_Compound - return compound - - -def get_top_level_topods_shapes( - topods_shape: TopoDS_Shape | None, -) -> list[TopoDS_Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - list[TopoDS_Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if topods_shape is None: - return ShapeList() - - first_level_shapes = [] - stack = [topods_shape] - - while stack: - current_shape = stack.pop() - if isinstance(current_shape, TopoDS_Compound): - iterator = TopoDS_Iterator() - iterator.Initialize(current_shape) - while iterator.More(): - child_shape = downcast(iterator.Value()) - if isinstance(child_shape, TopoDS_Compound): - # Traverse further into the compound - stack.append(child_shape) - else: - # Add non-compound shape - first_level_shapes.append(child_shape) - iterator.Next() - else: - first_level_shapes.append(current_shape) - - return first_level_shapes - - -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result + return comp def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None + outer_wire: TopoDS_Wire, inner_wires: Iterable[TopoDS_Wire] | None = None ) -> TopoDS_Face: """_make_topods_face_from_wires @@ -9563,37 +280,58 @@ def _make_topods_face_from_wires( return TopoDS.Face_s(sf_f.Result()) -def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: - """Sew faces into a shell if possible""" - shell_builder = BRepBuilderAPI_Sewing() - for face in faces: - shell_builder.Add(face) - shell_builder.Perform() - return downcast(shell_builder.SewedShape()) - - -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects +def _topods_bool_op( + args: Iterable[TopoDS_Shape], + tools: Iterable[TopoDS_Shape], + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, +) -> TopoDS_Shape: + """Generic boolean operation for TopoDS_Shapes Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes + args: Iterable[TopoDS_Shape]: + tools: Iterable[TopoDS_Shape]: + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: + + Returns: TopoDS_Shape - Returns: - TopoDS_Compound: OCCT compound """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) + args = list(args) + tools = list(tools) + arg = TopTools_ListOfShape() + for obj in args: + arg.Append(obj) - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) + tool = TopTools_ListOfShape() + for obj in tools: + tool.Append(obj) - return comp + operation.SetArguments(arg) + operation.SetTools(tool) + + operation.SetRunParallel(True) + operation.Build() + + result = downcast(operation.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(result, TopoDS_Compound): + result = unwrap_topods_compound(result, True) + + return result + + +def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: + """Compare the OCCT objects of each list and return the differences""" + shapes_one = list(shapes_one) + shapes_two = list(shapes_two) + occt_one = set(shape.wrapped for shape in shapes_one) + occt_two = set(shape.wrapped for shape in shapes_two) + occt_delta = list(occt_one - occt_two) + + all_shapes = [] + for shapes in [shapes_one, shapes_two]: + all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) + shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] + return shape_delta def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: @@ -9604,70 +342,90 @@ def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: return bbox.diagonal -def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) - - -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds +def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: + """Determine whether two floating point numbers are close in value. + Overridden abs_tol default for the math.isclose function. Args: - direction (VectorLike): direction and magnitude of extrusion + x (float): First value to compare + y (float): Second value to compare + rel_tol (float, optional): Maximum difference for being considered "close", + relative to the magnitude of the input values. Defaults to 1e-9. + abs_tol (float, optional): Maximum difference for being considered "close", + regardless of the magnitude of the input values. Defaults to 1e-14 + (unlike math.isclose which defaults to zero). - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result + Returns: True if a is close in value to b, and False otherwise. + """ + return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) + + +def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: + """new_edges + + Given a sequence of shapes and the combination of those shapes, find the newly added edges + + Args: + objects (Shape): sequence of shapes + combined (Shape): result of the combination of objects Returns: - TopoDS_Shape: extruded shape + ShapeList[Edge]: new edges """ - direction = Vector(direction) + # Create a list of combined object edges + combined_topo_edges = TopTools_ListOfShape() + for edge in combined.edges(): + if edge.wrapped is not None: + combined_topo_edges.Append(edge.wrapped) - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") + # Create a list of original object edges + original_topo_edges = TopTools_ListOfShape() + for edge in [e for obj in objects for e in obj.edges()]: + if edge.wrapped is not None: + original_topo_edges.Append(edge.wrapped) - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion + # Cut the original edges from the combined edges + operation = BRepAlgoAPI_Cut() + operation.SetArguments(combined_topo_edges) + operation.SetTools(original_topo_edges) + operation.SetRunParallel(True) + operation.Build() + + edges = [] + explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) + while explorer.More(): + found_edge = combined.__class__.cast(downcast(explorer.Current())) + found_edge.topo_parent = combined + edges.append(found_edge) + explorer.Next() + + return ShapeList(edges) -class SkipClean: - """Skip clean context for use in operator driven code where clean=False wouldn't work""" +def polar(length: float, angle: float) -> tuple[float, float]: + """Convert polar coordinates into cartesian coordinates""" + return (length * cos(radians(angle)), length * sin(radians(angle))) - clean = True - def __enter__(self): - SkipClean.clean = False +def tuplify(obj: Any, dim: int) -> tuple | None: + """Create a size tuple""" + if obj is None: + result = None + elif isinstance(obj, (tuple, list)): + result = tuple(obj) + else: + result = tuple([obj] * dim) + return result - def __exit__(self, exception_type, exception_value, traceback): - SkipClean.clean = True + +def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: + """Return Shape's TopAbs_ShapeEnum""" + if isinstance(obj.wrapped, TopoDS_Compound): + shapetypes = set(shapetype(o.wrapped) for o in obj) + if len(shapetypes) == 1: + result = shapetypes.pop() + else: + result = shapetype(obj) + else: + result = shapetype(obj.wrapped) + return result From 0984cb6369fd7e369b8fe27e5f0a8a24729088b2 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:48 -0500 Subject: [PATCH 071/518] Step 4 - one_d.py --- src/build123d/{topology.py => topology/one_d.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/build123d/{topology.py => topology/one_d.py} (100%) diff --git a/src/build123d/topology.py b/src/build123d/topology/one_d.py similarity index 100% rename from src/build123d/topology.py rename to src/build123d/topology/one_d.py From 42411b6a1f3f7989247cc1e6508c27a1a98cd492 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:48 -0500 Subject: [PATCH 072/518] Step 3b split - zero_d.py --- src/build123d/topology/zero_d.py | 9560 +----------------------------- 1 file changed, 107 insertions(+), 9453 deletions(-) diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index 5986e08..9e8e47d 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -1,17 +1,41 @@ """ build123d topology -name: topology.py +name: zero_d.py by: Gumyr -date: Oct 14, 2022 +date: January 07, 2025 desc: - This python module is a CAD library based on OpenCascade containing - the base Shape class and all of its derived classes. + +This module provides the foundational implementation for zero-dimensional geometry in the build123d +CAD system, focusing on the `Vertex` class and its related operations. A `Vertex` represents a +single point in 3D space, serving as the cornerstone for more complex geometric structures such as +edges, wires, and faces. It is directly integrated with the OpenCascade kernel, enabling precise +modeling and manipulation of 3D objects. + +Key Features: +- **Vertex Class**: + - Supports multiple constructors, including Cartesian coordinates, iterable inputs, and + OpenCascade `TopoDS_Vertex` objects. + - Offers robust arithmetic operations such as addition and subtraction with other vertices, + vectors, or tuples. + - Provides utility methods for transforming vertices, converting to tuples, and iterating over + coordinate components. + +- **Intersection Utilities**: + - Includes `topo_explore_common_vertex`, a utility to identify shared vertices between edges, + facilitating advanced topological queries. + +- **Integration with Shape Hierarchy**: + - Extends the `Shape` base class, inheriting essential features such as transformation matrices + and bounding box computations. + +This module plays a critical role in defining precise geometric points and their interactions, +serving as the building block for complex 3D models in the build123d library. license: - Copyright 2022 Gumyr + Copyright 2025 Gumyr Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,7894 +53,23 @@ license: from __future__ import annotations -# pylint has trouble with the OCP imports -# pylint: disable=no-name-in-module, import-error -# pylint: disable=too-many-lines -# other pylint warning to temp remove: -# too-many-arguments, too-many-locals, too-many-public-methods, -# too-many-statements, too-many-instance-attributes, too-many-branches -import copy import itertools -import os -import platform -import sys -import warnings -from abc import ABC, abstractmethod -from itertools import combinations -from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose -from typing import ( - Any, - Callable, - Dict, - Generic, - Iterable, - Iterator, - Optional, - Protocol, - Sequence, - SupportsIndex, - Tuple, - Type, - TypeVar, - Union, - overload, - TYPE_CHECKING, -) -from typing import cast as tcast -from typing_extensions import Self, Literal -from anytree import NodeMixin, PreOrderIter, RenderTree -from IPython.lib.pretty import pretty, PrettyPrinter -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter - -import OCP.GeomAbs as ga # Geometry type enum -import OCP.TopAbs as ta # Topology type enum -from OCP.Aspect import Aspect_TOL_SOLID -from OCP.Bnd import Bnd_Box -from OCP.BOPAlgo import BOPAlgo_GlueEnum +from typing import Iterable, overload, TYPE_CHECKING +import OCP.TopAbs as ta from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import ( - BRepAdaptor_CompCurve, - BRepAdaptor_Curve, - BRepAdaptor_Surface, -) -from OCP.BRepAlgo import BRepAlgo -from OCP.BRepAlgoAPI import ( - BRepAlgoAPI_BooleanOperation, - BRepAlgoAPI_Common, - BRepAlgoAPI_Cut, - BRepAlgoAPI_Fuse, - BRepAlgoAPI_Section, - BRepAlgoAPI_Splitter, -) -from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_Copy, - BRepBuilderAPI_DisconnectedWire, - BRepBuilderAPI_EmptyWire, - BRepBuilderAPI_GTransform, - BRepBuilderAPI_MakeEdge, - BRepBuilderAPI_MakeFace, - BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeShell, - BRepBuilderAPI_MakeSolid, - BRepBuilderAPI_MakeVertex, - BRepBuilderAPI_MakeWire, - BRepBuilderAPI_NonManifoldWire, - BRepBuilderAPI_RightCorner, - BRepBuilderAPI_RoundCorner, - BRepBuilderAPI_Sewing, - BRepBuilderAPI_Transform, - BRepBuilderAPI_Transformed, -) -from OCP.BRepCheck import BRepCheck_Analyzer -from OCP.BRepClass3d import BRepClass3d_SolidClassifier -from OCP.BRepExtrema import BRepExtrema_DistShapeShape -from OCP.BRepFeat import BRepFeat_MakeDPrism, BRepFeat_SplitShape -from OCP.BRepFill import BRepFill -from OCP.BRepFilletAPI import ( - BRepFilletAPI_MakeChamfer, - BRepFilletAPI_MakeFillet, - BRepFilletAPI_MakeFillet2d, -) -from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation -from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter -from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepMesh import BRepMesh_IncrementalMesh -from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import ( - BRepOffsetAPI_MakeFilling, - BRepOffsetAPI_MakeOffset, - BRepOffsetAPI_MakePipeShell, - BRepOffsetAPI_MakeThickSolid, - BRepOffsetAPI_ThruSections, -) -from OCP.BRepPrimAPI import ( - BRepPrimAPI_MakeBox, - BRepPrimAPI_MakeCone, - BRepPrimAPI_MakeCylinder, - BRepPrimAPI_MakePrism, - BRepPrimAPI_MakeRevol, - BRepPrimAPI_MakeSphere, - BRepPrimAPI_MakeTorus, - BRepPrimAPI_MakeWedge, -) -from OCP.BRepProj import BRepProj_Projection -from OCP.BRepTools import BRepTools -from OCP.Font import ( - Font_FA_Bold, - Font_FA_Italic, - Font_FA_Regular, - Font_FontMgr, - Font_SystemFont, -) -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse # geometry construction -from OCP.gce import gce_MakeLin -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import ( - Geom_BezierCurve, - Geom_BezierSurface, - Geom_ConicalSurface, - Geom_CylindricalSurface, - Geom_Plane, - Geom_Surface, - Geom_TrimmedCurve, - Geom_Line, -) -from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve -from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType -from OCP.GeomAPI import ( - GeomAPI_IntCS, - GeomAPI_Interpolate, - GeomAPI_PointsToBSpline, - GeomAPI_PointsToBSplineSurface, - GeomAPI_ProjectPointOnSurf, - GeomAPI_ProjectPointOnCurve, -) -from OCP.GeomFill import ( - GeomFill_CorrectedFrenet, - GeomFill_Frenet, - GeomFill_TrihedronLaw, -) -from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, -) +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeVertex +from OCP.TopExp import TopExp_Explorer +from OCP.TopoDS import TopoDS, TopoDS_Shape, TopoDS_Vertex, TopoDS_Edge +from OCP.gp import gp_Pnt +from build123d.geometry import Matrix, Vector, VectorLike +from typing_extensions import Self -# properties used to store mass calculation result -from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher -from OCP.IVtkVTK import IVtkVTK_ShapeData -from OCP.LocOpe import LocOpe_DPrism -from OCP.NCollection import NCollection_Utf8String -from OCP.Precision import Precision -from OCP.Prs3d import Prs3d_IsoAspect -from OCP.Quantity import Quantity_Color -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds, ShapeAnalysis_Curve -from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters -from OCP.ShapeFix import ( - ShapeFix_Face, - ShapeFix_Shape, - ShapeFix_Solid, - ShapeFix_Wireframe, -) -from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain +from .shape_core import Shape, ShapeList, downcast, shapetype -# for catching exceptions -from OCP.Standard import ( - Standard_Failure, - Standard_NoSuchObject, - Standard_ConstructionError, -) -from OCP.StdFail import StdFail_NotDone -from OCP.StdPrs import StdPrs_BRepFont -from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder -# Array of vectors (used for B-spline interpolation): -# Array of points (used for B-spline construction): -from OCP.TColgp import ( - TColgp_Array1OfPnt, - TColgp_Array1OfVec, - TColgp_HArray1OfPnt, - TColgp_HArray2OfPnt, -) -from OCP.TCollection import TCollection_AsciiString - -# Array of floats (used for B-spline interpolation): -# Array of booleans (used for B-spline interpolation): -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, - TColStd_HArray2OfReal, -) -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer # Topology explorer -from OCP.TopLoc import TopLoc_Location -from OCP.TopoDS import ( - TopoDS, - TopoDS_Builder, - TopoDS_Compound, - TopoDS_Face, - TopoDS_Iterator, - TopoDS_Shape, - TopoDS_Shell, - TopoDS_Solid, - TopoDS_Vertex, - TopoDS_Edge, - TopoDS_Wire, -) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) -from build123d.build_enums import ( - Align, - AngularDirection, - CenterOf, - FontStyle, - FrameMethod, - GeomType, - Keep, - Kind, - PositionMode, - Side, - SortBy, - Transition, - Until, -) -from build123d.geometry import ( - DEG2RAD, - TOLERANCE, - Axis, - BoundBox, - Color, - Location, - Matrix, - Plane, - Vector, - VectorLike, - logger, -) - - -def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: - """Find the normal at a point on surface""" - surface = BRep_Tool.Surface_s(face) - - # project point on surface - projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - -def topods_dim(topods: TopoDS_Shape) -> int | None: - """Return the dimension of this TopoDS_Shape""" - shape_dim_map = { - (TopoDS_Vertex,): 0, - (TopoDS_Edge, TopoDS_Wire): 1, - (TopoDS_Face, TopoDS_Shell): 2, - (TopoDS_Solid,): 3, - } - - for shape_types, dim in shape_dim_map.items(): - if isinstance(topods, shape_types): - return dim - - if isinstance(topods, TopoDS_Compound): - sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - return None - - -HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode - - -Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] - -TrimmingTool = Union[Plane, "Shell", "Face"] - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - -TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) - - -class Shape(NodeMixin, Generic[TOPODS]): - """Shape - - Base class for all CAD objects such as Edge, Face, Solid, etc. - - Args: - obj (TopoDS_Shape, optional): OCCT object. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - - Attributes: - wrapped (TopoDS_Shape): the OCP object - label (str): user assigned label - color (Color): object color - joints (dict[str:Joint]): dictionary of joints bound to this object (Solid only) - children (Shape): list of assembly children of this object (Compound only) - topo_parent (Shape): assembly parent of this object - - """ - - # pylint: disable=too-many-instance-attributes, too-many-public-methods - - @property - @abstractmethod - def _dim(self) -> int | None: - """Dimension of the object""" - - shape_LUT = { - ta.TopAbs_VERTEX: "Vertex", - ta.TopAbs_EDGE: "Edge", - ta.TopAbs_WIRE: "Wire", - ta.TopAbs_FACE: "Face", - ta.TopAbs_SHELL: "Shell", - ta.TopAbs_SOLID: "Solid", - ta.TopAbs_COMPOUND: "Compound", - ta.TopAbs_COMPSOLID: "CompSolid", - } - - shape_properties_LUT = { - ta.TopAbs_VERTEX: None, - ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, - ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, - ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, - } - - inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} - - downcast_LUT = { - ta.TopAbs_VERTEX: TopoDS.Vertex_s, - ta.TopAbs_EDGE: TopoDS.Edge_s, - ta.TopAbs_WIRE: TopoDS.Wire_s, - ta.TopAbs_FACE: TopoDS.Face_s, - ta.TopAbs_SHELL: TopoDS.Shell_s, - ta.TopAbs_SOLID: TopoDS.Solid_s, - ta.TopAbs_COMPOUND: TopoDS.Compound_s, - ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, - } - - geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { - ga.GeomAbs_Line: GeomType.LINE, - ga.GeomAbs_Circle: GeomType.CIRCLE, - ga.GeomAbs_Ellipse: GeomType.ELLIPSE, - ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, - ga.GeomAbs_Parabola: GeomType.PARABOLA, - ga.GeomAbs_BezierCurve: GeomType.BEZIER, - ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, - ga.GeomAbs_OffsetCurve: GeomType.OFFSET, - ga.GeomAbs_OtherCurve: GeomType.OTHER, - } - geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { - ga.GeomAbs_Plane: GeomType.PLANE, - ga.GeomAbs_Cylinder: GeomType.CYLINDER, - ga.GeomAbs_Cone: GeomType.CONE, - ga.GeomAbs_Sphere: GeomType.SPHERE, - ga.GeomAbs_Torus: GeomType.TORUS, - ga.GeomAbs_BezierSurface: GeomType.BEZIER, - ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, - ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, - ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, - ga.GeomAbs_OffsetSurface: GeomType.OFFSET, - ga.GeomAbs_OtherSurface: GeomType.OTHER, - } - _transModeDict = { - Transition.TRANSFORMED: BRepBuilderAPI_Transformed, - Transition.ROUND: BRepBuilderAPI_RoundCorner, - Transition.RIGHT: BRepBuilderAPI_RightCorner, - } - - def __init__( - self, - obj: TopoDS_Shape | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - self.wrapped: TOPODS | None = ( - tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None - ) - self.for_construction = False - self.label = label - self._color = color - - # parent must be set following children as post install accesses children - self.parent = parent - - # Extracted objects like Vertices and Edges may need to know where they came from - self.topo_parent: Shape | None = None - - @property - def location(self) -> Location | None: - """Get this Shape's Location""" - if self.wrapped is None: - return None - return Location(self.wrapped.Location()) - - @location.setter - def location(self, value: Location): - """Set Shape's Location to value""" - if self.wrapped is not None: - self.wrapped.Location(value.wrapped) - - @property - def position(self) -> Vector | None: - """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: - return None - return self.location.position - - @position.setter - def position(self, value: VectorLike): - """Set the position component of this Shape's Location to value""" - loc = self.location - if loc is not None: - loc.position = Vector(value) - self.location = loc - - @property - def orientation(self) -> Vector | None: - """Get the orientation component of this Shape's Location""" - if self.location is None: - return None - return self.location.orientation - - @orientation.setter - def orientation(self, rotations: VectorLike): - """Set the orientation component of this Shape's Location to rotations""" - loc = self.location - if loc is not None: - loc.orientation = Vector(rotations) - self.location = loc - - @property - def color(self) -> Union[None, Color]: - """Get the shape's color. If it's None, get the color of the nearest - ancestor, assign it to this Shape and return this value.""" - # Find the correct color for this node - if self._color is None: - # Find parent color - current_node: Compound | Shape | None = self - while current_node is not None: - parent_color = current_node._color - if parent_color is not None: - break - current_node = current_node.parent - node_color = parent_color - else: - node_color = self._color - self._color = node_color # Set the node's color for next time - return node_color - - @color.setter - def color(self, value): - """Set the shape's color""" - self._color = value - - @property - def is_planar_face(self) -> bool: - """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): - return False - surface = BRep_Tool.Surface_s(self.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() - - def copy_attributes_to( - self, target: Shape, exceptions: Iterable[str] | None = None - ): - """Copy common object attributes to target - - Note that preset attributes of target will not be overridden. - - Args: - target (Shape): object to gain attributes - exceptions (Iterable[str], optional): attributes not to copy - - Raises: - ValueError: invalid attribute - """ - # Find common attributes and eliminate exceptions - attrs1 = set(self.__dict__.keys()) - attrs2 = set(target.__dict__.keys()) - common_attrs = attrs1 & attrs2 - if exceptions is not None: - common_attrs -= set(exceptions) - - for attr in common_attrs: - # Copy the attribute only if the target's attribute not set - if not getattr(target, attr): - setattr(target, attr, getattr(self, attr)) - # Attach joints to the new part - if attr == "joints": - joint: Joint - for joint in target.joints.values(): - joint.parent = target - - @property - def is_manifold(self) -> bool: - """is_manifold - - Check if each edge in the given Shape has exactly two faces associated with it - (skipping degenerate edges). If so, the shape is manifold. - - Returns: - bool: is the shape manifold or water tight - """ - # Extract one or more (if a Compound) shape from self - if self.wrapped is None: - return False - shape_stack = get_top_level_topods_shapes(self.wrapped) - - while shape_stack: - shape = shape_stack.pop(0) - - # Create an empty indexed data map to store the edges and their corresponding faces. - shape_map = TopTools_IndexedDataMapOfShapeListOfShape() - - # Fill the map with edges and their associated faces in the given shape. Each edge in - # the map is associated with a list of faces that share that edge. - TopExp.MapShapesAndAncestors_s( - # shape.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map - shape, - ta.TopAbs_EDGE, - ta.TopAbs_FACE, - shape_map, - ) - - # Iterate over the edges in the map and checks if each edge is non-degenerate and has - # exactly two faces associated with it. - for i in range(shape_map.Extent()): - # Access each edge in the map sequentially - edge = TopoDS.Edge_s(shape_map.FindKey(i + 1)) - - vertex0 = TopoDS_Vertex() - vertex1 = TopoDS_Vertex() - - # Extract the two vertices of the current edge and stores them in vertex0/1. - TopExp.Vertices_s(edge, vertex0, vertex1) - - # Check if both vertices are null and if they are the same vertex. If so, the - # edge is considered degenerate (i.e., has zero length), and it is skipped. - if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): - continue - - # Check if the current edge has exactly two faces associated with it. If not, - # it means the edge is not shared by exactly two faces, indicating that the - # shape is not manifold. - if shape_map.FindFromIndex(i + 1).Extent() != 2: - return False - - return True - - class _DisplayNode(NodeMixin): - """Used to create anytree structures from TopoDS_Shapes""" - - def __init__( - self, - label: str = "", - address: int | None = None, - position: Union[Vector, Location, None] = None, - parent: Shape._DisplayNode | None = None, - ): - self.label = label - self.address = address - self.position = position - self.parent = parent - self.children: list[Shape] = [] - - _ordered_shapes = [ - TopAbs_ShapeEnum.TopAbs_COMPOUND, - TopAbs_ShapeEnum.TopAbs_SOLID, - TopAbs_ShapeEnum.TopAbs_SHELL, - TopAbs_ShapeEnum.TopAbs_FACE, - TopAbs_ShapeEnum.TopAbs_WIRE, - TopAbs_ShapeEnum.TopAbs_EDGE, - TopAbs_ShapeEnum.TopAbs_VERTEX, - ] - - @staticmethod - def _build_tree( - shape: TopoDS_Shape, - tree: list[_DisplayNode], - parent: _DisplayNode | None = None, - limit: TopAbs_ShapeEnum = TopAbs_ShapeEnum.TopAbs_VERTEX, - show_center: bool = True, - ) -> list[_DisplayNode]: - """Create an anytree copy of the TopoDS_Shape structure""" - - obj_type = Shape.shape_LUT[shape.ShapeType()] - loc: Vector | Location - if show_center: - loc = Shape(shape).bounding_box().center() - else: - loc = Location(shape.Location()) - tree.append(Shape._DisplayNode(obj_type, id(shape), loc, parent)) - iterator = TopoDS_Iterator() - iterator.Initialize(shape) - parent_node = tree[-1] - while iterator.More(): - child = iterator.Value() - if Shape._ordered_shapes.index( - child.ShapeType() - ) <= Shape._ordered_shapes.index(limit): - Shape._build_tree(child, tree, parent_node, limit) - iterator.Next() - return tree - - @staticmethod - def _show_tree(root_node, show_center: bool) -> str: - """Display an assembly or TopoDS_Shape anytree structure""" - - # Calculate the size of the tree labels - size_tuples = [(node.height, len(node.label)) for node in root_node.descendants] - size_tuples.append((root_node.height, len(root_node.label))) - # pylint: disable=cell-var-from-loop - size_tuples_per_level = [ - list(filter(lambda ll: ll[0] == l, size_tuples)) - for l in range(root_node.height + 1) - ] - max_sizes_per_level = [ - max(4, max(l[1] for l in level)) for level in size_tuples_per_level - ] - level_sizes_per_level = [ - l + i * 4 for i, l in enumerate(reversed(max_sizes_per_level)) - ] - tree_label_width = max(level_sizes_per_level) + 1 - - # Build the tree line by line - result = "" - for pre, _fill, node in RenderTree(root_node): - treestr = f"{pre}{node.label}".ljust(tree_label_width) - if hasattr(root_node, "address"): - address = node.address - name = "" - loc = ( - "Center" + str(node.position.to_tuple()) - if show_center - else "Position" + str(node.position.to_tuple()) - ) - else: - address = id(node) - name = node.__class__.__name__.ljust(9) - loc = ( - "Center" + str(node.center().to_tuple()) - if show_center - else "Location" + repr(node.location) - ) - result += f"{treestr}{name}at {address:#x}, {loc}\n" - return result - - def show_topology( - self, - limit_class: Literal[ - "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" - ] = "Vertex", - show_center: bool | None = None, - ) -> str: - """Display internal topology - - Display the internal structure of a Compound 'assembly' or Shape. Example: - - .. code:: - - >>> c1.show_topology() - - c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) - ├── Solid at 0x7f4a4cafafd0, Location(...)) - ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) - │ ├── Solid at 0x7f4a4cafad00, Location(...)) - │ └── Solid at 0x7f4a11a52790, Location(...)) - └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) - ├── Solid at 0x7f4a11a52700, Location(...)) - └── Solid at 0x7f4a11a58550, Location(...)) - - Args: - limit_class: type of displayed leaf node. Defaults to 'Vertex'. - show_center (bool, optional): If None, shows the Location of Compound 'assemblies' - and the bounding box center of Shapes. True or False forces the display. - Defaults to None. - - Returns: - str: tree representation of internal structure - """ - if ( - self.wrapped is not None - and isinstance(self.wrapped, TopoDS_Compound) - and self.children - ): - show_center = False if show_center is None else show_center - result = Shape._show_tree(self, show_center) - else: - tree = Shape._build_tree( - tcast(TopoDS_Shape, self.wrapped), - tree=[], - limit=Shape.inverse_shape_LUT[limit_class], - ) - show_center = True if show_center is None else show_center - result = Shape._show_tree(tree[0], show_center) - return result - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: - """fuse shape to self operator +""" - # Convert `other` to list of base objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self - - # Check that all dimensions are the same - addend_dim = self._dim - if addend_dim is None: - raise ValueError("Dimensions of objects to add to are inconsistent") - - if not all(summand._dim == addend_dim for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - sum_shape = summands[0].fuse(*summands[1:]) - else: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - return sum_shape - - def __sub__( - self, other: Union[None, Shape, Iterable[Shape]] - ) -> Self | ShapeList[Self]: - """cut shape from self operator -""" - - if self.wrapped is None: - raise ValueError("Cannot subtract shape from empty compound") - - # Convert `other` to list of base objects and filter out None values - if other is None: - subtrahends = [] - else: - subtrahends = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to subtract return the original object - if not subtrahends: - return self - - # Check that all dimensions are the same - minuend_dim = self._dim - if minuend_dim is None or any(s._dim is None for s in subtrahends): - raise ValueError("Dimensions of objects to subtract from are inconsistent") - - # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] - if any(d < minuend_dim for d in subtrahend_dims): - raise ValueError( - f"Only shapes with equal or greater dimension can be subtracted: " - f"not {type(self).__name__} ({minuend_dim}D) and " - f"{type(other).__name__} ({min(subtrahend_dims)}D)" - ) - - # Do the actual cut operation - difference = self.cut(*subtrahends) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: - """intersect shape with self operator &""" - others = other if isinstance(other, (list, tuple)) else [other] - - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot intersect shape with empty compound") - new_shape = self.intersect(*others) - - if ( - not isinstance(new_shape, list) - and new_shape is not None - and new_shape.wrapped is not None - and SkipClean.clean - ): - new_shape = new_shape.clean() - - return new_shape - - def __rmul__(self, other): - """right multiply for positioning operator *""" - if not ( - isinstance(other, (list, tuple)) - and all(isinstance(o, (Location, Plane)) for o in other) - ): - raise ValueError( - "shapes can only be multiplied list of locations or planes" - ) - return [loc * self for loc in other] - - # Actually creating the abstract method causes the subclass to pass center_of - # even when not required - possibly this could be improved. - # @abstractmethod - # def center(self, center_of: CenterOf) -> Vector: - # """Compute the center with a specific type of calculation.""" - - def clean(self) -> Self: - """clean - - Remove internal edges - - Returns: - Shape: Original object with extraneous internal edges removed - """ - if self.wrapped is None: - return self - upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) - upgrader.AllowInternalEdges(False) - # upgrader.SetAngularTolerance(1e-5) - try: - upgrader.Build() - self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) - except Exception: - warnings.warn(f"Unable to clean {self}", stacklevel=2) - return self - - def fix(self) -> Self: - """fix - try to fix shape if not valid""" - if self.wrapped is None: - return self - if not self.is_valid(): - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) - - return shape_copy - - return self - - @classmethod - @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: - """Returns the right type of wrapper, given a OCCT object""" - - @property - def geom_type(self) -> GeomType: - """Gets the underlying geometry type. - - Returns: - GeomType: The geometry type of the shape - - """ - if self.wrapped is None: - raise ValueError("Cannot determine geometry type of an empty shape") - - shape: TopAbs_ShapeEnum = shapetype(self.wrapped) - - if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[ - BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() - ] - elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[ - BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() - ] - else: - geom = GeomType.OTHER - - return geom - - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - - def is_same(self, other: Shape) -> bool: - """Returns True if other and this shape are same, i.e. if they share the - same TShape with the same Locations. Orientations may differ. Also see - :py:meth:`is_equal` - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsSame(other.wrapped) - - def is_equal(self, other: Shape) -> bool: - """Returns True if two shapes are equal, i.e. if they share the same - TShape with the same Locations and Orientations. Also see - :py:meth:`is_same`. - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsEqual(other.wrapped) - - def __eq__(self, other) -> bool: - """Check if two shapes are the same. - - This method checks if the current shape is the same as the other shape. - Two shapes are considered the same if they share the same TShape with - the same Locations. Orientations may differ. - - Args: - other (Shape): The shape to compare with. - - Returns: - bool: True if the shapes are the same, False otherwise. - """ - if isinstance(other, Shape): - return self.is_same(other) - return NotImplemented - - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - - def bounding_box( - self, tolerance: float | None = None, optimal: bool = True - ) -> BoundBox: - """Create a bounding box for this Shape. - - Args: - tolerance (float, optional): Defaults to None. - - Returns: - BoundBox: A box sized to contain this Shape - """ - if self.wrapped is None: - return BoundBox(Bnd_Box()) - tolerance = TOLERANCE if tolerance is None else tolerance - return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - - def mirror(self, mirror_plane: Plane | None = None) -> Self: - """ - Applies a mirror transform to this Shape. Does not duplicate objects - about the plane. - - Args: - mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY - Returns: - The mirrored shape - """ - if not mirror_plane: - mirror_plane = Plane.XY - - if self.wrapped is None: - return self - transformation = gp_Trsf() - transformation.SetMirror( - gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) - ) - - return self._apply_transform(transformation) - - @staticmethod - def combined_center( - objects: Iterable[Shape], center_of: CenterOf = CenterOf.MASS - ) -> Vector: - """combined center - - Calculates the center of a multiple objects. - - Args: - objects (Iterable[Shape]): list of objects - center_of (CenterOf, optional): centering option. Defaults to CenterOf.MASS. - - Raises: - ValueError: CenterOf.GEOMETRY not implemented - - Returns: - Vector: center of multiple objects - """ - objects = list(objects) - if center_of == CenterOf.MASS: - total_mass = sum(Shape.compute_mass(o) for o in objects) - weighted_centers = [ - o.center(CenterOf.MASS).multiply(Shape.compute_mass(o)) for o in objects - ] - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - elif center_of == CenterOf.BOUNDING_BOX: - total_mass = len(list(objects)) - - weighted_centers = [] - for obj in objects: - weighted_centers.append(obj.bounding_box().center()) - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - else: - raise ValueError("CenterOf.GEOMETRY not implemented") - - return middle - - @staticmethod - def compute_mass(obj: Shape) -> float: - """Calculates the 'mass' of an object. - - Args: - obj: Compute the mass of this object - obj: Shape: - - Returns: - - """ - if obj.wrapped is None: - return 0.0 - - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] - - if not calc_function: - raise NotImplementedError - - calc_function(obj.wrapped, properties) - return properties.Mass() - - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - - def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return all of the TopoDS sub entities of the given type""" - if self.wrapped is None: - return [] - return _topods_entities(self.wrapped, topo_type) - - # def _entities_from( - # self, child_type: Shapes, parent_type: Shapes - # ) -> Dict[Shape, list[Shape]]: - # """This function is very slow on M1 macs and is currently unused""" - # if self.wrapped is None: - # return {} - - # res = TopTools_IndexedDataMapOfShapeListOfShape() - - # TopExp.MapShapesAndAncestors_s( - # self.wrapped, - # Shape.inverse_shape_LUT[child_type], - # Shape.inverse_shape_LUT[parent_type], - # res, - # ) - - # out: Dict[Shape, list[Shape]] = {} - # for i in range(1, res.Extent() + 1): - # out[self.__class__.cast(res.FindKey(i))] = [ - # self.__class__.cast(el) for el in res.FindFromIndex(i) - # ] - - # return out - - def get_top_level_shapes(self) -> ShapeList[Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - ShapeList[Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if self.wrapped is None: - return ShapeList() - return ShapeList( - self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) - ) - - @staticmethod - def get_shape_list( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> ShapeList: - """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: - return ShapeList() - shape_list = ShapeList( - [shape.__class__.cast(i) for i in shape.entities(entity_type)] - ) - for item in shape_list: - item.topo_parent = shape - return shape_list - - @staticmethod - def get_single_shape( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> Shape: - """Helper to extract a single entity of a specific type from a shape, - with a warning if count != 1.""" - shape_list = Shape.get_shape_list(shape, entity_type) - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=3, - ) - return shape_list[0] if shape_list else None - - # Note all sub-classes have vertices and vertex methods - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() - - def edge(self) -> Edge | None: - """Return the Edge""" - return None - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return ShapeList() - - def wire(self) -> Wire | None: - """Return the Wire""" - return None - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return ShapeList() - - def face(self) -> Face | None: - """Return the Face""" - return None - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return ShapeList() - - def shell(self) -> Shell | None: - """Return the Shell""" - return None - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return ShapeList() - - def solid(self) -> Solid | None: - """Return the Solid""" - return None - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - return ShapeList() - - def compound(self) -> Compound | None: - """Return the Compound""" - return None - - @property - def area(self) -> float: - """area -the surface area of all faces in this Shape""" - if self.wrapped is None: - return 0.0 - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - - return properties.Mass() - - def _apply_transform(self, transformation: gp_Trsf) -> Self: - """Private Apply Transform - - Apply the provided transformation matrix to a copy of Shape - - Args: - transformation (gp_Trsf): transformation matrix - - Returns: - Shape: copy of transformed Shape - """ - if self.wrapped is None: - return self - shape_copy: Shape = copy.deepcopy(self, None) - transformed_shape = BRepBuilderAPI_Transform( - self.wrapped, - transformation, - True, - ).Shape() - shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) - return shape_copy - - def rotate(self, axis: Axis, angle: float) -> Self: - """rotate a copy - - Rotates a shape around an axis. - - Args: - axis (Axis): rotation Axis - angle (float): angle to rotate, in degrees - - Returns: - a copy of the shape, rotated - """ - transformation = gp_Trsf() - transformation.SetRotation(axis.wrapped, angle * DEG2RAD) - - return self._apply_transform(transformation) - - def translate(self, vector: VectorLike) -> Self: - """Translates this shape through a transformation. - - Args: - vector: VectorLike: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetTranslation(Vector(vector).wrapped) - - return self._apply_transform(transformation) - - def scale(self, factor: float) -> Self: - """Scales this shape through a transformation. - - Args: - factor: float: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetScale(gp_Pnt(), factor) - - return self._apply_transform(transformation) - - def __deepcopy__(self, memo) -> Self: - """Return deepcopy of self""" - # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied - # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this - # value already copied which causes deepcopy to skip it. - cls = self.__class__ - result = cls.__new__(cls) - memo[id(self)] = result - if self.wrapped is not None: - memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) - for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) - if key == "joints": - for joint in result.joints.values(): - joint.parent = result - return result - - def __copy__(self) -> Self: - """Return shallow copy or reference of self - - Create an copy of this Shape that shares the underlying TopoDS_TShape. - - Used when there is a need for many objects with the same CAD structure but at - different Locations, etc. - for examples fasteners in a larger assembly. By - sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. - - Changes to the CAD structure of the base object will be reflected in all instances. - """ - reference = copy.deepcopy(self) - if self.wrapped is not None: - assert ( - reference.wrapped is not None - ) # Ensure mypy knows reference.wrapped is not None - reference.wrapped.TShape(self.wrapped.TShape()) - return reference - - def transform_shape(self, t_matrix: Matrix) -> Self: - """Apply affine transform without changing type - - Transforms a copy of this Shape by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: copy of transformed shape with all objects keeping their type - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def transform_geometry(self, t_matrix: Matrix) -> Self: - """Apply affine transform - - WARNING: transform_geometry will sometimes convert lines and circles to - splines, but it also has the ability to handle skew and stretching - transformations. - - If your transformation is only translation and rotation, it is safer to - use :py:meth:`transform_shape`, which doesn't change the underlying type - of the geometry, but cannot handle skew transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: a copy of the object, but with geometry transformed - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def locate(self, loc: Location) -> Self: - """Apply a location in absolute sense to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - self.wrapped.Location(loc.wrapped) - - return self - - def located(self, loc: Location) -> Self: - """located - - Apply a location in absolute sense to a copy of self - - Args: - loc (Location): new absolute location - - Returns: - Shape: copy of Shape at location - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) # type: ignore - return shape_copy - - def move(self, loc: Location) -> Self: - """Apply a location in relative sense (i.e. update current location) to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - - self.wrapped.Move(loc.wrapped) - - return self - - def moved(self, loc: Location) -> Self: - """moved - - Apply a location in relative sense (i.e. update current location) to a copy of self - - Args: - loc (Location): new location relative to current location - - Returns: - Shape: copy of Shape moved to relative location - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) - return shape_copy - - def relocate(self, loc: Location): - """Change the location of self while keeping it geometrically similar - - Args: - loc (Location): new location to set for self - """ - if self.wrapped is None: - raise ValueError("Cannot relocate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot relocate a shape at an empty location") - - if self.location != loc: - old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore - - new_ax = gp_Ax3() - new_ax.Transform(loc.wrapped.Transformation()) - - trsf = gp_Trsf() - trsf.SetDisplacement(new_ax, old_ax) - builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - - self.wrapped = tcast(TOPODS, downcast(builder.Shape())) - self.wrapped.Location(loc.wrapped) - - def distance_to_with_closest_points( - self, other: Union[Shape, VectorLike] - ) -> tuple[float, Vector, Vector]: - """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot calculate distance to or from an empty shape") - - if isinstance(other, Shape): - topods_shape = tcast(TopoDS_Shape, other.wrapped) - else: - vec = Vector(other) - topods_shape = BRepBuilderAPI_MakeVertex( - gp_Pnt(vec.X, vec.Y, vec.Z) - ).Vertex() - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(topods_shape) - dist_calc.Perform() - return ( - dist_calc.Value(), - Vector(dist_calc.PointOnShape1(1)), - Vector(dist_calc.PointOnShape2(1)), - ) - - def distance_to(self, other: Union[Shape, VectorLike]) -> float: - """Minimal distance between two shapes""" - return self.distance_to_with_closest_points(other)[0] - - def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: - """Points on two shapes where the distance between them is minimal""" - return self.distance_to_with_closest_points(other)[1:3] - - def __hash__(self) -> int: - """Return has code""" - return self.hash_code() - - def _bool_op( - self, - args: Iterable[Shape], - tools: Iterable[Shape], - operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self | ShapeList[Self]: - """Generic boolean operation - - Args: - args: Iterable[Shape]: - tools: Iterable[Shape]: - operation: Union[BRepAlgoAPI_BooleanOperation: - BRepAlgoAPI_Splitter]: - - Returns: - - """ - args = list(args) - tools = list(tools) - # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} - highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] - - # The base of the operation - base = args[0] if isinstance(args, (list, tuple)) else args - - arg = TopTools_ListOfShape() - for obj in args: - if obj.wrapped is not None: - arg.Append(obj.wrapped) - - tool = TopTools_ListOfShape() - for obj in tools: - if obj.wrapped is not None: - tool.Append(obj.wrapped) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - topo_result = downcast(operation.Shape()) - - # Clean - if SkipClean.clean: - upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) - upgrader.AllowInternalEdges(False) - try: - upgrader.Build() - topo_result = downcast(upgrader.Shape()) - except Exception: - warnings.warn("Boolean operation unable to clean", stacklevel=2) - - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(topo_result, TopoDS_Compound): - topo_result = unwrap_topods_compound(topo_result, True) - - if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: - results = ShapeList( - highest_order[0].cast(s) - for s in get_top_level_topods_shapes(topo_result) - ) - for result in results: - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return results - - result = highest_order[0].cast(topo_result) - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - - return result - - def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: - """Remove the positional arguments from this Shape. - - Args: - *to_cut: Shape: - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - cut_op = BRepAlgoAPI_Cut() - - return self._bool_op((self,), to_cut, cut_op) - - def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float | None = None - ) -> Self | ShapeList[Self]: - """fuse - - Fuse a sequence of shapes into a single shape. - - Args: - to_fuse (sequence Shape): shapes to fuse - glue (bool, optional): performance improvement for some shapes. Defaults to False. - tol (float, optional): tolerance. Defaults to None. - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - return_value = self._bool_op((self,), to_fuse, fuse_op) - - return return_value - - def intersect( - self, *to_intersect: Union[Shape, Axis, Plane] - ) -> None | Self | ShapeList[Self]: - """Intersection of the arguments and this shape - - Args: - to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to - intersect with - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - def _to_vertex(vec: Vector) -> Vertex: - """Helper method to convert vector to shape""" - return self.__class__.cast( - downcast( - BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() - ) - ) - - def _to_edge(axis: Axis) -> Edge: - """Helper method to convert axis to shape""" - return self.__class__.cast( - BRepBuilderAPI_MakeEdge( - Geom_Line( - axis.position.to_pnt(), - axis.direction.to_dir(), - ) - ).Edge() - ) - - def _to_face(plane: Plane) -> Face: - """Helper method to convert plane to shape""" - return self.__class__.cast(BRepBuilderAPI_MakeFace(plane.wrapped).Face()) - - # Convert any geometry objects into their respective topology objects - objs = [] - for obj in to_intersect: - if isinstance(obj, Vector): - objs.append(_to_vertex(obj)) - elif isinstance(obj, Axis): - objs.append(_to_edge(obj)) - elif isinstance(obj, Plane): - objs.append(_to_face(obj)) - elif isinstance(obj, Location): - if obj.wrapped is None: - raise ValueError("Cannot intersect with an empty location") - objs.append(_to_vertex(tcast(Vector, obj.position))) - else: - objs.append(obj) - - # Find the shape intersections - intersect_op = BRepAlgoAPI_Common() - shape_intersections = self._bool_op((self,), objs, intersect_op) - if isinstance(shape_intersections, ShapeList) and not shape_intersections: - return None - if ( - not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null() - ): - return None - return shape_intersections - - @classmethod - @abstractmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge | Face | Shell | Solid | Compound: extruded shape - """ - - def _ocp_section( - self: Shape, other: Union[Vertex, Edge, Wire, Face] - ) -> tuple[list[Vertex], list[Edge]]: - """_ocp_section - - Create a BRepAlgoAPI_Section object - - The algorithm is to build a Section operation between arguments and tools. - The result of Section operation consists of vertices and edges. The result - of Section operation contains: - - new vertices that are subjects of V/V, E/E, E/F, F/F interferences - - vertices that are subjects of V/E, V/F interferences - - new edges that are subjects of F/F interferences - - edges that are Common Blocks - - - Args: - other (Union[Vertex, Edge, Wire, Face]): shape to section with - - Returns: - tuple[list[Vertex], list[Edge]]: section results - """ - if self.wrapped is None or other.wrapped is None: - return ([], []) - - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation - section.Build() - - # Get the resulting shapes from the intersection - intersection_shape = section.Shape() - - vertices = [] - # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) - while explorer.More(): - vertices.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - edges = [] - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - edges.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - - return (vertices, edges) - - def faces_intersected_by_axis( - self, - axis: Axis, - tol: float = 1e-4, - ) -> ShapeList[Face]: - """Line Intersection - - Computes the intersections between the provided axis and the faces of this Shape - - Args: - axis (Axis): Axis on which the intersection line rests - tol (float, optional): Intersection tolerance. Defaults to 1e-4. - - Returns: - list[Face]: A list of intersected faces sorted by distance from axis.position - """ - if self.wrapped is None: - return ShapeList() - - line = gce_MakeLin(axis.wrapped).Value() - - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, line, tol) - - faces_dist = [] # using a list instead of a dictionary to be able to sort it - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - - distance = axis.position.to_pnt().SquareDistance(inter_pt) - - faces_dist.append( - ( - intersect_maker.Face(), - abs(distance), - ) - ) # will sort all intersected faces by distance whatever the direction is - - intersect_maker.Next() - - faces_dist.sort(key=lambda x: x[1]) - faces = [face[0] for face in faces_dist] - - return ShapeList([self.__class__.cast(face) for face in faces]) - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside or outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] - ) -> tuple[ - Face | Shell | ShapeList[Face] | None, - Face | Shell | ShapeList[Face] | None, - ]: - """split_by_perimeter and keep inside and outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside (default)""" - - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE - ): - """split_by_perimeter - - Divide the faces of this object into those within the perimeter - and those outside the perimeter. - - Note: this method may fail if the perimeter intersects shape edges. - - Args: - perimeter (Union[Edge,Wire]): closed perimeter - keep (Keep, optional): which object(s) to return. Defaults to Keep.INSIDE. - - Raises: - ValueError: perimeter must be closed - ValueError: keep must be one of Keep.INSIDE|OUTSIDE|BOTH - - Returns: - Union[Face | Shell | ShapeList[Face] | None, - Tuple[Face | Shell | ShapeList[Face] | None]: The result of the split operation. - - - **Keep.INSIDE**: Returns the inside part as a `Shell` or `Face`, or `None` - if no inside part is found. - - **Keep.OUTSIDE**: Returns the outside part as a `Shell` or `Face`, or `None` - if no outside part is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Shell`, `Face`, or `None` if no corresponding part is found. - - """ - - def get(los: TopTools_ListOfShape) -> list: - """Return objects from TopTools_ListOfShape as list""" - shapes = [] - for _ in range(los.Size()): - first = los.First() - if not first.IsNull(): - shapes.append(self.__class__.cast(first)) - los.RemoveFirst() - return shapes - - def process_sides(sides): - """Process sides to determine if it should be None, a single element, - a Shell, or a ShapeList.""" - # if not sides: - # return None - if len(sides) == 1: - return sides[0] - # Attempt to create a shell - potential_shell = _sew_topods_faces([s.wrapped for s in sides]) - if isinstance(potential_shell, TopoDS_Shell): - return self.__class__.cast(potential_shell) - return ShapeList(sides) - - if keep not in {Keep.INSIDE, Keep.OUTSIDE, Keep.BOTH}: - raise ValueError( - "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" - ) - - if self.wrapped is None: - raise ValueError("Cannot split an empty shape") - - # Process the perimeter - if not perimeter.is_closed: - raise ValueError("perimeter must be a closed Wire or Edge") - perimeter_edges = TopTools_SequenceOfShape() - for perimeter_edge in perimeter.edges(): - perimeter_edges.Append(perimeter_edge.wrapped) - - # Split the shells by the perimeter edges - lefts: list[Shell] = [] - rights: list[Shell] = [] - for target_shell in self.shells(): - constructor = BRepFeat_SplitShape(target_shell.wrapped) - constructor.Add(perimeter_edges) - constructor.Build() - lefts.extend(get(constructor.Left())) - rights.extend(get(constructor.Right())) - - left = process_sides(lefts) - right = process_sides(rights) - - # Is left or right the inside? - perimeter_length = perimeter.length - left_perimeter_length = sum(e.length for e in left.edges()) if left else 0 - right_perimeter_length = sum(e.length for e in right.edges()) if right else 0 - left_inside = abs(perimeter_length - left_perimeter_length) < abs( - perimeter_length - right_perimeter_length - ) - if keep == Keep.BOTH: - return (left, right) if left_inside else (right, left) - if keep == Keep.INSIDE: - return left if left_inside else right - # keep == Keep.OUTSIDE: - return right if left_inside else left - - def distance(self, other: Shape) -> float: - """Minimal distance between two shapes - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() - - def distances(self, *others: Shape) -> Iterator[float]: - """Minimal distances to between self and other shapes - - Args: - *others: Shape: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - for other_shape in others: - if other_shape.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - dist_calc.LoadS2(other_shape.wrapped) - dist_calc.Perform() - - yield dist_calc.Value() - - def mesh(self, tolerance: float, angular_tolerance: float = 0.1): - """Generate triangulation if none exists. - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot mesh an empty shape") - - if not BRepTools.Triangulation_s(self.wrapped, tolerance): - BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - - def tessellate( - self, tolerance: float, angular_tolerance: float = 0.1 - ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: - """General triangulated approximation""" - if self.wrapped is None: - raise ValueError("Cannot tessellate an empty shape") - - self.mesh(tolerance, angular_tolerance) - - vertices: list[Vector] = [] - triangles: list[Tuple[int, int, int]] = [] - offset = 0 - - for face in self.faces(): - assert face.wrapped is not None - loc = TopLoc_Location() - poly = BRep_Tool.Triangulation_s(face.wrapped, loc) - trsf = loc.Transformation() - reverse = face.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED - - # add vertices - vertices += [ - Vector(v.X(), v.Y(), v.Z()) - for v in ( - poly.Node(i).Transformed(trsf) for i in range(1, poly.NbNodes() + 1) - ) - ] - # add triangles - triangles += [ - ( - ( - t.Value(1) + offset - 1, - t.Value(3) + offset - 1, - t.Value(2) + offset - 1, - ) - if reverse - else ( - t.Value(1) + offset - 1, - t.Value(2) + offset - 1, - t.Value(3) + offset - 1, - ) - ) - for t in poly.Triangles() - ] - - offset += poly.NbNodes() - - return vertices, triangles - - def to_splines( - self, degree: int = 3, tolerance: float = 1e-3, nurbs: bool = False - ) -> Self: - """to_splines - - Approximate shape with b-splines of the specified degree. - - Args: - degree (int, optional): Maximum degree. Defaults to 3. - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - nurbs (bool, optional): Use rational splines. Defaults to False. - - Returns: - Self: Approximated shape - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - params = ShapeCustom_RestrictionParameters() - - result = ShapeCustom.BSplineRestriction_s( - self.wrapped, - tolerance, # 3D tolerance - tolerance, # 2D tolerance - degree, - 1, # dummy value, degree is leading - ga.GeomAbs_C0, - ga.GeomAbs_C0, - True, # set degree to be leading - not nurbs, - params, - ) - - return self.__class__.cast(result) - - def to_vtk_poly_data( - self, - tolerance: float | None = None, - angular_tolerance: float | None = None, - normals: bool = False, - ) -> vtkPolyData: - """Convert shape to vtkPolyData - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - normals: bool: (Default value = True) - - Returns: data object in VTK consisting of points, vertices, lines, and polygons - """ - if self.wrapped is None: - raise ValueError("Cannot convert an empty shape") - - vtk_shape = IVtkOCC_Shape(self.wrapped) - shape_data = IVtkVTK_ShapeData() - shape_mesher = IVtkOCC_ShapeMesher() - - drawer = vtk_shape.Attributes() - drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - - if tolerance: - drawer.SetDeviationCoefficient(tolerance) - - if angular_tolerance: - drawer.SetDeviationAngle(angular_tolerance) - - shape_mesher.Build(vtk_shape, shape_data) - - vtk_poly_data = shape_data.getVtkPolyData() - - # convert to triangles and split edges - t_filter = vtkTriangleFilter() - t_filter.SetInputData(vtk_poly_data) - t_filter.Update() - - return_value = t_filter.GetOutput() - - # compute normals - if normals: - n_filter = vtkPolyDataNormals() - n_filter.SetComputePointNormals(True) - n_filter.SetComputeCellNormals(True) - n_filter.SetFeatureAngle(360) - n_filter.SetInputData(return_value) - n_filter.Update() - - return_value = n_filter.GetOutput() - - return return_value - - def _repr_javascript_(self): - """Jupyter 3D representation support""" - - from build123d.jupyter_tools import display - - return display(self)._repr_javascript_() - - def transformed( - self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) - ) -> Self: - """Transform Shape - - Rotate and translate the Shape by the three angles (in degrees) and offset. - - Args: - rotate (VectorLike, optional): 3-tuple of angles to rotate, in degrees. - Defaults to (0, 0, 0). - offset (VectorLike, optional): 3-tuple to offset. Defaults to (0, 0, 0). - - Returns: - Shape: transformed object - - """ - # Convert to a Vector of radians - rotate_vector = Vector(rotate).multiply(DEG2RAD) - # Compute rotation matrix. - t_rx = gp_Trsf() - t_rx.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), rotate_vector.X) - t_ry = gp_Trsf() - t_ry.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), rotate_vector.Y) - t_rz = gp_Trsf() - t_rz.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), rotate_vector.Z) - t_o = gp_Trsf() - t_o.SetTranslation(Vector(offset).wrapped) - return self._apply_transform(t_o * t_rx * t_ry * t_rz) - - def project_faces( - self, - faces: Union[list[Face], Compound], - path: Union[Wire, Edge], - start: float = 0, - ) -> ShapeList[Face]: - """Projected Faces following the given path on Shape - - Project by positioning each face of to the shape along the path and - projecting onto the surface. - - Note that projection may result in distortion depending on - the shape at a position along the path. - - .. image:: projectText.png - - Args: - faces (Union[list[Face], Compound]): faces to project - path: Path on the Shape to follow - start: Relative location on path to start the faces. Defaults to 0. - - Returns: - The projected faces - - """ - # pylint: disable=too-many-locals - path_length = path.length - # The derived classes of Shape implement center - shape_center = self.center() # pylint: disable=no-member - - if ( - not isinstance(faces, (list, tuple)) - and faces.wrapped is not None - and isinstance(faces.wrapped, TopoDS_Compound) - ): - faces = faces.faces() - - first_face_min_x = faces[0].bounding_box().min.X - - logger.debug("projecting %d face(s)", len(faces)) - - # Position each face normal to the surface along the path and project to the surface - projected_faces = [] - for face in faces: - bbox = face.bounding_box() - face_center_x = (bbox.min.X + bbox.max.X) / 2 - relative_position_on_wire = ( - start + (face_center_x - first_face_min_x) / path_length - ) - path_position = path.position_at(relative_position_on_wire) - path_tangent = path.tangent_at(relative_position_on_wire) - projection_axis = Axis(path_position, shape_center - path_position) - (surface_point, surface_normal) = self.find_intersection_points( - projection_axis - )[0] - surface_normal_plane = Plane( - origin=surface_point, x_dir=path_tangent, z_dir=surface_normal - ) - projection_face: Face = surface_normal_plane.from_local_coords( - face.moved(Location((-face_center_x, 0, 0))) - ) - - logger.debug("projecting face at %0.2f", relative_position_on_wire) - projected_faces.append( - projection_face.project_to_shape(self, surface_normal * -1)[0] - ) - - logger.debug("finished projecting '%d' faces", len(faces)) - - return ShapeList(projected_faces) - - -class Comparable(ABC): - """Abstract base class that requires comparison methods""" - - @abstractmethod - def __lt__(self, other: Any) -> bool: ... - - @abstractmethod - def __eq__(self, other: Any) -> bool: ... - - -# This TypeVar allows IDEs to see the type of objects within the ShapeList -T = TypeVar("T", bound=Union[Shape, Vector]) -K = TypeVar("K", bound=Comparable) - - -class ShapePredicate(Protocol): - """Predicate for shape filters""" - - def __call__(self, shape: Shape) -> bool: ... - - -class ShapeList(list[T]): - """Subclass of list with custom filter and sort methods appropriate to CAD""" - - # pylint: disable=too-many-public-methods - - @property - def first(self) -> T: - """First element in the ShapeList""" - return self[0] - - @property - def last(self) -> T: - """Last element in the ShapeList""" - return self[-1] - - def center(self) -> Vector: - """The average of the center of objects within the ShapeList""" - if not self: - return Vector(0, 0, 0) - - total_center = sum((o.center() for o in self), Vector(0, 0, 0)) - return total_center / len(self) - - def filter_by( - self, - filter_by: Union[ShapePredicate, Axis, Plane, GeomType], - reverse: bool = False, - tolerance: float = 1e-5, - ) -> ShapeList[T]: - """filter by Axis, Plane, or GeomType - - Either: - - filter objects of type planar Face or linear Edge by their normal or tangent - (respectively) and sort the results by the given axis, or - - filter the objects by the provided type. Note that not all types apply to all - objects. - - Args: - filter_by (Union[Axis,Plane,GeomType]): axis, plane, or geom type to filter - and possibly sort by. Filtering by a plane returns faces/edges parallel - to that plane. - reverse (bool, optional): invert the geom type filter. Defaults to False. - tolerance (float, optional): maximum deviation from axis. Defaults to 1e-5. - - Raises: - ValueError: Invalid filter_by type - - Returns: - ShapeList: filtered list of objects - """ - - # could be moved out maybe? - def axis_parallel_predicate(axis: Axis, tolerance: float): - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt = gp_Pnt() - surface_normal = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector( - surface_normal.X(), surface_normal.Y(), surface_normal.Z() - ).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - elif ( - isinstance(shape.wrapped, TopoDS_Edge) - and shape.geom_type == GeomType.LINE - ): - curve = shape.geom_adaptor() - umin = curve.FirstParameter() - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(umin, tmp, res) - start_pos = Vector(tmp) - start_dir = Vector(gp_Dir(res)) - shape_axis = Axis(start_pos, start_dir) - else: - return False - return axis.is_parallel(shape_axis, tolerance) - - return pred - - def plane_parallel_predicate(plane: Plane, tolerance: float): - plane_axis = Axis(plane.origin, plane.z_dir) - plane_xyz = plane.z_dir.wrapped.XYZ() - - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt: gp_Pnt = gp_Pnt() - surface_normal: gp_Vec = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector(surface_normal).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - return plane_axis.is_parallel(shape_axis, tolerance) - if isinstance(shape.wrapped, TopoDS_Wire): - return all(pred(e) for e in shape.edges()) - if isinstance(shape.wrapped, TopoDS_Edge): - for curve in shape.wrapped.TShape().Curves(): - if curve.IsCurve3D(): - return ShapeAnalysis_Curve.IsPlanar_s( - curve.Curve3D(), plane_xyz, tolerance - ) - return False - return False - - return pred - - # convert input to callable predicate - if callable(filter_by): - predicate = filter_by - elif isinstance(filter_by, Axis): - predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, Plane): - predicate = plane_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, GeomType): - - def predicate(obj): - return obj.geom_type == filter_by - - else: - raise ValueError(f"Unsupported filter_by predicate: {filter_by}") - - # final predicate is negated if `reverse=True` - if reverse: - - def actual_predicate(shape): - return not predicate(shape) - - else: - actual_predicate = predicate - - return ShapeList(filter(actual_predicate, self)) - - def filter_by_position( - self, - axis: Axis, - minimum: float, - maximum: float, - inclusive: tuple[bool, bool] = (True, True), - ) -> ShapeList[T]: - """filter by position - - Filter and sort objects by the position of their centers along given axis. - min and max values can be inclusive or exclusive depending on the inclusive tuple. - - Args: - axis (Axis): axis to sort by - minimum (float): minimum value - maximum (float): maximum value - inclusive (tuple[bool, bool], optional): include min,max values. - Defaults to (True, True). - - Returns: - ShapeList: filtered object list - """ - if inclusive == (True, True): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (True, False): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - elif inclusive == (False, True): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (False, False): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - - return ShapeList(objects).sort_by(axis) - - def group_by( - self, - group_by: Union[Callable[[Shape], K], Axis, Edge, Wire, SortBy] = Axis.Z, - reverse=False, - tol_digits=6, - ) -> GroupBy[T, K]: - """group by - - Group objects by provided criteria and then sort the groups according to the criteria. - Note that not all group_by criteria apply to all objects. - - Args: - group_by (SortBy, optional): group and sort criteria. Defaults to Axis.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - tol_digits (int, optional): Tolerance for building the group keys by - round(key, tol_digits) - - Returns: - GroupBy[K, ShapeList]: sorted list of ShapeLists - """ - - if isinstance(group_by, Axis): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty axis") - assert group_by.location is not None - axis_as_location = group_by.location.inverse() - - def key_f(obj): - return round( - (axis_as_location * Location(obj.center())).position.Z, - tol_digits, - ) - - elif hasattr(group_by, "wrapped"): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty object") - - if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) - - elif isinstance(group_by, SortBy): - if group_by == SortBy.LENGTH: - - def key_f(obj): - return round(obj.length, tol_digits) - - elif group_by == SortBy.RADIUS: - - def key_f(obj): - return round(obj.radius, tol_digits) - - elif group_by == SortBy.DISTANCE: - - def key_f(obj): - return round(obj.center().length, tol_digits) - - elif group_by == SortBy.AREA: - - def key_f(obj): - return round(obj.area, tol_digits) - - elif group_by == SortBy.VOLUME: - - def key_f(obj): - return round(obj.volume, tol_digits) - - elif callable(group_by): - key_f = group_by - - else: - raise ValueError(f"Unsupported group_by function: {group_by}") - - return GroupBy(key_f, self, reverse=reverse) - - def sort_by( - self, sort_by: Union[Axis, Edge, Wire, SortBy] = Axis.Z, reverse: bool = False - ) -> ShapeList[T]: - """sort by - - Sort objects by provided criteria. Note that not all sort_by criteria apply to all - objects. - - Args: - sort_by (SortBy, optional): sort criteria. Defaults to SortBy.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: sorted list of objects - """ - - if isinstance(sort_by, Axis): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty axis") - assert sort_by.location is not None - axis_as_location = sort_by.location.inverse() - objects = sorted( - self, - key=lambda o: (axis_as_location * Location(o.center())).position.Z, - reverse=reverse, - ) - elif hasattr(sort_by, "wrapped"): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty object") - - if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) - - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) - - elif isinstance(sort_by, SortBy): - if sort_by == SortBy.LENGTH: - objects = sorted( - self, - key=lambda obj: obj.length, - reverse=reverse, - ) - elif sort_by == SortBy.RADIUS: - with_radius = [obj for obj in self if hasattr(obj, "radius")] - objects = sorted( - with_radius, - key=lambda obj: obj.radius, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.DISTANCE: - objects = sorted( - self, - key=lambda obj: obj.center().length, - reverse=reverse, - ) - elif sort_by == SortBy.AREA: - with_area = [obj for obj in self if hasattr(obj, "area")] - objects = sorted( - with_area, - key=lambda obj: obj.area, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.VOLUME: - with_volume = [obj for obj in self if hasattr(obj, "volume")] - objects = sorted( - with_volume, - key=lambda obj: obj.volume, # type: ignore - reverse=reverse, - ) - - return ShapeList(objects) - - def sort_by_distance( - self, other: Union[Shape, VectorLike], reverse: bool = False - ) -> ShapeList[T]: - """Sort by distance - - Sort by minimal distance between objects and other - - Args: - other (Union[Shape,VectorLike]): reference object - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: Sorted shapes - """ - distances = sorted( - [(obj.distance_to(other), obj) for obj in self], # type: ignore - key=lambda obj: obj[0], - reverse=reverse, - ) - return ShapeList([obj[1] for obj in distances]) - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore - - def vertex(self) -> Vertex: - """Return the Vertex""" - vertices = self.vertices() - vertex_count = len(vertices) - if vertex_count != 1: - warnings.warn( - f"Found {vertex_count} vertices, returning first", stacklevel=2 - ) - return vertices[0] - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore - - def edge(self) -> Edge: - """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) - return edges[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore - - def wire(self) -> Wire: - """Return the Wire""" - wires = self.wires() - wire_count = len(wires) - if wire_count != 1: - warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) - return wires[0] - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) - return solids[0] - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore - - def compound(self) -> Compound: - """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: - warnings.warn( - f"Found {compound_count} compounds, returning first", stacklevel=2 - ) - return compounds[0] - - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Sort operator >""" - return self.sort_by(sort_by) - - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Reverse sort operator <""" - return self.sort_by(sort_by, reverse=True) - - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select largest group operator >>""" - return self.group_by(group_by)[-1] - - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select smallest group operator <<""" - return self.group_by(group_by)[0] - - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: - """Filter by axis or geomtype operator |""" - return self.filter_by(filter_by) - - def __eq__(self, other: object) -> bool: - """ShapeLists equality operator ==""" - return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore - ) - - # Normally implementing __eq__ is enough, but ShapeList subclasses list, - # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList) -> bool: # type: ignore - """ShapeLists inequality operator !=""" - return ( - set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented - ) - - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) - - def __sub__(self, other: ShapeList) -> ShapeList[T]: - """Differences between two ShapeLists operator -""" - return ShapeList(set(self) - set(other)) - - def __and__(self, other: ShapeList) -> ShapeList[T]: - """Intersect two ShapeLists operator &""" - return ShapeList(set(self) & set(other)) - - @overload - def __getitem__(self, key: SupportsIndex) -> T: ... - - @overload - def __getitem__(self, key: slice) -> ShapeList[T]: ... - - def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: - """Return slices of ShapeList as ShapeList""" - if isinstance(key, slice): - return ShapeList(list(self).__getitem__(key)) - return list(self).__getitem__(key) - - -class GroupBy(Generic[T, K]): - """Result of a Shape.groupby operation. Groups can be accessed by index or key""" - - def __init__( - self, - key_f: Callable[[T], K], - shapelist: Iterable[T], - *, - reverse: bool = False, - ): - # can't be a dict because K may not be hashable - self.key_to_group_index: list[tuple[K, int]] = [] - self.groups: list[ShapeList[T]] = [] - self.key_f = key_f - - for i, (key, shapegroup) in enumerate( - itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) - ): - self.groups.append(ShapeList(shapegroup)) - self.key_to_group_index.append((key, i)) - - def __iter__(self): - return iter(self.groups) - - def __len__(self): - return len(self.groups) - - def __getitem__(self, key: int): - return self.groups[key] - - def __str__(self): - return pretty(self) - - def __repr__(self): - return repr(ShapeList(self)) - - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: - """ - Render a formatted representation of the object for pretty-printing in - interactive environments. - - Args: - printer (PrettyPrinter): The pretty printer instance handling the output. - cycle (bool): Indicates if a reference cycle is detected to - prevent infinite recursion. - """ - if cycle: - printer.text("(...)") - else: - with printer.group(1, "[", "]"): - for idx, item in enumerate(self): - if idx: - printer.text(",") - printer.breakable() - printer.pretty(item) - - def group(self, key: K): - """Select group by key""" - for k, i in self.key_to_group_index: - if key == k: - return self.groups[i] - raise KeyError(key) - - def group_for(self, shape: T): - """Select group by shape""" - return self.group(self.key_f(shape)) - - -class Mixin1D(Shape): - """Methods to add to the Edge and Wire classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Edges and Wires""" - return 1 - - def __add__( - self, other: None | Shape | Iterable[Shape] - ) -> Edge | Wire | ShapeList[Edge]: - """fuse shape to wire/edge operator +""" - - # Convert `other` to list of base topods objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] - # If there is nothing to add return the original object - if not summands: - return self - - if not all(topods_dim(summand) == 1 for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] - summand_edges = [e for summand in summands for e in summand.edges()] - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - try: - sum_shape = Wire(summand_edges) - except Exception: - sum_shape = summands[0].fuse(*summands[1:]) - if type(self).order == 4: - sum_shape = type(self)(sum_shape) - else: - try: - sum_shape = Wire(self.edges() + ShapeList(summand_edges)) - except Exception: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape - - return sum_shape - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" - - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of object - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - middle = self.position_at(0.5) - elif center_of == CenterOf.MASS: - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: - """common_plane - - Find the plane containing all the edges/wires (including self). If there - is no common plane return None. If the edges are coaxial, select one - of the infinite number of valid planes. - - Args: - lines (sequence of Union[Edge,Wire]): edges in common with self - - Returns: - Union[None, Plane]: Either the common plane or None - """ - # pylint: disable=too-many-locals - # Note: BRepLib_FindSurface is not helpful as it requires the - # Edges to form a surface perimeter. - points: list[Vector] = [] - all_lines: list[Edge | Wire] = [ - line for line in [self, *lines] if line is not None - ] - if any(not isinstance(line, (Edge, Wire)) for line in all_lines): - raise ValueError("Only Edges or Wires are valid") - - result = None - # Are they all co-axial - if so, select one of the infinite planes - all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all(e.geom_type == GeomType.LINE for e in all_edges): - as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): - origin = as_axis[0].position - x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir - c_plane = Plane(origin, z_dir=z_dir) - result = c_plane.shift_origin((0, 0)) - - if result is None: # not coaxial - # Shorten any infinite lines (from converted Axis) - normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) - infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] - all_lines = normal_lines + shortened_lines - - for line in all_lines: - num_points = 2 if line.geom_type == GeomType.LINE else 8 - points.extend( - [line.position_at(i / (num_points - 1)) for i in range(num_points)] - ) - points = list(set(points)) # unique points - extreme_areas = {} - for subset in combinations(points, 3): - vector1 = subset[1] - subset[0] - vector2 = subset[2] - subset[0] - area = 0.5 * (vector1.cross(vector2).length) - extreme_areas[area] = subset - # The points that create the largest area make the most accurate plane - extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] - - # Create a plane from these points - x_dir = (extremes[1] - extremes[0]).normalized() - z_dir = (extremes[2] - extremes[0]).cross(x_dir) - try: - c_plane = Plane( - origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir - ) - c_plane = c_plane.shift_origin((0, 0)) - except ValueError: - # There is no valid common plane - result = None - else: - # Are all of the points on the common plane - common = all(c_plane.contains(p) for p in points) - result = c_plane if common else None - - return result - - @property - def length(self) -> float: - """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) - - @property - def radius(self) -> float: - """Calculate the radius. - - Note that when applied to a Wire, the radius is simply the radius of the first edge. - - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] - - def location_at( - self, - distance: float, - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> Location: - """Locations along curve - - Generate a location along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - Location: A Location object representing local coordinate system - at the specified distance. - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - law: GeomFill_TrihedronLaw - if frame_method == FrameMethod.FRENET: - law = GeomFill_Frenet() - else: - law = GeomFill_CorrectedFrenet() - - law.SetCurve(curve) - - tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() - - law.D0(param, tangent, normal, binormal) - pnt = curve.Value(param) - - transformation = gp_Trsf() - if planar: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() - ) - else: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() - ) - - return Location(TopLoc_Location(transformation)) - - def locations( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> list[Location]: - """Locations along curve - - Generate location along the curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - list[Location]: A list of Location objects representing local coordinate - systems at the specified distances. - """ - return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances - ] - - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) - - def offset_2d( - self, - distance: float, - kind: Kind = Kind.ARC, - side: Side = Side.BOTH, - closed: bool = True, - ) -> Union[Edge, Wire]: - """2d Offset - - Offsets a planar edge/wire - - Args: - distance (float): distance from edge/wire to offset - kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. - side (Side, optional): side to place offset. Defaults to Side.BOTH. - closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT - offset. Defaults to True. - Raises: - RuntimeError: Multiple Wires generated - RuntimeError: Unexpected result type - - Returns: - Wire: offset wire - """ - # pylint: disable=too-many-branches, too-many-locals, too-many-statements - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - line = self if isinstance(self, Wire) else Wire([self]) - - # Avoiding a bug when the wire contains a single Edge - if len(line.edges()) == 1: - edge = line.edges()[0] - edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] - topods_wire = Wire(edges).wrapped - else: - topods_wire = line.wrapped - - offset_builder = BRepOffsetAPI_MakeOffset() - offset_builder.Init(kind_dict[kind]) - # offset_builder.SetApprox(True) - offset_builder.AddWire(topods_wire) - offset_builder.Perform(distance) - - obj = downcast(offset_builder.Shape()) - if isinstance(obj, TopoDS_Compound): - obj = unwrap_topods_compound(obj, fully=True) - if isinstance(obj, TopoDS_Wire): - offset_wire = Wire(obj) - else: # Likely multiple Wires were generated - raise RuntimeError("Unexpected result type") - - if side != Side.BOTH: - # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] - centers = [w.position_at(0.5) for w in wires] - angles = [ - line.tangent_at(0).get_signed_angle(c - line.position_at(0)) - for c in centers - ] - if side == Side.LEFT: - offset_wire = wires[int(angles[0] > angles[1])] - else: - offset_wire = wires[int(angles[0] <= angles[1])] - - if closed: - self0 = line.position_at(0) - self1 = line.position_at(1) - end0 = offset_wire.position_at(0) - end1 = offset_wire.position_at(1) - if (self0 - end0).length - abs(distance) <= TOLERANCE: - edge0 = Edge.make_line(self0, end0) - edge1 = Edge.make_line(self1, end1) - else: - edge0 = Edge.make_line(self0, end1) - edge1 = Edge.make_line(self1, end0) - offset_wire = Wire( - line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) - ) - - offset_edges = offset_wire.edges() - return offset_edges[0] if len(offset_edges) == 1 else offset_wire - - def perpendicular_line( - self, length: float, u_value: float, plane: Plane = Plane.XY - ) -> Edge: - """perpendicular_line - - Create a line on the given plane perpendicular to and centered on beginning of self - - Args: - length (float): line length - u_value (float): position along line between 0.0 and 1.0 - plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. - - Returns: - Edge: perpendicular line - """ - start = self.position_at(u_value) - local_plane = Plane( - origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir - ) - line = Edge.make_line( - start + local_plane.y_dir * length / 2, - start - local_plane.y_dir * length / 2, - ) - return line - - def project( - self, face: Face, direction: VectorLike, closest: bool = True - ) -> Edge | Wire | ShapeList[Edge | Wire]: - """Project onto a face along the specified direction - - Args: - face: Face: - direction: VectorLike: - closest: bool: (Default value = True) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") - - bldr = BRepProj_Projection( - self.wrapped, face.wrapped, Vector(direction).to_dir() - ) - shapes: TopoDS_Compound = bldr.Shape() - - # select the closest projection if requested - return_value: Edge | Wire | ShapeList[Edge | Wire] - - if closest: - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - min_dist = inf - - # for shape in shapes: - for shape in get_top_level_topods_shapes(shapes): - dist_calc.LoadS2(shape) - dist_calc.Perform() - dist = dist_calc.Value() - - if dist < min_dist: - min_dist = dist - return_value = Mixin1D.cast(shape) - - else: - return_value = ShapeList( - Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) - ) - - return return_value - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike | None = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - visible_edges = ShapeList(Edge(e) for e in visible_edges) - hidden_edges = ShapeList(Edge(e) for e in hidden_edges) - - return (visible_edges, hidden_edges) - - -class Mixin2D(Shape): - """Additional methods to add to Face and Shell class""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Faces and Shells""" - return 2 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") - - def __neg__(self) -> Self: - """Reverse normal operator -""" - if self.wrapped is None: - raise ValueError("Invalid Shape") - new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) - - return new_surface - - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - - def find_intersection_points( - self, other: Axis, tolerance: float = TOLERANCE - ) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape - - Args: - axis (Axis): axis defining the intersection line - - Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection - """ - if self.wrapped is None: - return [] - - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, tolerance) - - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) - ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - - -class Mixin3D(Shape): - """Additional methods to add to 3D Shape classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int | None: - """Dimension of Solids""" - return 3 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") - - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") - - def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: - """Fillet - - Fillets the specified edges of this solid. - - Args: - radius (float): float > 0, the radius of the fillet - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - - Returns: - Any: Filleted solid - """ - native_edges = [e.wrapped for e in edge_list] - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(radius, native_edge) - - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - f"Failed creating a fillet with radius of {radius}, try a smaller value" - f" or use max_fillet() to find the largest valid fillet radius" - ) from err - - return new_shape - - def max_fillet( - self, - edge_list: Iterable[Edge], - tolerance=0.1, - max_iterations: int = 10, - ) -> float: - """Find Maximum Fillet Size - - Find the largest fillet radius for the given Shape and edges with a - recursive binary search. - - Example: - - max_fillet_radius = my_shape.max_fillet(shape_edges) - max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) - - - Args: - edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid - tolerance (float, optional): maximum error from actual value. Defaults to 0.1. - max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. - - Raises: - RuntimeError: failed to find the max value - ValueError: the provided Shape is invalid - - Returns: - float: maximum fillet radius - """ - - def __max_fillet(window_min: float, window_max: float, current_iteration: int): - window_mid = (window_min + window_max) / 2 - - if current_iteration == max_iterations: - raise RuntimeError( - f"Failed to find the max value within {tolerance} in {max_iterations}" - ) - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(window_mid, native_edge) - - # Do these numbers work? - if not try with the smaller window - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise fillet_exception - except fillet_exception: - return __max_fillet(window_min, window_mid, current_iteration + 1) - - # These numbers work, are they close enough? - if not try larger window - if window_mid - window_min <= tolerance: - return_value = window_mid - else: - return_value = __max_fillet( - window_mid, window_max, current_iteration + 1 - ) - return return_value - - if not self.is_valid(): - raise ValueError("Invalid Shape") - - native_edges = [e.wrapped for e in edge_list] - - # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform - # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone - - max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) - - return max_radius - - def chamfer( - self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face | None = None, - ) -> Self: - """Chamfer - - Chamfers the specified edges of this solid. - - Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face, optional): identifies the side where length is measured. The edge(s) - must be part of the face - - Returns: - Self: Chamfered solid - """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") - - native_edges = [e.wrapped for e in edge_list] - - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__.cast(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) - else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__.cast(sol.Shape()).fix() - - return return_value - - def offset_3d( - self, - openings: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Shell - - Make an offset solid of self. - - Args: - openings (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): offset amount - positive offset outwards, negative inwards - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A shelled solid. - """ - openings = list(openings) if openings else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - - occ_faces_list = TopTools_ListOfShape() - for face in openings: - occ_faces_list.Append(face.wrapped) - - offset_builder = BRepOffsetAPI_MakeThickSolid() - offset_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - RemoveIntEdges=True, - Join=kind_dict[kind], - ) - offset_builder.Build() - - try: - offset_occt_solid = offset_builder.Shape() - except (StdFail_NotDone, Standard_Failure) as err: - raise RuntimeError( - "offset Error, an alternative kind may resolve this error" - ) from err - - offset_solid = self.__class__.cast(offset_occt_solid) - assert offset_solid.wrapped is not None - - # The Solid can be inverted, if so reverse - if offset_solid.volume < 0: - offset_solid.wrapped.Reverse() - - return offset_solid - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. - - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float | None = None, - taper: float = 0, - up_to_face: Face | None = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] - else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) - - -class Compound(Mixin3D, Shape[TopoDS_Compound]): - """A Compound in build123d is a topological entity representing a collection of - geometric shapes grouped together within a single structure. It serves as a - container for organizing diverse shapes like edges, faces, or solids. This - hierarchical arrangement facilitates the construction of complex models by - combining simpler shapes. Compound plays a pivotal role in managing the - composition and structure of intricate 3D models in computer-aided design - (CAD) applications, allowing engineers and designers to work with assemblies - of shapes as unified entities for efficient modeling and analysis.""" - - order = 4.0 - - project_to_viewport = Mixin1D.project_to_viewport - - @classmethod - def cast( - cls, obj: TopoDS_Shape - ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def _dim(self) -> Union[int, None]: - """The dimension of the shapes within the Compound - None if inconsistent""" - return topods_dim(self.wrapped) - - def __init__( - self, - obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - children: Sequence[Shape] | None = None, - ): - """Build a Compound from Shapes - - Args: - obj (TopoDS_Compound | Iterable[Shape], optional): OCCT Compound or shapes - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - children (Sequence[Shape], optional): assembly children. Defaults to None. - """ - - if isinstance(obj, Iterable): - topods_compound = _make_topods_compound_from_shapes( - [s.wrapped for s in obj] - ) - else: - topods_compound = obj - - super().__init__( - obj=topods_compound, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - self.children = [] if children is None else children - - def __repr__(self): - """Return Compound info as string""" - if hasattr(self, "label") and hasattr(self, "children"): - result = ( - f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " - + f"#children({len(self.children)})" - ) - else: - result = f"{self.__class__.__name__} at {id(self):#x}" - return result - - @property - def volume(self) -> float: - """volume - the volume of this Compound""" - # when density == 1, mass == volume - return sum(i.volume for i in [*self.get_type(Solid), *self.get_type(Shell)]) - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def _remove(self, shape: Shape) -> Compound: - """Return self with the specified shape removed. - - Args: - shape: Shape: - """ - comp_builder = TopoDS_Builder() - comp_builder.Remove(self.wrapped, shape.wrapped) - return self - - def _post_detach(self, parent: Compound): - """Method call after detaching from `parent`.""" - logger.debug("Removing parent of %s (%s)", self.label, parent.label) - if parent.children: - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - else: - parent.wrapped = None - - def _pre_attach(self, parent: Compound): - """Method call before attaching to `parent`.""" - if not isinstance(parent, Compound): - raise ValueError("`parent` must be of type Compound") - - def _post_attach(self, parent: Compound): - """Method call after attaching to `parent`.""" - logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - - def _post_detach_children(self, children): - """Method call before detaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Removing no children from %s", self.label) - - def _pre_attach_children(self, children): - """Method call before attaching `children`.""" - if not all(isinstance(child, Shape) for child in children): - raise ValueError("Each child must be of type Shape") - - def _post_attach_children(self, children: Iterable[Shape]): - """Method call after attaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Adding no children to %s", self.label) - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Combine other to self `+` operator - - Note that if all of the objects are connected Edges/Wires the result - will be a Wire, otherwise a Shape. - """ - if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other - - summands: ShapeList[Shape] - if other is None: - summands = ShapeList() - else: - summands = ShapeList( - shape - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ) - # If there is nothing to add return the original object - if not summands: - return self - - summands = ShapeList( - s for s in self.get_top_level_shapes() + summands if s is not None - ) - - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = Compound(summands[0:1]) - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(bool_result, list): - result = Compound(bool_result) - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - else: - result = bool_result - - if SkipClean.clean: - result = result.clean() - - return result - - def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Cut other to self `-` operator""" - difference = Shape.__sub__(self, other) - difference = Compound( - difference if isinstance(difference, list) else [difference] - ) - self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> Compound: - """Intersect other to self `&` operator""" - intersection = Shape.__and__(self, other) - intersection = Compound( - intersection if isinstance(intersection, list) else [intersection] - ) - self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) - return intersection - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) - - def compound(self) -> Compound | None: - """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None - - @classmethod - def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: - """extrude - - Extrude a Shell into a Compound. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Compound( - TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) - ) - - def do_children_intersect( - self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: - """Do Children Intersect - - Determine if any of the child objects within a Compound/assembly intersect by - intersecting each of the shapes with each other and checking for - a common volume. - - Args: - include_parent (bool, optional): check parent for intersections. Defaults to False. - tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. - - Returns: - tuple[bool, tuple[Shape, Shape], float]: - do the object intersect, intersecting objects, volume of intersection - """ - children: list[Shape] = list(PreOrderIter(self)) - if not include_parent: - children.pop(0) # remove parent - # children_bbox = [child.bounding_box().to_solid() for child in children] - children_bbox = [ - Solid.from_bounding_box(child.bounding_box()) for child in children - ] - child_index_pairs = [ - tuple(map(int, comb)) - for comb in combinations(list(range(len(children))), 2) - ] - for child_index_pair in child_index_pairs: - # First check for bounding box intersections .. - # .. then confirm with actual object intersections which could be complex - bbox_intersection = children_bbox[child_index_pair[0]].intersect( - children_bbox[child_index_pair[1]] - ) - if bbox_intersection is not None: - obj_intersection = children[child_index_pair[0]].intersect( - children[child_index_pair[1]] - ) - if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - ( - children[child_index_pair[0]], - children[child_index_pair[1]], - ), - common_volume, - ) - return (False, (None, None), 0.0) - - @classmethod - def make_text( - cls, - txt: str, - font_size: float, - font: str = "Arial", - font_path: Optional[str] = None, - font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), - position_on_path: float = 0.0, - text_path: Union[Edge, Wire, None] = None, - ) -> "Compound": - """2D Text that optionally follows a path. - - The text that is created can be combined as with other sketch features by specifying - a mode or rotated by the given angle. In addition, edges have been previously created - with arc or segment, the text will follow the path defined by these edges. The start - parameter can be used to shift the text along the path to achieve precise positioning. - - Args: - txt: text to be rendered - font_size: size of the font in model units - font: font name - font_path: path to font file - font_style: text style. Defaults to FontStyle.REGULAR. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max - of object. Defaults to (Align.CENTER, Align.CENTER). - position_on_path: the relative location on path to position the text, - between 0.0 and 1.0. Defaults to 0.0. - text_path: a path for the text to follows. Defaults to None - linear text. - - Returns: - a Compound object containing multiple Faces representing the text - - Examples:: - - fox = Compound.make_text( - txt="The quick brown fox jumped over the lazy dog", - font_size=10, - position_on_path=0.1, - text_path=jump_edge, - ) - - """ - # pylint: disable=too-many-locals - - def position_face(orig_face: Face) -> Face: - """ - Reposition a face to the provided path - - Local coordinates are used to calculate the position of the face - relative to the path. Global coordinates to position the face. - """ - assert text_path is not None - bbox = orig_face.bounding_box() - face_bottom_center = Vector((bbox.min.X + bbox.max.X) / 2, 0, 0) - relative_position_on_wire = ( - position_on_path + face_bottom_center.X / path_length - ) - wire_tangent = text_path.tangent_at(relative_position_on_wire) - wire_angle = Vector(1, 0, 0).get_signed_angle(wire_tangent) - wire_position = text_path.position_at(relative_position_on_wire) - - return orig_face.translate(wire_position - face_bottom_center).rotate( - Axis(wire_position, (0, 0, 1)), - -wire_angle, - ) - - if sys.platform.startswith("linux"): - os.environ["FONTCONFIG_FILE"] = "/etc/fonts/fonts.conf" - os.environ["FONTCONFIG_PATH"] = "/etc/fonts/" - - font_kind = { - FontStyle.REGULAR: Font_FA_Regular, - FontStyle.BOLD: Font_FA_Bold, - FontStyle.ITALIC: Font_FA_Italic, - }[font_style] - - mgr = Font_FontMgr.GetInstance_s() - - if font_path and mgr.CheckFont(TCollection_AsciiString(font_path).ToCString()): - font_t = Font_SystemFont(TCollection_AsciiString(font_path)) - font_t.SetFontPath(font_kind, TCollection_AsciiString(font_path)) - mgr.RegisterFont(font_t, True) - - else: - font_t = mgr.FindFont(TCollection_AsciiString(font), font_kind) - - logger.info( - "Creating text with font %s located at %s", - font_t.FontName().ToCString(), - font_t.FontPath(font_kind).ToCString(), - ) - - builder = Font_BRepTextBuilder() - font_i = StdPrs_BRepFont( - NCollection_Utf8String(font_t.FontName().ToCString()), - font_kind, - float(font_size), - ) - text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) - - # Align the text from the bounding box - align_text = tuplify(align, 2) - text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align_text)) - ) - - if text_path is not None: - path_length = text_path.length - text_flat = Compound([position_face(f) for f in text_flat.faces()]) - - return text_flat - - @classmethod - def make_triad(cls, axes_scale: float) -> Compound: - """The coordinate system triad (X, Y, Z axes)""" - x_axis = Edge.make_line((0, 0, 0), (axes_scale, 0, 0)) - y_axis = Edge.make_line((0, 0, 0), (0, axes_scale, 0)) - z_axis = Edge.make_line((0, 0, 0), (0, 0, axes_scale)) - arrow_arc = Edge.make_spline( - [(0, 0, 0), (-axes_scale / 20, axes_scale / 30, 0)], - [(-1, 0, 0), (-1, 1.5, 0)], - ) - arrow = Wire([arrow_arc, copy.copy(arrow_arc).mirror(Plane.XZ)]) - x_label = ( - Compound.make_text( - "X", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .move(Location(x_axis @ 1)) - .edges() - ) - y_label = ( - Compound.make_text( - "Y", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .rotate(Axis.Z, 90) - .move(Location(y_axis @ 1)) - .edges() - ) - z_label = ( - Compound.make_text( - "Z", font_size=axes_scale / 4, align=(Align.CENTER, Align.MIN) - ) - .rotate(Axis.Y, 90) - .rotate(Axis.X, 90) - .move(Location(z_axis @ 1)) - .edges() - ) - triad = Curve( - [ - x_axis, - y_axis, - z_axis, - arrow.moved(Location(x_axis @ 1)), - arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), - arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), - *x_label, - *y_label, - *z_label, - ] - ) - - return triad - - def __iter__(self) -> Iterator[Shape]: - """ - Iterate over subshapes. - - """ - - iterator = TopoDS_Iterator(self.wrapped) - - while iterator.More(): - yield Compound.cast(iterator.Value()) - iterator.Next() - - def __len__(self) -> int: - """Return the number of subshapes""" - count = 0 - if self.wrapped is not None: - for _ in self: - count += 1 - return count - - def __bool__(self) -> bool: - """ - Check if empty. - """ - - return TopoDS_Iterator(self.wrapped).More() - - def get_type( - self, - obj_type: Union[ - Type[Vertex], Type[Edge], Type[Face], Type[Shell], Type[Solid], Type[Wire] - ], - ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: - """get_type - - Extract the objects of the given type from a Compound. Note that this - isn't the same as Faces() etc. which will extract Faces from Solids. - - Args: - obj_type (Union[Vertex, Edge, Face, Shell, Solid, Wire]): Object types to extract - - Returns: - list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: Extracted objects - """ - - type_map = { - Vertex: TopAbs_ShapeEnum.TopAbs_VERTEX, - Edge: TopAbs_ShapeEnum.TopAbs_EDGE, - Face: TopAbs_ShapeEnum.TopAbs_FACE, - Shell: TopAbs_ShapeEnum.TopAbs_SHELL, - Solid: TopAbs_ShapeEnum.TopAbs_SOLID, - Wire: TopAbs_ShapeEnum.TopAbs_WIRE, - Compound: TopAbs_ShapeEnum.TopAbs_COMPOUND, - } - results = [] - for comp in self.compounds(): - iterator = TopoDS_Iterator() - iterator.Initialize(comp.wrapped) - while iterator.More(): - child = iterator.Value() - if child.ShapeType() == type_map[obj_type]: - results.append(obj_type(downcast(child))) - iterator.Next() - - return results - - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: - """Strip unnecessary Compound wrappers - - Args: - fully (bool, optional): return base shape without any Compound - wrappers (otherwise one Compound is left). Defaults to True. - - Returns: - Union[Self, Shape]: base shape - """ - if len(self) == 1: - single_element = next(iter(self)) - self.copy_attributes_to(single_element, ["wrapped", "_NodeMixin__children"]) - - # If the single element is another Compound, unwrap it recursively - if isinstance(single_element, Compound): - # Unwrap recursively and copy attributes down - unwrapped = single_element.unwrap(fully) - if not fully: - unwrapped = type(self)(unwrapped.wrapped) - self.copy_attributes_to(unwrapped, ["wrapped", "_NodeMixin__children"]) - return unwrapped - - return single_element if fully else self - - # If there are no elements or more than one element, return self - return self - - -class Part(Compound): - """A Compound containing 3D objects - aka Solids""" - - @property - def _dim(self) -> int: - return 3 - - -class Sketch(Compound): - """A Compound containing 2D objects - aka Faces""" - - @property - def _dim(self) -> int: - return 2 - - -class Curve(Compound): - """A Compound containing 1D objects - aka Edges""" - - @property - def _dim(self) -> int: - return 1 - - __add__ = Mixin1D.__add__ # type: ignore - - def __matmul__(self, position: float) -> Vector: - """Position on curve operator @ - only works if continuous""" - return Wire(self.edges()).position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator % - only works if continuous""" - return Wire(self.edges()).tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^ - only works if continuous""" - return Wire(self.edges()).location_at(position) - - def wires(self) -> ShapeList[Wire]: # type: ignore - """A list of wires created from the edges""" - return Wire.combine(self.edges()) - - -class Edge(Mixin1D, Shape[TopoDS_Edge]): - """An Edge in build123d is a fundamental element in the topological data structure - representing a one-dimensional geometric entity within a 3D model. It encapsulates - information about a curve, which could be a line, arc, or other parametrically - defined shape. Edge is crucial in for precise modeling and manipulation of curves, - facilitating operations like filleting, chamfering, and Boolean operations. It - serves as a building block for constructing complex structures, such as wires - and faces.""" - - # pylint: disable=too-many-public-methods - - order = 1.0 - - def __init__( - self, - obj: Optional[TopoDS_Edge | Axis | None] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge - - Args: - obj (TopoDS_Edge | Axis, optional): OCCT Edge or Axis. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Axis): - obj = BRepBuilderAPI_MakeEdge( - Geom_Line( - obj.position.to_pnt(), - obj.direction.to_dir(), - ) - ).Edge() - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_Curve: - """Return the Geom Curve from this Edge""" - return BRepAdaptor_Curve(self.wrapped) - - def close(self) -> Union[Edge, Wire]: - """Close an Edge""" - if not self.is_closed: - return_value = Wire([self]).close() - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Edge as Wire""" - return Wire([self]) - - @property - def arc_center(self) -> Vector: - """center of an underlying circle or ellipse geometry.""" - - geom_type = self.geom_type - geom_adaptor = self.geom_adaptor() - - if geom_type == GeomType.CIRCLE: - return_value = Vector(geom_adaptor.Circle().Position().Location()) - elif geom_type == GeomType.ELLIPSE: - return_value = Vector(geom_adaptor.Ellipse().Position().Location()) - else: - raise ValueError(f"{geom_type} has no arc center") - - return return_value - - def find_tangent( - self, - angle: float, - ) -> list[float]: - """find_tangent - - Find the parameter values of self where the tangent is equal to angle. - - Args: - angle (float): target angle in degrees - - Returns: - list[float]: u values between 0.0 and 1.0 - """ - angle = angle % 360 # angle needs to always be positive 0..360 - u_values: list[float] - - if self.geom_type == GeomType.LINE: - if self.tangent_angle_at(0) == angle: - u_values = [0] - else: - u_values = [] - else: - # Solve this problem geometrically by creating a tangent curve and finding intercepts - periodic = int(self.is_closed) # if closed don't include end point - tan_pnts: list[VectorLike] = [] - previous_tangent = None - - # When angles go from 360 to 0 a discontinuity is created so add 360 to these - # values and intercept another line - discontinuities = 0.0 - for i in range(101 - periodic): - tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 - if ( - previous_tangent is not None - and abs(previous_tangent - tangent) > 300 - ): - discontinuities = copysign(1.0, previous_tangent - tangent) - tangent += 360 * discontinuities - previous_tangent = tangent - tan_pnts.append((i / 100, tangent)) - - # Generate a first differential curve from the tangent points - tan_curve = Edge.make_spline(tan_pnts) - - # Use the bounding box to find the min and max values - tan_curve_bbox = tan_curve.bounding_box() - min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) - max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) - - # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts: list[Vector] = [] - for i in range(min_range, max_range + 1, 360): - line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) - intercept_pnts.extend(tan_curve.find_intersection_points(line)) - - u_values = [p.X for p in intercept_pnts] - - return u_values - - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - - def find_intersection_points( - self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE - ) -> ShapeList[Vector]: - """find_intersection_points - - Determine the points where a 2D edge crosses itself or another 2D edge - - Args: - other (Axis | Edge): curve to compare with - tolerance (float, optional): the precision of computing the intersection points. - Defaults to TOLERANCE. - - Returns: - ShapeList[Vector]: list of intersection points - """ - # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) - other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, - ) - # To determine the 2D plane to work on - plane = self.common_plane(other) - if plane is None: - raise ValueError("All objects must be on the same plane") - # Convert the plane into a Geom_Surface - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - edge_surface = BRep_Tool.Surface_s(pln_shape) - - self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - self.wrapped, - edge_surface, - TopLoc_Location(), - self.param_at(0), - self.param_at(1), - ) - if other is not None: - edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - other.wrapped, - edge_surface, - TopLoc_Location(), - other.param_at(0), - other.param_at(1), - ) - intersector = Geom2dAPI_InterCurveCurve( - self_2d_curve, edge_2d_curve, tolerance - ) - else: - intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) - - crosses = [ - Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) - for i in range(intersector.NbPoints()) - ] - # Convert back to global coordinates - crosses = [plane.from_local_coords(p) for p in crosses] - - # crosses may contain points beyond the ends of the edge so - # .. filter those out - valid_crosses = [] - for pnt in crosses: - try: - if other is not None: - if ( - self.distance_to(pnt) <= TOLERANCE - and other.distance_to(pnt) <= TOLERANCE - ): - valid_crosses.append(pnt) - else: - if self.distance_to(pnt) <= TOLERANCE: - valid_crosses.append(pnt) - except ValueError: - pass # skip invalid points - - return ShapeList(valid_crosses) - - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Union[Edge, Axis]): other object - - Returns: - Union[Shape, None]: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None - - @classmethod - def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: - """extrude - - Extrude a Vertex into an Edge. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) - - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" - reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge - return reversed_edge - - def trim(self, start: float, end: float) -> Edge: - """trim - - Create a new edge by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Edge: trimmed edge - """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") - - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) - trimmed_curve = Geom_TrimmedCurve( - new_curve, - parm_start, - parm_end, - ) - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def trim_to_length(self, start: float, length: float) -> Edge: - """trim_to_length - - Create a new edge starting at the given normalized parameter of a - given length. - - Args: - start (float): 0.0 <= start < 1.0 - length (float): target length - - Returns: - Edge: trimmed edge - """ - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - - # Create an adaptor for the curve - adaptor_curve = GeomAdaptor_Curve(new_curve) - - # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) - abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - - # Get the parameter at the desired length - parm_end = abscissa_point.Parameter() - - # Trim the curve to the desired length - trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" - - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) - - point = Vector(point) - - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") - - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length - - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value - - @classmethod - def make_bezier( - cls, *cntl_pnts: VectorLike, weights: list[float] | None = None - ) -> Edge: - """make_bezier - - Create a rational (with weights) or non-rational bezier curve. The first and last - control points represent the start and end of the curve respectively. If weights - are provided, there must be one provided for each control point. - - Args: - cntl_pnts (sequence[VectorLike]): points defining the curve - weights (list[float], optional): control point weights list. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Edge: bezier curve - """ - if len(cntl_pnts) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(cntl_pnts) > 25: - raise ValueError("The maximum number of control points is 25") - if weights: - if len(cntl_pnts) != len(weights): - raise ValueError("A weight must be provided for each control point") - - cntl_gp_pnts = [Vector(cntl_pnt).to_pnt() for cntl_pnt in cntl_pnts] - - # The poles are stored in an OCCT Array object - poles = TColgp_Array1OfPnt(1, len(cntl_gp_pnts)) - for i, cntl_gp_pnt in enumerate(cntl_gp_pnts): - poles.SetValue(i + 1, cntl_gp_pnt) - - if weights: - pole_weights = TColStd_Array1OfReal(1, len(weights)) - for i, weight in enumerate(weights): - pole_weights.SetValue(i + 1, float(weight)) - bezier_curve = Geom_BezierCurve(poles, pole_weights) - else: - bezier_curve = Geom_BezierCurve(poles) - - return cls(BRepBuilderAPI_MakeEdge(bezier_curve).Edge()) - - @classmethod - def make_circle( - cls, - radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make circle - - Create a circle centered on the origin of plane - - Args: - radius (float): circle radius - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): start of arc angle. Defaults to 360.0. - end_angle (float, optional): end of arc angle. Defaults to 360. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial circle - """ - circle_gp = gp_Circ(plane.to_gp_ax2(), radius) - - if start_angle == end_angle: # full circle case - return_value = cls(BRepBuilderAPI_MakeEdge(circle_gp).Edge()) - else: # arc case - ccw = angular_direction == AngularDirection.COUNTER_CLOCKWISE - if ccw: - start = radians(start_angle) - end = radians(end_angle) - else: - start = radians(end_angle) - end = radians(start_angle) - circle_geom = GC_MakeArcOfCircle(circle_gp, start, end, ccw).Value() - return_value = cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - return return_value - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): Defaults to 360.0. - end_angle (float, optional): Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial ellipse - """ - ax1 = gp_Ax1(plane.origin.to_pnt(), plane.z_dir.to_dir()) - - if y_radius > x_radius: - # swap x and y radius and rotate by 90° afterwards to create an ellipse - # with x_radius < y_radius - correction_angle = 90.0 * DEG2RAD - ellipse_gp = gp_Elips(plane.to_gp_ax2(), y_radius, x_radius).Rotated( - ax1, correction_angle - ) - else: - correction_angle = 0.0 - ellipse_gp = gp_Elips(plane.to_gp_ax2(), x_radius, y_radius) - - if start_angle == end_angle: # full ellipse case - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_gp).Edge()) - else: # arc case - # take correction_angle into account - ellipse_geom = GC_MakeArcOfEllipse( - ellipse_gp, - start_angle * DEG2RAD - correction_angle, - end_angle * DEG2RAD - correction_angle, - angular_direction == AngularDirection.COUNTER_CLOCKWISE, - ).Value() - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_geom).Edge()) - - return ellipse - - @classmethod - def make_mid_way(cls, first: Edge, second: Edge, middle: float = 0.5) -> Edge: - """make line between edges - - Create a new linear Edge between the two provided Edges. If the Edges are parallel - but in the opposite directions one Edge is flipped such that the mid way Edge isn't - truncated. - - Args: - first (Edge): first reference Edge - second (Edge): second reference Edge - middle (float, optional): factional distance between Edges. Defaults to 0.5. - - Returns: - Edge: linear Edge between two Edges - """ - flip = first.to_axis().is_opposite(second.to_axis()) - pnts = [ - Edge.make_line( - first.position_at(i), second.position_at(1 - i if flip else i) - ).position_at(middle) - for i in [0, 1] - ] - return Edge.make_line(*pnts) - - @classmethod - def make_spline( - cls, - points: list[VectorLike], - tangents: list[VectorLike] | None = None, - periodic: bool = False, - parameters: list[float] | None = None, - scale: bool = True, - tol: float = 1e-6, - ) -> Edge: - """Spline - - Interpolate a spline through the provided points. - - Args: - points (list[VectorLike]): the points defining the spline - tangents (list[VectorLike], optional): start and finish tangent. - Defaults to None. - periodic (bool, optional): creation of periodic curves. Defaults to False. - parameters (list[float], optional): the value of the parameter at each - interpolation point. (The interpolated curve is represented as a vector-valued - function of a scalar parameter.) If periodic == True, then len(parameters) - must be len(interpolation points) + 1, otherwise len(parameters) - must be equal to len(interpolation points). Defaults to None. - scale (bool, optional): whether to scale the specified tangent vectors before - interpolating. Each tangent is scaled, so it's length is equal to the derivative - of the Lagrange interpolated curve. I.e., set this to True, if you want to use - only the direction of the tangent vectors specified by `tangents` , but not - their magnitude. Defaults to True. - tol (float, optional): tolerance of the algorithm (consult OCC documentation). - Used to check that the specified points are not too close to each other, and - that tangent vectors are not too short. (In either case interpolation may fail.). - Defaults to 1e-6. - - Raises: - ValueError: Parameter for each interpolation point - ValueError: Tangent for each interpolation point - ValueError: B-spline interpolation failed - - Returns: - Edge: the spline - """ - # pylint: disable=too-many-locals - point_vectors = [Vector(point) for point in points] - if tangents: - tangent_vectors = tuple(Vector(v) for v in tangents) - pnts = TColgp_HArray1OfPnt(1, len(point_vectors)) - for i, point in enumerate(point_vectors): - pnts.SetValue(i + 1, point.to_pnt()) - - if parameters is None: - spline_builder = GeomAPI_Interpolate(pnts, periodic, tol) - else: - if len(parameters) != (len(point_vectors) + periodic): - raise ValueError( - "There must be one parameter for each interpolation point " - "(plus one if periodic), or none specified. Parameter count: " - f"{len(parameters)}, point count: {len(point_vectors)}" - ) - parameters_array = TColStd_HArray1OfReal(1, len(parameters)) - for p_index, p_value in enumerate(parameters): - parameters_array.SetValue(p_index + 1, p_value) - - spline_builder = GeomAPI_Interpolate(pnts, parameters_array, periodic, tol) - - if tangents: - if len(tangent_vectors) == 2 and len(point_vectors) != 2: - # Specify only initial and final tangent: - spline_builder.Load( - tangent_vectors[0].wrapped, tangent_vectors[1].wrapped, scale - ) - else: - if len(tangent_vectors) != len(point_vectors): - raise ValueError( - f"There must be one tangent for each interpolation point, " - f"or just two end point tangents. Tangent count: " - f"{len(tangent_vectors)}, point count: {len(point_vectors)}" - ) - - # Specify a tangent for each interpolation point: - tangents_array = TColgp_Array1OfVec(1, len(tangent_vectors)) - tangent_enabled_array = TColStd_HArray1OfBoolean( - 1, len(tangent_vectors) - ) - for t_index, t_value in enumerate(tangent_vectors): - tangent_enabled_array.SetValue(t_index + 1, t_value is not None) - tangent_vec = t_value if t_value is not None else Vector() - tangents_array.SetValue(t_index + 1, tangent_vec.wrapped) - - spline_builder.Load(tangents_array, tangent_enabled_array, scale) - - spline_builder.Perform() - if not spline_builder.IsDone(): - raise ValueError("B-spline interpolation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_spline_approx( - cls, - points: list[VectorLike], - tol: float = 1e-3, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 6, - ) -> Edge: - """make_spline_approx - - Approximate a spline through the provided points. - - Args: - points (list[Vector]): - tol (float, optional): tolerance of the algorithm. Defaults to 1e-3. - smoothing (Tuple[float, float, float], optional): optional tuple of 3 weights - use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when smoothing - is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 6. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Edge: spline - """ - pnts = TColgp_HArray1OfPnt(1, len(points)) - for i, point in enumerate(points): - pnts.SetValue(i + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSpline( - pnts, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSpline( - pnts, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_three_point_arc( - cls, point1: VectorLike, point2: VectorLike, point3: VectorLike - ) -> Edge: - """Three Point Arc - - Makes a three point arc through the provided points - - Args: - point1 (VectorLike): start point - point2 (VectorLike): middle point - point3 (VectorLike): end point - - Returns: - Edge: a circular arc through the three points - """ - circle_geom = GC_MakeArcOfCircle( - Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_tangent_arc( - cls, start: VectorLike, tangent: VectorLike, end: VectorLike - ) -> Edge: - """Tangent Arc - - Makes a tangent arc from point start, in the direction of tangent and ends at end. - - Args: - start (VectorLike): start point - tangent (VectorLike): start tangent - end (VectorLike): end point - - Returns: - Edge: circular arc - """ - circle_geom = GC_MakeArcOfCircle( - Vector(start).to_pnt(), Vector(tangent).wrapped, Vector(end).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: - """Create a line between two points - - Args: - point1: VectorLike: that represents the first point - point2: VectorLike: that represents the second point - - Returns: - A linear edge between the two provided points - - """ - return cls( - BRepBuilderAPI_MakeEdge( - Vector(point1).to_pnt(), Vector(point2).to_pnt() - ).Edge() - ) - - @classmethod - def make_helix( - cls, - pitch: float, - height: float, - radius: float, - center: VectorLike = (0, 0, 0), - normal: VectorLike = (0, 0, 1), - angle: float = 0.0, - lefthand: bool = False, - ) -> Wire: - """make_helix - - Make a helix with a given pitch, height and radius. By default a cylindrical surface is - used to create the helix. If the :angle: is set (the apex given in degree) a conical - surface is used instead. - - Args: - pitch (float): distance per revolution along normal - height (float): total height - radius (float): - center (VectorLike, optional): Defaults to (0, 0, 0). - normal (VectorLike, optional): Defaults to (0, 0, 1). - angle (float, optional): conical angle. Defaults to 0.0. - lefthand (bool, optional): Defaults to False. - - Returns: - Wire: helix - """ - # pylint: disable=too-many-locals - # 1. build underlying cylindrical/conical surface - if angle == 0.0: - geom_surf: Geom_Surface = Geom_CylindricalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius - ) - else: - geom_surf = Geom_ConicalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), - angle * DEG2RAD, - radius, - ) - - # 2. construct an segment in the u,v domain - - # Determine the length of the 2d line which will be wrapped around the surface - line_sign = -1 if lefthand else 1 - line_dir = Vector(line_sign * 2 * pi, pitch).normalized() - line_len = (height / line_dir.Y) / cos(radians(angle)) - - # Create an infinite 2d line in the direction of the helix - helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) - # Trim the line to the desired length - helix_curve = Geom2d_TrimmedCurve( - helix_line, 0, line_len, theAdjustPeriodic=True - ) - - # 3. Wrap the line around the surface - edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) - topods_edge = edge_builder.Edge() - - # 4. Convert the edge made with 2d geometry to 3d - BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) - - return cls(topods_edge) - - def distribute_locations( - self: Union[Wire, Edge], - count: int, - start: float = 0.0, - stop: float = 1.0, - positions_only: bool = False, - ) -> list[Location]: - """Distribute Locations - - Distribute locations along edge or wire. - - Args: - self: Union[Wire:Edge]: - count(int): Number of locations to generate - start(float): position along Edge|Wire to start. Defaults to 0.0. - stop(float): position along Edge|Wire to end. Defaults to 1.0. - positions_only(bool): only generate position not orientation. Defaults to False. - - Returns: - list[Location]: locations distributed along Edge|Wire - - Raises: - ValueError: count must be two or greater - - """ - if count < 2: - raise ValueError("count must be two or greater") - - t_values = [start + i * (stop - start) / (count - 1) for i in range(count)] - - locations = self.locations(t_values) - if positions_only: - for loc in locations: - loc.orientation = Vector(0, 0, 0) - - return locations - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Edge]: - """Project Edge - - Project an Edge onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected Edge(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - wire = Wire([self]) - projected_wires = wire.project_to_shape(target_object, direction, center) - projected_edges = [w.edges()[0] for w in projected_wires] - return projected_edges - - def to_axis(self) -> Axis: - """Translate a linear Edge to an Axis""" - if self.geom_type != GeomType.LINE: - raise ValueError( - f"to_axis is only valid for linear Edges not {self.geom_type}" - ) - return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) - - -class Face(Mixin2D, Shape[TopoDS_Face]): - """A Face in build123d represents a 3D bounded surface within the topological data - structure. It encapsulates geometric information, defining a face of a 3D shape. - These faces are integral components of complex structures, such as solids and - shells. Face enables precise modeling and manipulation of surfaces, supporting - operations like trimming, filleting, and Boolean operations.""" - - # pylint: disable=too-many-public-methods - - order = 2.0 - - @overload - def __init__( - self, - obj: TopoDS_Face, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face - - Args: - obj (TopoDS_Shape, optional): OCCT Face. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - outer_wire: Wire, - inner_wires: Iterable[Wire] | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a planar Face from a boundary Wire with optional hole Wires. - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (Iterable[Wire], optional): holes. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args: Any, **kwargs: Any): - outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - outer_wire, inner_wires, label, color, parent = args[:5] + (None,) * ( - 5 - l_a - ) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "outer_wire", - "inner_wires", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - outer_wire = kwargs.get("outer_wire", outer_wire) - inner_wires = kwargs.get("inner_wires", inner_wires) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if outer_wire is not None: - inner_topods_wires = ( - [w.wrapped for w in inner_wires] if inner_wires is not None else [] - ) - obj = _make_topods_face_from_wires(outer_wire.wrapped, inner_topods_wires) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - # Faces can optionally record the plane it was created on for later extrusion - self.created_on: Plane | None = None - - @property - def length(self) -> None | float: - """length of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.X) - result = face_vertices[-1].X - face_vertices[0].X - return result - - @property - def volume(self) -> float: - """volume - the volume of this Face, which is always zero""" - return 0.0 - - @property - def width(self) -> None | float: - """width of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.Y) - result = face_vertices[-1].Y - face_vertices[0].Y - return result - - @property - def geometry(self) -> None | str: - """geometry of planar face""" - result = None - if self.is_planar: - flat_face: Face = Plane(self).to_local_coords(self) - flat_face_edges = flat_face.edges() - if all(e.geom_type == GeomType.LINE for e in flat_face_edges): - flat_face_vertices = flat_face.vertices() - result = "POLYGON" - if len(flat_face_edges) == 4: - edge_pairs: list[list[Edge]] = [] - for vertex in flat_face_vertices: - edge_pairs.append( - [e for e in flat_face_edges if vertex in e.vertices()] - ) - edge_pair_directions = [ - [edge.tangent_at(0) for edge in pair] for pair in edge_pairs - ] - if all( - edge_directions[0].get_angle(edge_directions[1]) == 90 - for edge_directions in edge_pair_directions - ): - result = "RECTANGLE" - if len(flat_face_edges.group_by(SortBy.LENGTH)) == 1: - result = "SQUARE" - - return result - - @property - def center_location(self) -> Location: - """Location at the center of face""" - origin = self.position_at(0.5, 0.5) - return Plane(origin, z_dir=self.normal_at(origin)).location - - @property - def is_planar(self) -> bool: - """Is the face planar even though its geom_type may not be PLANE""" - return self.is_planar_face - - def geom_adaptor(self) -> Geom_Surface: - """Return the Geom Surface for this Face""" - return BRep_Tool.Surface_s(self.wrapped) - - def _uv_bounds(self) -> Tuple[float, float, float, float]: - """Return the u min, u max, v min, v max values""" - return BRepTools.UVBounds_s(self.wrapped) - - @overload - def normal_at(self, surface_point: VectorLike | None = None) -> Vector: - """normal_at point on surface - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where - the normal. Defaults to the center (None). - - Returns: - Vector: surface normal direction - """ - - @overload - def normal_at(self, u: float, v: float) -> Vector: - """normal_at u, v values on Face - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - Defaults to the center (None/None) - - Raises: - ValueError: Either neither or both u v values must be provided - - Returns: - Vector: surface normal direction - """ - - def normal_at(self, *args, **kwargs) -> Vector: - """normal_at - - Computes the normal vector at the desired location on the face. - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where the normal. - Defaults to None. - - Returns: - Vector: surface normal direction - """ - surface_point, u, v = None, -1.0, -1.0 - - if args: - if isinstance(args[0], Sequence): - surface_point = args[0] - elif isinstance(args[0], (int, float)): - u = args[0] - if len(args) == 2 and isinstance(args[1], (int, float)): - v = args[1] - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["surface_point", "u", "v"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - surface_point = kwargs.get("surface_point", surface_point) - u = kwargs.get("u", u) - v = kwargs.get("v", v) - if surface_point is None and u < 0 and v < 0: - u, v = 0.5, 0.5 - elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: - raise ValueError("Both u & v values must be specified") - - # get the geometry - surface = self.geom_adaptor() - - if surface_point is None: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) - else: - # project point on surface - projector = GeomAPI_ProjectPointOnSurf( - Vector(surface_point).to_pnt(), surface - ) - - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - def position_at(self, u: float, v: float) -> Vector: - """position_at - - Computes a point on the Face given u, v coordinates. - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - - Returns: - Vector: point on Face - """ - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u_val0 + u * (u_val1 - u_val0) - v_val = v_val0 + v * (v_val1 - v_val0) - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(gp_pnt) - - def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) - else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) - return Location(pln) - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of Face - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if (center_of == CenterOf.MASS) or ( - center_of == CenterOf.GEOMETRY and self.is_planar - ): - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - center_point = properties.CentreOfMass() - - elif center_of == CenterOf.BOUNDING_BOX: - center_point = self.bounding_box().center() - - elif center_of == CenterOf.GEOMETRY: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = 0.5 * (u_val0 + u_val1) - v_val = 0.5 * (v_val0 + v_val1) - - center_point = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) - - return Vector(center_point) - - def outer_wire(self) -> Wire: - """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) - - def inner_wires(self) -> ShapeList[Wire]: - """Extract the inner or hole wires from this Face""" - outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) - - def wire(self) -> Wire: - """Return the outerwire, generate a warning if inner_wires present""" - if self.inner_wires(): - warnings.warn( - "Found holes, returning outer_wire", - stacklevel=2, - ) - return self.outer_wire() - - @classmethod - def extrude(cls, obj: Edge, direction: VectorLike) -> Face: - """extrude - - Extrude an Edge into a Face. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Face: extruded shape - """ - return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: - """make_rect - - Make a Rectangle centered on center with the given normal - - Args: - width (float, optional): width (local x). - height (float, optional): height (local y). - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Face: The centered rectangle - """ - pln_shape = BRepBuilderAPI_MakeFace( - plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 - ).Face() - - return cls(pln_shape) - - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - - @overload - @classmethod - def make_surface_from_curves( - cls, edge1: Edge, edge2: Edge - ) -> Face: # pragma: no cover - ... - - @overload - @classmethod - def make_surface_from_curves( - cls, wire1: Wire, wire2: Wire - ) -> Face: # pragma: no cover - ... - - @classmethod - def make_surface_from_curves(cls, *args, **kwargs) -> Face: - """make_surface_from_curves - - Create a ruled surface out of two edges or two wires. If wires are used then - these must have the same number of edges. - - Args: - curve1 (Union[Edge,Wire]): side of surface - curve2 (Union[Edge,Wire]): opposite side of surface - - Returns: - Face: potentially non planar surface - """ - curve1, curve2 = None, None - if args: - if len(args) != 2 or type(args[0]) is not type(args[1]): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - curve1, curve2 = args - - curve1 = kwargs.pop("edge1", curve1) - curve2 = kwargs.pop("edge2", curve2) - curve1 = kwargs.pop("wire1", curve1) - curve2 = kwargs.pop("wire2", curve2) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - - if isinstance(curve1, Wire): - return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) - else: - return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) - return return_value - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: - """sew faces - - Group contiguous faces and return them in a list of ShapeList - - Args: - faces (Iterable[Face]): Faces to sew together - - Raises: - RuntimeError: OCCT SewedShape generated unexpected output - - Returns: - list[ShapeList[Face]]: grouped contiguous faces - """ - # Sew the faces - sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) - top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces: list[ShapeList] = [] - - # For each of the top level shapes create a ShapeList of Face - for top_level_shape in top_level_shapes: - if isinstance(top_level_shape, TopoDS_Face): - sewn_faces.append(ShapeList([Face(top_level_shape)])) - elif isinstance(top_level_shape, TopoDS_Shell): - sewn_faces.append(Shell(top_level_shape).faces()) - elif isinstance(top_level_shape, TopoDS_Solid): - sewn_faces.append( - ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") - ) - ) - else: - raise RuntimeError( - f"SewedShape returned a {type(top_level_shape)} which was unexpected" - ) - - return sewn_faces - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Face: - """sweep - - Sweep a 1D profile along a 1D path. Both the profile and path must be composed - of only 1 Edge. - - Args: - profile (Union[Curve,Edge,Wire]): the object to sweep - path (Union[Curve,Edge,Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Raises: - ValueError: Only 1 Edge allowed in profile & path - - Returns: - Face: resulting face, may be non-planar - """ - # Note: BRepOffsetAPI_MakePipe is an option here - # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) - # pipe_sweep.Build() - # return Face(pipe_sweep.Shape()) - - if len(profile.edges()) != 1 or len(path.edges()) != 1: - raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Face(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_surface_from_array_of_points( - cls, - points: list[list[VectorLike]], - tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 3, - ) -> Face: - """make_surface_from_array_of_points - - Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter - space of the face. The second dimension correspond to points on the horizontal - direction in the parameter space of the face. The 2 dimensions are U,V dimensions - of the parameter space of the face. - - Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V - parameters second is U parameters. - tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. - smoothing (Tuple[float, float, float], optional): optional tuple of - 3 weights use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when - smoothing is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 3. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Face: a potentially non-planar face defined by points - """ - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - - for i, point_row in enumerate(points): - for j, point in enumerate(point_row): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Surface() - - return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) - - @classmethod - def make_bezier_surface( - cls, - points: list[list[VectorLike]], - weights: list[list[float]] | None = None, - ) -> Face: - """make_bezier_surface - - Construct a Bézier surface from the provided 2d array of points. - - Args: - points (list[list[VectorLike]]): a 2D list of control points - weights (list[list[float]], optional): control point weights. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Face: a potentially non-planar face - """ - if len(points) < 2 or len(points[0]) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(points) > 25 or len(points[0]) > 25: - raise ValueError("The maximum number of control points is 25") - if weights and ( - len(points) != len(weights) or len(points[0]) != len(weights[0]) - ): - raise ValueError("A weight must be provided for each control point") - - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - for i, row_points in enumerate(points): - for j, point in enumerate(row_points): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if weights: - weights_ = TColStd_HArray2OfReal(1, len(weights), 1, len(weights[0])) - for i, row_weights in enumerate(weights): - for j, weight in enumerate(row_weights): - weights_.SetValue(i + 1, j + 1, float(weight)) - bezier = Geom_BezierSurface(points_, weights_) - else: - bezier = Geom_BezierSurface(points_) - - return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) - - @classmethod - def make_surface( - cls, - exterior: Union[Wire, Iterable[Edge]], - surface_points: Iterable[VectorLike] | None = None, - interior_wires: Iterable[Wire] | None = None, - ) -> Face: - """Create Non-Planar Face - - Create a potentially non-planar face bounded by exterior (wire or edges), - optionally refined by surface_points with optional holes defined by - interior_wires. - - Args: - exterior (Union[Wire, list[Edge]]): Perimeter of face - surface_points (list[VectorLike], optional): Points on the surface that - refine the shape. Defaults to None. - interior_wires (list[Wire], optional): Hole(s) in the face. Defaults to None. - - Raises: - RuntimeError: Internal error building face - RuntimeError: Error building non-planar face with provided surface_points - RuntimeError: Error adding interior hole - RuntimeError: Generated face is invalid - - Returns: - Face: Potentially non-planar face - """ - exterior = list(exterior) if isinstance(exterior, Iterable) else exterior - # pylint: disable=too-many-branches - if surface_points: - surface_point_vectors = [Vector(p) for p in surface_points] - else: - surface_point_vectors = None - - # First, create the non-planar surface - surface = BRepOffsetAPI_MakeFilling( - # order of energy criterion to minimize for computing the deformation of the surface - Degree=3, - # average number of points for discretisation of the edges - NbPtsOnCur=15, - NbIter=2, - Anisotropie=False, - # the maximum distance allowed between the support surface and the constraints - Tol2d=0.00001, - # the maximum distance allowed between the support surface and the constraints - Tol3d=0.0001, - # the maximum angle allowed between the normal of the surface and the constraints - TolAng=0.01, - # the maximum difference of curvature allowed between the surface and the constraint - TolCurv=0.1, - # the highest degree which the polynomial defining the filling surface can have - MaxDeg=8, - # the greatest number of segments which the filling surface can have - MaxSegments=9, - ) - if isinstance(exterior, Wire): - outside_edges = exterior.edges() - elif isinstance(exterior, Iterable) and all( - isinstance(o, Edge) for o in exterior - ): - outside_edges = ShapeList(exterior) - else: - raise ValueError("exterior must be a Wire or list of Edges") - - for edge in outside_edges: - surface.Add(edge.wrapped, GeomAbs_C0) - - try: - surface.Build() - surface_face = Face(surface.Shape()) - except ( - Standard_Failure, - StdFail_NotDone, - Standard_NoSuchObject, - Standard_ConstructionError, - ) as err: - raise RuntimeError( - "Error building non-planar face with provided exterior" - ) from err - if surface_point_vectors: - for point in surface_point_vectors: - surface.Add(gp_Pnt(*point.to_tuple())) - try: - surface.Build() - surface_face = Face(surface.Shape()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error building non-planar face with provided surface_points" - ) from err - - # Next, add wires that define interior holes - note these wires must be entirely interior - if interior_wires: - makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) - for wire in interior_wires: - makeface_object.Add(wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - if not surface_face.is_valid(): - raise RuntimeError("non planar face is invalid") - - return surface_face - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: - """Apply 2D fillet to a face - - Args: - radius: float: - vertices: Iterable[Vertex]: - - Returns: - - """ - - fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - - fillet_builder.Build() - - return self.__class__.cast(fillet_builder.Shape()) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Face: - """Apply 2D chamfer to a face - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Raises: - ValueError: Cannot chamfer at this location - ValueError: One or more vertices are not part of edge - - Returns: - Face: face with a chamfered corner(s) - - """ - reference_edge = edge - - chamfer_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - return self.__class__.cast(chamfer_builder.Shape()).fix() - - def is_coplanar(self, plane: Plane) -> bool: - """Is this planar face coplanar with the provided plane""" - u_val0, _u_val1, v_val0, _v_val1 = self._uv_bounds() - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val0, v_val0, gp_pnt, normal) - - return ( - plane.contains(Vector(gp_pnt)) - and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE - ) - - def project_to_shape( - self, target_object: Shape, direction: VectorLike - ) -> ShapeList[Face | Shell]: - """Project Face to target Object - - Project a Face onto a Shape generating new Face(s) on the surfaces of the object. - - A projection with no taper is illustrated below: - - .. image:: flatProjection.png - :alt: flatProjection - - Note that an array of faces is returned as the projection might result in faces - on the "front" and "back" of the object (or even more if there are intermediate - surfaces in the projection path). faces "behind" the projection are not - returned. - - Args: - target_object (Shape): Object to project onto - direction (VectorLike): projection direction - - Returns: - ShapeList[Face]: Face(s) projected on target object ordered by distance - """ - max_dimension = find_max_dimension([self, target_object]) - extruded_topods_self = _extrude_topods_shape( - self.wrapped, Vector(direction) * max_dimension - ) - - intersected_shapes: ShapeList[Face | Shell] = ShapeList() - if isinstance(target_object, Vertex): - raise TypeError("projection to a vertex is not supported") - if isinstance(target_object, Face): - topods_shape = _topods_bool_op( - (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() - ) - if not topods_shape.IsNull(): - intersected_shapes.append(Face(topods_shape)) - else: - for target_shell in target_object.shells(): - topods_shape = _topods_bool_op( - (extruded_topods_self,), - (target_shell.wrapped,), - BRepAlgoAPI_Common(), - ) - for topods_shell in get_top_level_topods_shapes(topods_shape): - intersected_shapes.append(Shell(topods_shell)) - - intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = ShapeList( - s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ) - return intersected_shapes - - def make_holes(self, interior_wires: list[Wire]) -> Face: - """Make Holes in Face - - Create holes in the Face 'self' from interior_wires which must be entirely interior. - Note that making holes in faces is more efficient than using boolean operations - with solid object. Also note that OCCT core may fail unless the orientation of the wire - is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. - - Example: - - For example, make a series of slots on the curved walls of a cylinder. - - .. image:: slotted_cylinder.png - - Args: - interior_wires: a list of hole outline wires - interior_wires: list[Wire]: - - Returns: - Face: 'self' with holes - - Raises: - RuntimeError: adding interior hole in non-planar face with provided interior_wires - RuntimeError: resulting face is not valid - - """ - # Add wires that define interior holes - note these wires must be entirely interior - makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) - for interior_wire in interior_wires: - makeface_object.Add(interior_wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - # if not surface_face.is_valid(): - # raise RuntimeError("non planar face is invalid") - - return surface_face - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Point inside Face - - Returns whether or not the point is inside a Face within the specified tolerance. - Points on the edge of the Face are considered inside. - - Args: - point(VectorLike): tuple or Vector representing 3D point to be tested - tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool: indicating whether or not point is within Face - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - return solid_classifier.IsOnAFace() - - # surface = BRep_Tool.Surface_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) - # return projector.LowerDistance() <= TOLERANCE - - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs - - Approximate planar face with arcs and straight line segments. - - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - - -class Shell(Mixin2D, Shape[TopoDS_Shell]): - """A Shell is a fundamental component in build123d's topological data structure - representing a connected set of faces forming a closed surface in 3D space. As - part of a geometric model, it defines a watertight enclosure, commonly encountered - in solid modeling. Shells group faces in a coherent manner, playing a crucial role - in representing complex shapes with voids and surfaces. This hierarchical structure - allows for efficient handling of surfaces within a model, supporting various - operations and analyses.""" - - order = 2.5 - - def __init__( - self, - obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell - - Args: - obj (TopoDS_Shape | Face | Iterable[Face], optional): OCCT Shell, Face or Faces. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - obj = list(obj) if isinstance(obj, Iterable) else obj - if isinstance(obj, Iterable) and len(obj_list := list(obj)) == 1: - obj = obj_list[0] - - if isinstance(obj, Face): - builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(obj.wrapped).Surface().Surface() - ) - obj = builder.Shape() - elif isinstance(obj, Iterable): - obj = _sew_topods_faces([f.wrapped for f in obj]) - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - @property - def volume(self) -> float: - """volume - the volume of this Shell if manifold, otherwise zero""" - if self.is_manifold: - solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] - calc_function(solid_shell, properties) - return properties.Mass() - return 0.0 - - def center(self) -> Vector: - """Center of mass of the shell""" - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - return Vector(properties.CentreOfMass()) - - @classmethod - def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: - """extrude - - Extrude a Wire into a Shell. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Shell: - """sweep - - Sweep a 1D profile along a 1D path - - Args: - profile (Union[Curve, Edge, Wire]): the object to sweep - path (Union[Curve, Edge, Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Shell: resulting Shell, may be non-planar - """ - profile = Wire(profile.edges()) - path = Wire(Wire(path.edges()).order_edges()) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Shell(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Shell: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list nor - between wires. Wires may be closed or opened. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Shell: Lofted object - """ - return cls(_make_loft(objs, False, ruled)) - - -class Solid(Mixin3D, Shape[TopoDS_Solid]): - """A Solid in build123d represents a three-dimensional solid geometry - in a topological structure. A solid is a closed and bounded volume, enclosing - a region in 3D space. It comprises faces, edges, and vertices connected in a - well-defined manner. Solid modeling operations, such as Boolean - operations (union, intersection, and difference), are often performed on - Solid objects to create or modify complex geometries.""" - - order = 3.0 - - def __init__( - self, - obj: TopoDS_Solid | Shell | None = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - ): - """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid - - Args: - obj (TopoDS_Shape | Shell, optional): OCCT Solid or Shell. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Shell): - obj = Solid._make_solid(obj) - - super().__init__( - obj=obj, - # label="" if label is None else label, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - - @property - def volume(self) -> float: - """volume - the volume of this Solid""" - # when density == 1, mass == volume - return Shape.compute_mass(self) - - @classmethod - def _make_solid(cls, shell: Shell) -> TopoDS_Solid: - """Create a Solid object from the surface shell""" - return ShapeFix_Solid().SolidFromShell(shell.wrapped) - - @classmethod - def extrude(cls, obj: Face, direction: VectorLike) -> Solid: - """extrude - - Extrude a Face into a Solid. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: - """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) - - @classmethod - def make_box( - cls, length: float, width: float, height: float, plane: Plane = Plane.XY - ) -> Solid: - """make box - - Make a box at the origin of plane extending in positive direction of each axis. - - Args: - length (float): - width (float): - height (float): - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Solid: Box - """ - return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() - ) - - @classmethod - def make_cone( - cls, - base_radius: float, - top_radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cone - - Make a cone with given radii and height - - Args: - base_radius (float): - top_radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cone - """ - return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_cylinder( - cls, - radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cylinder - - Make a cylinder with a given radius and height with the base center on plane origin. - - Args: - radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cylinder - """ - return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_torus( - cls, - major_radius: float, - minor_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 0, - end_angle: float = 360, - major_angle: float = 360, - ) -> Solid: - """make torus - - Make a torus with a given radii and angles - - Args: - major_radius (float): - minor_radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - start_angle (float, optional): start major arc. Defaults to 0. - end_angle (float, optional): end major arc. Defaults to 360. - - Returns: - Solid: Full or partial torus - """ - return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Solid: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Solid: Lofted object - """ - return cls(_make_loft(objs, True, ruled)) - - @classmethod - def make_wedge( - cls, - delta_x: float, - delta_y: float, - delta_z: float, - min_x: float, - min_z: float, - max_x: float, - max_z: float, - plane: Plane = Plane.XY, - ) -> Solid: - """Make a wedge - - Args: - delta_x (float): - delta_y (float): - delta_z (float): - min_x (float): - min_z (float): - max_x (float): - max_z (float): - plane (Plane): base plane. Defaults to Plane.XY. - - Returns: - Solid: wedge - """ - return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() - ) - - @classmethod - def make_sphere( - cls, - radius: float, - plane: Plane = Plane.XY, - angle1: float = -90, - angle2: float = 90, - angle3: float = 360, - ) -> Solid: - """Sphere - - Make a full or partial sphere - with a given radius center on the origin or plane. - - Args: - radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle1 (float, optional): Defaults to -90. - angle2 (float, optional): Defaults to 90. - angle3 (float, optional): Defaults to 360. - - Returns: - Solid: sphere - """ - return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() - ) - - @classmethod - def extrude_taper( - cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True - ) -> Solid: - """Extrude a cross section with a taper - - Extrude a cross section into a prismatic solid in the provided direction. - - Note that two difference algorithms are used. If direction aligns with - the profile normal (which must be positive), the taper is positive and the profile - contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most - accurate results. Otherwise, a loft is created between the profile and the profile - with a 2D offset set at the appropriate direction. - - Args: - section (Face]): cross section - normal (VectorLike): a vector along which to extrude the wires. The length - of the vector controls the length of the extrusion. - taper (float): taper angle in degrees. - flip_inner (bool, optional): outer and inner geometry have opposite tapers to - allow for part extraction when injection molding. - - Returns: - Solid: extruded cross section - """ - # pylint: disable=too-many-locals - direction = Vector(direction) - - if ( - direction.normalized() == profile.normal_at() - and Plane(profile).z_dir.Z > 0 - and taper > 0 - and not profile.inner_wires() - ): - prism_builder = LocOpe_DPrism( - profile.wrapped, - direction.length / cos(radians(taper)), - radians(taper), - ) - new_solid = Solid(prism_builder.Shape()) - else: - # Determine the offset to get the taper - offset_amt = -direction.length * tan(radians(taper)) - - outer = profile.outer_wire() - local_outer: Wire = Plane(profile).to_local_coords(outer) - local_taper_outer = local_outer.offset_2d( - offset_amt, kind=Kind.INTERSECTION - ) - taper_outer = Plane(profile).from_local_coords(local_taper_outer) - taper_outer.move(Location(direction)) - - profile_wires = [profile.outer_wire()] + profile.inner_wires() - - taper_wires = [] - for i, wire in enumerate(profile_wires): - flip = -1 if i > 0 and flip_inner else 1 - local: Wire = Plane(profile).to_local_coords(wire) - local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper_wire: Wire = Plane(profile).from_local_coords(local_taper) - taper_wire.move(Location(direction)) - taper_wires.append(taper_wire) - - solids = [ - Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) - ] - if len(solids) > 1: - complex_solid = solids[0].cut(*solids[1:]) - assert isinstance(complex_solid, Solid) # Can't be a list - new_solid = complex_solid - else: - new_solid = solids[0] - - return new_solid - - @classmethod - def extrude_linear_with_rotation( - cls, - section: Union[Face, Wire], - center: VectorLike, - normal: VectorLike, - angle: float, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Extrude with Rotation - - Creates a 'twisted prism' by extruding, while simultaneously rotating around the - extrusion vector. - - Args: - section (Union[Face,Wire]): cross section - vec_center (VectorLike): the center point about which to rotate - vec_normal (VectorLike): a vector along which to extrude the wires - angle (float): the angle to rotate through while extruding - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to None. - - Returns: - Solid: extruded object - """ - # Though the signature may appear to be similar enough to extrude to merit - # combining them, the construction methods used here are different enough that they - # should be separate. - - # At a high level, the steps followed are: - # (1) accept a set of wires - # (2) create another set of wires like this one, but which are transformed and rotated - # (3) create a ruledSurface between the sets of wires - # (4) create a shell and compute the resulting object - - inner_wires = inner_wires if inner_wires else [] - center = Vector(center) - normal = Vector(normal) - - def extrude_aux_spine( - wire: TopoDS_Wire, spine: TopoDS_Wire, aux_spine: TopoDS_Wire - ) -> TopoDS_Shape: - """Helper function""" - extrude_builder = BRepOffsetAPI_MakePipeShell(spine) - extrude_builder.SetMode(aux_spine, False) # auxiliary spine - extrude_builder.Add(wire) - extrude_builder.Build() - extrude_builder.MakeSolid() - return extrude_builder.Shape() - - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - - # make straight spine - straight_spine_e = Edge.make_line(center, center.add(normal)) - straight_spine_w = Wire.combine([straight_spine_e])[0].wrapped - - # make an auxiliary spine - pitch = 360.0 / angle * normal.length - aux_spine_w = Wire( - [Edge.make_helix(pitch, normal.length, 1, center=center, normal=normal)] - ).wrapped - - # extrude the outer wire - outer_solid = extrude_aux_spine( - outer_wire.wrapped, straight_spine_w, aux_spine_w - ) - - # extrude inner wires - inner_solids = [ - extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w) - for w in inner_wires - ] - - # combine the inner solids into compound - inner_comp = _make_topods_compound_from_shapes(inner_solids) - - # subtract from the outer solid - return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) - - @classmethod - def extrude_until( - cls, - section: Face, - target_object: Union[Compound, Solid], - direction: VectorLike, - until: Until = Until.NEXT, - ) -> Union[Compound, Solid]: - """extrude_until - - Extrude section in provided direction until it encounters either the - NEXT or LAST surface of target_object. Note that the bounding surface - must be larger than the extruded face where they contact. - - Args: - section (Face): Face to extrude - target_object (Union[Compound, Solid]): object to limit extrusion - direction (VectorLike): extrusion direction - until (Until, optional): surface to limit extrusion. Defaults to Until.NEXT. - - Raises: - ValueError: provided face does not intersect target_object - - Returns: - Union[Compound, Solid]: extruded Face - """ - direction = Vector(direction) - if until in [Until.PREVIOUS, Until.FIRST]: - direction *= -1 - until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - - max_dimension = find_max_dimension([section, target_object]) - clipping_direction = ( - direction * max_dimension - if until == Until.NEXT - else -direction * max_dimension - ) - direction_axis = Axis(section.center(), clipping_direction) - # Create a linear extrusion to start - extrusion = Solid.extrude(section, direction * max_dimension) - - # Project section onto the shape to generate faces that will clip the extrusion - # and exclude the planar faces normal to the direction of extrusion and these - # will have no volume when extruded - faces = [] - for face in section.project_to_shape(target_object, direction): - if isinstance(face, Face): - faces.append(face) - else: - faces += face.faces() - - clip_faces = [ - f - for f in faces - if not (f.is_planar and f.normal_at().dot(direction) == 0.0) - ] - if not clip_faces: - raise ValueError("provided face does not intersect target_object") - - # Create the objects that will clip the linear extrusion - clipping_objects = [ - Solid.extrude(f, clipping_direction).fix() for f in clip_faces - ] - clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] - - if until == Until.NEXT: - trimmed_extrusion = extrusion.cut(target_object) - if isinstance(trimmed_extrusion, ShapeList): - closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] - else: - closest_extrusion = trimmed_extrusion - for clipping_object in clipping_objects: - # It's possible for clipping faces to self intersect when they are extruded - # thus they could be non manifold which results failed boolean operations - # - so skip these objects - try: - extrusion_shapes = closest_extrusion.cut(clipping_object) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - else: - base_part = extrusion.intersect(target_object) - if isinstance(base_part, ShapeList): - extrusion_parts = base_part - elif base_part is None: - extrusion_parts = ShapeList() - else: - extrusion_parts = ShapeList([base_part]) - for clipping_object in clipping_objects: - try: - clipped_extrusion = extrusion.intersect(clipping_object) - if clipped_extrusion is not None: - extrusion_parts.append( - clipped_extrusion.solids().sort_by(direction_axis)[0] - ) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - extrusion_shapes = Solid.fuse(*extrusion_parts) - - result = extrusion_shapes.solids().sort_by(direction_axis)[0] - - return result - - @classmethod - def revolve( - cls, - section: Union[Face, Wire], - angle: float, - axis: Axis, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Revolve - - Revolve a cross section about the given Axis by the given angle. - - Args: - section (Union[Face,Wire]): cross section - angle (float): the angle to revolve through - axis (Axis): rotation Axis - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to []. - - Returns: - Solid: the revolved cross section - """ - inner_wires = inner_wires if inner_wires else [] - if isinstance(section, Wire): - section_face = Face(section, inner_wires) - else: - section_face = section - - revol_builder = BRepPrimAPI_MakeRevol( - section_face.wrapped, - axis.wrapped, - angle * DEG2RAD, - True, - ) - - return cls(revol_builder.Shape()) - - @classmethod - def _set_sweep_mode( - cls, - builder: BRepOffsetAPI_MakePipeShell, - path: Union[Wire, Edge], - binormal: Union[Vector, Wire, Edge], - ) -> bool: - rotate = False - - if isinstance(binormal, Vector): - coordinate_system = gp_Ax2() - coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(binormal.to_dir()) - builder.SetMode(coordinate_system) - rotate = True - elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) - - return rotate - - @classmethod - def sweep( - cls, - section: Union[Face, Wire], - path: Union[Wire, Edge], - inner_wires: list[Wire] | None = None, - make_solid: bool = True, - is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, - transition: Transition = Transition.TRANSFORMED, - ) -> Solid: - """Sweep - - Sweep the given cross section into a prismatic solid along the provided path - - Args: - section (Union[Face, Wire]): cross section to sweep - path (Union[Wire, Edge]): sweep path - inner_wires (list[Wire]): holes - only used if section is a wire - make_solid (bool, optional): return Solid or Shell. Defaults to True. - is_frenet (bool, optional): Frenet mode. Defaults to False. - mode (Union[Vector, Wire, Edge, None], optional): additional sweep - mode parameters. Defaults to None. - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Solid: the swept cross section - """ - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - inner_wires = inner_wires if inner_wires else [] - - shapes = [] - for wire in [outer_wire] + inner_wires: - builder = BRepOffsetAPI_MakePipeShell(path.to_wire().wrapped) - - rotate = False - - # handle sweep mode - if mode: - rotate = Solid._set_sweep_mode(builder, path, mode) - else: - builder.SetMode(is_frenet) - - builder.SetTransitionMode(Shape._transModeDict[transition]) - - builder.Add(wire.wrapped, False, rotate) - - builder.Build() - if make_solid: - builder.MakeSolid() - - shapes.append(Mixin3D.cast(builder.Shape())) - - outer_shape, inner_shapes = shapes[0], shapes[1:] - - if inner_shapes: - hollow_outer_shape = outer_shape.cut(*inner_shapes) - assert isinstance(hollow_outer_shape, Solid) - return hollow_outer_shape - - return outer_shape - - @classmethod - def sweep_multi( - cls, - profiles: Iterable[Union[Wire, Face]], - path: Union[Wire, Edge], - make_solid: bool = True, - is_frenet: bool = False, - binormal: Union[Vector, Wire, Edge, None] = None, - ) -> Solid: - """Multi section sweep - - Sweep through a sequence of profiles following a path. - - Args: - profiles (Iterable[Union[Wire, Face]]): list of profiles - path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over - make_solid (bool, optional): Solid or Shell. Defaults to True. - is_frenet (bool, optional): Select frenet mode. Defaults to False. - binormal (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. - Defaults to None. - - Returns: - Solid: swept object - """ - path_as_wire = path.to_wire().wrapped - - builder = BRepOffsetAPI_MakePipeShell(path_as_wire) - - translate = False - rotate = False - - if binormal: - rotate = cls._set_sweep_mode(builder, path, binormal) - else: - builder.SetMode(is_frenet) - - for profile in profiles: - path_as_wire = ( - profile.wrapped - if isinstance(profile, Wire) - else profile.outer_wire().wrapped - ) - builder.Add(path_as_wire, translate, rotate) - - builder.Build() - - if make_solid: - builder.MakeSolid() - - return cls(builder.Shape()) - - @classmethod - def thicken( - cls, - surface: Face | Shell, - depth: float, - normal_override: Optional[VectorLike] = None, - ) -> Solid: - """Thicken Face or Shell - - Create a solid from a potentially non planar face or shell by thickening along - the normals. - - .. image:: thickenFace.png - - Non-planar faces are thickened both towards and away from the center of the sphere. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - normal_override (Vector, optional): Face only. The normal_override vector can be - used to indicate which way is 'up', potentially flipping the face normal - direction such that many faces with different normals all go in the same - direction (direction need only be +/- 90 degrees from the face normal). - Defaults to None. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - # Check to see if the normal needs to be flipped - adjusted_depth = depth - if isinstance(surface, Face) and normal_override is not None: - surface_center = surface.center() - surface_normal = surface.normal_at(surface_center).normalized() - if surface_normal.dot(Vector(normal_override).normalized()) < 0: - adjusted_depth = -depth - - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - surface.wrapped, - Offset=adjusted_depth, - Tol=1.0e-5, - Mode=BRepOffset_Skin, - # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both - # sides of the surface but doesn't seem to work - Intersection=True, - SelfInter=False, - Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection - Thickening=True, - RemoveIntEdges=True, - ) - offset_builder.MakeOffsetShape() - try: - result = Solid(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error applying thicken to given surface") from err - - return result +if TYPE_CHECKING: # pragma: no cover + from .one_d import Edge, Wire # pylint: disable=R0801 class Vertex(Shape[TopoDS_Vertex]): @@ -7928,10 +81,7 @@ class Vertex(Shape[TopoDS_Vertex]): for constructing complex structures like wires, faces, and solids.""" order = 0.0 - - @property - def _dim(self) -> int: - return 0 + # ---- Constructor ---- @overload def __init__(self): # pragma: no cover @@ -7982,6 +132,19 @@ class Vertex(Shape[TopoDS_Vertex]): super().__init__(ocp_vx) self.X, self.Y, self.Z = self.to_tuple() + # ---- Properties ---- + + @property + def _dim(self) -> int: + return 0 + + @property + def volume(self) -> float: + """volume - the volume of this Vertex, which is always zero""" + return 0.0 + + # ---- Class Methods ---- + @classmethod def cast(cls, obj: TopoDS_Shape) -> Self: "Returns the right type of wrapper, given a OCCT object" @@ -7995,27 +158,12 @@ class Vertex(Shape[TopoDS_Vertex]): # NB downcast is needed to handle TopoDS_Shape types return constructor_lut[shape_type](downcast(obj)) - @property - def volume(self) -> float: - """volume - the volume of this Vertex, which is always zero""" - return 0.0 + @classmethod + def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: + """extrude - invalid operation for Vertex""" + raise NotImplementedError("Vertices can't be created by extrusion") - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return ShapeList((self,)) # Vertex is an iterable - - def vertex(self) -> Vertex: - """Return the Vertex""" - return self - - def to_tuple(self) -> tuple[float, float, float]: - """Return vertex as three tuple of floats""" - geom_point = BRep_Tool.Pnt_s(self.wrapped) - return (geom_point.X(), geom_point.Y(), geom_point.Z()) - - def center(self) -> Vector: - """The center of a vertex is itself!""" - return Vector(self) + # ---- Instance Methods ---- def __add__( # type: ignore self, other: Vertex | Vector | tuple[float, float, float] @@ -8052,7 +200,41 @@ class Vertex(Shape[TopoDS_Vertex]): ) return new_vertex - def __sub__(self, other: Union[Vertex, Vector, tuple]) -> Vertex: # type: ignore + def __and__(self, *args, **kwargs): + """intersect operator +""" + raise NotImplementedError("Vertices can't be intersected") + + def __iter__(self): + """Initialize to beginning""" + self.vertex_index = 0 + return self + + def __next__(self): + """return the next value""" + if self.vertex_index == 0: + self.vertex_index += 1 + value = self.X + elif self.vertex_index == 1: + self.vertex_index += 1 + value = self.Y + elif self.vertex_index == 2: + self.vertex_index += 1 + value = self.Z + else: + raise StopIteration + return value + + def __repr__(self) -> str: + """To String + + Convert Vertex to String for display + + Returns: + Vertex as String + """ + return f"Vertex({self.X}, {self.Y}, {self.Z})" + + def __sub__(self, other: Vertex | Vector | tuple) -> Vertex: # type: ignore """Subtract Substract a Vertex with a Vertex, Vector or Tuple from self @@ -8082,39 +264,14 @@ class Vertex(Shape[TopoDS_Vertex]): ) return new_vertex - def __and__(self, *args, **kwargs): - """intersect operator +""" - raise NotImplementedError("Vertices can't be intersected") + def center(self) -> Vector: + """The center of a vertex is itself!""" + return Vector(self) - def __repr__(self) -> str: - """To String - - Convert Vertex to String for display - - Returns: - Vertex as String - """ - return f"Vertex({self.X}, {self.Y}, {self.Z})" - - def __iter__(self): - """Initialize to beginning""" - self.vertex_index = 0 - return self - - def __next__(self): - """return the next value""" - if self.vertex_index == 0: - self.vertex_index += 1 - value = self.X - elif self.vertex_index == 1: - self.vertex_index += 1 - value = self.Y - elif self.vertex_index == 2: - self.vertex_index += 1 - value = self.Z - else: - raise StopIteration - return value + def to_tuple(self) -> tuple[float, float, float]: + """Return vertex as three tuple of floats""" + geom_point = BRep_Tool.Pnt_s(self.wrapped) + return (geom_point.X(), geom_point.Y(), geom_point.Z()) def transform_shape(self, t_matrix: Matrix) -> Vertex: """Apply affine transform without changing type @@ -8131,1242 +288,18 @@ class Vertex(Shape[TopoDS_Vertex]): """ return Vertex(*t_matrix.multiply(Vector(self))) - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: - """extrude - invalid operation for Vertex""" - raise NotImplementedError("Vertices can't be created by extrusion") - - -class Wire(Mixin1D, Shape[TopoDS_Wire]): - """A Wire in build123d is a topological entity representing a connected sequence - of edges forming a continuous curve or path in 3D space. Wires are essential - components in modeling complex objects, defining boundaries for surfaces or - solids. They store information about the connectivity and order of edges, - allowing precise definition of paths within a 3D model.""" - - order = 1.5 - - @overload - def __init__( - self, - obj: TopoDS_Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from an OCCT TopoDS_Wire - - Args: - obj (TopoDS_Wire, optional): OCCT Wire. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edge: Edge, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Edge - - Args: - edge (Edge): Edge to convert to Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Wire - used when the input could be an Edge or Wire. - - Args: - wire (Wire): Wire to convert to another Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Curve, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Curve. - - Args: - curve (Curve): Curve to convert to a Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edges: Iterable[Edge], - sequenced: bool = False, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from Edges - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - curve, edge, edges, wire, sequenced, obj, label, color, parent = (None,) * 9 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Wire): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Edge): - edge, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - # elif isinstance(args[0], Curve): - elif ( - hasattr(args[0], "wrapped") - and isinstance(args[0].wrapped, TopoDS_Compound) - and topods_dim(args[0].wrapped) == 1 - ): # Curve - curve, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Iterable): - edges, sequenced, label, color, parent = args[:5] + (None,) * (5 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "curve", - "wire", - "edge", - "edges", - "sequenced", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - edge = kwargs.get("edge", edge) - edges = kwargs.get("edges", edges) - sequenced = kwargs.get("sequenced", sequenced) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - wire = kwargs.get("wire", wire) - curve = kwargs.get("curve", curve) - - if edge is not None: - edges = [edge] - elif curve is not None: - edges = curve.edges() - if wire is not None: - obj = wire.wrapped - elif edges: - obj = Wire._make_wire(edges, False if sequenced is None else sequenced) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_CompCurve: - """Return the Geom Comp Curve for this Wire""" - return BRepAdaptor_CompCurve(self.wrapped) - - def close(self) -> Wire: - """Close a Wire""" - if not self.is_closed: - edge = Edge.make_line(self.end_point(), self.start_point()) - return_value = Wire.combine((self, edge))[0] - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" + def vertex(self) -> Vertex: + """Return the Vertex""" return self - @classmethod - def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 - ) -> ShapeList[Wire]: - """combine - - Combine a list of wires and edges into a list of Wires. - - Args: - wires (Iterable[Union[Wire, Edge]]): unsorted - tol (float, optional): tolerance. Defaults to 1e-9. - - Returns: - ShapeList[Wire]: Wires - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) - - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires = ShapeList() - for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) - - return wires - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: - """extrude - invalid operation for Wire""" - raise NotImplementedError("Wires can't be created by extrusion") - - def fix_degenerate_edges(self, precision: float) -> Wire: - """fix_degenerate_edges - - Fix a Wire that contains degenerate (very small) edges - - Args: - precision (float): minimum value edge length - - Returns: - Wire: fixed wire - """ - sf_w = ShapeFix_Wireframe(self.wrapped) - sf_w.SetPrecision(precision) - sf_w.SetMaxTolerance(1e-6) - sf_w.FixSmallEdges() - sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) - - def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" - - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. - - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False - - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) - - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length - break - distance += edge.length - - if not found: - raise ValueError(f"{point} not on wire") - - return distance / wire_length - - def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Wire: trimmed wire - """ - - # pylint: disable=too-many-branches - if start >= end: - raise ValueError("start must be less than end") - - edges = self.edges() - - # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) - - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) - - trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue - - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) - - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) - - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) - - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) - - return Wire(trimmed_edges) - - def order_edges(self) -> ShapeList[Edge]: - """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) - - @classmethod - def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: - """_make_wire - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - - Raises: - ValueError: Edges are disconnected and can't be sequenced. - RuntimeError: Wire is empty - - Returns: - Wire: assembled edges - """ - - def closest_to_end(current: Wire, unplaced_edges: list[Edge]) -> Edge: - """Return the Edge closest to the end of last_edge""" - target_point = current.position_at(1) - - sorted_edges = sorted( - unplaced_edges, - key=lambda e: min( - (target_point - e.position_at(0)).length, - (target_point - e.position_at(1)).length, - ), - ) - return sorted_edges[0] - - edges = list(edges) - if sequenced: - placed_edges = [edges.pop(0)] - unplaced_edges = edges - - while unplaced_edges: - next_edge = closest_to_end(Wire(placed_edges), unplaced_edges) - next_edge_index = unplaced_edges.index(next_edge) - placed_edges.append(unplaced_edges.pop(next_edge_index)) - - edges = placed_edges - - wire_builder = BRepBuilderAPI_MakeWire() - combined_edges = TopTools_ListOfShape() - for edge in edges: - combined_edges.Append(edge.wrapped) - wire_builder.Add(combined_edges) - - wire_builder.Build() - if not wire_builder.IsDone(): - if wire_builder.Error() == BRepBuilderAPI_NonManifoldWire: - warnings.warn( - "Wire is non manifold (e.g. branching, self intersecting)", - stacklevel=2, - ) - elif wire_builder.Error() == BRepBuilderAPI_EmptyWire: - raise RuntimeError("Wire is empty") - elif wire_builder.Error() == BRepBuilderAPI_DisconnectedWire: - raise ValueError("Edges are disconnected") - - return wire_builder.Wire() - - @classmethod - def make_circle(cls, radius: float, plane: Plane = Plane.XY) -> Wire: - """make_circle - - Makes a circle centered at the origin of plane - - Args: - radius (float): circle radius - plane (Plane): base plane. Defaults to Plane.XY - - Returns: - Wire: a circle - """ - circle_edge = Edge.make_circle(radius, plane=plane) - return Wire([circle_edge]) - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - closed: bool = True, - ) -> Wire: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): _description_. Defaults to 360.0. - end_angle (float, optional): _description_. Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - closed (bool, optional): close the arc. Defaults to True. - - Returns: - Wire: an ellipse - """ - ellipse_edge = Edge.make_ellipse( - x_radius, y_radius, plane, start_angle, end_angle, angular_direction - ) - - if start_angle != end_angle and closed: - line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) - wire = Wire([ellipse_edge, line]) - else: - wire = Wire([ellipse_edge]) - - return wire - - @classmethod - def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: - """make_polygon - - Create an irregular polygon by defining vertices - - Args: - vertices (Iterable[VectorLike]): - close (bool, optional): close the polygon. Defaults to True. - - Returns: - Wire: an irregular polygon - """ - vectors = [Vector(v) for v in vertices] - if (vectors[0] - vectors[-1]).length > TOLERANCE and close: - vectors.append(vectors[0]) - - wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vectors: - wire_builder.Add(vertex.to_pnt()) - - return cls(wire_builder.Wire()) - - def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires - - Args: - other: Wire: - - Returns: - - """ - - wire_builder = BRepBuilderAPI_MakeWire() - wire_builder.Add(TopoDS.Wire_s(self.wrapped)) - wire_builder.Add(TopoDS.Wire_s(other.wrapped)) - wire_builder.Build() - - return self.__class__.cast(wire_builder.Wire()) - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: - """fillet_2d - - Apply 2D fillet to a wire - - Args: - radius (float): - vertices (Iterable[Vertex]): vertices to fillet - - Returns: - Wire: filleted wire - """ - # Create a face to fillet - unfilleted_face = _make_topods_face_from_wires(self.wrapped) - # Fillet the face - fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - fillet_builder.Build() - filleted_face = downcast(fillet_builder.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(filleted_face)) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Wire: - """chamfer_2d - - Apply 2D chamfer to a wire - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Returns: - Wire: chamfered wire - """ - reference_edge = edge - - # Create a face to chamfer - unchamfered_face = _make_topods_face_from_wires(self.wrapped) - chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - chamfered_face = chamfer_builder.Shape() - # Fix the shape - shape_fix = ShapeFix_Shape(chamfered_face) - shape_fix.Perform() - chamfered_face = downcast(shape_fix.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(chamfered_face)) - - @staticmethod - def order_chamfer_edges( - reference_edge: Optional[Edge], edges: tuple[Edge, Edge] - ) -> tuple[Edge, Edge]: - """Order the edges of a chamfer relative to a reference Edge""" - if reference_edge: - edge1, edge2 = edges - if edge1 == reference_edge: - return edge1, edge2 - if edge2 == reference_edge: - return edge2, edge1 - raise ValueError("reference edge not in edges") - return edges - - @classmethod - def make_rect( - cls, - width: float, - height: float, - plane: Plane = Plane.XY, - ) -> Wire: - """Make Rectangle - - Make a Rectangle centered on center with the given normal - - Args: - width (float): width (local x) - height (float): height (local y) - plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. - - Returns: - Wire: The centered rectangle - """ - corners_local = [ - (width / 2, height / 2), - (width / 2, height / -2), - (width / -2, height / -2), - (width / -2, height / 2), - ] - corners_world = [plane.from_local_coords(c) for c in corners_local] - return Wire.make_polygon(corners_world, close=True) - - @classmethod - def make_convex_hull(cls, edges: Iterable[Edge], tolerance: float = 1e-3) -> Wire: - """make_convex_hull - - Create a wire of minimum length enclosing all of the provided edges. - - Note that edges can't overlap each other. - - Args: - edges (Iterable[Edge]): edges defining the convex hull - tolerance (float): allowable error as a fraction of each edge length. - Defaults to 1e-3. - - Raises: - ValueError: edges overlap - - Returns: - Wire: convex hull perimeter - """ - # pylint: disable=too-many-branches, too-many-locals - # Algorithm: - # 1) create a cloud of points along all edges - # 2) create a convex hull which returns facets/simplices as pairs of point indices - # 3) find facets that are within an edge but not adjacent and store trim and - # new connecting edge data - # 4) find facets between edges and store trim and new connecting edge data - # 5) post process the trim data to remove duplicates and store in pairs - # 6) create connecting edges - # 7) create trim edges from the original edges and the trim data - # 8) return a wire version of all the edges - - # Possible enhancement: The accuracy of the result could be improved and the - # execution time reduced by adaptively placing more points around where the - # connecting edges contact the arc. - - # if any( - # [ - # edge_pair[0].overlaps(edge_pair[1]) - # for edge_pair in combinations(edges, 2) - # ] - # ): - # raise ValueError("edges overlap") - edges = list(edges) - fragments_per_edge = int(2 / tolerance) - points_lookup = {} # lookup from point index to edge/position on edge - points = [] # convex hull point cloud - - # Create points along each edge and the lookup structure - for edge_index, edge in enumerate(edges): - for i in range(fragments_per_edge): - param = i / (fragments_per_edge - 1) - points.append(edge.position_at(param).to_tuple()[:2]) - points_lookup[edge_index * fragments_per_edge + i] = (edge_index, param) - - convex_hull = ConvexHull(points) - - # Filter the fragments - connecting_edge_data = [] - trim_points: dict[int, list[int]] = {} - for simplice in convex_hull.simplices: - edge0 = points_lookup[simplice[0]][0] - edge1 = points_lookup[simplice[1]][0] - # Look for connecting edges between edges - if edge0 != edge1: - if edge0 not in trim_points: - trim_points[edge0] = [simplice[0]] - else: - trim_points[edge0].append(simplice[0]) - if edge1 not in trim_points: - trim_points[edge1] = [simplice[1]] - else: - trim_points[edge1].append(simplice[1]) - connecting_edge_data.append( - ( - (edge0, points_lookup[simplice[0]][1], simplice[0]), - (edge1, points_lookup[simplice[1]][1], simplice[1]), - ) - ) - # Look for connecting edges within an edge - elif abs(simplice[0] - simplice[1]) != 1: - start_pnt = min(simplice.tolist()) - end_pnt = max(simplice.tolist()) - if edge0 not in trim_points: - trim_points[edge0] = [start_pnt, end_pnt] - else: - trim_points[edge0].extend([start_pnt, end_pnt]) - connecting_edge_data.append( - ( - (edge0, points_lookup[start_pnt][1], start_pnt), - (edge0, points_lookup[end_pnt][1], end_pnt), - ) - ) - - trim_data = {} - for edge_index, start_end_pnts in trim_points.items(): - s_points = sorted(start_end_pnts) - f_points = [] - for i in range(0, len(s_points) - 1, 2): - if s_points[i] != s_points[i + 1]: - f_points.append(tuple(s_points[i : i + 2])) - trim_data[edge_index] = f_points - - connecting_edges = [ - Edge.make_line( - edges[line[0][0]] @ line[0][1], edges[line[1][0]] @ line[1][1] - ) - for line in connecting_edge_data - ] - trimmed_edges = [ - edges[edge_index].trim( - points_lookup[trim_pair[0]][1], points_lookup[trim_pair[1]][1] - ) - for edge_index, trim_pairs in trim_data.items() - for trim_pair in trim_pairs - ] - hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) - return hull_wire - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Wire]: - """Project Wire - - Project a Wire onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected wire(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - # pylint: disable=too-many-branches - if self.wrapped is None or target_object.wrapped is None: - raise ValueError("Can't project empty Wires or to empty Shapes") - - if not (direction is None) ^ (center is None): - raise ValueError("One of either direction or center must be provided") - if direction is not None: - direction_vector = Vector(direction).normalized() - center_point = Vector() # for typing, never used - else: - direction_vector = None - center_point = Vector(center) - - # Project the wire on the target object - if direction_vector is not None: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Dir(*direction_vector.to_tuple()), - ) - else: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Pnt(*center_point.to_tuple()), - ) - - # Generate a list of the projected wires with aligned orientation - output_wires = [] - target_orientation = self.wrapped.Orientation() - while projection_object.More(): - projected_wire = projection_object.Current() - if target_orientation == projected_wire.Orientation(): - output_wires.append(Wire(projected_wire)) - else: - output_wires.append(Wire(projected_wire.Reversed())) - projection_object.Next() - - logger.debug("wire generated %d projected wires", len(output_wires)) - - # BRepProj_Projection is inconsistent in the order that it returns projected - # wires, sometimes front first and sometimes back - so sort this out by sorting - # by distance from the original planar wire - if len(output_wires) > 1: - output_wires_distances = [] - planar_wire_center = self.center() - for output_wire in output_wires: - output_wire_center = output_wire.center() - if direction_vector is not None: - output_wire_direction = ( - output_wire_center - planar_wire_center - ).normalized() - if output_wire_direction.dot(direction_vector) >= 0: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - planar_wire_center).length, - ) - ) - else: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - center_point).length, - ) - ) - - output_wires_distances.sort(key=lambda x: x[1]) - logger.debug( - "projected, filtered and sorted wire list is of length %d", - len(output_wires_distances), - ) - output_wires = [w[0] for w in output_wires_distances] - - return output_wires - - -class Joint(ABC): - """Joint - - Abstract Base Joint class - used to join two components together - - Args: - parent (Union[Solid, Compound]): object that joint to bound to - - Attributes: - label (str): user assigned label - parent (Shape): object joint is bound to - connected_to (Joint): joint that is connect to this joint - - """ - - def __init__(self, label: str, parent: Union[Solid, Compound]): - self.label = label - self.parent = parent - self.connected_to: Joint | None = None - - def _connect_to(self, other: Joint, **kwargs): # pragma: no cover - """Connect Joint self by repositioning other""" - - if not isinstance(other, Joint): - raise TypeError(f"other must of type Joint not {type(other)}") - if self.parent.location is None: - raise ValueError("Parent location is not set") - relative_location = self.relative_to(other, **kwargs) - other.parent.locate(self.parent.location * relative_location) - self.connected_to = other - - @abstractmethod - def connect_to(self, other: Joint): - """All derived classes must provide a connect_to method""" - - @abstractmethod - def relative_to(self, other: Joint) -> Location: - """Return relative location to another joint""" - - @property - @abstractmethod - def location(self) -> Location: - """Location of joint""" - - @property - @abstractmethod - def symbol(self) -> Compound: - """A CAD object positioned in global space to illustrate the joint""" - - -def _make_loft( - objs: Iterable[Union[Vertex, Wire]], - filled: bool, - ruled: bool = False, -) -> TopoDS_Shape: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - wires (list[Wire]): section perimeters - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - TopoDS_Shape: Lofted object - """ - objs = list(objs) # To determine its length - if len(objs) < 2: - raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] - vertex_count = len(vertices) - - if vertex_count > 2: - raise ValueError("Only two vertices are allowed") - - if vertex_count == 1 and not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - or isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertex must be either at the beginning or end of the list" - ) - - if vertex_count == 2: - if len(objs) == 2: - raise ValueError( - "You can't have only 2 vertices to loft; try adding some wires" - ) - if not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - and isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertices must be at the beginning and end of the list" - ) - - loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) - - for obj in objs: - if isinstance(obj.wrapped, TopoDS_Vertex): - loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj.wrapped, TopoDS_Wire): - loft_builder.AddWire(obj.wrapped) - - loft_builder.Build() - - return loft_builder.Shape() - - -def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: - """Downcasts a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - f_downcast: Any = Shape.downcast_LUT[shapetype(obj)] - return_value = f_downcast(obj) - - return return_value - - -def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: - """Convert edges to a list of wires. - - Args: - edges: Iterable[Edge]: - tol: float: (Default value = 1e-6) - - Returns: - - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in edges: - if edge.wrapped is not None: - edges_in.Append(edge.wrapped) - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires: ShapeList[Wire] = ShapeList() - for i in range(wires_out.Length()): - # wires.append(Wire(downcast(wires_out.Value(i + 1)))) - wires.append(Wire(TopoDS.Wire_s(wires_out.Value(i + 1)))) - - return wires - - -def fix(obj: TopoDS_Shape) -> TopoDS_Shape: - """Fix a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - shape_fix = ShapeFix_Shape(obj) - shape_fix.Perform() - - return downcast(shape_fix.Shape()) - - -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: - """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj is None or obj.IsNull(): - raise ValueError("Null TopoDS_Shape object") - - return obj.ShapeType() - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) - if len(shapetypes) == 1: - result = shapetypes.pop() - else: - result = shapetype(obj) - else: - result = shapetype(obj.wrapped) - return result - - -def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: - """Tries to determine how wires should be combined into faces. - - Assume: - The wires make up one or more faces, which could have 'holes' - Outer wires are listed ahead of inner wires - there are no wires inside wires inside wires - ( IE, islands -- we can deal with that later on ) - none of the wires are construction wires - - Compute: - one or more sets of wires, with the outer wire listed first, and inner - ones - - Returns, list of lists. - - Args: - wire_list: list[Wire]: - - Returns: - - """ - - # check if we have something to sort at all - if len(wire_list) < 2: - return [ - wire_list, - ] - - # make a Face, NB: this might return a compound of faces - faces = Face(wire_list[0], wire_list[1:]) - - return_value = [] - for face in faces.faces(): - return_value.append( - [ - face.outer_wire(), - ] - + face.inner_wires() - ) - - return return_value - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - -def topo_explore_connected_edges( - edge: Edge, parent: Shape | None = None -) -> ShapeList[Edge]: - """Given an edge extracted from a Shape, return the edges connected to it""" - - parent = parent if parent is not None else edge.topo_parent - if parent is None: - raise ValueError("edge has no valid parent") - given_topods_edge = edge.wrapped - if given_topods_edge is None: - raise ValueError("edge is empty") - connected_edges = set() - - # Find all the TopoDS_Edges for this Shape - topods_edges = [e.wrapped for e in parent.edges() if e.wrapped is not None] - - for topods_edge in topods_edges: - # # Don't match with the given edge - if given_topods_edge.IsSame(topods_edge): - continue - # If the edge shares a vertex with the given edge they are connected - if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: - connected_edges.add(topods_edge) - - return ShapeList(Edge(e) for e in connected_edges) + def vertices(self) -> ShapeList[Vertex]: + """vertices - all the vertices in this Shape""" + return ShapeList((self,)) # Vertex is an iterable def topo_explore_common_vertex( edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge -) -> Optional[Vertex]: +) -> Vertex | None: """Given two edges, find the common vertex""" topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped @@ -9392,282 +325,3 @@ def topo_explore_common_vertex( vert_exp.Next() return None # No common vertex found - - -def unwrap_topods_compound( - compound: TopoDS_Compound, fully: bool = True -) -> TopoDS_Compound | TopoDS_Shape: - """Strip unnecessary Compound wrappers - - Args: - compound (TopoDS_Compound): The TopoDS_Compound to unwrap. - fully (bool, optional): return base shape without any TopoDS_Compound - wrappers (otherwise one TopoDS_Compound is left). Defaults to True. - - Returns: - TopoDS_Compound | TopoDS_Shape: base shape - """ - if compound.NbChildren() == 1: - iterator = TopoDS_Iterator(compound) - single_element = downcast(iterator.Value()) - - # If the single element is another TopoDS_Compound, unwrap it recursively - if isinstance(single_element, TopoDS_Compound): - return unwrap_topods_compound(single_element, fully) - - return single_element if fully else compound - - # If there are no elements or more than one element, return TopoDS_Compound - return compound - - -def get_top_level_topods_shapes( - topods_shape: TopoDS_Shape | None, -) -> list[TopoDS_Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - list[TopoDS_Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if topods_shape is None: - return ShapeList() - - first_level_shapes = [] - stack = [topods_shape] - - while stack: - current_shape = stack.pop() - if isinstance(current_shape, TopoDS_Compound): - iterator = TopoDS_Iterator() - iterator.Initialize(current_shape) - while iterator.More(): - child_shape = downcast(iterator.Value()) - if isinstance(child_shape, TopoDS_Compound): - # Traverse further into the compound - stack.append(child_shape) - else: - # Add non-compound shape - first_level_shapes.append(child_shape) - iterator.Next() - else: - first_level_shapes.append(current_shape) - - return first_level_shapes - - -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - -def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None -) -> TopoDS_Face: - """_make_topods_face_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error - - Returns: - TopoDS_Face: planar face potentially with holes - """ - if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = list(inner_wires) if inner_wires else [] - - # check if wires are coplanar - verification_compound = _make_topods_compound_from_shapes( - [outer_wire] + inner_wires - ) - if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): - raise ValueError("Cannot build face(s): wires not planar") - - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) - - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) - - for inner_wire in inner_wires: - if not BRep_Tool.IsClosed_s(inner_wire): - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) - - face_builder.Build() - - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") - - face = face_builder.Face() - - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() - - return TopoDS.Face_s(sf_f.Result()) - - -def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: - """Sew faces into a shell if possible""" - shell_builder = BRepBuilderAPI_Sewing() - for face in faces: - shell_builder.Add(face) - shell_builder.Perform() - return downcast(shell_builder.SewedShape()) - - -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound - """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) - - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) - - return comp - - -def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: - """Return the maximum dimension of one or more shapes""" - shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) - bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) - return bbox.diagonal - - -def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) - - -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - TopoDS_Shape: extruded shape - """ - direction = Vector(direction) - - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") - - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion - - -class SkipClean: - """Skip clean context for use in operator driven code where clean=False wouldn't work""" - - clean = True - - def __enter__(self): - SkipClean.clean = False - - def __exit__(self, exception_type, exception_value, traceback): - SkipClean.clean = True From 45cc8e78e8e7e2b3483d5a4a395deb611d628ad7 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:58 -0500 Subject: [PATCH 073/518] Step 5 - two_d.py --- src/build123d/{topology.py => topology/two_d.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/build123d/{topology.py => topology/two_d.py} (100%) diff --git a/src/build123d/topology.py b/src/build123d/topology/two_d.py similarity index 100% rename from src/build123d/topology.py rename to src/build123d/topology/two_d.py From a50e4f3d251a5b0235406feaa13b70fb2547ab2b Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:52:58 -0500 Subject: [PATCH 074/518] Step 4b split - one_d.py --- src/build123d/topology/one_d.py | 9191 +++++-------------------------- 1 file changed, 1263 insertions(+), 7928 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 5986e08..e3346a1 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1,17 +1,39 @@ """ build123d topology -name: topology.py +name: one_d.py by: Gumyr -date: Oct 14, 2022 +date: January 07, 2025 desc: - This python module is a CAD library based on OpenCascade containing - the base Shape class and all of its derived classes. + +This module defines the classes and methods for one-dimensional geometric entities in the build123d +CAD library. It focuses on `Edge` and `Wire`, representing essential topological elements like +curves and connected sequences of curves within a 3D model. These entities are pivotal for +constructing complex shapes, boundaries, and paths in CAD applications. + +Key Features: +- **Edge Class**: + - Represents curves such as lines, arcs, splines, and circles. + - Supports advanced operations like trimming, offsetting, splitting, and projecting onto shapes. + - Includes methods for geometric queries like finding tangent angles, normals, and intersection + points. + +- **Wire Class**: + - Represents a connected sequence of edges forming a continuous path. + - Supports operations such as closure, projection, and edge manipulation. + +- **Mixin1D**: + - Shared functionality for both `Edge` and `Wire` classes, enabling splitting, extrusion, and + 1D-specific operations. + +This module integrates deeply with OpenCascade, leveraging its robust geometric and topological +operations. It provides utility functions to create, manipulate, and query 1D geometric entities, +ensuring precise and efficient workflows in 3D modeling tasks. license: - Copyright 2022 Gumyr + Copyright 2025 Gumyr Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,136 +51,39 @@ license: from __future__ import annotations -# pylint has trouble with the OCP imports -# pylint: disable=no-name-in-module, import-error -# pylint: disable=too-many-lines -# other pylint warning to temp remove: -# too-many-arguments, too-many-locals, too-many-public-methods, -# too-many-statements, too-many-instance-attributes, too-many-branches import copy import itertools -import os -import platform -import sys import warnings -from abc import ABC, abstractmethod from itertools import combinations -from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose -from typing import ( - Any, - Callable, - Dict, - Generic, - Iterable, - Iterator, - Optional, - Protocol, - Sequence, - SupportsIndex, - Tuple, - Type, - TypeVar, - Union, - overload, - TYPE_CHECKING, -) -from typing import cast as tcast -from typing_extensions import Self, Literal -from anytree import NodeMixin, PreOrderIter, RenderTree -from IPython.lib.pretty import pretty, PrettyPrinter -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter - -import OCP.GeomAbs as ga # Geometry type enum -import OCP.TopAbs as ta # Topology type enum -from OCP.Aspect import Aspect_TOL_SOLID -from OCP.Bnd import Bnd_Box -from OCP.BOPAlgo import BOPAlgo_GlueEnum +from math import radians, inf, pi, cos, copysign, ceil, floor +from typing import Iterable, Tuple, Union, overload, TYPE_CHECKING +import OCP.TopAbs as ta from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import ( - BRepAdaptor_CompCurve, - BRepAdaptor_Curve, - BRepAdaptor_Surface, -) -from OCP.BRepAlgo import BRepAlgo -from OCP.BRepAlgoAPI import ( - BRepAlgoAPI_BooleanOperation, - BRepAlgoAPI_Common, - BRepAlgoAPI_Cut, - BRepAlgoAPI_Fuse, - BRepAlgoAPI_Section, - BRepAlgoAPI_Splitter, -) +from OCP.BRepAdaptor import BRepAdaptor_CompCurve, BRepAdaptor_Curve +from OCP.BRepAlgoAPI import BRepAlgoAPI_Common, BRepAlgoAPI_Splitter from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_Copy, BRepBuilderAPI_DisconnectedWire, BRepBuilderAPI_EmptyWire, - BRepBuilderAPI_GTransform, BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeShell, - BRepBuilderAPI_MakeSolid, - BRepBuilderAPI_MakeVertex, BRepBuilderAPI_MakeWire, BRepBuilderAPI_NonManifoldWire, - BRepBuilderAPI_RightCorner, - BRepBuilderAPI_RoundCorner, - BRepBuilderAPI_Sewing, - BRepBuilderAPI_Transform, - BRepBuilderAPI_Transformed, ) -from OCP.BRepCheck import BRepCheck_Analyzer -from OCP.BRepClass3d import BRepClass3d_SolidClassifier from OCP.BRepExtrema import BRepExtrema_DistShapeShape -from OCP.BRepFeat import BRepFeat_MakeDPrism, BRepFeat_SplitShape -from OCP.BRepFill import BRepFill -from OCP.BRepFilletAPI import ( - BRepFilletAPI_MakeChamfer, - BRepFilletAPI_MakeFillet, - BRepFilletAPI_MakeFillet2d, -) -from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation -from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter +from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d +from OCP.BRepGProp import BRepGProp from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepMesh import BRepMesh_IncrementalMesh -from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import ( - BRepOffsetAPI_MakeFilling, - BRepOffsetAPI_MakeOffset, - BRepOffsetAPI_MakePipeShell, - BRepOffsetAPI_MakeThickSolid, - BRepOffsetAPI_ThruSections, -) -from OCP.BRepPrimAPI import ( - BRepPrimAPI_MakeBox, - BRepPrimAPI_MakeCone, - BRepPrimAPI_MakeCylinder, - BRepPrimAPI_MakePrism, - BRepPrimAPI_MakeRevol, - BRepPrimAPI_MakeSphere, - BRepPrimAPI_MakeTorus, - BRepPrimAPI_MakeWedge, -) +from OCP.BRepOffset import BRepOffset_MakeOffset +from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset from OCP.BRepProj import BRepProj_Projection from OCP.BRepTools import BRepTools -from OCP.Font import ( - Font_FA_Bold, - Font_FA_Italic, - Font_FA_Regular, - Font_FontMgr, - Font_SystemFont, -) -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse # geometry construction -from OCP.gce import gce_MakeLin +from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse from OCP.GCPnts import GCPnts_AbscissaPoint +from OCP.GProp import GProp_GProps from OCP.Geom import ( Geom_BezierCurve, - Geom_BezierSurface, Geom_ConicalSurface, Geom_CylindricalSurface, Geom_Plane, @@ -166,24 +91,42 @@ from OCP.Geom import ( Geom_TrimmedCurve, Geom_Line, ) -from OCP.GeomAdaptor import GeomAdaptor_Curve from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType from OCP.GeomAPI import ( GeomAPI_IntCS, GeomAPI_Interpolate, GeomAPI_PointsToBSpline, - GeomAPI_PointsToBSplineSurface, - GeomAPI_ProjectPointOnSurf, GeomAPI_ProjectPointOnCurve, ) +from OCP.GeomAbs import GeomAbs_Intersection, GeomAbs_JoinType +from OCP.GeomAdaptor import GeomAdaptor_Curve from OCP.GeomFill import ( GeomFill_CorrectedFrenet, GeomFill_Frenet, GeomFill_TrihedronLaw, ) -from OCP.GeomLib import GeomLib_IsPlanarSurface +from OCP.HLRAlgo import HLRAlgo_Projector +from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape +from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds +from OCP.ShapeFix import ShapeFix_Shape, ShapeFix_Wireframe +from OCP.Standard import Standard_Failure, Standard_NoSuchObject +from OCP.StdFail import StdFail_NotDone +from OCP.TColStd import ( + TColStd_Array1OfReal, + TColStd_HArray1OfBoolean, + TColStd_HArray1OfReal, +) +from OCP.TColgp import TColgp_Array1OfPnt, TColgp_Array1OfVec, TColgp_HArray1OfPnt +from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum +from OCP.TopExp import TopExp, TopExp_Explorer +from OCP.TopLoc import TopLoc_Location +from OCP.TopTools import ( + TopTools_HSequenceOfShape, + TopTools_IndexedDataMapOfShapeListOfShape, + TopTools_ListOfShape, +) +from OCP.TopoDS import TopoDS, TopoDS_Compound, TopoDS_Shape, TopoDS_Edge, TopoDS_Wire from OCP.gp import ( gp_Ax1, gp_Ax2, @@ -197,2742 +140,131 @@ from OCP.gp import ( gp_Trsf, gp_Vec, ) - -# properties used to store mass calculation result -from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher -from OCP.IVtkVTK import IVtkVTK_ShapeData -from OCP.LocOpe import LocOpe_DPrism -from OCP.NCollection import NCollection_Utf8String -from OCP.Precision import Precision -from OCP.Prs3d import Prs3d_IsoAspect -from OCP.Quantity import Quantity_Color -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds, ShapeAnalysis_Curve -from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters -from OCP.ShapeFix import ( - ShapeFix_Face, - ShapeFix_Shape, - ShapeFix_Solid, - ShapeFix_Wireframe, -) -from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain - -# for catching exceptions -from OCP.Standard import ( - Standard_Failure, - Standard_NoSuchObject, - Standard_ConstructionError, -) -from OCP.StdFail import StdFail_NotDone -from OCP.StdPrs import StdPrs_BRepFont -from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder - -# Array of vectors (used for B-spline interpolation): -# Array of points (used for B-spline construction): -from OCP.TColgp import ( - TColgp_Array1OfPnt, - TColgp_Array1OfVec, - TColgp_HArray1OfPnt, - TColgp_HArray2OfPnt, -) -from OCP.TCollection import TCollection_AsciiString - -# Array of floats (used for B-spline interpolation): -# Array of booleans (used for B-spline interpolation): -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, - TColStd_HArray2OfReal, -) -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer # Topology explorer -from OCP.TopLoc import TopLoc_Location -from OCP.TopoDS import ( - TopoDS, - TopoDS_Builder, - TopoDS_Compound, - TopoDS_Face, - TopoDS_Iterator, - TopoDS_Shape, - TopoDS_Shell, - TopoDS_Solid, - TopoDS_Vertex, - TopoDS_Edge, - TopoDS_Wire, -) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) from build123d.build_enums import ( - Align, AngularDirection, CenterOf, - FontStyle, FrameMethod, GeomType, Keep, Kind, PositionMode, Side, - SortBy, - Transition, - Until, ) from build123d.geometry import ( DEG2RAD, TOLERANCE, Axis, - BoundBox, Color, Location, - Matrix, Plane, Vector, VectorLike, logger, ) - - -def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: - """Find the normal at a point on surface""" - surface = BRep_Tool.Surface_s(face) - - # project point on surface - projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - -def topods_dim(topods: TopoDS_Shape) -> int | None: - """Return the dimension of this TopoDS_Shape""" - shape_dim_map = { - (TopoDS_Vertex,): 0, - (TopoDS_Edge, TopoDS_Wire): 1, - (TopoDS_Face, TopoDS_Shell): 2, - (TopoDS_Solid,): 3, - } - - for shape_types, dim in shape_dim_map.items(): - if isinstance(topods, shape_types): - return dim - - if isinstance(topods, TopoDS_Compound): - sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - return None - - -HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode - - -Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] - -TrimmingTool = Union[Plane, "Shell", "Face"] - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - -TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) - - -class Shape(NodeMixin, Generic[TOPODS]): - """Shape - - Base class for all CAD objects such as Edge, Face, Solid, etc. - - Args: - obj (TopoDS_Shape, optional): OCCT object. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - - Attributes: - wrapped (TopoDS_Shape): the OCP object - label (str): user assigned label - color (Color): object color - joints (dict[str:Joint]): dictionary of joints bound to this object (Solid only) - children (Shape): list of assembly children of this object (Compound only) - topo_parent (Shape): assembly parent of this object - - """ - - # pylint: disable=too-many-instance-attributes, too-many-public-methods - - @property - @abstractmethod - def _dim(self) -> int | None: - """Dimension of the object""" - - shape_LUT = { - ta.TopAbs_VERTEX: "Vertex", - ta.TopAbs_EDGE: "Edge", - ta.TopAbs_WIRE: "Wire", - ta.TopAbs_FACE: "Face", - ta.TopAbs_SHELL: "Shell", - ta.TopAbs_SOLID: "Solid", - ta.TopAbs_COMPOUND: "Compound", - ta.TopAbs_COMPSOLID: "CompSolid", - } - - shape_properties_LUT = { - ta.TopAbs_VERTEX: None, - ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, - ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, - ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, - } - - inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} - - downcast_LUT = { - ta.TopAbs_VERTEX: TopoDS.Vertex_s, - ta.TopAbs_EDGE: TopoDS.Edge_s, - ta.TopAbs_WIRE: TopoDS.Wire_s, - ta.TopAbs_FACE: TopoDS.Face_s, - ta.TopAbs_SHELL: TopoDS.Shell_s, - ta.TopAbs_SOLID: TopoDS.Solid_s, - ta.TopAbs_COMPOUND: TopoDS.Compound_s, - ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, - } - - geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { - ga.GeomAbs_Line: GeomType.LINE, - ga.GeomAbs_Circle: GeomType.CIRCLE, - ga.GeomAbs_Ellipse: GeomType.ELLIPSE, - ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, - ga.GeomAbs_Parabola: GeomType.PARABOLA, - ga.GeomAbs_BezierCurve: GeomType.BEZIER, - ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, - ga.GeomAbs_OffsetCurve: GeomType.OFFSET, - ga.GeomAbs_OtherCurve: GeomType.OTHER, - } - geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { - ga.GeomAbs_Plane: GeomType.PLANE, - ga.GeomAbs_Cylinder: GeomType.CYLINDER, - ga.GeomAbs_Cone: GeomType.CONE, - ga.GeomAbs_Sphere: GeomType.SPHERE, - ga.GeomAbs_Torus: GeomType.TORUS, - ga.GeomAbs_BezierSurface: GeomType.BEZIER, - ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, - ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, - ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, - ga.GeomAbs_OffsetSurface: GeomType.OFFSET, - ga.GeomAbs_OtherSurface: GeomType.OTHER, - } - _transModeDict = { - Transition.TRANSFORMED: BRepBuilderAPI_Transformed, - Transition.ROUND: BRepBuilderAPI_RoundCorner, - Transition.RIGHT: BRepBuilderAPI_RightCorner, - } - - def __init__( - self, - obj: TopoDS_Shape | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - self.wrapped: TOPODS | None = ( - tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None - ) - self.for_construction = False - self.label = label - self._color = color - - # parent must be set following children as post install accesses children - self.parent = parent - - # Extracted objects like Vertices and Edges may need to know where they came from - self.topo_parent: Shape | None = None - - @property - def location(self) -> Location | None: - """Get this Shape's Location""" - if self.wrapped is None: - return None - return Location(self.wrapped.Location()) - - @location.setter - def location(self, value: Location): - """Set Shape's Location to value""" - if self.wrapped is not None: - self.wrapped.Location(value.wrapped) - - @property - def position(self) -> Vector | None: - """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: - return None - return self.location.position - - @position.setter - def position(self, value: VectorLike): - """Set the position component of this Shape's Location to value""" - loc = self.location - if loc is not None: - loc.position = Vector(value) - self.location = loc - - @property - def orientation(self) -> Vector | None: - """Get the orientation component of this Shape's Location""" - if self.location is None: - return None - return self.location.orientation - - @orientation.setter - def orientation(self, rotations: VectorLike): - """Set the orientation component of this Shape's Location to rotations""" - loc = self.location - if loc is not None: - loc.orientation = Vector(rotations) - self.location = loc - - @property - def color(self) -> Union[None, Color]: - """Get the shape's color. If it's None, get the color of the nearest - ancestor, assign it to this Shape and return this value.""" - # Find the correct color for this node - if self._color is None: - # Find parent color - current_node: Compound | Shape | None = self - while current_node is not None: - parent_color = current_node._color - if parent_color is not None: - break - current_node = current_node.parent - node_color = parent_color - else: - node_color = self._color - self._color = node_color # Set the node's color for next time - return node_color - - @color.setter - def color(self, value): - """Set the shape's color""" - self._color = value - - @property - def is_planar_face(self) -> bool: - """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): - return False - surface = BRep_Tool.Surface_s(self.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() - - def copy_attributes_to( - self, target: Shape, exceptions: Iterable[str] | None = None - ): - """Copy common object attributes to target - - Note that preset attributes of target will not be overridden. - - Args: - target (Shape): object to gain attributes - exceptions (Iterable[str], optional): attributes not to copy - - Raises: - ValueError: invalid attribute - """ - # Find common attributes and eliminate exceptions - attrs1 = set(self.__dict__.keys()) - attrs2 = set(target.__dict__.keys()) - common_attrs = attrs1 & attrs2 - if exceptions is not None: - common_attrs -= set(exceptions) - - for attr in common_attrs: - # Copy the attribute only if the target's attribute not set - if not getattr(target, attr): - setattr(target, attr, getattr(self, attr)) - # Attach joints to the new part - if attr == "joints": - joint: Joint - for joint in target.joints.values(): - joint.parent = target - - @property - def is_manifold(self) -> bool: - """is_manifold - - Check if each edge in the given Shape has exactly two faces associated with it - (skipping degenerate edges). If so, the shape is manifold. - - Returns: - bool: is the shape manifold or water tight - """ - # Extract one or more (if a Compound) shape from self - if self.wrapped is None: - return False - shape_stack = get_top_level_topods_shapes(self.wrapped) - - while shape_stack: - shape = shape_stack.pop(0) - - # Create an empty indexed data map to store the edges and their corresponding faces. - shape_map = TopTools_IndexedDataMapOfShapeListOfShape() - - # Fill the map with edges and their associated faces in the given shape. Each edge in - # the map is associated with a list of faces that share that edge. - TopExp.MapShapesAndAncestors_s( - # shape.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map - shape, - ta.TopAbs_EDGE, - ta.TopAbs_FACE, - shape_map, - ) - - # Iterate over the edges in the map and checks if each edge is non-degenerate and has - # exactly two faces associated with it. - for i in range(shape_map.Extent()): - # Access each edge in the map sequentially - edge = TopoDS.Edge_s(shape_map.FindKey(i + 1)) - - vertex0 = TopoDS_Vertex() - vertex1 = TopoDS_Vertex() - - # Extract the two vertices of the current edge and stores them in vertex0/1. - TopExp.Vertices_s(edge, vertex0, vertex1) - - # Check if both vertices are null and if they are the same vertex. If so, the - # edge is considered degenerate (i.e., has zero length), and it is skipped. - if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): - continue - - # Check if the current edge has exactly two faces associated with it. If not, - # it means the edge is not shared by exactly two faces, indicating that the - # shape is not manifold. - if shape_map.FindFromIndex(i + 1).Extent() != 2: - return False - - return True - - class _DisplayNode(NodeMixin): - """Used to create anytree structures from TopoDS_Shapes""" - - def __init__( - self, - label: str = "", - address: int | None = None, - position: Union[Vector, Location, None] = None, - parent: Shape._DisplayNode | None = None, - ): - self.label = label - self.address = address - self.position = position - self.parent = parent - self.children: list[Shape] = [] - - _ordered_shapes = [ - TopAbs_ShapeEnum.TopAbs_COMPOUND, - TopAbs_ShapeEnum.TopAbs_SOLID, - TopAbs_ShapeEnum.TopAbs_SHELL, - TopAbs_ShapeEnum.TopAbs_FACE, - TopAbs_ShapeEnum.TopAbs_WIRE, - TopAbs_ShapeEnum.TopAbs_EDGE, - TopAbs_ShapeEnum.TopAbs_VERTEX, - ] - - @staticmethod - def _build_tree( - shape: TopoDS_Shape, - tree: list[_DisplayNode], - parent: _DisplayNode | None = None, - limit: TopAbs_ShapeEnum = TopAbs_ShapeEnum.TopAbs_VERTEX, - show_center: bool = True, - ) -> list[_DisplayNode]: - """Create an anytree copy of the TopoDS_Shape structure""" - - obj_type = Shape.shape_LUT[shape.ShapeType()] - loc: Vector | Location - if show_center: - loc = Shape(shape).bounding_box().center() - else: - loc = Location(shape.Location()) - tree.append(Shape._DisplayNode(obj_type, id(shape), loc, parent)) - iterator = TopoDS_Iterator() - iterator.Initialize(shape) - parent_node = tree[-1] - while iterator.More(): - child = iterator.Value() - if Shape._ordered_shapes.index( - child.ShapeType() - ) <= Shape._ordered_shapes.index(limit): - Shape._build_tree(child, tree, parent_node, limit) - iterator.Next() - return tree - - @staticmethod - def _show_tree(root_node, show_center: bool) -> str: - """Display an assembly or TopoDS_Shape anytree structure""" - - # Calculate the size of the tree labels - size_tuples = [(node.height, len(node.label)) for node in root_node.descendants] - size_tuples.append((root_node.height, len(root_node.label))) - # pylint: disable=cell-var-from-loop - size_tuples_per_level = [ - list(filter(lambda ll: ll[0] == l, size_tuples)) - for l in range(root_node.height + 1) - ] - max_sizes_per_level = [ - max(4, max(l[1] for l in level)) for level in size_tuples_per_level - ] - level_sizes_per_level = [ - l + i * 4 for i, l in enumerate(reversed(max_sizes_per_level)) - ] - tree_label_width = max(level_sizes_per_level) + 1 - - # Build the tree line by line - result = "" - for pre, _fill, node in RenderTree(root_node): - treestr = f"{pre}{node.label}".ljust(tree_label_width) - if hasattr(root_node, "address"): - address = node.address - name = "" - loc = ( - "Center" + str(node.position.to_tuple()) - if show_center - else "Position" + str(node.position.to_tuple()) - ) - else: - address = id(node) - name = node.__class__.__name__.ljust(9) - loc = ( - "Center" + str(node.center().to_tuple()) - if show_center - else "Location" + repr(node.location) - ) - result += f"{treestr}{name}at {address:#x}, {loc}\n" - return result - - def show_topology( - self, - limit_class: Literal[ - "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" - ] = "Vertex", - show_center: bool | None = None, - ) -> str: - """Display internal topology - - Display the internal structure of a Compound 'assembly' or Shape. Example: - - .. code:: - - >>> c1.show_topology() - - c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) - ├── Solid at 0x7f4a4cafafd0, Location(...)) - ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) - │ ├── Solid at 0x7f4a4cafad00, Location(...)) - │ └── Solid at 0x7f4a11a52790, Location(...)) - └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) - ├── Solid at 0x7f4a11a52700, Location(...)) - └── Solid at 0x7f4a11a58550, Location(...)) - - Args: - limit_class: type of displayed leaf node. Defaults to 'Vertex'. - show_center (bool, optional): If None, shows the Location of Compound 'assemblies' - and the bounding box center of Shapes. True or False forces the display. - Defaults to None. - - Returns: - str: tree representation of internal structure - """ - if ( - self.wrapped is not None - and isinstance(self.wrapped, TopoDS_Compound) - and self.children - ): - show_center = False if show_center is None else show_center - result = Shape._show_tree(self, show_center) - else: - tree = Shape._build_tree( - tcast(TopoDS_Shape, self.wrapped), - tree=[], - limit=Shape.inverse_shape_LUT[limit_class], - ) - show_center = True if show_center is None else show_center - result = Shape._show_tree(tree[0], show_center) - return result - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: - """fuse shape to self operator +""" - # Convert `other` to list of base objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self - - # Check that all dimensions are the same - addend_dim = self._dim - if addend_dim is None: - raise ValueError("Dimensions of objects to add to are inconsistent") - - if not all(summand._dim == addend_dim for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - sum_shape = summands[0].fuse(*summands[1:]) - else: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - return sum_shape - - def __sub__( - self, other: Union[None, Shape, Iterable[Shape]] - ) -> Self | ShapeList[Self]: - """cut shape from self operator -""" - - if self.wrapped is None: - raise ValueError("Cannot subtract shape from empty compound") - - # Convert `other` to list of base objects and filter out None values - if other is None: - subtrahends = [] - else: - subtrahends = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to subtract return the original object - if not subtrahends: - return self - - # Check that all dimensions are the same - minuend_dim = self._dim - if minuend_dim is None or any(s._dim is None for s in subtrahends): - raise ValueError("Dimensions of objects to subtract from are inconsistent") - - # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] - if any(d < minuend_dim for d in subtrahend_dims): - raise ValueError( - f"Only shapes with equal or greater dimension can be subtracted: " - f"not {type(self).__name__} ({minuend_dim}D) and " - f"{type(other).__name__} ({min(subtrahend_dims)}D)" - ) - - # Do the actual cut operation - difference = self.cut(*subtrahends) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: - """intersect shape with self operator &""" - others = other if isinstance(other, (list, tuple)) else [other] - - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot intersect shape with empty compound") - new_shape = self.intersect(*others) - - if ( - not isinstance(new_shape, list) - and new_shape is not None - and new_shape.wrapped is not None - and SkipClean.clean - ): - new_shape = new_shape.clean() - - return new_shape - - def __rmul__(self, other): - """right multiply for positioning operator *""" - if not ( - isinstance(other, (list, tuple)) - and all(isinstance(o, (Location, Plane)) for o in other) - ): - raise ValueError( - "shapes can only be multiplied list of locations or planes" - ) - return [loc * self for loc in other] - - # Actually creating the abstract method causes the subclass to pass center_of - # even when not required - possibly this could be improved. - # @abstractmethod - # def center(self, center_of: CenterOf) -> Vector: - # """Compute the center with a specific type of calculation.""" - - def clean(self) -> Self: - """clean - - Remove internal edges - - Returns: - Shape: Original object with extraneous internal edges removed - """ - if self.wrapped is None: - return self - upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) - upgrader.AllowInternalEdges(False) - # upgrader.SetAngularTolerance(1e-5) - try: - upgrader.Build() - self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) - except Exception: - warnings.warn(f"Unable to clean {self}", stacklevel=2) - return self - - def fix(self) -> Self: - """fix - try to fix shape if not valid""" - if self.wrapped is None: - return self - if not self.is_valid(): - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) - - return shape_copy - - return self - - @classmethod - @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: - """Returns the right type of wrapper, given a OCCT object""" - - @property - def geom_type(self) -> GeomType: - """Gets the underlying geometry type. - - Returns: - GeomType: The geometry type of the shape - - """ - if self.wrapped is None: - raise ValueError("Cannot determine geometry type of an empty shape") - - shape: TopAbs_ShapeEnum = shapetype(self.wrapped) - - if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[ - BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() - ] - elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[ - BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() - ] - else: - geom = GeomType.OTHER - - return geom - - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - - def is_same(self, other: Shape) -> bool: - """Returns True if other and this shape are same, i.e. if they share the - same TShape with the same Locations. Orientations may differ. Also see - :py:meth:`is_equal` - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsSame(other.wrapped) - - def is_equal(self, other: Shape) -> bool: - """Returns True if two shapes are equal, i.e. if they share the same - TShape with the same Locations and Orientations. Also see - :py:meth:`is_same`. - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsEqual(other.wrapped) - - def __eq__(self, other) -> bool: - """Check if two shapes are the same. - - This method checks if the current shape is the same as the other shape. - Two shapes are considered the same if they share the same TShape with - the same Locations. Orientations may differ. - - Args: - other (Shape): The shape to compare with. - - Returns: - bool: True if the shapes are the same, False otherwise. - """ - if isinstance(other, Shape): - return self.is_same(other) - return NotImplemented - - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - - def bounding_box( - self, tolerance: float | None = None, optimal: bool = True - ) -> BoundBox: - """Create a bounding box for this Shape. - - Args: - tolerance (float, optional): Defaults to None. - - Returns: - BoundBox: A box sized to contain this Shape - """ - if self.wrapped is None: - return BoundBox(Bnd_Box()) - tolerance = TOLERANCE if tolerance is None else tolerance - return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - - def mirror(self, mirror_plane: Plane | None = None) -> Self: - """ - Applies a mirror transform to this Shape. Does not duplicate objects - about the plane. - - Args: - mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY - Returns: - The mirrored shape - """ - if not mirror_plane: - mirror_plane = Plane.XY - - if self.wrapped is None: - return self - transformation = gp_Trsf() - transformation.SetMirror( - gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) - ) - - return self._apply_transform(transformation) - - @staticmethod - def combined_center( - objects: Iterable[Shape], center_of: CenterOf = CenterOf.MASS - ) -> Vector: - """combined center - - Calculates the center of a multiple objects. - - Args: - objects (Iterable[Shape]): list of objects - center_of (CenterOf, optional): centering option. Defaults to CenterOf.MASS. - - Raises: - ValueError: CenterOf.GEOMETRY not implemented - - Returns: - Vector: center of multiple objects - """ - objects = list(objects) - if center_of == CenterOf.MASS: - total_mass = sum(Shape.compute_mass(o) for o in objects) - weighted_centers = [ - o.center(CenterOf.MASS).multiply(Shape.compute_mass(o)) for o in objects - ] - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - elif center_of == CenterOf.BOUNDING_BOX: - total_mass = len(list(objects)) - - weighted_centers = [] - for obj in objects: - weighted_centers.append(obj.bounding_box().center()) - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - else: - raise ValueError("CenterOf.GEOMETRY not implemented") - - return middle - - @staticmethod - def compute_mass(obj: Shape) -> float: - """Calculates the 'mass' of an object. - - Args: - obj: Compute the mass of this object - obj: Shape: - - Returns: - - """ - if obj.wrapped is None: - return 0.0 - - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] - - if not calc_function: - raise NotImplementedError - - calc_function(obj.wrapped, properties) - return properties.Mass() - - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - - def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return all of the TopoDS sub entities of the given type""" - if self.wrapped is None: - return [] - return _topods_entities(self.wrapped, topo_type) - - # def _entities_from( - # self, child_type: Shapes, parent_type: Shapes - # ) -> Dict[Shape, list[Shape]]: - # """This function is very slow on M1 macs and is currently unused""" - # if self.wrapped is None: - # return {} - - # res = TopTools_IndexedDataMapOfShapeListOfShape() - - # TopExp.MapShapesAndAncestors_s( - # self.wrapped, - # Shape.inverse_shape_LUT[child_type], - # Shape.inverse_shape_LUT[parent_type], - # res, - # ) - - # out: Dict[Shape, list[Shape]] = {} - # for i in range(1, res.Extent() + 1): - # out[self.__class__.cast(res.FindKey(i))] = [ - # self.__class__.cast(el) for el in res.FindFromIndex(i) - # ] - - # return out - - def get_top_level_shapes(self) -> ShapeList[Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - ShapeList[Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if self.wrapped is None: - return ShapeList() - return ShapeList( - self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) - ) - - @staticmethod - def get_shape_list( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> ShapeList: - """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: - return ShapeList() - shape_list = ShapeList( - [shape.__class__.cast(i) for i in shape.entities(entity_type)] - ) - for item in shape_list: - item.topo_parent = shape - return shape_list - - @staticmethod - def get_single_shape( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> Shape: - """Helper to extract a single entity of a specific type from a shape, - with a warning if count != 1.""" - shape_list = Shape.get_shape_list(shape, entity_type) - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=3, - ) - return shape_list[0] if shape_list else None - - # Note all sub-classes have vertices and vertex methods - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() - - def edge(self) -> Edge | None: - """Return the Edge""" - return None - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return ShapeList() - - def wire(self) -> Wire | None: - """Return the Wire""" - return None - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return ShapeList() - - def face(self) -> Face | None: - """Return the Face""" - return None - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return ShapeList() - - def shell(self) -> Shell | None: - """Return the Shell""" - return None - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return ShapeList() - - def solid(self) -> Solid | None: - """Return the Solid""" - return None - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - return ShapeList() - - def compound(self) -> Compound | None: - """Return the Compound""" - return None - - @property - def area(self) -> float: - """area -the surface area of all faces in this Shape""" - if self.wrapped is None: - return 0.0 - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - - return properties.Mass() - - def _apply_transform(self, transformation: gp_Trsf) -> Self: - """Private Apply Transform - - Apply the provided transformation matrix to a copy of Shape - - Args: - transformation (gp_Trsf): transformation matrix - - Returns: - Shape: copy of transformed Shape - """ - if self.wrapped is None: - return self - shape_copy: Shape = copy.deepcopy(self, None) - transformed_shape = BRepBuilderAPI_Transform( - self.wrapped, - transformation, - True, - ).Shape() - shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) - return shape_copy - - def rotate(self, axis: Axis, angle: float) -> Self: - """rotate a copy - - Rotates a shape around an axis. - - Args: - axis (Axis): rotation Axis - angle (float): angle to rotate, in degrees - - Returns: - a copy of the shape, rotated - """ - transformation = gp_Trsf() - transformation.SetRotation(axis.wrapped, angle * DEG2RAD) - - return self._apply_transform(transformation) - - def translate(self, vector: VectorLike) -> Self: - """Translates this shape through a transformation. - - Args: - vector: VectorLike: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetTranslation(Vector(vector).wrapped) - - return self._apply_transform(transformation) - - def scale(self, factor: float) -> Self: - """Scales this shape through a transformation. - - Args: - factor: float: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetScale(gp_Pnt(), factor) - - return self._apply_transform(transformation) - - def __deepcopy__(self, memo) -> Self: - """Return deepcopy of self""" - # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied - # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this - # value already copied which causes deepcopy to skip it. - cls = self.__class__ - result = cls.__new__(cls) - memo[id(self)] = result - if self.wrapped is not None: - memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) - for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) - if key == "joints": - for joint in result.joints.values(): - joint.parent = result - return result - - def __copy__(self) -> Self: - """Return shallow copy or reference of self - - Create an copy of this Shape that shares the underlying TopoDS_TShape. - - Used when there is a need for many objects with the same CAD structure but at - different Locations, etc. - for examples fasteners in a larger assembly. By - sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. - - Changes to the CAD structure of the base object will be reflected in all instances. - """ - reference = copy.deepcopy(self) - if self.wrapped is not None: - assert ( - reference.wrapped is not None - ) # Ensure mypy knows reference.wrapped is not None - reference.wrapped.TShape(self.wrapped.TShape()) - return reference - - def transform_shape(self, t_matrix: Matrix) -> Self: - """Apply affine transform without changing type - - Transforms a copy of this Shape by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: copy of transformed shape with all objects keeping their type - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def transform_geometry(self, t_matrix: Matrix) -> Self: - """Apply affine transform - - WARNING: transform_geometry will sometimes convert lines and circles to - splines, but it also has the ability to handle skew and stretching - transformations. - - If your transformation is only translation and rotation, it is safer to - use :py:meth:`transform_shape`, which doesn't change the underlying type - of the geometry, but cannot handle skew transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: a copy of the object, but with geometry transformed - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def locate(self, loc: Location) -> Self: - """Apply a location in absolute sense to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - self.wrapped.Location(loc.wrapped) - - return self - - def located(self, loc: Location) -> Self: - """located - - Apply a location in absolute sense to a copy of self - - Args: - loc (Location): new absolute location - - Returns: - Shape: copy of Shape at location - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) # type: ignore - return shape_copy - - def move(self, loc: Location) -> Self: - """Apply a location in relative sense (i.e. update current location) to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - - self.wrapped.Move(loc.wrapped) - - return self - - def moved(self, loc: Location) -> Self: - """moved - - Apply a location in relative sense (i.e. update current location) to a copy of self - - Args: - loc (Location): new location relative to current location - - Returns: - Shape: copy of Shape moved to relative location - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) - return shape_copy - - def relocate(self, loc: Location): - """Change the location of self while keeping it geometrically similar - - Args: - loc (Location): new location to set for self - """ - if self.wrapped is None: - raise ValueError("Cannot relocate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot relocate a shape at an empty location") - - if self.location != loc: - old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore - - new_ax = gp_Ax3() - new_ax.Transform(loc.wrapped.Transformation()) - - trsf = gp_Trsf() - trsf.SetDisplacement(new_ax, old_ax) - builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - - self.wrapped = tcast(TOPODS, downcast(builder.Shape())) - self.wrapped.Location(loc.wrapped) - - def distance_to_with_closest_points( - self, other: Union[Shape, VectorLike] - ) -> tuple[float, Vector, Vector]: - """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot calculate distance to or from an empty shape") - - if isinstance(other, Shape): - topods_shape = tcast(TopoDS_Shape, other.wrapped) - else: - vec = Vector(other) - topods_shape = BRepBuilderAPI_MakeVertex( - gp_Pnt(vec.X, vec.Y, vec.Z) - ).Vertex() - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(topods_shape) - dist_calc.Perform() - return ( - dist_calc.Value(), - Vector(dist_calc.PointOnShape1(1)), - Vector(dist_calc.PointOnShape2(1)), - ) - - def distance_to(self, other: Union[Shape, VectorLike]) -> float: - """Minimal distance between two shapes""" - return self.distance_to_with_closest_points(other)[0] - - def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: - """Points on two shapes where the distance between them is minimal""" - return self.distance_to_with_closest_points(other)[1:3] - - def __hash__(self) -> int: - """Return has code""" - return self.hash_code() - - def _bool_op( - self, - args: Iterable[Shape], - tools: Iterable[Shape], - operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self | ShapeList[Self]: - """Generic boolean operation - - Args: - args: Iterable[Shape]: - tools: Iterable[Shape]: - operation: Union[BRepAlgoAPI_BooleanOperation: - BRepAlgoAPI_Splitter]: - - Returns: - - """ - args = list(args) - tools = list(tools) - # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} - highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] - - # The base of the operation - base = args[0] if isinstance(args, (list, tuple)) else args - - arg = TopTools_ListOfShape() - for obj in args: - if obj.wrapped is not None: - arg.Append(obj.wrapped) - - tool = TopTools_ListOfShape() - for obj in tools: - if obj.wrapped is not None: - tool.Append(obj.wrapped) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - topo_result = downcast(operation.Shape()) - - # Clean - if SkipClean.clean: - upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) - upgrader.AllowInternalEdges(False) - try: - upgrader.Build() - topo_result = downcast(upgrader.Shape()) - except Exception: - warnings.warn("Boolean operation unable to clean", stacklevel=2) - - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(topo_result, TopoDS_Compound): - topo_result = unwrap_topods_compound(topo_result, True) - - if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: - results = ShapeList( - highest_order[0].cast(s) - for s in get_top_level_topods_shapes(topo_result) - ) - for result in results: - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return results - - result = highest_order[0].cast(topo_result) - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - - return result - - def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: - """Remove the positional arguments from this Shape. - - Args: - *to_cut: Shape: - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - cut_op = BRepAlgoAPI_Cut() - - return self._bool_op((self,), to_cut, cut_op) - - def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float | None = None - ) -> Self | ShapeList[Self]: - """fuse - - Fuse a sequence of shapes into a single shape. - - Args: - to_fuse (sequence Shape): shapes to fuse - glue (bool, optional): performance improvement for some shapes. Defaults to False. - tol (float, optional): tolerance. Defaults to None. - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - return_value = self._bool_op((self,), to_fuse, fuse_op) - - return return_value - - def intersect( - self, *to_intersect: Union[Shape, Axis, Plane] - ) -> None | Self | ShapeList[Self]: - """Intersection of the arguments and this shape - - Args: - to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to - intersect with - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - def _to_vertex(vec: Vector) -> Vertex: - """Helper method to convert vector to shape""" - return self.__class__.cast( - downcast( - BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() - ) - ) - - def _to_edge(axis: Axis) -> Edge: - """Helper method to convert axis to shape""" - return self.__class__.cast( - BRepBuilderAPI_MakeEdge( - Geom_Line( - axis.position.to_pnt(), - axis.direction.to_dir(), - ) - ).Edge() - ) - - def _to_face(plane: Plane) -> Face: - """Helper method to convert plane to shape""" - return self.__class__.cast(BRepBuilderAPI_MakeFace(plane.wrapped).Face()) - - # Convert any geometry objects into their respective topology objects - objs = [] - for obj in to_intersect: - if isinstance(obj, Vector): - objs.append(_to_vertex(obj)) - elif isinstance(obj, Axis): - objs.append(_to_edge(obj)) - elif isinstance(obj, Plane): - objs.append(_to_face(obj)) - elif isinstance(obj, Location): - if obj.wrapped is None: - raise ValueError("Cannot intersect with an empty location") - objs.append(_to_vertex(tcast(Vector, obj.position))) - else: - objs.append(obj) - - # Find the shape intersections - intersect_op = BRepAlgoAPI_Common() - shape_intersections = self._bool_op((self,), objs, intersect_op) - if isinstance(shape_intersections, ShapeList) and not shape_intersections: - return None - if ( - not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null() - ): - return None - return shape_intersections - - @classmethod - @abstractmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge | Face | Shell | Solid | Compound: extruded shape - """ - - def _ocp_section( - self: Shape, other: Union[Vertex, Edge, Wire, Face] - ) -> tuple[list[Vertex], list[Edge]]: - """_ocp_section - - Create a BRepAlgoAPI_Section object - - The algorithm is to build a Section operation between arguments and tools. - The result of Section operation consists of vertices and edges. The result - of Section operation contains: - - new vertices that are subjects of V/V, E/E, E/F, F/F interferences - - vertices that are subjects of V/E, V/F interferences - - new edges that are subjects of F/F interferences - - edges that are Common Blocks - - - Args: - other (Union[Vertex, Edge, Wire, Face]): shape to section with - - Returns: - tuple[list[Vertex], list[Edge]]: section results - """ - if self.wrapped is None or other.wrapped is None: - return ([], []) - - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation - section.Build() - - # Get the resulting shapes from the intersection - intersection_shape = section.Shape() - - vertices = [] - # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) - while explorer.More(): - vertices.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - edges = [] - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - edges.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - - return (vertices, edges) - - def faces_intersected_by_axis( - self, - axis: Axis, - tol: float = 1e-4, - ) -> ShapeList[Face]: - """Line Intersection - - Computes the intersections between the provided axis and the faces of this Shape - - Args: - axis (Axis): Axis on which the intersection line rests - tol (float, optional): Intersection tolerance. Defaults to 1e-4. - - Returns: - list[Face]: A list of intersected faces sorted by distance from axis.position - """ - if self.wrapped is None: - return ShapeList() - - line = gce_MakeLin(axis.wrapped).Value() - - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, line, tol) - - faces_dist = [] # using a list instead of a dictionary to be able to sort it - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - - distance = axis.position.to_pnt().SquareDistance(inter_pt) - - faces_dist.append( - ( - intersect_maker.Face(), - abs(distance), - ) - ) # will sort all intersected faces by distance whatever the direction is - - intersect_maker.Next() - - faces_dist.sort(key=lambda x: x[1]) - faces = [face[0] for face in faces_dist] - - return ShapeList([self.__class__.cast(face) for face in faces]) - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside or outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] - ) -> tuple[ - Face | Shell | ShapeList[Face] | None, - Face | Shell | ShapeList[Face] | None, - ]: - """split_by_perimeter and keep inside and outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside (default)""" - - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE - ): - """split_by_perimeter - - Divide the faces of this object into those within the perimeter - and those outside the perimeter. - - Note: this method may fail if the perimeter intersects shape edges. - - Args: - perimeter (Union[Edge,Wire]): closed perimeter - keep (Keep, optional): which object(s) to return. Defaults to Keep.INSIDE. - - Raises: - ValueError: perimeter must be closed - ValueError: keep must be one of Keep.INSIDE|OUTSIDE|BOTH - - Returns: - Union[Face | Shell | ShapeList[Face] | None, - Tuple[Face | Shell | ShapeList[Face] | None]: The result of the split operation. - - - **Keep.INSIDE**: Returns the inside part as a `Shell` or `Face`, or `None` - if no inside part is found. - - **Keep.OUTSIDE**: Returns the outside part as a `Shell` or `Face`, or `None` - if no outside part is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Shell`, `Face`, or `None` if no corresponding part is found. - - """ - - def get(los: TopTools_ListOfShape) -> list: - """Return objects from TopTools_ListOfShape as list""" - shapes = [] - for _ in range(los.Size()): - first = los.First() - if not first.IsNull(): - shapes.append(self.__class__.cast(first)) - los.RemoveFirst() - return shapes - - def process_sides(sides): - """Process sides to determine if it should be None, a single element, - a Shell, or a ShapeList.""" - # if not sides: - # return None - if len(sides) == 1: - return sides[0] - # Attempt to create a shell - potential_shell = _sew_topods_faces([s.wrapped for s in sides]) - if isinstance(potential_shell, TopoDS_Shell): - return self.__class__.cast(potential_shell) - return ShapeList(sides) - - if keep not in {Keep.INSIDE, Keep.OUTSIDE, Keep.BOTH}: - raise ValueError( - "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" - ) - - if self.wrapped is None: - raise ValueError("Cannot split an empty shape") - - # Process the perimeter - if not perimeter.is_closed: - raise ValueError("perimeter must be a closed Wire or Edge") - perimeter_edges = TopTools_SequenceOfShape() - for perimeter_edge in perimeter.edges(): - perimeter_edges.Append(perimeter_edge.wrapped) - - # Split the shells by the perimeter edges - lefts: list[Shell] = [] - rights: list[Shell] = [] - for target_shell in self.shells(): - constructor = BRepFeat_SplitShape(target_shell.wrapped) - constructor.Add(perimeter_edges) - constructor.Build() - lefts.extend(get(constructor.Left())) - rights.extend(get(constructor.Right())) - - left = process_sides(lefts) - right = process_sides(rights) - - # Is left or right the inside? - perimeter_length = perimeter.length - left_perimeter_length = sum(e.length for e in left.edges()) if left else 0 - right_perimeter_length = sum(e.length for e in right.edges()) if right else 0 - left_inside = abs(perimeter_length - left_perimeter_length) < abs( - perimeter_length - right_perimeter_length - ) - if keep == Keep.BOTH: - return (left, right) if left_inside else (right, left) - if keep == Keep.INSIDE: - return left if left_inside else right - # keep == Keep.OUTSIDE: - return right if left_inside else left - - def distance(self, other: Shape) -> float: - """Minimal distance between two shapes - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() - - def distances(self, *others: Shape) -> Iterator[float]: - """Minimal distances to between self and other shapes - - Args: - *others: Shape: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - for other_shape in others: - if other_shape.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - dist_calc.LoadS2(other_shape.wrapped) - dist_calc.Perform() - - yield dist_calc.Value() - - def mesh(self, tolerance: float, angular_tolerance: float = 0.1): - """Generate triangulation if none exists. - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot mesh an empty shape") - - if not BRepTools.Triangulation_s(self.wrapped, tolerance): - BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - - def tessellate( - self, tolerance: float, angular_tolerance: float = 0.1 - ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: - """General triangulated approximation""" - if self.wrapped is None: - raise ValueError("Cannot tessellate an empty shape") - - self.mesh(tolerance, angular_tolerance) - - vertices: list[Vector] = [] - triangles: list[Tuple[int, int, int]] = [] - offset = 0 - - for face in self.faces(): - assert face.wrapped is not None - loc = TopLoc_Location() - poly = BRep_Tool.Triangulation_s(face.wrapped, loc) - trsf = loc.Transformation() - reverse = face.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED - - # add vertices - vertices += [ - Vector(v.X(), v.Y(), v.Z()) - for v in ( - poly.Node(i).Transformed(trsf) for i in range(1, poly.NbNodes() + 1) - ) - ] - # add triangles - triangles += [ - ( - ( - t.Value(1) + offset - 1, - t.Value(3) + offset - 1, - t.Value(2) + offset - 1, - ) - if reverse - else ( - t.Value(1) + offset - 1, - t.Value(2) + offset - 1, - t.Value(3) + offset - 1, - ) - ) - for t in poly.Triangles() - ] - - offset += poly.NbNodes() - - return vertices, triangles - - def to_splines( - self, degree: int = 3, tolerance: float = 1e-3, nurbs: bool = False - ) -> Self: - """to_splines - - Approximate shape with b-splines of the specified degree. - - Args: - degree (int, optional): Maximum degree. Defaults to 3. - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - nurbs (bool, optional): Use rational splines. Defaults to False. - - Returns: - Self: Approximated shape - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - params = ShapeCustom_RestrictionParameters() - - result = ShapeCustom.BSplineRestriction_s( - self.wrapped, - tolerance, # 3D tolerance - tolerance, # 2D tolerance - degree, - 1, # dummy value, degree is leading - ga.GeomAbs_C0, - ga.GeomAbs_C0, - True, # set degree to be leading - not nurbs, - params, - ) - - return self.__class__.cast(result) - - def to_vtk_poly_data( - self, - tolerance: float | None = None, - angular_tolerance: float | None = None, - normals: bool = False, - ) -> vtkPolyData: - """Convert shape to vtkPolyData - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - normals: bool: (Default value = True) - - Returns: data object in VTK consisting of points, vertices, lines, and polygons - """ - if self.wrapped is None: - raise ValueError("Cannot convert an empty shape") - - vtk_shape = IVtkOCC_Shape(self.wrapped) - shape_data = IVtkVTK_ShapeData() - shape_mesher = IVtkOCC_ShapeMesher() - - drawer = vtk_shape.Attributes() - drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - - if tolerance: - drawer.SetDeviationCoefficient(tolerance) - - if angular_tolerance: - drawer.SetDeviationAngle(angular_tolerance) - - shape_mesher.Build(vtk_shape, shape_data) - - vtk_poly_data = shape_data.getVtkPolyData() - - # convert to triangles and split edges - t_filter = vtkTriangleFilter() - t_filter.SetInputData(vtk_poly_data) - t_filter.Update() - - return_value = t_filter.GetOutput() - - # compute normals - if normals: - n_filter = vtkPolyDataNormals() - n_filter.SetComputePointNormals(True) - n_filter.SetComputeCellNormals(True) - n_filter.SetFeatureAngle(360) - n_filter.SetInputData(return_value) - n_filter.Update() - - return_value = n_filter.GetOutput() - - return return_value - - def _repr_javascript_(self): - """Jupyter 3D representation support""" - - from build123d.jupyter_tools import display - - return display(self)._repr_javascript_() - - def transformed( - self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) - ) -> Self: - """Transform Shape - - Rotate and translate the Shape by the three angles (in degrees) and offset. - - Args: - rotate (VectorLike, optional): 3-tuple of angles to rotate, in degrees. - Defaults to (0, 0, 0). - offset (VectorLike, optional): 3-tuple to offset. Defaults to (0, 0, 0). - - Returns: - Shape: transformed object - - """ - # Convert to a Vector of radians - rotate_vector = Vector(rotate).multiply(DEG2RAD) - # Compute rotation matrix. - t_rx = gp_Trsf() - t_rx.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), rotate_vector.X) - t_ry = gp_Trsf() - t_ry.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), rotate_vector.Y) - t_rz = gp_Trsf() - t_rz.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), rotate_vector.Z) - t_o = gp_Trsf() - t_o.SetTranslation(Vector(offset).wrapped) - return self._apply_transform(t_o * t_rx * t_ry * t_rz) - - def project_faces( - self, - faces: Union[list[Face], Compound], - path: Union[Wire, Edge], - start: float = 0, - ) -> ShapeList[Face]: - """Projected Faces following the given path on Shape - - Project by positioning each face of to the shape along the path and - projecting onto the surface. - - Note that projection may result in distortion depending on - the shape at a position along the path. - - .. image:: projectText.png - - Args: - faces (Union[list[Face], Compound]): faces to project - path: Path on the Shape to follow - start: Relative location on path to start the faces. Defaults to 0. - - Returns: - The projected faces - - """ - # pylint: disable=too-many-locals - path_length = path.length - # The derived classes of Shape implement center - shape_center = self.center() # pylint: disable=no-member - - if ( - not isinstance(faces, (list, tuple)) - and faces.wrapped is not None - and isinstance(faces.wrapped, TopoDS_Compound) - ): - faces = faces.faces() - - first_face_min_x = faces[0].bounding_box().min.X - - logger.debug("projecting %d face(s)", len(faces)) - - # Position each face normal to the surface along the path and project to the surface - projected_faces = [] - for face in faces: - bbox = face.bounding_box() - face_center_x = (bbox.min.X + bbox.max.X) / 2 - relative_position_on_wire = ( - start + (face_center_x - first_face_min_x) / path_length - ) - path_position = path.position_at(relative_position_on_wire) - path_tangent = path.tangent_at(relative_position_on_wire) - projection_axis = Axis(path_position, shape_center - path_position) - (surface_point, surface_normal) = self.find_intersection_points( - projection_axis - )[0] - surface_normal_plane = Plane( - origin=surface_point, x_dir=path_tangent, z_dir=surface_normal - ) - projection_face: Face = surface_normal_plane.from_local_coords( - face.moved(Location((-face_center_x, 0, 0))) - ) - - logger.debug("projecting face at %0.2f", relative_position_on_wire) - projected_faces.append( - projection_face.project_to_shape(self, surface_normal * -1)[0] - ) - - logger.debug("finished projecting '%d' faces", len(faces)) - - return ShapeList(projected_faces) - - -class Comparable(ABC): - """Abstract base class that requires comparison methods""" - - @abstractmethod - def __lt__(self, other: Any) -> bool: ... - - @abstractmethod - def __eq__(self, other: Any) -> bool: ... - - -# This TypeVar allows IDEs to see the type of objects within the ShapeList -T = TypeVar("T", bound=Union[Shape, Vector]) -K = TypeVar("K", bound=Comparable) - - -class ShapePredicate(Protocol): - """Predicate for shape filters""" - - def __call__(self, shape: Shape) -> bool: ... - - -class ShapeList(list[T]): - """Subclass of list with custom filter and sort methods appropriate to CAD""" - - # pylint: disable=too-many-public-methods - - @property - def first(self) -> T: - """First element in the ShapeList""" - return self[0] - - @property - def last(self) -> T: - """Last element in the ShapeList""" - return self[-1] - - def center(self) -> Vector: - """The average of the center of objects within the ShapeList""" - if not self: - return Vector(0, 0, 0) - - total_center = sum((o.center() for o in self), Vector(0, 0, 0)) - return total_center / len(self) - - def filter_by( - self, - filter_by: Union[ShapePredicate, Axis, Plane, GeomType], - reverse: bool = False, - tolerance: float = 1e-5, - ) -> ShapeList[T]: - """filter by Axis, Plane, or GeomType - - Either: - - filter objects of type planar Face or linear Edge by their normal or tangent - (respectively) and sort the results by the given axis, or - - filter the objects by the provided type. Note that not all types apply to all - objects. - - Args: - filter_by (Union[Axis,Plane,GeomType]): axis, plane, or geom type to filter - and possibly sort by. Filtering by a plane returns faces/edges parallel - to that plane. - reverse (bool, optional): invert the geom type filter. Defaults to False. - tolerance (float, optional): maximum deviation from axis. Defaults to 1e-5. - - Raises: - ValueError: Invalid filter_by type - - Returns: - ShapeList: filtered list of objects - """ - - # could be moved out maybe? - def axis_parallel_predicate(axis: Axis, tolerance: float): - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt = gp_Pnt() - surface_normal = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector( - surface_normal.X(), surface_normal.Y(), surface_normal.Z() - ).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - elif ( - isinstance(shape.wrapped, TopoDS_Edge) - and shape.geom_type == GeomType.LINE - ): - curve = shape.geom_adaptor() - umin = curve.FirstParameter() - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(umin, tmp, res) - start_pos = Vector(tmp) - start_dir = Vector(gp_Dir(res)) - shape_axis = Axis(start_pos, start_dir) - else: - return False - return axis.is_parallel(shape_axis, tolerance) - - return pred - - def plane_parallel_predicate(plane: Plane, tolerance: float): - plane_axis = Axis(plane.origin, plane.z_dir) - plane_xyz = plane.z_dir.wrapped.XYZ() - - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt: gp_Pnt = gp_Pnt() - surface_normal: gp_Vec = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector(surface_normal).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - return plane_axis.is_parallel(shape_axis, tolerance) - if isinstance(shape.wrapped, TopoDS_Wire): - return all(pred(e) for e in shape.edges()) - if isinstance(shape.wrapped, TopoDS_Edge): - for curve in shape.wrapped.TShape().Curves(): - if curve.IsCurve3D(): - return ShapeAnalysis_Curve.IsPlanar_s( - curve.Curve3D(), plane_xyz, tolerance - ) - return False - return False - - return pred - - # convert input to callable predicate - if callable(filter_by): - predicate = filter_by - elif isinstance(filter_by, Axis): - predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, Plane): - predicate = plane_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, GeomType): - - def predicate(obj): - return obj.geom_type == filter_by - - else: - raise ValueError(f"Unsupported filter_by predicate: {filter_by}") - - # final predicate is negated if `reverse=True` - if reverse: - - def actual_predicate(shape): - return not predicate(shape) - - else: - actual_predicate = predicate - - return ShapeList(filter(actual_predicate, self)) - - def filter_by_position( - self, - axis: Axis, - minimum: float, - maximum: float, - inclusive: tuple[bool, bool] = (True, True), - ) -> ShapeList[T]: - """filter by position - - Filter and sort objects by the position of their centers along given axis. - min and max values can be inclusive or exclusive depending on the inclusive tuple. - - Args: - axis (Axis): axis to sort by - minimum (float): minimum value - maximum (float): maximum value - inclusive (tuple[bool, bool], optional): include min,max values. - Defaults to (True, True). - - Returns: - ShapeList: filtered object list - """ - if inclusive == (True, True): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (True, False): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - elif inclusive == (False, True): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (False, False): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - - return ShapeList(objects).sort_by(axis) - - def group_by( - self, - group_by: Union[Callable[[Shape], K], Axis, Edge, Wire, SortBy] = Axis.Z, - reverse=False, - tol_digits=6, - ) -> GroupBy[T, K]: - """group by - - Group objects by provided criteria and then sort the groups according to the criteria. - Note that not all group_by criteria apply to all objects. - - Args: - group_by (SortBy, optional): group and sort criteria. Defaults to Axis.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - tol_digits (int, optional): Tolerance for building the group keys by - round(key, tol_digits) - - Returns: - GroupBy[K, ShapeList]: sorted list of ShapeLists - """ - - if isinstance(group_by, Axis): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty axis") - assert group_by.location is not None - axis_as_location = group_by.location.inverse() - - def key_f(obj): - return round( - (axis_as_location * Location(obj.center())).position.Z, - tol_digits, - ) - - elif hasattr(group_by, "wrapped"): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty object") - - if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) - - elif isinstance(group_by, SortBy): - if group_by == SortBy.LENGTH: - - def key_f(obj): - return round(obj.length, tol_digits) - - elif group_by == SortBy.RADIUS: - - def key_f(obj): - return round(obj.radius, tol_digits) - - elif group_by == SortBy.DISTANCE: - - def key_f(obj): - return round(obj.center().length, tol_digits) - - elif group_by == SortBy.AREA: - - def key_f(obj): - return round(obj.area, tol_digits) - - elif group_by == SortBy.VOLUME: - - def key_f(obj): - return round(obj.volume, tol_digits) - - elif callable(group_by): - key_f = group_by - - else: - raise ValueError(f"Unsupported group_by function: {group_by}") - - return GroupBy(key_f, self, reverse=reverse) - - def sort_by( - self, sort_by: Union[Axis, Edge, Wire, SortBy] = Axis.Z, reverse: bool = False - ) -> ShapeList[T]: - """sort by - - Sort objects by provided criteria. Note that not all sort_by criteria apply to all - objects. - - Args: - sort_by (SortBy, optional): sort criteria. Defaults to SortBy.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: sorted list of objects - """ - - if isinstance(sort_by, Axis): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty axis") - assert sort_by.location is not None - axis_as_location = sort_by.location.inverse() - objects = sorted( - self, - key=lambda o: (axis_as_location * Location(o.center())).position.Z, - reverse=reverse, - ) - elif hasattr(sort_by, "wrapped"): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty object") - - if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) - - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) - - elif isinstance(sort_by, SortBy): - if sort_by == SortBy.LENGTH: - objects = sorted( - self, - key=lambda obj: obj.length, - reverse=reverse, - ) - elif sort_by == SortBy.RADIUS: - with_radius = [obj for obj in self if hasattr(obj, "radius")] - objects = sorted( - with_radius, - key=lambda obj: obj.radius, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.DISTANCE: - objects = sorted( - self, - key=lambda obj: obj.center().length, - reverse=reverse, - ) - elif sort_by == SortBy.AREA: - with_area = [obj for obj in self if hasattr(obj, "area")] - objects = sorted( - with_area, - key=lambda obj: obj.area, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.VOLUME: - with_volume = [obj for obj in self if hasattr(obj, "volume")] - objects = sorted( - with_volume, - key=lambda obj: obj.volume, # type: ignore - reverse=reverse, - ) - - return ShapeList(objects) - - def sort_by_distance( - self, other: Union[Shape, VectorLike], reverse: bool = False - ) -> ShapeList[T]: - """Sort by distance - - Sort by minimal distance between objects and other - - Args: - other (Union[Shape,VectorLike]): reference object - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: Sorted shapes - """ - distances = sorted( - [(obj.distance_to(other), obj) for obj in self], # type: ignore - key=lambda obj: obj[0], - reverse=reverse, - ) - return ShapeList([obj[1] for obj in distances]) - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore - - def vertex(self) -> Vertex: - """Return the Vertex""" - vertices = self.vertices() - vertex_count = len(vertices) - if vertex_count != 1: - warnings.warn( - f"Found {vertex_count} vertices, returning first", stacklevel=2 - ) - return vertices[0] - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore - - def edge(self) -> Edge: - """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) - return edges[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore - - def wire(self) -> Wire: - """Return the Wire""" - wires = self.wires() - wire_count = len(wires) - if wire_count != 1: - warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) - return wires[0] - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) - return solids[0] - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore - - def compound(self) -> Compound: - """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: - warnings.warn( - f"Found {compound_count} compounds, returning first", stacklevel=2 - ) - return compounds[0] - - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Sort operator >""" - return self.sort_by(sort_by) - - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Reverse sort operator <""" - return self.sort_by(sort_by, reverse=True) - - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select largest group operator >>""" - return self.group_by(group_by)[-1] - - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select smallest group operator <<""" - return self.group_by(group_by)[0] - - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: - """Filter by axis or geomtype operator |""" - return self.filter_by(filter_by) - - def __eq__(self, other: object) -> bool: - """ShapeLists equality operator ==""" - return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore - ) - - # Normally implementing __eq__ is enough, but ShapeList subclasses list, - # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList) -> bool: # type: ignore - """ShapeLists inequality operator !=""" - return ( - set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented - ) - - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) - - def __sub__(self, other: ShapeList) -> ShapeList[T]: - """Differences between two ShapeLists operator -""" - return ShapeList(set(self) - set(other)) - - def __and__(self, other: ShapeList) -> ShapeList[T]: - """Intersect two ShapeLists operator &""" - return ShapeList(set(self) & set(other)) - - @overload - def __getitem__(self, key: SupportsIndex) -> T: ... - - @overload - def __getitem__(self, key: slice) -> ShapeList[T]: ... - - def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: - """Return slices of ShapeList as ShapeList""" - if isinstance(key, slice): - return ShapeList(list(self).__getitem__(key)) - return list(self).__getitem__(key) - - -class GroupBy(Generic[T, K]): - """Result of a Shape.groupby operation. Groups can be accessed by index or key""" - - def __init__( - self, - key_f: Callable[[T], K], - shapelist: Iterable[T], - *, - reverse: bool = False, - ): - # can't be a dict because K may not be hashable - self.key_to_group_index: list[tuple[K, int]] = [] - self.groups: list[ShapeList[T]] = [] - self.key_f = key_f - - for i, (key, shapegroup) in enumerate( - itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) - ): - self.groups.append(ShapeList(shapegroup)) - self.key_to_group_index.append((key, i)) - - def __iter__(self): - return iter(self.groups) - - def __len__(self): - return len(self.groups) - - def __getitem__(self, key: int): - return self.groups[key] - - def __str__(self): - return pretty(self) - - def __repr__(self): - return repr(ShapeList(self)) - - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: - """ - Render a formatted representation of the object for pretty-printing in - interactive environments. - - Args: - printer (PrettyPrinter): The pretty printer instance handling the output. - cycle (bool): Indicates if a reference cycle is detected to - prevent infinite recursion. - """ - if cycle: - printer.text("(...)") - else: - with printer.group(1, "[", "]"): - for idx, item in enumerate(self): - if idx: - printer.text(",") - printer.breakable() - printer.pretty(item) - - def group(self, key: K): - """Select group by key""" - for k, i in self.key_to_group_index: - if key == k: - return self.groups[i] - raise KeyError(key) - - def group_for(self, shape: T): - """Select group by shape""" - return self.group(self.key_f(shape)) +from numpy import ndarray +from scipy.optimize import minimize +from scipy.spatial import ConvexHull +from typing_extensions import Self, Literal + +from .shape_core import ( + Shape, + ShapeList, + SkipClean, + TrimmingTool, + downcast, + get_top_level_topods_shapes, + shapetype, + topods_dim, + unwrap_topods_compound, +) +from .utils import ( + _extrude_topods_shape, + isclose_b, + _make_topods_face_from_wires, + _topods_bool_op, +) +from .zero_d import topo_explore_common_vertex, Vertex + + +if TYPE_CHECKING: # pragma: no cover + from .two_d import Face, Shell # pylint: disable=R0801 + from .three_d import Solid # pylint: disable=R0801 + from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 class Mixin1D(Shape): """Methods to add to the Edge and Wire classes""" + # ---- Properties ---- + + @property + def _dim(self) -> int: + """Dimension of Edges and Wires""" + return 1 + + @property + def is_closed(self) -> bool: + """Are the start and end points equal?""" + if self.wrapped is None: + raise ValueError("Can't determine if empty Edge or Wire is closed") + return BRep_Tool.IsClosed_s(self.wrapped) + + @property + def is_forward(self) -> bool: + """Does the Edge/Wire loop forward or reverse""" + if self.wrapped is None: + raise ValueError("Can't determine direction of empty Edge or Wire") + return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD + + @property + def length(self) -> float: + """Edge or Wire length""" + return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) + + @property + def radius(self) -> float: + """Calculate the radius. + + Note that when applied to a Wire, the radius is simply the radius of the first edge. + + Args: + + Returns: + radius + + Raises: + ValueError: if kernel can not reduce the shape to a circular edge + + """ + geom = self.geom_adaptor() + try: + circ = geom.Circle() + except (Standard_NoSuchObject, Standard_Failure) as err: + raise ValueError("Shape could not be reduced to a circle") from err + return circ.Radius() + + @property + def volume(self) -> float: + """volume - the volume of this Edge or Wire, which is always zero""" + return 0.0 + + # ---- Class Methods ---- + + @classmethod + def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: + "Returns the right type of wrapper, given a OCCT object" + + # Extend the lookup table with additional entries + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + } + + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) + @classmethod def extrude( cls, obj: Shape, direction: VectorLike @@ -2940,10 +272,7 @@ class Mixin1D(Shape): """Unused - only here because Mixin1D is a subclass of Shape""" return NotImplemented - @property - def _dim(self) -> int: - """Dimension of Edges and Wires""" - return 1 + # ---- Instance Methods ---- def __add__( self, other: None | Shape | Iterable[Shape] @@ -2996,303 +325,17 @@ class Mixin1D(Shape): return sum_shape - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" + def __matmul__(self, position: float) -> Vector: + """Position on wire operator @""" + return self.position_at(position) - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } + def __mod__(self, position: float) -> Vector: + """Tangent on wire operator %""" + return self.tangent_at(position) - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value + def __xor__(self, position: float) -> Location: + """Location on wire operator ^""" + return self.location_at(position) def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: """Center of object @@ -3315,7 +358,7 @@ class Mixin1D(Shape): middle = self.bounding_box().center() return middle - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: + def common_plane(self, *lines: Edge | Wire | None) -> None | Plane: """common_plane Find the plane containing all the edges/wires (including self). If there @@ -3390,94 +433,26 @@ class Mixin1D(Shape): return result - @property - def length(self) -> float: - """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) + def edge(self) -> Edge: + """Return the Edge""" + return Shape.get_single_shape(self, "Edge") - @property - def radius(self) -> float: - """Calculate the radius. + def edges(self) -> ShapeList[Edge]: + """edges - all the edges in this Shape""" + edge_list = Shape.get_shape_list(self, "Edge") + return edge_list.filter_by( + lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True + ) - Note that when applied to a Wire, the radius is simply the radius of the first edge. + def end_point(self) -> Vector: + """The end point of this edge. - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve + Note that circles may have identical start and end points. """ curve = self.geom_adaptor() + umax = curve.LastParameter() - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] + return Vector(curve.Value(umax)) def location_at( self, @@ -3561,17 +536,36 @@ class Mixin1D(Shape): self.location_at(d, position_mode, frame_method, planar) for d in distances ] - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) + def normal(self) -> Vector: + """Calculate the normal Vector. Only possible for planar curves. - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) + :return: normal vector - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) + Args: + + Returns: + + """ + curve = self.geom_adaptor() + gtype = self.geom_type + + if gtype == GeomType.CIRCLE: + circ = curve.Circle() + return_value = Vector(circ.Axis().Direction()) + elif gtype == GeomType.ELLIPSE: + ell = curve.Ellipse() + return_value = Vector(ell.Axis().Direction()) + else: + find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) + surf = find_surface.Surface() + + if isinstance(surf, Geom_Plane): + pln = surf.Pln() + return_value = Vector(pln.Axis().Direction()) + else: + raise ValueError("Normal not defined") + + return return_value def offset_2d( self, @@ -3579,7 +573,7 @@ class Mixin1D(Shape): kind: Kind = Kind.ARC, side: Side = Side.BOTH, closed: bool = True, - ) -> Union[Edge, Wire]: + ) -> Edge | Wire: """2d Offset Offsets a planar edge/wire @@ -3670,6 +664,24 @@ class Mixin1D(Shape): offset_edges = offset_wire.edges() return offset_edges[0] if len(offset_edges) == 1 else offset_wire + def param_at(self, distance: float) -> float: + """Parameter along a curve + + Compute parameter value at the specified normalized distance. + + Args: + d (float): normalized distance (0.0 >= d >= 1.0) + + Returns: + float: parameter value + """ + curve = self.geom_adaptor() + + length = GCPnts_AbscissaPoint.Length_s(curve) + return GCPnts_AbscissaPoint( + curve, length * distance, curve.FirstParameter() + ).Parameter() + def perpendicular_line( self, length: float, u_value: float, plane: Plane = Plane.XY ) -> Edge: @@ -3695,6 +707,49 @@ class Mixin1D(Shape): ) return line + def position_at( + self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER + ) -> Vector: + """Position At + + Generate a position along the underlying curve. + + Args: + distance (float): distance or parameter value + position_mode (PositionMode, optional): position calculation mode. Defaults to + PositionMode.PARAMETER. + + Returns: + Vector: position on the underlying curve + """ + curve = self.geom_adaptor() + + if position_mode == PositionMode.PARAMETER: + param = self.param_at(distance) + else: + param = self.param_at(distance / self.length) + + return Vector(curve.Value(param)) + + def positions( + self, + distances: Iterable[float], + position_mode: PositionMode = PositionMode.PARAMETER, + ) -> list[Vector]: + """Positions along curve + + Generate positions along the underlying curve + + Args: + distances (Iterable[float]): distance or parameter values + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. + + Returns: + list[Vector]: positions along curve + """ + return [self.position_at(d, position_mode) for d in distances] + def project( self, face: Face, direction: VectorLike, closest: bool = True ) -> Edge | Wire | ShapeList[Edge | Wire]: @@ -3830,1237 +885,218 @@ class Mixin1D(Shape): return (visible_edges, hidden_edges) + @overload + def split( + self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] + ) -> Self | list[Self] | None: + """split and keep inside or outside""" -class Mixin2D(Shape): - """Additional methods to add to Face and Shell class""" + @overload + def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ + Self | list[Self] | None, + Self | list[Self] | None, + ]: + """split and keep inside and outside""" - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented + @overload + def split(self, tool: TrimmingTool) -> Self | list[Self] | None: + """split and keep inside (default)""" - @property - def _dim(self) -> int: - """Dimension of Faces and Shells""" - return 2 + def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): + """split - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") - - def __neg__(self) -> Self: - """Reverse normal operator -""" - if self.wrapped is None: - raise ValueError("Invalid Shape") - new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) - - return new_surface - - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - - def find_intersection_points( - self, other: Axis, tolerance: float = TOLERANCE - ) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape + Split this shape by the provided plane or face. Args: - axis (Axis): axis defining the intersection line + surface (Union[Plane,Face]): surface to segment shape + keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection + Shape: result of split + Returns: + Self | list[Self] | None, + Tuple[Self | list[Self] | None]: The result of the split operation. + + - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` + if no top is found. + - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` + if no bottom is found. + - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is + either a `Self` or `list[Self]`, or `None` if no corresponding part is found. """ - if self.wrapped is None: - return [] + shape_list = TopTools_ListOfShape() + shape_list.Append(self.wrapped) - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, tolerance) + # Define the splitting tool + trim_tool = ( + BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face + if isinstance(tool, Plane) + else tool.wrapped + ) + tool_list = TopTools_ListOfShape() + tool_list.Append(trim_tool) - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) + # Create the splitter algorithm + splitter = BRepAlgoAPI_Splitter() + + # Set the shape to be split and the splitting tool (plane face) + splitter.SetArguments(shape_list) + splitter.SetTools(tool_list) + + # Perform the splitting operation + splitter.Build() + + split_result = downcast(splitter.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(split_result, TopoDS_Compound): + split_result = unwrap_topods_compound(split_result, True) + + if not isinstance(tool, Plane): + # Create solids from the surfaces for sorting by thickening + offset_builder = BRepOffset_MakeOffset() + offset_builder.Initialize( + tool.wrapped, + Offset=0.1, + Tol=1.0e-5, + Intersection=True, + Join=GeomAbs_Intersection, + Thickening=True, ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - - -class Mixin3D(Shape): - """Additional methods to add to 3D Shape classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int | None: - """Dimension of Solids""" - return 3 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") - - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") - - def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: - """Fillet - - Fillets the specified edges of this solid. - - Args: - radius (float): float > 0, the radius of the fillet - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - - Returns: - Any: Filleted solid - """ - native_edges = [e.wrapped for e in edge_list] - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(radius, native_edge) - - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - f"Failed creating a fillet with radius of {radius}, try a smaller value" - f" or use max_fillet() to find the largest valid fillet radius" - ) from err - - return new_shape - - def max_fillet( - self, - edge_list: Iterable[Edge], - tolerance=0.1, - max_iterations: int = 10, - ) -> float: - """Find Maximum Fillet Size - - Find the largest fillet radius for the given Shape and edges with a - recursive binary search. - - Example: - - max_fillet_radius = my_shape.max_fillet(shape_edges) - max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) - - - Args: - edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid - tolerance (float, optional): maximum error from actual value. Defaults to 0.1. - max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. - - Raises: - RuntimeError: failed to find the max value - ValueError: the provided Shape is invalid - - Returns: - float: maximum fillet radius - """ - - def __max_fillet(window_min: float, window_max: float, current_iteration: int): - window_mid = (window_min + window_max) / 2 - - if current_iteration == max_iterations: - raise RuntimeError( - f"Failed to find the max value within {tolerance} in {max_iterations}" - ) - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(window_mid, native_edge) - - # Do these numbers work? - if not try with the smaller window + offset_builder.MakeOffsetShape() try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise fillet_exception - except fillet_exception: - return __max_fillet(window_min, window_mid, current_iteration + 1) + tool_thickened = downcast(offset_builder.Shape()) + except StdFail_NotDone as err: + raise RuntimeError("Error determining top/bottom") from err - # These numbers work, are they close enough? - if not try larger window - if window_mid - window_min <= tolerance: - return_value = window_mid + tops: list[Shape] = [] + bottoms: list[Shape] = [] + properties = GProp_GProps() + for part in get_top_level_topods_shapes(split_result): + sub_shape = self.__class__.cast(part) + if isinstance(tool, Plane): + is_up = tool.to_local_coords(sub_shape).center().Z >= 0 else: - return_value = __max_fillet( - window_mid, window_max, current_iteration + 1 + # Intersect self and the thickened tool + is_up_obj = _topods_bool_op( + (part,), (tool_thickened,), BRepAlgoAPI_Common() ) - return return_value + # Calculate volume of intersection + BRepGProp.VolumeProperties_s(is_up_obj, properties) + is_up = properties.Mass() >= TOLERANCE + (tops if is_up else bottoms).append(sub_shape) - if not self.is_valid(): - raise ValueError("Invalid Shape") + top = None if not tops else tops[0] if len(tops) == 1 else tops + bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - native_edges = [e.wrapped for e in edge_list] + if keep == Keep.BOTH: + return (top, bottom) + if keep == Keep.TOP: + return top + if keep == Keep.BOTTOM: + return bottom + return None - # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform - # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone + def start_point(self) -> Vector: + """The start point of this edge - max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) + Note that circles may have identical start and end points. + """ + curve = self.geom_adaptor() + umin = curve.FirstParameter() - return max_radius + return Vector(curve.Value(umin)) - def chamfer( + def tangent_angle_at( self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face | None = None, - ) -> Self: - """Chamfer + location_param: float = 0.5, + position_mode: PositionMode = PositionMode.PARAMETER, + plane: Plane = Plane.XY, + ) -> float: + """tangent_angle_at - Chamfers the specified edges of this solid. + Compute the tangent angle at the specified location Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face, optional): identifies the side where length is measured. The edge(s) - must be part of the face + location_param (float, optional): distance or parameter value. Defaults to 0.5. + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. + plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. Returns: - Self: Chamfered solid + float: angle in degrees between 0 and 360 """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") + tan_vector = self.tangent_at(location_param, position_mode) + angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 + return angle - native_edges = [e.wrapped for e in edge_list] + def tangent_at( + self, + position: float | VectorLike = 0.5, + position_mode: PositionMode = PositionMode.PARAMETER, + ) -> Vector: + """tangent_at - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object + Find the tangent at a given position on the 1D shape where the position + is either a float (or int) parameter or a point that lies on the shape. Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. + position (Union[float, VectorLike]): distance, parameter value, or + point on shape. Defaults to 0.5. + position_mode (PositionMode, optional): position calculation mode. + Defaults to PositionMode.PARAMETER. Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object + ValueError: invalid position Returns: - Vector: center + Vector: tangent value """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__.cast(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) + if isinstance(position, (float, int)): + curve = self.geom_adaptor() + if position_mode == PositionMode.PARAMETER: + parameter = self.param_at(position) else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__.cast(sol.Shape()).fix() - - return return_value - - def offset_3d( - self, - openings: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Shell - - Make an offset solid of self. - - Args: - openings (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): offset amount - positive offset outwards, negative inwards - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A shelled solid. - """ - openings = list(openings) if openings else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - - occ_faces_list = TopTools_ListOfShape() - for face in openings: - occ_faces_list.Append(face.wrapped) - - offset_builder = BRepOffsetAPI_MakeThickSolid() - offset_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - RemoveIntEdges=True, - Join=kind_dict[kind], - ) - offset_builder.Build() - - try: - offset_occt_solid = offset_builder.Shape() - except (StdFail_NotDone, Standard_Failure) as err: - raise RuntimeError( - "offset Error, an alternative kind may resolve this error" - ) from err - - offset_solid = self.__class__.cast(offset_occt_solid) - assert offset_solid.wrapped is not None - - # The Solid can be inverted, if so reverse - if offset_solid.volume < 0: - offset_solid.wrapped.Reverse() - - return offset_solid - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. - - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float | None = None, - taper: float = 0, - up_to_face: Face | None = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] + parameter = self.param_at(position / self.length) else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) - - -class Compound(Mixin3D, Shape[TopoDS_Compound]): - """A Compound in build123d is a topological entity representing a collection of - geometric shapes grouped together within a single structure. It serves as a - container for organizing diverse shapes like edges, faces, or solids. This - hierarchical arrangement facilitates the construction of complex models by - combining simpler shapes. Compound plays a pivotal role in managing the - composition and structure of intricate 3D models in computer-aided design - (CAD) applications, allowing engineers and designers to work with assemblies - of shapes as unified entities for efficient modeling and analysis.""" - - order = 4.0 - - project_to_viewport = Mixin1D.project_to_viewport - - @classmethod - def cast( - cls, obj: TopoDS_Shape - ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def _dim(self) -> Union[int, None]: - """The dimension of the shapes within the Compound - None if inconsistent""" - return topods_dim(self.wrapped) - - def __init__( - self, - obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - children: Sequence[Shape] | None = None, - ): - """Build a Compound from Shapes - - Args: - obj (TopoDS_Compound | Iterable[Shape], optional): OCCT Compound or shapes - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - children (Sequence[Shape], optional): assembly children. Defaults to None. - """ - - if isinstance(obj, Iterable): - topods_compound = _make_topods_compound_from_shapes( - [s.wrapped for s in obj] - ) - else: - topods_compound = obj - - super().__init__( - obj=topods_compound, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - self.children = [] if children is None else children - - def __repr__(self): - """Return Compound info as string""" - if hasattr(self, "label") and hasattr(self, "children"): - result = ( - f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " - + f"#children({len(self.children)})" - ) - else: - result = f"{self.__class__.__name__} at {id(self):#x}" - return result - - @property - def volume(self) -> float: - """volume - the volume of this Compound""" - # when density == 1, mass == volume - return sum(i.volume for i in [*self.get_type(Solid), *self.get_type(Shell)]) - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def _remove(self, shape: Shape) -> Compound: - """Return self with the specified shape removed. - - Args: - shape: Shape: - """ - comp_builder = TopoDS_Builder() - comp_builder.Remove(self.wrapped, shape.wrapped) - return self - - def _post_detach(self, parent: Compound): - """Method call after detaching from `parent`.""" - logger.debug("Removing parent of %s (%s)", self.label, parent.label) - if parent.children: - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - else: - parent.wrapped = None - - def _pre_attach(self, parent: Compound): - """Method call before attaching to `parent`.""" - if not isinstance(parent, Compound): - raise ValueError("`parent` must be of type Compound") - - def _post_attach(self, parent: Compound): - """Method call after attaching to `parent`.""" - logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - - def _post_detach_children(self, children): - """Method call before detaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Removing no children from %s", self.label) - - def _pre_attach_children(self, children): - """Method call before attaching `children`.""" - if not all(isinstance(child, Shape) for child in children): - raise ValueError("Each child must be of type Shape") - - def _post_attach_children(self, children: Iterable[Shape]): - """Method call after attaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Adding no children to %s", self.label) - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Combine other to self `+` operator - - Note that if all of the objects are connected Edges/Wires the result - will be a Wire, otherwise a Shape. - """ - if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other - - summands: ShapeList[Shape] - if other is None: - summands = ShapeList() - else: - summands = ShapeList( - shape - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ) - # If there is nothing to add return the original object - if not summands: - return self - - summands = ShapeList( - s for s in self.get_top_level_shapes() + summands if s is not None - ) - - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = Compound(summands[0:1]) - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(bool_result, list): - result = Compound(bool_result) - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - else: - result = bool_result - - if SkipClean.clean: - result = result.clean() - - return result - - def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Cut other to self `-` operator""" - difference = Shape.__sub__(self, other) - difference = Compound( - difference if isinstance(difference, list) else [difference] - ) - self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> Compound: - """Intersect other to self `&` operator""" - intersection = Shape.__and__(self, other) - intersection = Compound( - intersection if isinstance(intersection, list) else [intersection] - ) - self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) - return intersection - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) - - def compound(self) -> Compound | None: - """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None - - @classmethod - def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: - """extrude - - Extrude a Shell into a Compound. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Compound( - TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) - ) - - def do_children_intersect( - self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: - """Do Children Intersect - - Determine if any of the child objects within a Compound/assembly intersect by - intersecting each of the shapes with each other and checking for - a common volume. - - Args: - include_parent (bool, optional): check parent for intersections. Defaults to False. - tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. - - Returns: - tuple[bool, tuple[Shape, Shape], float]: - do the object intersect, intersecting objects, volume of intersection - """ - children: list[Shape] = list(PreOrderIter(self)) - if not include_parent: - children.pop(0) # remove parent - # children_bbox = [child.bounding_box().to_solid() for child in children] - children_bbox = [ - Solid.from_bounding_box(child.bounding_box()) for child in children - ] - child_index_pairs = [ - tuple(map(int, comb)) - for comb in combinations(list(range(len(children))), 2) - ] - for child_index_pair in child_index_pairs: - # First check for bounding box intersections .. - # .. then confirm with actual object intersections which could be complex - bbox_intersection = children_bbox[child_index_pair[0]].intersect( - children_bbox[child_index_pair[1]] - ) - if bbox_intersection is not None: - obj_intersection = children[child_index_pair[0]].intersect( - children[child_index_pair[1]] - ) - if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - ( - children[child_index_pair[0]], - children[child_index_pair[1]], - ), - common_volume, - ) - return (False, (None, None), 0.0) - - @classmethod - def make_text( - cls, - txt: str, - font_size: float, - font: str = "Arial", - font_path: Optional[str] = None, - font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), - position_on_path: float = 0.0, - text_path: Union[Edge, Wire, None] = None, - ) -> "Compound": - """2D Text that optionally follows a path. - - The text that is created can be combined as with other sketch features by specifying - a mode or rotated by the given angle. In addition, edges have been previously created - with arc or segment, the text will follow the path defined by these edges. The start - parameter can be used to shift the text along the path to achieve precise positioning. - - Args: - txt: text to be rendered - font_size: size of the font in model units - font: font name - font_path: path to font file - font_style: text style. Defaults to FontStyle.REGULAR. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max - of object. Defaults to (Align.CENTER, Align.CENTER). - position_on_path: the relative location on path to position the text, - between 0.0 and 1.0. Defaults to 0.0. - text_path: a path for the text to follows. Defaults to None - linear text. - - Returns: - a Compound object containing multiple Faces representing the text - - Examples:: - - fox = Compound.make_text( - txt="The quick brown fox jumped over the lazy dog", - font_size=10, - position_on_path=0.1, - text_path=jump_edge, - ) - - """ - # pylint: disable=too-many-locals - - def position_face(orig_face: Face) -> Face: - """ - Reposition a face to the provided path - - Local coordinates are used to calculate the position of the face - relative to the path. Global coordinates to position the face. - """ - assert text_path is not None - bbox = orig_face.bounding_box() - face_bottom_center = Vector((bbox.min.X + bbox.max.X) / 2, 0, 0) - relative_position_on_wire = ( - position_on_path + face_bottom_center.X / path_length - ) - wire_tangent = text_path.tangent_at(relative_position_on_wire) - wire_angle = Vector(1, 0, 0).get_signed_angle(wire_tangent) - wire_position = text_path.position_at(relative_position_on_wire) - - return orig_face.translate(wire_position - face_bottom_center).rotate( - Axis(wire_position, (0, 0, 1)), - -wire_angle, - ) - - if sys.platform.startswith("linux"): - os.environ["FONTCONFIG_FILE"] = "/etc/fonts/fonts.conf" - os.environ["FONTCONFIG_PATH"] = "/etc/fonts/" - - font_kind = { - FontStyle.REGULAR: Font_FA_Regular, - FontStyle.BOLD: Font_FA_Bold, - FontStyle.ITALIC: Font_FA_Italic, - }[font_style] - - mgr = Font_FontMgr.GetInstance_s() - - if font_path and mgr.CheckFont(TCollection_AsciiString(font_path).ToCString()): - font_t = Font_SystemFont(TCollection_AsciiString(font_path)) - font_t.SetFontPath(font_kind, TCollection_AsciiString(font_path)) - mgr.RegisterFont(font_t, True) - - else: - font_t = mgr.FindFont(TCollection_AsciiString(font), font_kind) - - logger.info( - "Creating text with font %s located at %s", - font_t.FontName().ToCString(), - font_t.FontPath(font_kind).ToCString(), - ) - - builder = Font_BRepTextBuilder() - font_i = StdPrs_BRepFont( - NCollection_Utf8String(font_t.FontName().ToCString()), - font_kind, - float(font_size), - ) - text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) - - # Align the text from the bounding box - align_text = tuplify(align, 2) - text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align_text)) - ) - - if text_path is not None: - path_length = text_path.length - text_flat = Compound([position_face(f) for f in text_flat.faces()]) - - return text_flat - - @classmethod - def make_triad(cls, axes_scale: float) -> Compound: - """The coordinate system triad (X, Y, Z axes)""" - x_axis = Edge.make_line((0, 0, 0), (axes_scale, 0, 0)) - y_axis = Edge.make_line((0, 0, 0), (0, axes_scale, 0)) - z_axis = Edge.make_line((0, 0, 0), (0, 0, axes_scale)) - arrow_arc = Edge.make_spline( - [(0, 0, 0), (-axes_scale / 20, axes_scale / 30, 0)], - [(-1, 0, 0), (-1, 1.5, 0)], - ) - arrow = Wire([arrow_arc, copy.copy(arrow_arc).mirror(Plane.XZ)]) - x_label = ( - Compound.make_text( - "X", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .move(Location(x_axis @ 1)) - .edges() - ) - y_label = ( - Compound.make_text( - "Y", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .rotate(Axis.Z, 90) - .move(Location(y_axis @ 1)) - .edges() - ) - z_label = ( - Compound.make_text( - "Z", font_size=axes_scale / 4, align=(Align.CENTER, Align.MIN) - ) - .rotate(Axis.Y, 90) - .rotate(Axis.X, 90) - .move(Location(z_axis @ 1)) - .edges() - ) - triad = Curve( - [ - x_axis, - y_axis, - z_axis, - arrow.moved(Location(x_axis @ 1)), - arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), - arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), - *x_label, - *y_label, - *z_label, - ] - ) - - return triad - - def __iter__(self) -> Iterator[Shape]: - """ - Iterate over subshapes. - - """ - - iterator = TopoDS_Iterator(self.wrapped) - - while iterator.More(): - yield Compound.cast(iterator.Value()) - iterator.Next() - - def __len__(self) -> int: - """Return the number of subshapes""" - count = 0 - if self.wrapped is not None: - for _ in self: - count += 1 - return count - - def __bool__(self) -> bool: - """ - Check if empty. - """ - - return TopoDS_Iterator(self.wrapped).More() - - def get_type( - self, - obj_type: Union[ - Type[Vertex], Type[Edge], Type[Face], Type[Shell], Type[Solid], Type[Wire] - ], - ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: - """get_type - - Extract the objects of the given type from a Compound. Note that this - isn't the same as Faces() etc. which will extract Faces from Solids. - - Args: - obj_type (Union[Vertex, Edge, Face, Shell, Solid, Wire]): Object types to extract - - Returns: - list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: Extracted objects - """ - - type_map = { - Vertex: TopAbs_ShapeEnum.TopAbs_VERTEX, - Edge: TopAbs_ShapeEnum.TopAbs_EDGE, - Face: TopAbs_ShapeEnum.TopAbs_FACE, - Shell: TopAbs_ShapeEnum.TopAbs_SHELL, - Solid: TopAbs_ShapeEnum.TopAbs_SOLID, - Wire: TopAbs_ShapeEnum.TopAbs_WIRE, - Compound: TopAbs_ShapeEnum.TopAbs_COMPOUND, - } - results = [] - for comp in self.compounds(): - iterator = TopoDS_Iterator() - iterator.Initialize(comp.wrapped) - while iterator.More(): - child = iterator.Value() - if child.ShapeType() == type_map[obj_type]: - results.append(obj_type(downcast(child))) - iterator.Next() - - return results - - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: - """Strip unnecessary Compound wrappers - - Args: - fully (bool, optional): return base shape without any Compound - wrappers (otherwise one Compound is left). Defaults to True. - - Returns: - Union[Self, Shape]: base shape - """ - if len(self) == 1: - single_element = next(iter(self)) - self.copy_attributes_to(single_element, ["wrapped", "_NodeMixin__children"]) - - # If the single element is another Compound, unwrap it recursively - if isinstance(single_element, Compound): - # Unwrap recursively and copy attributes down - unwrapped = single_element.unwrap(fully) - if not fully: - unwrapped = type(self)(unwrapped.wrapped) - self.copy_attributes_to(unwrapped, ["wrapped", "_NodeMixin__children"]) - return unwrapped - - return single_element if fully else self - - # If there are no elements or more than one element, return self - return self - - -class Part(Compound): - """A Compound containing 3D objects - aka Solids""" - - @property - def _dim(self) -> int: - return 3 - - -class Sketch(Compound): - """A Compound containing 2D objects - aka Faces""" - - @property - def _dim(self) -> int: - return 2 - - -class Curve(Compound): - """A Compound containing 1D objects - aka Edges""" - - @property - def _dim(self) -> int: - return 1 - - __add__ = Mixin1D.__add__ # type: ignore - - def __matmul__(self, position: float) -> Vector: - """Position on curve operator @ - only works if continuous""" - return Wire(self.edges()).position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator % - only works if continuous""" - return Wire(self.edges()).tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^ - only works if continuous""" - return Wire(self.edges()).location_at(position) - - def wires(self) -> ShapeList[Wire]: # type: ignore - """A list of wires created from the edges""" - return Wire.combine(self.edges()) + try: + pnt = Vector(position) + except Exception as exc: + raise ValueError("position must be a float or a point") from exc + # GeomAPI_ProjectPointOnCurve only works with Edges so find + # the closest Edge if the shape has multiple Edges. + my_edges: list[Edge] = self.edges() + distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] + sorted_distances = sorted(distances, key=lambda x: x[0]) + closest_edge = my_edges[sorted_distances[0][1]] + # Get the extreme of the parameter values for this Edge + first: float = closest_edge.param_at(0) + last: float = closest_edge.param_at(1) + # Extract the Geom_Curve from the Shape + curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) + projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) + parameter = projector.LowerDistanceParameter() + + tmp = gp_Pnt() + res = gp_Vec() + curve.D1(parameter, tmp, res) + + return Vector(gp_Dir(res)) + + def vertex(self) -> Vertex: + """Return the Vertex""" + return Shape.get_single_shape(self, "Vertex") + + def vertices(self) -> ShapeList[Vertex]: + """vertices - all the vertices in this Shape""" + return Shape.get_shape_list(self, "Vertex") + + def wire(self) -> Wire: + """Return the Wire""" + return Shape.get_single_shape(self, "Wire") + + def wires(self) -> ShapeList[Wire]: + """wires - all the wires in this Shape""" + return Shape.get_shape_list(self, "Wire") class Edge(Mixin1D, Shape[TopoDS_Edge]): @@ -5075,10 +1111,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): # pylint: disable=too-many-public-methods order = 1.0 + # ---- Constructor ---- def __init__( self, - obj: Optional[TopoDS_Edge | Axis | None] = None, + obj: TopoDS_Edge | Axis | None | None = None, label: str = "", color: Color | None = None, parent: Compound | None = None, @@ -5107,22 +1144,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): parent=parent, ) - def geom_adaptor(self) -> BRepAdaptor_Curve: - """Return the Geom Curve from this Edge""" - return BRepAdaptor_Curve(self.wrapped) - - def close(self) -> Union[Edge, Wire]: - """Close an Edge""" - if not self.is_closed: - return_value = Wire([self]).close() - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Edge as Wire""" - return Wire([self]) + # ---- Properties ---- @property def arc_center(self) -> Vector: @@ -5140,231 +1162,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return return_value - def find_tangent( - self, - angle: float, - ) -> list[float]: - """find_tangent - - Find the parameter values of self where the tangent is equal to angle. - - Args: - angle (float): target angle in degrees - - Returns: - list[float]: u values between 0.0 and 1.0 - """ - angle = angle % 360 # angle needs to always be positive 0..360 - u_values: list[float] - - if self.geom_type == GeomType.LINE: - if self.tangent_angle_at(0) == angle: - u_values = [0] - else: - u_values = [] - else: - # Solve this problem geometrically by creating a tangent curve and finding intercepts - periodic = int(self.is_closed) # if closed don't include end point - tan_pnts: list[VectorLike] = [] - previous_tangent = None - - # When angles go from 360 to 0 a discontinuity is created so add 360 to these - # values and intercept another line - discontinuities = 0.0 - for i in range(101 - periodic): - tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 - if ( - previous_tangent is not None - and abs(previous_tangent - tangent) > 300 - ): - discontinuities = copysign(1.0, previous_tangent - tangent) - tangent += 360 * discontinuities - previous_tangent = tangent - tan_pnts.append((i / 100, tangent)) - - # Generate a first differential curve from the tangent points - tan_curve = Edge.make_spline(tan_pnts) - - # Use the bounding box to find the min and max values - tan_curve_bbox = tan_curve.bounding_box() - min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) - max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) - - # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts: list[Vector] = [] - for i in range(min_range, max_range + 1, 360): - line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) - intercept_pnts.extend(tan_curve.find_intersection_points(line)) - - u_values = [p.X for p in intercept_pnts] - - return u_values - - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - - def find_intersection_points( - self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE - ) -> ShapeList[Vector]: - """find_intersection_points - - Determine the points where a 2D edge crosses itself or another 2D edge - - Args: - other (Axis | Edge): curve to compare with - tolerance (float, optional): the precision of computing the intersection points. - Defaults to TOLERANCE. - - Returns: - ShapeList[Vector]: list of intersection points - """ - # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) - other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, - ) - # To determine the 2D plane to work on - plane = self.common_plane(other) - if plane is None: - raise ValueError("All objects must be on the same plane") - # Convert the plane into a Geom_Surface - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - edge_surface = BRep_Tool.Surface_s(pln_shape) - - self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - self.wrapped, - edge_surface, - TopLoc_Location(), - self.param_at(0), - self.param_at(1), - ) - if other is not None: - edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - other.wrapped, - edge_surface, - TopLoc_Location(), - other.param_at(0), - other.param_at(1), - ) - intersector = Geom2dAPI_InterCurveCurve( - self_2d_curve, edge_2d_curve, tolerance - ) - else: - intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) - - crosses = [ - Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) - for i in range(intersector.NbPoints()) - ] - # Convert back to global coordinates - crosses = [plane.from_local_coords(p) for p in crosses] - - # crosses may contain points beyond the ends of the edge so - # .. filter those out - valid_crosses = [] - for pnt in crosses: - try: - if other is not None: - if ( - self.distance_to(pnt) <= TOLERANCE - and other.distance_to(pnt) <= TOLERANCE - ): - valid_crosses.append(pnt) - else: - if self.distance_to(pnt) <= TOLERANCE: - valid_crosses.append(pnt) - except ValueError: - pass # skip invalid points - - return ShapeList(valid_crosses) - - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Union[Edge, Axis]): other object - - Returns: - Union[Shape, None]: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None + # ---- Class Methods ---- @classmethod def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: @@ -5384,121 +1182,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): """ return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" - reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge - return reversed_edge - - def trim(self, start: float, end: float) -> Edge: - """trim - - Create a new edge by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Edge: trimmed edge - """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") - - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) - trimmed_curve = Geom_TrimmedCurve( - new_curve, - parm_start, - parm_end, - ) - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def trim_to_length(self, start: float, length: float) -> Edge: - """trim_to_length - - Create a new edge starting at the given normalized parameter of a - given length. - - Args: - start (float): 0.0 <= start < 1.0 - length (float): target length - - Returns: - Edge: trimmed edge - """ - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - - # Create an adaptor for the curve - adaptor_curve = GeomAdaptor_Curve(new_curve) - - # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) - abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - - # Get the parameter at the desired length - parm_end = abscissa_point.Parameter() - - # Trim the curve to the desired length - trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" - - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) - - point = Vector(point) - - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") - - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length - - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value - @classmethod def make_bezier( cls, *cntl_pnts: VectorLike, weights: list[float] | None = None @@ -5641,6 +1324,89 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return ellipse + @classmethod + def make_helix( + cls, + pitch: float, + height: float, + radius: float, + center: VectorLike = (0, 0, 0), + normal: VectorLike = (0, 0, 1), + angle: float = 0.0, + lefthand: bool = False, + ) -> Wire: + """make_helix + + Make a helix with a given pitch, height and radius. By default a cylindrical surface is + used to create the helix. If the :angle: is set (the apex given in degree) a conical + surface is used instead. + + Args: + pitch (float): distance per revolution along normal + height (float): total height + radius (float): + center (VectorLike, optional): Defaults to (0, 0, 0). + normal (VectorLike, optional): Defaults to (0, 0, 1). + angle (float, optional): conical angle. Defaults to 0.0. + lefthand (bool, optional): Defaults to False. + + Returns: + Wire: helix + """ + # pylint: disable=too-many-locals + # 1. build underlying cylindrical/conical surface + if angle == 0.0: + geom_surf: Geom_Surface = Geom_CylindricalSurface( + gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius + ) + else: + geom_surf = Geom_ConicalSurface( + gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), + angle * DEG2RAD, + radius, + ) + + # 2. construct an segment in the u,v domain + + # Determine the length of the 2d line which will be wrapped around the surface + line_sign = -1 if lefthand else 1 + line_dir = Vector(line_sign * 2 * pi, pitch).normalized() + line_len = (height / line_dir.Y) / cos(radians(angle)) + + # Create an infinite 2d line in the direction of the helix + helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) + # Trim the line to the desired length + helix_curve = Geom2d_TrimmedCurve( + helix_line, 0, line_len, theAdjustPeriodic=True + ) + + # 3. Wrap the line around the surface + edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) + topods_edge = edge_builder.Edge() + + # 4. Convert the edge made with 2d geometry to 3d + BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) + + return cls(topods_edge) + + @classmethod + def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: + """Create a line between two points + + Args: + point1: VectorLike: that represents the first point + point2: VectorLike: that represents the second point + + Returns: + A linear edge between the two provided points + + """ + return cls( + BRepBuilderAPI_MakeEdge( + Vector(point1).to_pnt(), Vector(point2).to_pnt() + ).Edge() + ) + @classmethod def make_mid_way(cls, first: Edge, second: Edge, middle: float = 0.5) -> Edge: """make line between edges @@ -5813,28 +1579,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - @classmethod - def make_three_point_arc( - cls, point1: VectorLike, point2: VectorLike, point3: VectorLike - ) -> Edge: - """Three Point Arc - - Makes a three point arc through the provided points - - Args: - point1 (VectorLike): start point - point2 (VectorLike): middle point - point3 (VectorLike): end point - - Returns: - Edge: a circular arc through the three points - """ - circle_geom = GC_MakeArcOfCircle( - Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - @classmethod def make_tangent_arc( cls, start: VectorLike, tangent: VectorLike, end: VectorLike @@ -5858,90 +1602,40 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) @classmethod - def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: - """Create a line between two points + def make_three_point_arc( + cls, point1: VectorLike, point2: VectorLike, point3: VectorLike + ) -> Edge: + """Three Point Arc + + Makes a three point arc through the provided points Args: - point1: VectorLike: that represents the first point - point2: VectorLike: that represents the second point + point1 (VectorLike): start point + point2 (VectorLike): middle point + point3 (VectorLike): end point Returns: - A linear edge between the two provided points - + Edge: a circular arc through the three points """ - return cls( - BRepBuilderAPI_MakeEdge( - Vector(point1).to_pnt(), Vector(point2).to_pnt() - ).Edge() - ) + circle_geom = GC_MakeArcOfCircle( + Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() + ).Value() - @classmethod - def make_helix( - cls, - pitch: float, - height: float, - radius: float, - center: VectorLike = (0, 0, 0), - normal: VectorLike = (0, 0, 1), - angle: float = 0.0, - lefthand: bool = False, - ) -> Wire: - """make_helix + return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - Make a helix with a given pitch, height and radius. By default a cylindrical surface is - used to create the helix. If the :angle: is set (the apex given in degree) a conical - surface is used instead. + # ---- Instance Methods ---- - Args: - pitch (float): distance per revolution along normal - height (float): total height - radius (float): - center (VectorLike, optional): Defaults to (0, 0, 0). - normal (VectorLike, optional): Defaults to (0, 0, 1). - angle (float, optional): conical angle. Defaults to 0.0. - lefthand (bool, optional): Defaults to False. - - Returns: - Wire: helix - """ - # pylint: disable=too-many-locals - # 1. build underlying cylindrical/conical surface - if angle == 0.0: - geom_surf: Geom_Surface = Geom_CylindricalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius - ) + def close(self) -> Edge | Wire: + """Close an Edge""" + if not self.is_closed: + return_value = Wire([self]).close() else: - geom_surf = Geom_ConicalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), - angle * DEG2RAD, - radius, - ) + return_value = self - # 2. construct an segment in the u,v domain - - # Determine the length of the 2d line which will be wrapped around the surface - line_sign = -1 if lefthand else 1 - line_dir = Vector(line_sign * 2 * pi, pitch).normalized() - line_len = (height / line_dir.Y) / cos(radians(angle)) - - # Create an infinite 2d line in the direction of the helix - helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) - # Trim the line to the desired length - helix_curve = Geom2d_TrimmedCurve( - helix_line, 0, line_len, theAdjustPeriodic=True - ) - - # 3. Wrap the line around the surface - edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) - topods_edge = edge_builder.Edge() - - # 4. Convert the edge made with 2d geometry to 3d - BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) - - return cls(topods_edge) + return return_value def distribute_locations( - self: Union[Wire, Edge], + self: Wire | Edge, count: int, start: float = 0.0, stop: float = 1.0, @@ -5977,6 +1671,261 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return locations + def find_intersection_points( + self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE + ) -> ShapeList[Vector]: + """find_intersection_points + + Determine the points where a 2D edge crosses itself or another 2D edge + + Args: + other (Axis | Edge): curve to compare with + tolerance (float, optional): the precision of computing the intersection points. + Defaults to TOLERANCE. + + Returns: + ShapeList[Vector]: list of intersection points + """ + # Convert an Axis into an edge at least as large as self and Axis start point + if isinstance(other, Axis): + self_bbox_w_edge = self.bounding_box().add( + Vertex(other.position).bounding_box() + ) + other = Edge.make_line( + other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), + other.position + other.direction * self_bbox_w_edge.diagonal, + ) + # To determine the 2D plane to work on + plane = self.common_plane(other) + if plane is None: + raise ValueError("All objects must be on the same plane") + # Convert the plane into a Geom_Surface + pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() + edge_surface = BRep_Tool.Surface_s(pln_shape) + + self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( + self.wrapped, + edge_surface, + TopLoc_Location(), + self.param_at(0), + self.param_at(1), + ) + if other is not None: + edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( + other.wrapped, + edge_surface, + TopLoc_Location(), + other.param_at(0), + other.param_at(1), + ) + intersector = Geom2dAPI_InterCurveCurve( + self_2d_curve, edge_2d_curve, tolerance + ) + else: + intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) + + crosses = [ + Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) + for i in range(intersector.NbPoints()) + ] + # Convert back to global coordinates + crosses = [plane.from_local_coords(p) for p in crosses] + + # crosses may contain points beyond the ends of the edge so + # .. filter those out + valid_crosses = [] + for pnt in crosses: + try: + if other is not None: + if ( + self.distance_to(pnt) <= TOLERANCE + and other.distance_to(pnt) <= TOLERANCE + ): + valid_crosses.append(pnt) + else: + if self.distance_to(pnt) <= TOLERANCE: + valid_crosses.append(pnt) + except ValueError: + pass # skip invalid points + + return ShapeList(valid_crosses) + + def find_tangent( + self, + angle: float, + ) -> list[float]: + """find_tangent + + Find the parameter values of self where the tangent is equal to angle. + + Args: + angle (float): target angle in degrees + + Returns: + list[float]: u values between 0.0 and 1.0 + """ + angle = angle % 360 # angle needs to always be positive 0..360 + u_values: list[float] + + if self.geom_type == GeomType.LINE: + if self.tangent_angle_at(0) == angle: + u_values = [0] + else: + u_values = [] + else: + # Solve this problem geometrically by creating a tangent curve and finding intercepts + periodic = int(self.is_closed) # if closed don't include end point + tan_pnts: list[VectorLike] = [] + previous_tangent = None + + # When angles go from 360 to 0 a discontinuity is created so add 360 to these + # values and intercept another line + discontinuities = 0.0 + for i in range(101 - periodic): + tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 + if ( + previous_tangent is not None + and abs(previous_tangent - tangent) > 300 + ): + discontinuities = copysign(1.0, previous_tangent - tangent) + tangent += 360 * discontinuities + previous_tangent = tangent + tan_pnts.append((i / 100, tangent)) + + # Generate a first differential curve from the tangent points + tan_curve = Edge.make_spline(tan_pnts) + + # Use the bounding box to find the min and max values + tan_curve_bbox = tan_curve.bounding_box() + min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) + max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) + + # Create a horizontal line for each 360 cycle and intercept it + intercept_pnts: list[Vector] = [] + for i in range(min_range, max_range + 1, 360): + line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) + intercept_pnts.extend(tan_curve.find_intersection_points(line)) + + u_values = [p.X for p in intercept_pnts] + + return u_values + + def geom_adaptor(self) -> BRepAdaptor_Curve: + """Return the Geom Curve from this Edge""" + return BRepAdaptor_Curve(self.wrapped) + + def intersect( + self, *to_intersect: Edge | Axis | Plane + ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: + """intersect Edge with Edge or Axis + + Args: + other (Union[Edge, Axis]): other object + + Returns: + Union[Shape, None]: Compound of vertices and/or edges + """ + edges: list[Edge] = [] + planes: list[Plane] = [] + edges_common_to_planes: list[Edge] = [] + + for obj in to_intersect: + match obj: + case Axis(): + edges.append(Edge(obj)) + case Edge(): + edges.append(obj) + case Plane(): + planes.append(obj) + case _: + raise ValueError(f"Unknown object type: {type(obj)}") + + # Find any edge / edge intersection points + points_sets: list[set[Vector]] = [] + for edge_pair in combinations([self] + edges, 2): + intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) + points_sets.append(set(intersection_points)) + + # Find any edge / plane intersection points & edges + for edge, plane in itertools.product([self] + edges, planes): + # Find point intersections + geom_line = BRep_Tool.Curve_s( + edge.wrapped, edge.param_at(0), edge.param_at(1) + ) + geom_plane = Geom_Plane(plane.local_coord_system) + intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) + plane_intersection_points: list[Vector] = [] + if intersection_calculator.IsDone(): + plane_intersection_points = [ + Vector(intersection_calculator.Point(i + 1)) + for i in range(intersection_calculator.NbPoints()) + ] + points_sets.append(set(plane_intersection_points)) + + # Find edge intersections + if (edge_plane := edge.common_plane()) is not None: # is a 2D edge + if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): + edges_common_to_planes.append(edge) + + edges.extend(edges_common_to_planes) + + # Find the intersection of all sets + common_points = set.intersection(*points_sets) + common_vertices = [Vertex(*pnt) for pnt in common_points] + + # Find Edge/Edge overlaps + common_edges: list[Edge] = [] + if edges: + common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() + + if common_vertices or common_edges: + # If there is just one vertex or edge return it + if len(common_vertices) == 1 and len(common_edges) == 0: + return common_vertices[0] + if len(common_vertices) == 0 and len(common_edges) == 1: + return common_edges[0] + return ShapeList(common_vertices + common_edges) + return None + + def param_at_point(self, point: VectorLike) -> float: + """Normalized parameter at point along Edge""" + + # Note that this search algorithm would ideally be replaced with + # an OCP based solution, something like that which is shown below. + # However, there are known issues with the OCP methods for some + # curves which may return negative values or incorrect values at + # end points. Also note that this search takes about 1.5ms while + # the OCP methods take about 0.4ms. + # + # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) + # param_min, param_max = BRep_Tool.Range_s(self.wrapped) + # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) + # param_value = projector.LowerDistanceParameter() + # u_value = (param_value - param_min) / (param_max - param_min) + + point = Vector(point) + + if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): + raise ValueError(f"point ({point}) is not on edge") + + # Function to be minimized + def func(param: ndarray) -> float: + return (self.position_at(param[0]) - point).length + + # Find the u value that results in a point within tolerance of the target + initial_guess = max( + 0.0, min(1.0, (point - self.position_at(0)).length / self.length) + ) + result = minimize( + func, + x0=initial_guess, + method="Nelder-Mead", + bounds=[(0.0, 1.0)], + tol=TOLERANCE, + ) + u_value = float(result.x[0]) + return u_value + def project_to_shape( self, target_object: Shape, @@ -6013,6 +1962,18 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): projected_edges = [w.edges()[0] for w in projected_wires] return projected_edges + def reversed(self) -> Edge: + """Return a copy of self with the opposite orientation""" + reversed_edge = copy.deepcopy(self) + first: float = self.param_at(0) + last: float = self.param_at(1) + curve = BRep_Tool.Curve_s(self.wrapped, first, last) + first = curve.ReversedParameter(first) + last = curve.ReversedParameter(last) + topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() + reversed_edge.wrapped = topods_edge + return reversed_edge + def to_axis(self) -> Axis: """Translate a linear Edge to an Axis""" if self.geom_type != GeomType.LINE: @@ -6021,2120 +1982,87 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): ) return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) + def to_wire(self) -> Wire: + """Edge as Wire""" + return Wire([self]) -class Face(Mixin2D, Shape[TopoDS_Face]): - """A Face in build123d represents a 3D bounded surface within the topological data - structure. It encapsulates geometric information, defining a face of a 3D shape. - These faces are integral components of complex structures, such as solids and - shells. Face enables precise modeling and manipulation of surfaces, supporting - operations like trimming, filleting, and Boolean operations.""" + def trim(self, start: float, end: float) -> Edge: + """trim - # pylint: disable=too-many-public-methods - - order = 2.0 - - @overload - def __init__( - self, - obj: TopoDS_Face, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face + Create a new edge by keeping only the section between start and end. Args: - obj (TopoDS_Shape, optional): OCCT Face. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - outer_wire: Wire, - inner_wires: Iterable[Wire] | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a planar Face from a boundary Wire with optional hole Wires. - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (Iterable[Wire], optional): holes. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args: Any, **kwargs: Any): - outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - outer_wire, inner_wires, label, color, parent = args[:5] + (None,) * ( - 5 - l_a - ) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "outer_wire", - "inner_wires", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - outer_wire = kwargs.get("outer_wire", outer_wire) - inner_wires = kwargs.get("inner_wires", inner_wires) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if outer_wire is not None: - inner_topods_wires = ( - [w.wrapped for w in inner_wires] if inner_wires is not None else [] - ) - obj = _make_topods_face_from_wires(outer_wire.wrapped, inner_topods_wires) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - # Faces can optionally record the plane it was created on for later extrusion - self.created_on: Plane | None = None - - @property - def length(self) -> None | float: - """length of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.X) - result = face_vertices[-1].X - face_vertices[0].X - return result - - @property - def volume(self) -> float: - """volume - the volume of this Face, which is always zero""" - return 0.0 - - @property - def width(self) -> None | float: - """width of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.Y) - result = face_vertices[-1].Y - face_vertices[0].Y - return result - - @property - def geometry(self) -> None | str: - """geometry of planar face""" - result = None - if self.is_planar: - flat_face: Face = Plane(self).to_local_coords(self) - flat_face_edges = flat_face.edges() - if all(e.geom_type == GeomType.LINE for e in flat_face_edges): - flat_face_vertices = flat_face.vertices() - result = "POLYGON" - if len(flat_face_edges) == 4: - edge_pairs: list[list[Edge]] = [] - for vertex in flat_face_vertices: - edge_pairs.append( - [e for e in flat_face_edges if vertex in e.vertices()] - ) - edge_pair_directions = [ - [edge.tangent_at(0) for edge in pair] for pair in edge_pairs - ] - if all( - edge_directions[0].get_angle(edge_directions[1]) == 90 - for edge_directions in edge_pair_directions - ): - result = "RECTANGLE" - if len(flat_face_edges.group_by(SortBy.LENGTH)) == 1: - result = "SQUARE" - - return result - - @property - def center_location(self) -> Location: - """Location at the center of face""" - origin = self.position_at(0.5, 0.5) - return Plane(origin, z_dir=self.normal_at(origin)).location - - @property - def is_planar(self) -> bool: - """Is the face planar even though its geom_type may not be PLANE""" - return self.is_planar_face - - def geom_adaptor(self) -> Geom_Surface: - """Return the Geom Surface for this Face""" - return BRep_Tool.Surface_s(self.wrapped) - - def _uv_bounds(self) -> Tuple[float, float, float, float]: - """Return the u min, u max, v min, v max values""" - return BRepTools.UVBounds_s(self.wrapped) - - @overload - def normal_at(self, surface_point: VectorLike | None = None) -> Vector: - """normal_at point on surface - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where - the normal. Defaults to the center (None). - - Returns: - Vector: surface normal direction - """ - - @overload - def normal_at(self, u: float, v: float) -> Vector: - """normal_at u, v values on Face - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - Defaults to the center (None/None) + start (float): 0.0 <= start < 1.0 + end (float): 0.0 < end <= 1.0 Raises: - ValueError: Either neither or both u v values must be provided + ValueError: start >= end Returns: - Vector: surface normal direction + Edge: trimmed edge """ + if start >= end: + raise ValueError(f"start ({start}) must be less than end ({end})") - def normal_at(self, *args, **kwargs) -> Vector: - """normal_at - - Computes the normal vector at the desired location on the face. - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where the normal. - Defaults to None. - - Returns: - Vector: surface normal direction - """ - surface_point, u, v = None, -1.0, -1.0 - - if args: - if isinstance(args[0], Sequence): - surface_point = args[0] - elif isinstance(args[0], (int, float)): - u = args[0] - if len(args) == 2 and isinstance(args[1], (int, float)): - v = args[1] - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["surface_point", "u", "v"]) + new_curve = BRep_Tool.Curve_s( + copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - surface_point = kwargs.get("surface_point", surface_point) - u = kwargs.get("u", u) - v = kwargs.get("v", v) - if surface_point is None and u < 0 and v < 0: - u, v = 0.5, 0.5 - elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: - raise ValueError("Both u & v values must be specified") - - # get the geometry - surface = self.geom_adaptor() - - if surface_point is None: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) - else: - # project point on surface - projector = GeomAPI_ProjectPointOnSurf( - Vector(surface_point).to_pnt(), surface - ) - - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - def position_at(self, u: float, v: float) -> Vector: - """position_at - - Computes a point on the Face given u, v coordinates. - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - - Returns: - Vector: point on Face - """ - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u_val0 + u * (u_val1 - u_val0) - v_val = v_val0 + v * (v_val1 - v_val0) - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(gp_pnt) - - def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) - else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) - return Location(pln) - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of Face - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if (center_of == CenterOf.MASS) or ( - center_of == CenterOf.GEOMETRY and self.is_planar - ): - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - center_point = properties.CentreOfMass() - - elif center_of == CenterOf.BOUNDING_BOX: - center_point = self.bounding_box().center() - - elif center_of == CenterOf.GEOMETRY: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = 0.5 * (u_val0 + u_val1) - v_val = 0.5 * (v_val0 + v_val1) - - center_point = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) - - return Vector(center_point) - - def outer_wire(self) -> Wire: - """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) - - def inner_wires(self) -> ShapeList[Wire]: - """Extract the inner or hole wires from this Face""" - outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) - - def wire(self) -> Wire: - """Return the outerwire, generate a warning if inner_wires present""" - if self.inner_wires(): - warnings.warn( - "Found holes, returning outer_wire", - stacklevel=2, - ) - return self.outer_wire() - - @classmethod - def extrude(cls, obj: Edge, direction: VectorLike) -> Face: - """extrude - - Extrude an Edge into a Face. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Face: extruded shape - """ - return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: - """make_rect - - Make a Rectangle centered on center with the given normal - - Args: - width (float, optional): width (local x). - height (float, optional): height (local y). - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Face: The centered rectangle - """ - pln_shape = BRepBuilderAPI_MakeFace( - plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 - ).Face() - - return cls(pln_shape) - - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - - @overload - @classmethod - def make_surface_from_curves( - cls, edge1: Edge, edge2: Edge - ) -> Face: # pragma: no cover - ... - - @overload - @classmethod - def make_surface_from_curves( - cls, wire1: Wire, wire2: Wire - ) -> Face: # pragma: no cover - ... - - @classmethod - def make_surface_from_curves(cls, *args, **kwargs) -> Face: - """make_surface_from_curves - - Create a ruled surface out of two edges or two wires. If wires are used then - these must have the same number of edges. - - Args: - curve1 (Union[Edge,Wire]): side of surface - curve2 (Union[Edge,Wire]): opposite side of surface - - Returns: - Face: potentially non planar surface - """ - curve1, curve2 = None, None - if args: - if len(args) != 2 or type(args[0]) is not type(args[1]): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - curve1, curve2 = args - - curve1 = kwargs.pop("edge1", curve1) - curve2 = kwargs.pop("edge2", curve2) - curve1 = kwargs.pop("wire1", curve1) - curve2 = kwargs.pop("wire2", curve2) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - - if isinstance(curve1, Wire): - return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) - else: - return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) - return return_value - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: - """sew faces - - Group contiguous faces and return them in a list of ShapeList - - Args: - faces (Iterable[Face]): Faces to sew together - - Raises: - RuntimeError: OCCT SewedShape generated unexpected output - - Returns: - list[ShapeList[Face]]: grouped contiguous faces - """ - # Sew the faces - sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) - top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces: list[ShapeList] = [] - - # For each of the top level shapes create a ShapeList of Face - for top_level_shape in top_level_shapes: - if isinstance(top_level_shape, TopoDS_Face): - sewn_faces.append(ShapeList([Face(top_level_shape)])) - elif isinstance(top_level_shape, TopoDS_Shell): - sewn_faces.append(Shell(top_level_shape).faces()) - elif isinstance(top_level_shape, TopoDS_Solid): - sewn_faces.append( - ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") - ) - ) - else: - raise RuntimeError( - f"SewedShape returned a {type(top_level_shape)} which was unexpected" - ) - - return sewn_faces - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Face: - """sweep - - Sweep a 1D profile along a 1D path. Both the profile and path must be composed - of only 1 Edge. - - Args: - profile (Union[Curve,Edge,Wire]): the object to sweep - path (Union[Curve,Edge,Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Raises: - ValueError: Only 1 Edge allowed in profile & path - - Returns: - Face: resulting face, may be non-planar - """ - # Note: BRepOffsetAPI_MakePipe is an option here - # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) - # pipe_sweep.Build() - # return Face(pipe_sweep.Shape()) - - if len(profile.edges()) != 1 or len(path.edges()) != 1: - raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Face(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_surface_from_array_of_points( - cls, - points: list[list[VectorLike]], - tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 3, - ) -> Face: - """make_surface_from_array_of_points - - Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter - space of the face. The second dimension correspond to points on the horizontal - direction in the parameter space of the face. The 2 dimensions are U,V dimensions - of the parameter space of the face. - - Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V - parameters second is U parameters. - tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. - smoothing (Tuple[float, float, float], optional): optional tuple of - 3 weights use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when - smoothing is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 3. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Face: a potentially non-planar face defined by points - """ - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - - for i, point_row in enumerate(points): - for j, point in enumerate(point_row): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Surface() - - return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) - - @classmethod - def make_bezier_surface( - cls, - points: list[list[VectorLike]], - weights: list[list[float]] | None = None, - ) -> Face: - """make_bezier_surface - - Construct a Bézier surface from the provided 2d array of points. - - Args: - points (list[list[VectorLike]]): a 2D list of control points - weights (list[list[float]], optional): control point weights. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Face: a potentially non-planar face - """ - if len(points) < 2 or len(points[0]) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(points) > 25 or len(points[0]) > 25: - raise ValueError("The maximum number of control points is 25") - if weights and ( - len(points) != len(weights) or len(points[0]) != len(weights[0]) - ): - raise ValueError("A weight must be provided for each control point") - - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - for i, row_points in enumerate(points): - for j, point in enumerate(row_points): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if weights: - weights_ = TColStd_HArray2OfReal(1, len(weights), 1, len(weights[0])) - for i, row_weights in enumerate(weights): - for j, weight in enumerate(row_weights): - weights_.SetValue(i + 1, j + 1, float(weight)) - bezier = Geom_BezierSurface(points_, weights_) - else: - bezier = Geom_BezierSurface(points_) - - return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) - - @classmethod - def make_surface( - cls, - exterior: Union[Wire, Iterable[Edge]], - surface_points: Iterable[VectorLike] | None = None, - interior_wires: Iterable[Wire] | None = None, - ) -> Face: - """Create Non-Planar Face - - Create a potentially non-planar face bounded by exterior (wire or edges), - optionally refined by surface_points with optional holes defined by - interior_wires. - - Args: - exterior (Union[Wire, list[Edge]]): Perimeter of face - surface_points (list[VectorLike], optional): Points on the surface that - refine the shape. Defaults to None. - interior_wires (list[Wire], optional): Hole(s) in the face. Defaults to None. - - Raises: - RuntimeError: Internal error building face - RuntimeError: Error building non-planar face with provided surface_points - RuntimeError: Error adding interior hole - RuntimeError: Generated face is invalid - - Returns: - Face: Potentially non-planar face - """ - exterior = list(exterior) if isinstance(exterior, Iterable) else exterior - # pylint: disable=too-many-branches - if surface_points: - surface_point_vectors = [Vector(p) for p in surface_points] - else: - surface_point_vectors = None - - # First, create the non-planar surface - surface = BRepOffsetAPI_MakeFilling( - # order of energy criterion to minimize for computing the deformation of the surface - Degree=3, - # average number of points for discretisation of the edges - NbPtsOnCur=15, - NbIter=2, - Anisotropie=False, - # the maximum distance allowed between the support surface and the constraints - Tol2d=0.00001, - # the maximum distance allowed between the support surface and the constraints - Tol3d=0.0001, - # the maximum angle allowed between the normal of the surface and the constraints - TolAng=0.01, - # the maximum difference of curvature allowed between the surface and the constraint - TolCurv=0.1, - # the highest degree which the polynomial defining the filling surface can have - MaxDeg=8, - # the greatest number of segments which the filling surface can have - MaxSegments=9, + parm_start = self.param_at(start) + parm_end = self.param_at(end) + trimmed_curve = Geom_TrimmedCurve( + new_curve, + parm_start, + parm_end, ) - if isinstance(exterior, Wire): - outside_edges = exterior.edges() - elif isinstance(exterior, Iterable) and all( - isinstance(o, Edge) for o in exterior - ): - outside_edges = ShapeList(exterior) - else: - raise ValueError("exterior must be a Wire or list of Edges") + new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() + return Edge(new_edge) - for edge in outside_edges: - surface.Add(edge.wrapped, GeomAbs_C0) + def trim_to_length(self, start: float, length: float) -> Edge: + """trim_to_length - try: - surface.Build() - surface_face = Face(surface.Shape()) - except ( - Standard_Failure, - StdFail_NotDone, - Standard_NoSuchObject, - Standard_ConstructionError, - ) as err: - raise RuntimeError( - "Error building non-planar face with provided exterior" - ) from err - if surface_point_vectors: - for point in surface_point_vectors: - surface.Add(gp_Pnt(*point.to_tuple())) - try: - surface.Build() - surface_face = Face(surface.Shape()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error building non-planar face with provided surface_points" - ) from err - - # Next, add wires that define interior holes - note these wires must be entirely interior - if interior_wires: - makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) - for wire in interior_wires: - makeface_object.Add(wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - if not surface_face.is_valid(): - raise RuntimeError("non planar face is invalid") - - return surface_face - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: - """Apply 2D fillet to a face + Create a new edge starting at the given normalized parameter of a + given length. Args: - radius: float: - vertices: Iterable[Vertex]: + start (float): 0.0 <= start < 1.0 + length (float): target length Returns: - + Edge: trimmed edge """ - - fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - - fillet_builder.Build() - - return self.__class__.cast(fillet_builder.Shape()) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Face: - """Apply 2D chamfer to a face - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Raises: - ValueError: Cannot chamfer at this location - ValueError: One or more vertices are not part of edge - - Returns: - Face: face with a chamfered corner(s) - - """ - reference_edge = edge - - chamfer_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map + new_curve = BRep_Tool.Curve_s( + copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) ) - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) + # Create an adaptor for the curve + adaptor_curve = GeomAdaptor_Curve(new_curve) - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) + # Find the parameter corresponding to the desired length + parm_start = self.param_at(start) + abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) + # Get the parameter at the desired length + parm_end = abscissa_point.Parameter() - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) + # Trim the curve to the desired length + trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - chamfer_builder.Build() - return self.__class__.cast(chamfer_builder.Shape()).fix() + new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() + return Edge(new_edge) - def is_coplanar(self, plane: Plane) -> bool: - """Is this planar face coplanar with the provided plane""" - u_val0, _u_val1, v_val0, _v_val1 = self._uv_bounds() - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val0, v_val0, gp_pnt, normal) + def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: + """find intersection vertices and edges""" - return ( - plane.contains(Vector(gp_pnt)) - and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE - ) - - def project_to_shape( - self, target_object: Shape, direction: VectorLike - ) -> ShapeList[Face | Shell]: - """Project Face to target Object - - Project a Face onto a Shape generating new Face(s) on the surfaces of the object. - - A projection with no taper is illustrated below: - - .. image:: flatProjection.png - :alt: flatProjection - - Note that an array of faces is returned as the projection might result in faces - on the "front" and "back" of the object (or even more if there are intermediate - surfaces in the projection path). faces "behind" the projection are not - returned. - - Args: - target_object (Shape): Object to project onto - direction (VectorLike): projection direction - - Returns: - ShapeList[Face]: Face(s) projected on target object ordered by distance - """ - max_dimension = find_max_dimension([self, target_object]) - extruded_topods_self = _extrude_topods_shape( - self.wrapped, Vector(direction) * max_dimension - ) - - intersected_shapes: ShapeList[Face | Shell] = ShapeList() - if isinstance(target_object, Vertex): - raise TypeError("projection to a vertex is not supported") - if isinstance(target_object, Face): - topods_shape = _topods_bool_op( - (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() - ) - if not topods_shape.IsNull(): - intersected_shapes.append(Face(topods_shape)) - else: - for target_shell in target_object.shells(): - topods_shape = _topods_bool_op( - (extruded_topods_self,), - (target_shell.wrapped,), - BRepAlgoAPI_Common(), - ) - for topods_shell in get_top_level_topods_shapes(topods_shape): - intersected_shapes.append(Shell(topods_shell)) - - intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = ShapeList( - s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ) - return intersected_shapes - - def make_holes(self, interior_wires: list[Wire]) -> Face: - """Make Holes in Face - - Create holes in the Face 'self' from interior_wires which must be entirely interior. - Note that making holes in faces is more efficient than using boolean operations - with solid object. Also note that OCCT core may fail unless the orientation of the wire - is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. - - Example: - - For example, make a series of slots on the curved walls of a cylinder. - - .. image:: slotted_cylinder.png - - Args: - interior_wires: a list of hole outline wires - interior_wires: list[Wire]: - - Returns: - Face: 'self' with holes - - Raises: - RuntimeError: adding interior hole in non-planar face with provided interior_wires - RuntimeError: resulting face is not valid - - """ - # Add wires that define interior holes - note these wires must be entirely interior - makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) - for interior_wire in interior_wires: - makeface_object.Add(interior_wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - # if not surface_face.is_valid(): - # raise RuntimeError("non planar face is invalid") - - return surface_face - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Point inside Face - - Returns whether or not the point is inside a Face within the specified tolerance. - Points on the edge of the Face are considered inside. - - Args: - point(VectorLike): tuple or Vector representing 3D point to be tested - tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool: indicating whether or not point is within Face - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - return solid_classifier.IsOnAFace() - - # surface = BRep_Tool.Surface_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) - # return projector.LowerDistance() <= TOLERANCE - - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs - - Approximate planar face with arcs and straight line segments. - - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - - -class Shell(Mixin2D, Shape[TopoDS_Shell]): - """A Shell is a fundamental component in build123d's topological data structure - representing a connected set of faces forming a closed surface in 3D space. As - part of a geometric model, it defines a watertight enclosure, commonly encountered - in solid modeling. Shells group faces in a coherent manner, playing a crucial role - in representing complex shapes with voids and surfaces. This hierarchical structure - allows for efficient handling of surfaces within a model, supporting various - operations and analyses.""" - - order = 2.5 - - def __init__( - self, - obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell - - Args: - obj (TopoDS_Shape | Face | Iterable[Face], optional): OCCT Shell, Face or Faces. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - obj = list(obj) if isinstance(obj, Iterable) else obj - if isinstance(obj, Iterable) and len(obj_list := list(obj)) == 1: - obj = obj_list[0] - - if isinstance(obj, Face): - builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(obj.wrapped).Surface().Surface() - ) - obj = builder.Shape() - elif isinstance(obj, Iterable): - obj = _sew_topods_faces([f.wrapped for f in obj]) - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - @property - def volume(self) -> float: - """volume - the volume of this Shell if manifold, otherwise zero""" - if self.is_manifold: - solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] - calc_function(solid_shell, properties) - return properties.Mass() - return 0.0 - - def center(self) -> Vector: - """Center of mass of the shell""" - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - return Vector(properties.CentreOfMass()) - - @classmethod - def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: - """extrude - - Extrude a Wire into a Shell. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Shell: - """sweep - - Sweep a 1D profile along a 1D path - - Args: - profile (Union[Curve, Edge, Wire]): the object to sweep - path (Union[Curve, Edge, Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Shell: resulting Shell, may be non-planar - """ - profile = Wire(profile.edges()) - path = Wire(Wire(path.edges()).order_edges()) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Shell(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Shell: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list nor - between wires. Wires may be closed or opened. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Shell: Lofted object - """ - return cls(_make_loft(objs, False, ruled)) - - -class Solid(Mixin3D, Shape[TopoDS_Solid]): - """A Solid in build123d represents a three-dimensional solid geometry - in a topological structure. A solid is a closed and bounded volume, enclosing - a region in 3D space. It comprises faces, edges, and vertices connected in a - well-defined manner. Solid modeling operations, such as Boolean - operations (union, intersection, and difference), are often performed on - Solid objects to create or modify complex geometries.""" - - order = 3.0 - - def __init__( - self, - obj: TopoDS_Solid | Shell | None = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - ): - """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid - - Args: - obj (TopoDS_Shape | Shell, optional): OCCT Solid or Shell. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Shell): - obj = Solid._make_solid(obj) - - super().__init__( - obj=obj, - # label="" if label is None else label, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - - @property - def volume(self) -> float: - """volume - the volume of this Solid""" - # when density == 1, mass == volume - return Shape.compute_mass(self) - - @classmethod - def _make_solid(cls, shell: Shell) -> TopoDS_Solid: - """Create a Solid object from the surface shell""" - return ShapeFix_Solid().SolidFromShell(shell.wrapped) - - @classmethod - def extrude(cls, obj: Face, direction: VectorLike) -> Solid: - """extrude - - Extrude a Face into a Solid. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: - """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) - - @classmethod - def make_box( - cls, length: float, width: float, height: float, plane: Plane = Plane.XY - ) -> Solid: - """make box - - Make a box at the origin of plane extending in positive direction of each axis. - - Args: - length (float): - width (float): - height (float): - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Solid: Box - """ - return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() - ) - - @classmethod - def make_cone( - cls, - base_radius: float, - top_radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cone - - Make a cone with given radii and height - - Args: - base_radius (float): - top_radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cone - """ - return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_cylinder( - cls, - radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cylinder - - Make a cylinder with a given radius and height with the base center on plane origin. - - Args: - radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cylinder - """ - return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_torus( - cls, - major_radius: float, - minor_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 0, - end_angle: float = 360, - major_angle: float = 360, - ) -> Solid: - """make torus - - Make a torus with a given radii and angles - - Args: - major_radius (float): - minor_radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - start_angle (float, optional): start major arc. Defaults to 0. - end_angle (float, optional): end major arc. Defaults to 360. - - Returns: - Solid: Full or partial torus - """ - return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Solid: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Solid: Lofted object - """ - return cls(_make_loft(objs, True, ruled)) - - @classmethod - def make_wedge( - cls, - delta_x: float, - delta_y: float, - delta_z: float, - min_x: float, - min_z: float, - max_x: float, - max_z: float, - plane: Plane = Plane.XY, - ) -> Solid: - """Make a wedge - - Args: - delta_x (float): - delta_y (float): - delta_z (float): - min_x (float): - min_z (float): - max_x (float): - max_z (float): - plane (Plane): base plane. Defaults to Plane.XY. - - Returns: - Solid: wedge - """ - return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() - ) - - @classmethod - def make_sphere( - cls, - radius: float, - plane: Plane = Plane.XY, - angle1: float = -90, - angle2: float = 90, - angle3: float = 360, - ) -> Solid: - """Sphere - - Make a full or partial sphere - with a given radius center on the origin or plane. - - Args: - radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle1 (float, optional): Defaults to -90. - angle2 (float, optional): Defaults to 90. - angle3 (float, optional): Defaults to 360. - - Returns: - Solid: sphere - """ - return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() - ) - - @classmethod - def extrude_taper( - cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True - ) -> Solid: - """Extrude a cross section with a taper - - Extrude a cross section into a prismatic solid in the provided direction. - - Note that two difference algorithms are used. If direction aligns with - the profile normal (which must be positive), the taper is positive and the profile - contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most - accurate results. Otherwise, a loft is created between the profile and the profile - with a 2D offset set at the appropriate direction. - - Args: - section (Face]): cross section - normal (VectorLike): a vector along which to extrude the wires. The length - of the vector controls the length of the extrusion. - taper (float): taper angle in degrees. - flip_inner (bool, optional): outer and inner geometry have opposite tapers to - allow for part extraction when injection molding. - - Returns: - Solid: extruded cross section - """ - # pylint: disable=too-many-locals - direction = Vector(direction) - - if ( - direction.normalized() == profile.normal_at() - and Plane(profile).z_dir.Z > 0 - and taper > 0 - and not profile.inner_wires() - ): - prism_builder = LocOpe_DPrism( - profile.wrapped, - direction.length / cos(radians(taper)), - radians(taper), - ) - new_solid = Solid(prism_builder.Shape()) - else: - # Determine the offset to get the taper - offset_amt = -direction.length * tan(radians(taper)) - - outer = profile.outer_wire() - local_outer: Wire = Plane(profile).to_local_coords(outer) - local_taper_outer = local_outer.offset_2d( - offset_amt, kind=Kind.INTERSECTION - ) - taper_outer = Plane(profile).from_local_coords(local_taper_outer) - taper_outer.move(Location(direction)) - - profile_wires = [profile.outer_wire()] + profile.inner_wires() - - taper_wires = [] - for i, wire in enumerate(profile_wires): - flip = -1 if i > 0 and flip_inner else 1 - local: Wire = Plane(profile).to_local_coords(wire) - local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper_wire: Wire = Plane(profile).from_local_coords(local_taper) - taper_wire.move(Location(direction)) - taper_wires.append(taper_wire) - - solids = [ - Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) - ] - if len(solids) > 1: - complex_solid = solids[0].cut(*solids[1:]) - assert isinstance(complex_solid, Solid) # Can't be a list - new_solid = complex_solid - else: - new_solid = solids[0] - - return new_solid - - @classmethod - def extrude_linear_with_rotation( - cls, - section: Union[Face, Wire], - center: VectorLike, - normal: VectorLike, - angle: float, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Extrude with Rotation - - Creates a 'twisted prism' by extruding, while simultaneously rotating around the - extrusion vector. - - Args: - section (Union[Face,Wire]): cross section - vec_center (VectorLike): the center point about which to rotate - vec_normal (VectorLike): a vector along which to extrude the wires - angle (float): the angle to rotate through while extruding - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to None. - - Returns: - Solid: extruded object - """ - # Though the signature may appear to be similar enough to extrude to merit - # combining them, the construction methods used here are different enough that they - # should be separate. - - # At a high level, the steps followed are: - # (1) accept a set of wires - # (2) create another set of wires like this one, but which are transformed and rotated - # (3) create a ruledSurface between the sets of wires - # (4) create a shell and compute the resulting object - - inner_wires = inner_wires if inner_wires else [] - center = Vector(center) - normal = Vector(normal) - - def extrude_aux_spine( - wire: TopoDS_Wire, spine: TopoDS_Wire, aux_spine: TopoDS_Wire - ) -> TopoDS_Shape: - """Helper function""" - extrude_builder = BRepOffsetAPI_MakePipeShell(spine) - extrude_builder.SetMode(aux_spine, False) # auxiliary spine - extrude_builder.Add(wire) - extrude_builder.Build() - extrude_builder.MakeSolid() - return extrude_builder.Shape() - - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - - # make straight spine - straight_spine_e = Edge.make_line(center, center.add(normal)) - straight_spine_w = Wire.combine([straight_spine_e])[0].wrapped - - # make an auxiliary spine - pitch = 360.0 / angle * normal.length - aux_spine_w = Wire( - [Edge.make_helix(pitch, normal.length, 1, center=center, normal=normal)] - ).wrapped - - # extrude the outer wire - outer_solid = extrude_aux_spine( - outer_wire.wrapped, straight_spine_w, aux_spine_w - ) - - # extrude inner wires - inner_solids = [ - extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w) - for w in inner_wires + # Find any intersection points + vertex_intersections = [ + Vertex(pnt) for pnt in self.find_intersection_points(edge) ] - # combine the inner solids into compound - inner_comp = _make_topods_compound_from_shapes(inner_solids) + # Find Edge/Edge overlaps + intersect_op = BRepAlgoAPI_Common() + edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - # subtract from the outer solid - return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) - - @classmethod - def extrude_until( - cls, - section: Face, - target_object: Union[Compound, Solid], - direction: VectorLike, - until: Until = Until.NEXT, - ) -> Union[Compound, Solid]: - """extrude_until - - Extrude section in provided direction until it encounters either the - NEXT or LAST surface of target_object. Note that the bounding surface - must be larger than the extruded face where they contact. - - Args: - section (Face): Face to extrude - target_object (Union[Compound, Solid]): object to limit extrusion - direction (VectorLike): extrusion direction - until (Until, optional): surface to limit extrusion. Defaults to Until.NEXT. - - Raises: - ValueError: provided face does not intersect target_object - - Returns: - Union[Compound, Solid]: extruded Face - """ - direction = Vector(direction) - if until in [Until.PREVIOUS, Until.FIRST]: - direction *= -1 - until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - - max_dimension = find_max_dimension([section, target_object]) - clipping_direction = ( - direction * max_dimension - if until == Until.NEXT - else -direction * max_dimension - ) - direction_axis = Axis(section.center(), clipping_direction) - # Create a linear extrusion to start - extrusion = Solid.extrude(section, direction * max_dimension) - - # Project section onto the shape to generate faces that will clip the extrusion - # and exclude the planar faces normal to the direction of extrusion and these - # will have no volume when extruded - faces = [] - for face in section.project_to_shape(target_object, direction): - if isinstance(face, Face): - faces.append(face) - else: - faces += face.faces() - - clip_faces = [ - f - for f in faces - if not (f.is_planar and f.normal_at().dot(direction) == 0.0) - ] - if not clip_faces: - raise ValueError("provided face does not intersect target_object") - - # Create the objects that will clip the linear extrusion - clipping_objects = [ - Solid.extrude(f, clipping_direction).fix() for f in clip_faces - ] - clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] - - if until == Until.NEXT: - trimmed_extrusion = extrusion.cut(target_object) - if isinstance(trimmed_extrusion, ShapeList): - closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] - else: - closest_extrusion = trimmed_extrusion - for clipping_object in clipping_objects: - # It's possible for clipping faces to self intersect when they are extruded - # thus they could be non manifold which results failed boolean operations - # - so skip these objects - try: - extrusion_shapes = closest_extrusion.cut(clipping_object) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - else: - base_part = extrusion.intersect(target_object) - if isinstance(base_part, ShapeList): - extrusion_parts = base_part - elif base_part is None: - extrusion_parts = ShapeList() - else: - extrusion_parts = ShapeList([base_part]) - for clipping_object in clipping_objects: - try: - clipped_extrusion = extrusion.intersect(clipping_object) - if clipped_extrusion is not None: - extrusion_parts.append( - clipped_extrusion.solids().sort_by(direction_axis)[0] - ) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - extrusion_shapes = Solid.fuse(*extrusion_parts) - - result = extrusion_shapes.solids().sort_by(direction_axis)[0] - - return result - - @classmethod - def revolve( - cls, - section: Union[Face, Wire], - angle: float, - axis: Axis, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Revolve - - Revolve a cross section about the given Axis by the given angle. - - Args: - section (Union[Face,Wire]): cross section - angle (float): the angle to revolve through - axis (Axis): rotation Axis - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to []. - - Returns: - Solid: the revolved cross section - """ - inner_wires = inner_wires if inner_wires else [] - if isinstance(section, Wire): - section_face = Face(section, inner_wires) - else: - section_face = section - - revol_builder = BRepPrimAPI_MakeRevol( - section_face.wrapped, - axis.wrapped, - angle * DEG2RAD, - True, - ) - - return cls(revol_builder.Shape()) - - @classmethod - def _set_sweep_mode( - cls, - builder: BRepOffsetAPI_MakePipeShell, - path: Union[Wire, Edge], - binormal: Union[Vector, Wire, Edge], - ) -> bool: - rotate = False - - if isinstance(binormal, Vector): - coordinate_system = gp_Ax2() - coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(binormal.to_dir()) - builder.SetMode(coordinate_system) - rotate = True - elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) - - return rotate - - @classmethod - def sweep( - cls, - section: Union[Face, Wire], - path: Union[Wire, Edge], - inner_wires: list[Wire] | None = None, - make_solid: bool = True, - is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, - transition: Transition = Transition.TRANSFORMED, - ) -> Solid: - """Sweep - - Sweep the given cross section into a prismatic solid along the provided path - - Args: - section (Union[Face, Wire]): cross section to sweep - path (Union[Wire, Edge]): sweep path - inner_wires (list[Wire]): holes - only used if section is a wire - make_solid (bool, optional): return Solid or Shell. Defaults to True. - is_frenet (bool, optional): Frenet mode. Defaults to False. - mode (Union[Vector, Wire, Edge, None], optional): additional sweep - mode parameters. Defaults to None. - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Solid: the swept cross section - """ - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - inner_wires = inner_wires if inner_wires else [] - - shapes = [] - for wire in [outer_wire] + inner_wires: - builder = BRepOffsetAPI_MakePipeShell(path.to_wire().wrapped) - - rotate = False - - # handle sweep mode - if mode: - rotate = Solid._set_sweep_mode(builder, path, mode) - else: - builder.SetMode(is_frenet) - - builder.SetTransitionMode(Shape._transModeDict[transition]) - - builder.Add(wire.wrapped, False, rotate) - - builder.Build() - if make_solid: - builder.MakeSolid() - - shapes.append(Mixin3D.cast(builder.Shape())) - - outer_shape, inner_shapes = shapes[0], shapes[1:] - - if inner_shapes: - hollow_outer_shape = outer_shape.cut(*inner_shapes) - assert isinstance(hollow_outer_shape, Solid) - return hollow_outer_shape - - return outer_shape - - @classmethod - def sweep_multi( - cls, - profiles: Iterable[Union[Wire, Face]], - path: Union[Wire, Edge], - make_solid: bool = True, - is_frenet: bool = False, - binormal: Union[Vector, Wire, Edge, None] = None, - ) -> Solid: - """Multi section sweep - - Sweep through a sequence of profiles following a path. - - Args: - profiles (Iterable[Union[Wire, Face]]): list of profiles - path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over - make_solid (bool, optional): Solid or Shell. Defaults to True. - is_frenet (bool, optional): Select frenet mode. Defaults to False. - binormal (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. - Defaults to None. - - Returns: - Solid: swept object - """ - path_as_wire = path.to_wire().wrapped - - builder = BRepOffsetAPI_MakePipeShell(path_as_wire) - - translate = False - rotate = False - - if binormal: - rotate = cls._set_sweep_mode(builder, path, binormal) - else: - builder.SetMode(is_frenet) - - for profile in profiles: - path_as_wire = ( - profile.wrapped - if isinstance(profile, Wire) - else profile.outer_wire().wrapped - ) - builder.Add(path_as_wire, translate, rotate) - - builder.Build() - - if make_solid: - builder.MakeSolid() - - return cls(builder.Shape()) - - @classmethod - def thicken( - cls, - surface: Face | Shell, - depth: float, - normal_override: Optional[VectorLike] = None, - ) -> Solid: - """Thicken Face or Shell - - Create a solid from a potentially non planar face or shell by thickening along - the normals. - - .. image:: thickenFace.png - - Non-planar faces are thickened both towards and away from the center of the sphere. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - normal_override (Vector, optional): Face only. The normal_override vector can be - used to indicate which way is 'up', potentially flipping the face normal - direction such that many faces with different normals all go in the same - direction (direction need only be +/- 90 degrees from the face normal). - Defaults to None. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - # Check to see if the normal needs to be flipped - adjusted_depth = depth - if isinstance(surface, Face) and normal_override is not None: - surface_center = surface.center() - surface_normal = surface.normal_at(surface_center).normalized() - if surface_normal.dot(Vector(normal_override).normalized()) < 0: - adjusted_depth = -depth - - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - surface.wrapped, - Offset=adjusted_depth, - Tol=1.0e-5, - Mode=BRepOffset_Skin, - # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both - # sides of the surface but doesn't seem to work - Intersection=True, - SelfInter=False, - Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection - Thickening=True, - RemoveIntEdges=True, - ) - offset_builder.MakeOffsetShape() - try: - result = Solid(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error applying thicken to given surface") from err - - return result - - -class Vertex(Shape[TopoDS_Vertex]): - """A Vertex in build123d represents a zero-dimensional point in the topological - data structure. It marks the endpoints of edges within a 3D model, defining precise - locations in space. Vertices play a crucial role in defining the geometry of objects - and the connectivity between edges, facilitating accurate representation and - manipulation of 3D shapes. They hold coordinate information and are essential - for constructing complex structures like wires, faces, and solids.""" - - order = 0.0 - - @property - def _dim(self) -> int: - return 0 - - @overload - def __init__(self): # pragma: no cover - """Default Vertext at the origin""" - - @overload - def __init__(self, ocp_vx: TopoDS_Vertex): # pragma: no cover - """Vertex from OCCT TopoDS_Vertex object""" - - @overload - def __init__(self, X: float, Y: float, Z: float): # pragma: no cover - """Vertex from three float values""" - - @overload - def __init__(self, v: Iterable[float]): - """Vertex from Vector or other iterators""" - - def __init__(self, *args, **kwargs): - self.vertex_index = 0 - - ocp_vx = kwargs.pop("ocp_vx", None) - v = kwargs.pop("v", None) - x = kwargs.pop("X", 0) - y = kwargs.pop("Y", 0) - z = kwargs.pop("Z", 0) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if args: - if isinstance(args[0], TopoDS_Vertex): - ocp_vx = args[0] - elif isinstance(args[0], Iterable): - v = args[0] - else: - x, y, z = args[:3] + (0,) * (3 - len(args)) - - if v is not None: - x, y, z = itertools.islice(itertools.chain(v, [0, 0, 0]), 3) - - ocp_vx = ( - downcast(BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z)).Vertex()) - if ocp_vx is None - else ocp_vx - ) - - super().__init__(ocp_vx) - self.X, self.Y, self.Z = self.to_tuple() - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def volume(self) -> float: - """volume - the volume of this Vertex, which is always zero""" - return 0.0 - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return ShapeList((self,)) # Vertex is an iterable - - def vertex(self) -> Vertex: - """Return the Vertex""" - return self - - def to_tuple(self) -> tuple[float, float, float]: - """Return vertex as three tuple of floats""" - geom_point = BRep_Tool.Pnt_s(self.wrapped) - return (geom_point.X(), geom_point.Y(), geom_point.Z()) - - def center(self) -> Vector: - """The center of a vertex is itself!""" - return Vector(self) - - def __add__( # type: ignore - self, other: Vertex | Vector | tuple[float, float, float] - ) -> Vertex: - """Add - - Add to a Vertex with a Vertex, Vector or Tuple - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" Vertex: # type: ignore - """Subtract - - Substract a Vertex with a Vertex, Vector or Tuple from self - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" str: - """To String - - Convert Vertex to String for display - - Returns: - Vertex as String - """ - return f"Vertex({self.X}, {self.Y}, {self.Z})" - - def __iter__(self): - """Initialize to beginning""" - self.vertex_index = 0 - return self - - def __next__(self): - """return the next value""" - if self.vertex_index == 0: - self.vertex_index += 1 - value = self.X - elif self.vertex_index == 1: - self.vertex_index += 1 - value = self.Y - elif self.vertex_index == 2: - self.vertex_index += 1 - value = self.Z - else: - raise StopIteration - return value - - def transform_shape(self, t_matrix: Matrix) -> Vertex: - """Apply affine transform without changing type - - Transforms a copy of this Vertex by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Vertex: copy of transformed shape with all objects keeping their type - """ - return Vertex(*t_matrix.multiply(Vector(self))) - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: - """extrude - invalid operation for Vertex""" - raise NotImplementedError("Vertices can't be created by extrusion") + return vertex_intersections, edge_intersections class Wire(Mixin1D, Shape[TopoDS_Wire]): @@ -8145,6 +2073,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): allowing precise definition of paths within a 3D model.""" order = 1.5 + # ---- Constructor ---- @overload def __init__( @@ -8303,211 +2232,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): parent=parent, ) - def geom_adaptor(self) -> BRepAdaptor_CompCurve: - """Return the Geom Comp Curve for this Wire""" - return BRepAdaptor_CompCurve(self.wrapped) - - def close(self) -> Wire: - """Close a Wire""" - if not self.is_closed: - edge = Edge.make_line(self.end_point(), self.start_point()) - return_value = Wire.combine((self, edge))[0] - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" - return self - - @classmethod - def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 - ) -> ShapeList[Wire]: - """combine - - Combine a list of wires and edges into a list of Wires. - - Args: - wires (Iterable[Union[Wire, Edge]]): unsorted - tol (float, optional): tolerance. Defaults to 1e-9. - - Returns: - ShapeList[Wire]: Wires - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) - - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires = ShapeList() - for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) - - return wires - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: - """extrude - invalid operation for Wire""" - raise NotImplementedError("Wires can't be created by extrusion") - - def fix_degenerate_edges(self, precision: float) -> Wire: - """fix_degenerate_edges - - Fix a Wire that contains degenerate (very small) edges - - Args: - precision (float): minimum value edge length - - Returns: - Wire: fixed wire - """ - sf_w = ShapeFix_Wireframe(self.wrapped) - sf_w.SetPrecision(precision) - sf_w.SetMaxTolerance(1e-6) - sf_w.FixSmallEdges() - sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) - - def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" - - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. - - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False - - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) - - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length - break - distance += edge.length - - if not found: - raise ValueError(f"{point} not on wire") - - return distance / wire_length - - def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Wire: trimmed wire - """ - - # pylint: disable=too-many-branches - if start >= end: - raise ValueError("start must be less than end") - - edges = self.edges() - - # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) - - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) - - trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue - - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) - - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) - - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) - - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) - - return Wire(trimmed_edges) - - def order_edges(self) -> ShapeList[Edge]: - """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) + # ---- Class Methods ---- @classmethod def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: @@ -8575,6 +2300,41 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return wire_builder.Wire() + @classmethod + def combine( + cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 + ) -> ShapeList[Wire]: + """combine + + Combine a list of wires and edges into a list of Wires. + + Args: + wires (Iterable[Union[Wire, Edge]]): unsorted + tol (float, optional): tolerance. Defaults to 1e-9. + + Returns: + ShapeList[Wire]: Wires + """ + + edges_in = TopTools_HSequenceOfShape() + wires_out = TopTools_HSequenceOfShape() + + for edge in [e for w in wires for e in w.edges()]: + edges_in.Append(edge.wrapped) + + ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) + + wires = ShapeList() + for i in range(wires_out.Length()): + wires.append(Wire(downcast(wires_out.Value(i + 1)))) + + return wires + + @classmethod + def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: + """extrude - invalid operation for Wire""" + raise NotImplementedError("Wires can't be created by extrusion") + @classmethod def make_circle(cls, radius: float, plane: Plane = Plane.XY) -> Wire: """make_circle @@ -8591,208 +2351,6 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): circle_edge = Edge.make_circle(radius, plane=plane) return Wire([circle_edge]) - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - closed: bool = True, - ) -> Wire: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): _description_. Defaults to 360.0. - end_angle (float, optional): _description_. Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - closed (bool, optional): close the arc. Defaults to True. - - Returns: - Wire: an ellipse - """ - ellipse_edge = Edge.make_ellipse( - x_radius, y_radius, plane, start_angle, end_angle, angular_direction - ) - - if start_angle != end_angle and closed: - line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) - wire = Wire([ellipse_edge, line]) - else: - wire = Wire([ellipse_edge]) - - return wire - - @classmethod - def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: - """make_polygon - - Create an irregular polygon by defining vertices - - Args: - vertices (Iterable[VectorLike]): - close (bool, optional): close the polygon. Defaults to True. - - Returns: - Wire: an irregular polygon - """ - vectors = [Vector(v) for v in vertices] - if (vectors[0] - vectors[-1]).length > TOLERANCE and close: - vectors.append(vectors[0]) - - wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vectors: - wire_builder.Add(vertex.to_pnt()) - - return cls(wire_builder.Wire()) - - def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires - - Args: - other: Wire: - - Returns: - - """ - - wire_builder = BRepBuilderAPI_MakeWire() - wire_builder.Add(TopoDS.Wire_s(self.wrapped)) - wire_builder.Add(TopoDS.Wire_s(other.wrapped)) - wire_builder.Build() - - return self.__class__.cast(wire_builder.Wire()) - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: - """fillet_2d - - Apply 2D fillet to a wire - - Args: - radius (float): - vertices (Iterable[Vertex]): vertices to fillet - - Returns: - Wire: filleted wire - """ - # Create a face to fillet - unfilleted_face = _make_topods_face_from_wires(self.wrapped) - # Fillet the face - fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - fillet_builder.Build() - filleted_face = downcast(fillet_builder.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(filleted_face)) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Wire: - """chamfer_2d - - Apply 2D chamfer to a wire - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Returns: - Wire: chamfered wire - """ - reference_edge = edge - - # Create a face to chamfer - unchamfered_face = _make_topods_face_from_wires(self.wrapped) - chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - chamfered_face = chamfer_builder.Shape() - # Fix the shape - shape_fix = ShapeFix_Shape(chamfered_face) - shape_fix.Perform() - chamfered_face = downcast(shape_fix.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(chamfered_face)) - - @staticmethod - def order_chamfer_edges( - reference_edge: Optional[Edge], edges: tuple[Edge, Edge] - ) -> tuple[Edge, Edge]: - """Order the edges of a chamfer relative to a reference Edge""" - if reference_edge: - edge1, edge2 = edges - if edge1 == reference_edge: - return edge1, edge2 - if edge2 == reference_edge: - return edge2, edge1 - raise ValueError("reference edge not in edges") - return edges - - @classmethod - def make_rect( - cls, - width: float, - height: float, - plane: Plane = Plane.XY, - ) -> Wire: - """Make Rectangle - - Make a Rectangle centered on center with the given normal - - Args: - width (float): width (local x) - height (float): height (local y) - plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. - - Returns: - Wire: The centered rectangle - """ - corners_local = [ - (width / 2, height / 2), - (width / 2, height / -2), - (width / -2, height / -2), - (width / -2, height / 2), - ] - corners_world = [plane.from_local_coords(c) for c in corners_local] - return Wire.make_polygon(corners_world, close=True) - @classmethod def make_convex_hull(cls, edges: Iterable[Edge], tolerance: float = 1e-3) -> Wire: """make_convex_hull @@ -8911,6 +2469,276 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) return hull_wire + @classmethod + def make_ellipse( + cls, + x_radius: float, + y_radius: float, + plane: Plane = Plane.XY, + start_angle: float = 360.0, + end_angle: float = 360.0, + angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, + closed: bool = True, + ) -> Wire: + """make ellipse + + Makes an ellipse centered at the origin of plane. + + Args: + x_radius (float): x radius of the ellipse (along the x-axis of plane) + y_radius (float): y radius of the ellipse (along the y-axis of plane) + plane (Plane, optional): base plane. Defaults to Plane.XY. + start_angle (float, optional): _description_. Defaults to 360.0. + end_angle (float, optional): _description_. Defaults to 360.0. + angular_direction (AngularDirection, optional): arc direction. + Defaults to AngularDirection.COUNTER_CLOCKWISE. + closed (bool, optional): close the arc. Defaults to True. + + Returns: + Wire: an ellipse + """ + ellipse_edge = Edge.make_ellipse( + x_radius, y_radius, plane, start_angle, end_angle, angular_direction + ) + + if start_angle != end_angle and closed: + line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) + wire = Wire([ellipse_edge, line]) + else: + wire = Wire([ellipse_edge]) + + return wire + + @classmethod + def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: + """make_polygon + + Create an irregular polygon by defining vertices + + Args: + vertices (Iterable[VectorLike]): + close (bool, optional): close the polygon. Defaults to True. + + Returns: + Wire: an irregular polygon + """ + vectors = [Vector(v) for v in vertices] + if (vectors[0] - vectors[-1]).length > TOLERANCE and close: + vectors.append(vectors[0]) + + wire_builder = BRepBuilderAPI_MakePolygon() + for vertex in vectors: + wire_builder.Add(vertex.to_pnt()) + + return cls(wire_builder.Wire()) + + @classmethod + def make_rect( + cls, + width: float, + height: float, + plane: Plane = Plane.XY, + ) -> Wire: + """Make Rectangle + + Make a Rectangle centered on center with the given normal + + Args: + width (float): width (local x) + height (float): height (local y) + plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. + + Returns: + Wire: The centered rectangle + """ + corners_local = [ + (width / 2, height / 2), + (width / 2, height / -2), + (width / -2, height / -2), + (width / -2, height / 2), + ] + corners_world = [plane.from_local_coords(c) for c in corners_local] + return Wire.make_polygon(corners_world, close=True) + + # ---- Static Methods ---- + + @staticmethod + def order_chamfer_edges( + reference_edge: Edge | None, edges: tuple[Edge, Edge] + ) -> tuple[Edge, Edge]: + """Order the edges of a chamfer relative to a reference Edge""" + if reference_edge: + edge1, edge2 = edges + if edge1 == reference_edge: + return edge1, edge2 + if edge2 == reference_edge: + return edge2, edge1 + raise ValueError("reference edge not in edges") + return edges + + # ---- Instance Methods ---- + + def chamfer_2d( + self, + distance: float, + distance2: float, + vertices: Iterable[Vertex], + edge: Edge | None = None, + ) -> Wire: + """chamfer_2d + + Apply 2D chamfer to a wire + + Args: + distance (float): chamfer length + distance2 (float): chamfer length + vertices (Iterable[Vertex]): vertices to chamfer + edge (Edge): identifies the side where length is measured. The vertices must be + part of the edge + + Returns: + Wire: chamfered wire + """ + reference_edge = edge + + # Create a face to chamfer + unchamfered_face = _make_topods_face_from_wires(self.wrapped) + chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) + + vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() + TopExp.MapShapesAndAncestors_s( + unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map + ) + + for v in vertices: + edge_list = vertex_edge_map.FindFromKey(v.wrapped) + + # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs + # Using First() and Last() to omit + edges = (Edge(edge_list.First()), Edge(edge_list.Last())) + + edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) + + chamfer_builder.AddChamfer( + TopoDS.Edge_s(edge1.wrapped), + TopoDS.Edge_s(edge2.wrapped), + distance, + distance2, + ) + + chamfer_builder.Build() + chamfered_face = chamfer_builder.Shape() + # Fix the shape + shape_fix = ShapeFix_Shape(chamfered_face) + shape_fix.Perform() + chamfered_face = downcast(shape_fix.Shape()) + # Return the outer wire + return Wire(BRepTools.OuterWire_s(chamfered_face)) + + def close(self) -> Wire: + """Close a Wire""" + if not self.is_closed: + edge = Edge.make_line(self.end_point(), self.start_point()) + return_value = Wire.combine((self, edge))[0] + else: + return_value = self + + return return_value + + def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: + """fillet_2d + + Apply 2D fillet to a wire + + Args: + radius (float): + vertices (Iterable[Vertex]): vertices to fillet + + Returns: + Wire: filleted wire + """ + # Create a face to fillet + unfilleted_face = _make_topods_face_from_wires(self.wrapped) + # Fillet the face + fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) + for vertex in vertices: + fillet_builder.AddFillet(vertex.wrapped, radius) + fillet_builder.Build() + filleted_face = downcast(fillet_builder.Shape()) + # Return the outer wire + return Wire(BRepTools.OuterWire_s(filleted_face)) + + def fix_degenerate_edges(self, precision: float) -> Wire: + """fix_degenerate_edges + + Fix a Wire that contains degenerate (very small) edges + + Args: + precision (float): minimum value edge length + + Returns: + Wire: fixed wire + """ + sf_w = ShapeFix_Wireframe(self.wrapped) + sf_w.SetPrecision(precision) + sf_w.SetMaxTolerance(1e-6) + sf_w.FixSmallEdges() + sf_w.FixWireGaps() + return Wire(downcast(sf_w.Shape())) + + def geom_adaptor(self) -> BRepAdaptor_CompCurve: + """Return the Geom Comp Curve for this Wire""" + return BRepAdaptor_CompCurve(self.wrapped) + + def order_edges(self) -> ShapeList[Edge]: + """Return the edges in self ordered by wire direction and orientation""" + ordered_edges = [ + e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) + ] + return ShapeList(ordered_edges) + + def param_at_point(self, point: VectorLike) -> float: + """Parameter at point on Wire""" + + # OCP doesn't support this so this algorithm finds the edge that contains the + # point, finds the u value/fractional distance of the point on that edge and + # sums up the length of the edges from the start to the edge with the point. + + wire_length = self.length + edge_list = self.edges() + target = self.position_at(0) # To start, find the edge at the beginning + distance = 0.0 # distance along wire + found = False + + while edge_list: + # Find the edge closest to the target + edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] + edge_list.pop(edge_list.index(edge)) + + # The edge might be flipped requiring the u value to be reversed + edge_p0 = edge.position_at(0) + edge_p1 = edge.position_at(1) + flipped = (target - edge_p0).length > (target - edge_p1).length + + # Set the next start to "end" of the current edge + target = edge_p0 if flipped else edge_p1 + + # If this edge contain the point, get a fractional distance - otherwise the whole + if edge.distance_to(point) <= TOLERANCE: + found = True + u_value = edge.param_at_point(point) + if flipped: + distance += (1 - u_value) * edge.length + else: + distance += u_value * edge.length + break + distance += edge.length + + if not found: + raise ValueError(f"{point} not on wire") + + return distance / wire_length + def project_to_shape( self, target_object: Shape, @@ -9018,135 +2846,112 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return output_wires + def stitch(self, other: Wire) -> Wire: + """Attempt to stich wires -class Joint(ABC): - """Joint + Args: + other: Wire: - Abstract Base Joint class - used to join two components together + Returns: - Args: - parent (Union[Solid, Compound]): object that joint to bound to + """ - Attributes: - label (str): user assigned label - parent (Shape): object joint is bound to - connected_to (Joint): joint that is connect to this joint + wire_builder = BRepBuilderAPI_MakeWire() + wire_builder.Add(TopoDS.Wire_s(self.wrapped)) + wire_builder.Add(TopoDS.Wire_s(other.wrapped)) + wire_builder.Build() - """ + return self.__class__.cast(wire_builder.Wire()) - def __init__(self, label: str, parent: Union[Solid, Compound]): - self.label = label - self.parent = parent - self.connected_to: Joint | None = None + def to_wire(self) -> Wire: + """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" + return self - def _connect_to(self, other: Joint, **kwargs): # pragma: no cover - """Connect Joint self by repositioning other""" + def trim(self: Wire, start: float, end: float) -> Wire: + """trim - if not isinstance(other, Joint): - raise TypeError(f"other must of type Joint not {type(other)}") - if self.parent.location is None: - raise ValueError("Parent location is not set") - relative_location = self.relative_to(other, **kwargs) - other.parent.locate(self.parent.location * relative_location) - self.connected_to = other + Create a new wire by keeping only the section between start and end. - @abstractmethod - def connect_to(self, other: Joint): - """All derived classes must provide a connect_to method""" + Args: + start (float): 0.0 <= start < 1.0 + end (float): 0.0 < end <= 1.0 - @abstractmethod - def relative_to(self, other: Joint) -> Location: - """Return relative location to another joint""" + Raises: + ValueError: start >= end - @property - @abstractmethod - def location(self) -> Location: - """Location of joint""" + Returns: + Wire: trimmed wire + """ - @property - @abstractmethod - def symbol(self) -> Compound: - """A CAD object positioned in global space to illustrate the joint""" + # pylint: disable=too-many-branches + if start >= end: + raise ValueError("start must be less than end") + edges = self.edges() -def _make_loft( - objs: Iterable[Union[Vertex, Wire]], - filled: bool, - ruled: bool = False, -) -> TopoDS_Shape: - """make loft + # If this is really just an edge, skip the complexity of a Wire + if len(edges) == 1: + return Wire([edges[0].trim(start, end)]) - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. + # For each Edge determine the beginning and end wire parameters + # Note that u, v values are parameters along the Wire + edges_uv_values: list[tuple[float, float, Edge]] = [] + found_end_of_wire = False # for finding ends of closed wires - Args: - wires (list[Wire]): section perimeters - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). + for edge in edges: + u = self.param_at_point(edge.position_at(0)) + v = self.param_at_point(edge.position_at(1)) + if self.is_closed: # Avoid two beginnings or ends + u = ( + 1 - u + if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) + else u + ) + v = ( + 1 - v + if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) + else v + ) + found_end_of_wire = ( + isclose_b(u, 0) + or isclose_b(u, 1) + or isclose_b(v, 0) + or isclose_b(v, 1) + or found_end_of_wire + ) - Raises: - ValueError: Too few wires + # Edge might be reversed and require flipping parms + u, v = (v, u) if u > v else (u, v) - Returns: - TopoDS_Shape: Lofted object - """ - objs = list(objs) # To determine its length - if len(objs) < 2: - raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] - vertex_count = len(vertices) + edges_uv_values.append((u, v, edge)) - if vertex_count > 2: - raise ValueError("Only two vertices are allowed") + trimmed_edges = [] + for u, v, edge in edges_uv_values: + if v < start or u > end: # Edge not needed + continue - if vertex_count == 1 and not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - or isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertex must be either at the beginning or end of the list" - ) + if start <= u and v <= end: # keep whole Edge + trimmed_edges.append(edge) - if vertex_count == 2: - if len(objs) == 2: - raise ValueError( - "You can't have only 2 vertices to loft; try adding some wires" - ) - if not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - and isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertices must be at the beginning and end of the list" - ) + elif start >= u and end <= v: # Wire trimmed to single Edge + u_edge = edge.param_at_point(self.position_at(start)) + v_edge = edge.param_at_point(self.position_at(end)) + u_edge, v_edge = ( + (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) + ) + trimmed_edges.append(edge.trim(u_edge, v_edge)) - loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) + elif start <= u: # keep start of Edge + u_edge = edge.param_at_point(self.position_at(end)) + if u_edge != 0: + trimmed_edges.append(edge.trim(0, u_edge)) - for obj in objs: - if isinstance(obj.wrapped, TopoDS_Vertex): - loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj.wrapped, TopoDS_Wire): - loft_builder.AddWire(obj.wrapped) + else: # v <= end keep end of Edge + v_edge = edge.param_at_point(self.position_at(start)) + if v_edge != 1: + trimmed_edges.append(edge.trim(v_edge, 1)) - loft_builder.Build() - - return loft_builder.Shape() - - -def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: - """Downcasts a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - f_downcast: Any = Shape.downcast_LUT[shapetype(obj)] - return_value = f_downcast(obj) - - return return_value + return Wire(trimmed_edges) def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: @@ -9176,167 +2981,6 @@ def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: return wires -def fix(obj: TopoDS_Shape) -> TopoDS_Shape: - """Fix a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - shape_fix = ShapeFix_Shape(obj) - shape_fix.Perform() - - return downcast(shape_fix.Shape()) - - -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: - """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj is None or obj.IsNull(): - raise ValueError("Null TopoDS_Shape object") - - return obj.ShapeType() - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) - if len(shapetypes) == 1: - result = shapetypes.pop() - else: - result = shapetype(obj) - else: - result = shapetype(obj.wrapped) - return result - - -def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: - """Tries to determine how wires should be combined into faces. - - Assume: - The wires make up one or more faces, which could have 'holes' - Outer wires are listed ahead of inner wires - there are no wires inside wires inside wires - ( IE, islands -- we can deal with that later on ) - none of the wires are construction wires - - Compute: - one or more sets of wires, with the outer wire listed first, and inner - ones - - Returns, list of lists. - - Args: - wire_list: list[Wire]: - - Returns: - - """ - - # check if we have something to sort at all - if len(wire_list) < 2: - return [ - wire_list, - ] - - # make a Face, NB: this might return a compound of faces - faces = Face(wire_list[0], wire_list[1:]) - - return_value = [] - for face in faces.faces(): - return_value.append( - [ - face.outer_wire(), - ] - + face.inner_wires() - ) - - return return_value - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - def topo_explore_connected_edges( edge: Edge, parent: Shape | None = None ) -> ShapeList[Edge]: @@ -9362,312 +3006,3 @@ def topo_explore_connected_edges( connected_edges.add(topods_edge) return ShapeList(Edge(e) for e in connected_edges) - - -def topo_explore_common_vertex( - edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge -) -> Optional[Vertex]: - """Given two edges, find the common vertex""" - topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped - topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped - - if topods_edge1 is None or topods_edge2 is None: - raise ValueError("edge is empty") - - # Explore vertices of the first edge - vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) - while vert_exp.More(): - vertex1 = vert_exp.Current() - - # Explore vertices of the second edge - explorer2 = TopExp_Explorer(topods_edge2, ta.TopAbs_VERTEX) - while explorer2.More(): - vertex2 = explorer2.Current() - - # Check if the vertices are the same - if vertex1.IsSame(vertex2): - return Vertex(TopoDS.Vertex_s(vertex1)) # Common vertex found - - explorer2.Next() - vert_exp.Next() - - return None # No common vertex found - - -def unwrap_topods_compound( - compound: TopoDS_Compound, fully: bool = True -) -> TopoDS_Compound | TopoDS_Shape: - """Strip unnecessary Compound wrappers - - Args: - compound (TopoDS_Compound): The TopoDS_Compound to unwrap. - fully (bool, optional): return base shape without any TopoDS_Compound - wrappers (otherwise one TopoDS_Compound is left). Defaults to True. - - Returns: - TopoDS_Compound | TopoDS_Shape: base shape - """ - if compound.NbChildren() == 1: - iterator = TopoDS_Iterator(compound) - single_element = downcast(iterator.Value()) - - # If the single element is another TopoDS_Compound, unwrap it recursively - if isinstance(single_element, TopoDS_Compound): - return unwrap_topods_compound(single_element, fully) - - return single_element if fully else compound - - # If there are no elements or more than one element, return TopoDS_Compound - return compound - - -def get_top_level_topods_shapes( - topods_shape: TopoDS_Shape | None, -) -> list[TopoDS_Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - list[TopoDS_Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if topods_shape is None: - return ShapeList() - - first_level_shapes = [] - stack = [topods_shape] - - while stack: - current_shape = stack.pop() - if isinstance(current_shape, TopoDS_Compound): - iterator = TopoDS_Iterator() - iterator.Initialize(current_shape) - while iterator.More(): - child_shape = downcast(iterator.Value()) - if isinstance(child_shape, TopoDS_Compound): - # Traverse further into the compound - stack.append(child_shape) - else: - # Add non-compound shape - first_level_shapes.append(child_shape) - iterator.Next() - else: - first_level_shapes.append(current_shape) - - return first_level_shapes - - -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - -def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None -) -> TopoDS_Face: - """_make_topods_face_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error - - Returns: - TopoDS_Face: planar face potentially with holes - """ - if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = list(inner_wires) if inner_wires else [] - - # check if wires are coplanar - verification_compound = _make_topods_compound_from_shapes( - [outer_wire] + inner_wires - ) - if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): - raise ValueError("Cannot build face(s): wires not planar") - - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) - - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) - - for inner_wire in inner_wires: - if not BRep_Tool.IsClosed_s(inner_wire): - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) - - face_builder.Build() - - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") - - face = face_builder.Face() - - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() - - return TopoDS.Face_s(sf_f.Result()) - - -def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: - """Sew faces into a shell if possible""" - shell_builder = BRepBuilderAPI_Sewing() - for face in faces: - shell_builder.Add(face) - shell_builder.Perform() - return downcast(shell_builder.SewedShape()) - - -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound - """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) - - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) - - return comp - - -def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: - """Return the maximum dimension of one or more shapes""" - shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) - bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) - return bbox.diagonal - - -def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) - - -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - TopoDS_Shape: extruded shape - """ - direction = Vector(direction) - - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") - - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion - - -class SkipClean: - """Skip clean context for use in operator driven code where clean=False wouldn't work""" - - clean = True - - def __enter__(self): - SkipClean.clean = False - - def __exit__(self, exception_type, exception_value, traceback): - SkipClean.clean = True From 8862fa7940b6e19451d73d6198977502c434950b Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:53:08 -0500 Subject: [PATCH 075/518] Step 6 - three_d.py --- src/build123d/{topology.py => topology/three_d.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/build123d/{topology.py => topology/three_d.py} (100%) diff --git a/src/build123d/topology.py b/src/build123d/topology/three_d.py similarity index 100% rename from src/build123d/topology.py rename to src/build123d/topology/three_d.py From c9beb4f7572311e08c7b81cec74c2a524f4c0ca9 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:53:08 -0500 Subject: [PATCH 076/518] Step 5b split - two_d.py --- src/build123d/topology/two_d.py | 9581 +++---------------------------- 1 file changed, 659 insertions(+), 8922 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 5986e08..df01732 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1,17 +1,43 @@ """ build123d topology -name: topology.py +name: two_d.py by: Gumyr -date: Oct 14, 2022 +date: January 07, 2025 desc: - This python module is a CAD library based on OpenCascade containing - the base Shape class and all of its derived classes. + +This module provides classes and methods for two-dimensional geometric entities in the build123d CAD +library, focusing on the `Face` and `Shell` classes. These entities form the building blocks for +creating and manipulating complex 2D surfaces and 3D shells, enabling precise modeling for CAD +applications. + +Key Features: +- **Mixin2D**: + - Adds shared functionality to `Face` and `Shell` classes, such as splitting, extrusion, and + projection operations. + +- **Face Class**: + - Represents a 3D bounded surface with advanced features like trimming, offsetting, and Boolean + operations. + - Provides utilities for creating faces from wires, arrays of points, Bézier surfaces, and ruled + surfaces. + - Enables geometry queries like normal vectors, surface centers, and planarity checks. + +- **Shell Class**: + - Represents a collection of connected faces forming a closed surface. + - Supports operations like lofting and sweeping profiles along paths. + +- **Utilities**: + - Includes methods for sorting wires into buildable faces and creating holes within faces + efficiently. + +The module integrates deeply with OpenCascade to leverage its powerful CAD kernel, offering robust +and extensible tools for surface and shell creation, manipulation, and analysis. license: - Copyright 2022 Gumyr + Copyright 2025 Gumyr Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,3825 +55,100 @@ license: from __future__ import annotations -# pylint has trouble with the OCP imports -# pylint: disable=no-name-in-module, import-error -# pylint: disable=too-many-lines -# other pylint warning to temp remove: -# too-many-arguments, too-many-locals, too-many-public-methods, -# too-many-statements, too-many-instance-attributes, too-many-branches import copy -import itertools -import os -import platform -import sys import warnings -from abc import ABC, abstractmethod -from itertools import combinations -from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose -from typing import ( - Any, - Callable, - Dict, - Generic, - Iterable, - Iterator, - Optional, - Protocol, - Sequence, - SupportsIndex, - Tuple, - Type, - TypeVar, - Union, - overload, - TYPE_CHECKING, -) -from typing import cast as tcast -from typing_extensions import Self, Literal -from anytree import NodeMixin, PreOrderIter, RenderTree -from IPython.lib.pretty import pretty, PrettyPrinter -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter - -import OCP.GeomAbs as ga # Geometry type enum -import OCP.TopAbs as ta # Topology type enum -from OCP.Aspect import Aspect_TOL_SOLID -from OCP.Bnd import Bnd_Box -from OCP.BOPAlgo import BOPAlgo_GlueEnum +from typing import Any, Iterable, Sequence, Tuple, Union, overload, TYPE_CHECKING +import OCP.TopAbs as ta from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import ( - BRepAdaptor_CompCurve, - BRepAdaptor_Curve, - BRepAdaptor_Surface, -) +from OCP.BRepAdaptor import BRepAdaptor_Surface from OCP.BRepAlgo import BRepAlgo -from OCP.BRepAlgoAPI import ( - BRepAlgoAPI_BooleanOperation, - BRepAlgoAPI_Common, - BRepAlgoAPI_Cut, - BRepAlgoAPI_Fuse, - BRepAlgoAPI_Section, - BRepAlgoAPI_Splitter, -) -from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_Copy, - BRepBuilderAPI_DisconnectedWire, - BRepBuilderAPI_EmptyWire, - BRepBuilderAPI_GTransform, - BRepBuilderAPI_MakeEdge, - BRepBuilderAPI_MakeFace, - BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeShell, - BRepBuilderAPI_MakeSolid, - BRepBuilderAPI_MakeVertex, - BRepBuilderAPI_MakeWire, - BRepBuilderAPI_NonManifoldWire, - BRepBuilderAPI_RightCorner, - BRepBuilderAPI_RoundCorner, - BRepBuilderAPI_Sewing, - BRepBuilderAPI_Transform, - BRepBuilderAPI_Transformed, -) -from OCP.BRepCheck import BRepCheck_Analyzer +from OCP.BRepAlgoAPI import BRepAlgoAPI_Common +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakeShell from OCP.BRepClass3d import BRepClass3d_SolidClassifier -from OCP.BRepExtrema import BRepExtrema_DistShapeShape -from OCP.BRepFeat import BRepFeat_MakeDPrism, BRepFeat_SplitShape from OCP.BRepFill import BRepFill -from OCP.BRepFilletAPI import ( - BRepFilletAPI_MakeChamfer, - BRepFilletAPI_MakeFillet, - BRepFilletAPI_MakeFillet2d, -) -from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation +from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d +from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter -from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepMesh import BRepMesh_IncrementalMesh -from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import ( - BRepOffsetAPI_MakeFilling, - BRepOffsetAPI_MakeOffset, - BRepOffsetAPI_MakePipeShell, - BRepOffsetAPI_MakeThickSolid, - BRepOffsetAPI_ThruSections, -) -from OCP.BRepPrimAPI import ( - BRepPrimAPI_MakeBox, - BRepPrimAPI_MakeCone, - BRepPrimAPI_MakeCylinder, - BRepPrimAPI_MakePrism, - BRepPrimAPI_MakeRevol, - BRepPrimAPI_MakeSphere, - BRepPrimAPI_MakeTorus, - BRepPrimAPI_MakeWedge, -) -from OCP.BRepProj import BRepProj_Projection +from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeFilling, BRepOffsetAPI_MakePipeShell from OCP.BRepTools import BRepTools -from OCP.Font import ( - Font_FA_Bold, - Font_FA_Italic, - Font_FA_Regular, - Font_FontMgr, - Font_SystemFont, -) -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse # geometry construction -from OCP.gce import gce_MakeLin -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import ( - Geom_BezierCurve, - Geom_BezierSurface, - Geom_ConicalSurface, - Geom_CylindricalSurface, - Geom_Plane, - Geom_Surface, - Geom_TrimmedCurve, - Geom_Line, -) -from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve -from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType -from OCP.GeomAPI import ( - GeomAPI_IntCS, - GeomAPI_Interpolate, - GeomAPI_PointsToBSpline, - GeomAPI_PointsToBSplineSurface, - GeomAPI_ProjectPointOnSurf, - GeomAPI_ProjectPointOnCurve, -) -from OCP.GeomFill import ( - GeomFill_CorrectedFrenet, - GeomFill_Frenet, - GeomFill_TrihedronLaw, -) -from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, -) - -# properties used to store mass calculation result from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher -from OCP.IVtkVTK import IVtkVTK_ShapeData -from OCP.LocOpe import LocOpe_DPrism -from OCP.NCollection import NCollection_Utf8String +from OCP.Geom import Geom_BezierSurface, Geom_Surface +from OCP.GeomAPI import GeomAPI_PointsToBSplineSurface, GeomAPI_ProjectPointOnSurf +from OCP.GeomAbs import GeomAbs_C0 from OCP.Precision import Precision -from OCP.Prs3d import Prs3d_IsoAspect -from OCP.Quantity import Quantity_Color -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds, ShapeAnalysis_Curve -from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters -from OCP.ShapeFix import ( - ShapeFix_Face, - ShapeFix_Shape, - ShapeFix_Solid, - ShapeFix_Wireframe, -) -from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain - -# for catching exceptions +from OCP.ShapeFix import ShapeFix_Solid from OCP.Standard import ( Standard_Failure, Standard_NoSuchObject, Standard_ConstructionError, ) from OCP.StdFail import StdFail_NotDone -from OCP.StdPrs import StdPrs_BRepFont -from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder - -# Array of vectors (used for B-spline interpolation): -# Array of points (used for B-spline construction): -from OCP.TColgp import ( - TColgp_Array1OfPnt, - TColgp_Array1OfVec, - TColgp_HArray1OfPnt, - TColgp_HArray2OfPnt, -) -from OCP.TCollection import TCollection_AsciiString - -# Array of floats (used for B-spline interpolation): -# Array of booleans (used for B-spline interpolation): -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, - TColStd_HArray2OfReal, -) -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer # Topology explorer -from OCP.TopLoc import TopLoc_Location -from OCP.TopoDS import ( - TopoDS, - TopoDS_Builder, - TopoDS_Compound, - TopoDS_Face, - TopoDS_Iterator, - TopoDS_Shape, - TopoDS_Shell, - TopoDS_Solid, - TopoDS_Vertex, - TopoDS_Edge, - TopoDS_Wire, -) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) -from build123d.build_enums import ( - Align, - AngularDirection, - CenterOf, - FontStyle, - FrameMethod, - GeomType, - Keep, - Kind, - PositionMode, - Side, - SortBy, - Transition, - Until, -) +from OCP.TColStd import TColStd_HArray2OfReal +from OCP.TColgp import TColgp_HArray2OfPnt +from OCP.TopExp import TopExp +from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape +from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid +from OCP.gce import gce_MakeLin +from OCP.gp import gp_Pnt, gp_Vec +from build123d.build_enums import CenterOf, GeomType, SortBy, Transition from build123d.geometry import ( - DEG2RAD, TOLERANCE, Axis, - BoundBox, Color, Location, - Matrix, Plane, Vector, VectorLike, - logger, ) - - -def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: - """Find the normal at a point on surface""" - surface = BRep_Tool.Surface_s(face) - - # project point on surface - projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - -def topods_dim(topods: TopoDS_Shape) -> int | None: - """Return the dimension of this TopoDS_Shape""" - shape_dim_map = { - (TopoDS_Vertex,): 0, - (TopoDS_Edge, TopoDS_Wire): 1, - (TopoDS_Face, TopoDS_Shell): 2, - (TopoDS_Solid,): 3, - } - - for shape_types, dim in shape_dim_map.items(): - if isinstance(topods, shape_types): - return dim - - if isinstance(topods, TopoDS_Compound): - sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - return None - - -HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode - - -Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] - -TrimmingTool = Union[Plane, "Shell", "Face"] - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - -TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) - - -class Shape(NodeMixin, Generic[TOPODS]): - """Shape - - Base class for all CAD objects such as Edge, Face, Solid, etc. - - Args: - obj (TopoDS_Shape, optional): OCCT object. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - - Attributes: - wrapped (TopoDS_Shape): the OCP object - label (str): user assigned label - color (Color): object color - joints (dict[str:Joint]): dictionary of joints bound to this object (Solid only) - children (Shape): list of assembly children of this object (Compound only) - topo_parent (Shape): assembly parent of this object - - """ - - # pylint: disable=too-many-instance-attributes, too-many-public-methods - - @property - @abstractmethod - def _dim(self) -> int | None: - """Dimension of the object""" - - shape_LUT = { - ta.TopAbs_VERTEX: "Vertex", - ta.TopAbs_EDGE: "Edge", - ta.TopAbs_WIRE: "Wire", - ta.TopAbs_FACE: "Face", - ta.TopAbs_SHELL: "Shell", - ta.TopAbs_SOLID: "Solid", - ta.TopAbs_COMPOUND: "Compound", - ta.TopAbs_COMPSOLID: "CompSolid", - } - - shape_properties_LUT = { - ta.TopAbs_VERTEX: None, - ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, - ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, - ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, - } - - inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} - - downcast_LUT = { - ta.TopAbs_VERTEX: TopoDS.Vertex_s, - ta.TopAbs_EDGE: TopoDS.Edge_s, - ta.TopAbs_WIRE: TopoDS.Wire_s, - ta.TopAbs_FACE: TopoDS.Face_s, - ta.TopAbs_SHELL: TopoDS.Shell_s, - ta.TopAbs_SOLID: TopoDS.Solid_s, - ta.TopAbs_COMPOUND: TopoDS.Compound_s, - ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, - } - - geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { - ga.GeomAbs_Line: GeomType.LINE, - ga.GeomAbs_Circle: GeomType.CIRCLE, - ga.GeomAbs_Ellipse: GeomType.ELLIPSE, - ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, - ga.GeomAbs_Parabola: GeomType.PARABOLA, - ga.GeomAbs_BezierCurve: GeomType.BEZIER, - ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, - ga.GeomAbs_OffsetCurve: GeomType.OFFSET, - ga.GeomAbs_OtherCurve: GeomType.OTHER, - } - geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { - ga.GeomAbs_Plane: GeomType.PLANE, - ga.GeomAbs_Cylinder: GeomType.CYLINDER, - ga.GeomAbs_Cone: GeomType.CONE, - ga.GeomAbs_Sphere: GeomType.SPHERE, - ga.GeomAbs_Torus: GeomType.TORUS, - ga.GeomAbs_BezierSurface: GeomType.BEZIER, - ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, - ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, - ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, - ga.GeomAbs_OffsetSurface: GeomType.OFFSET, - ga.GeomAbs_OtherSurface: GeomType.OTHER, - } - _transModeDict = { - Transition.TRANSFORMED: BRepBuilderAPI_Transformed, - Transition.ROUND: BRepBuilderAPI_RoundCorner, - Transition.RIGHT: BRepBuilderAPI_RightCorner, - } - - def __init__( - self, - obj: TopoDS_Shape | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - self.wrapped: TOPODS | None = ( - tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None - ) - self.for_construction = False - self.label = label - self._color = color - - # parent must be set following children as post install accesses children - self.parent = parent - - # Extracted objects like Vertices and Edges may need to know where they came from - self.topo_parent: Shape | None = None - - @property - def location(self) -> Location | None: - """Get this Shape's Location""" - if self.wrapped is None: - return None - return Location(self.wrapped.Location()) - - @location.setter - def location(self, value: Location): - """Set Shape's Location to value""" - if self.wrapped is not None: - self.wrapped.Location(value.wrapped) - - @property - def position(self) -> Vector | None: - """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: - return None - return self.location.position - - @position.setter - def position(self, value: VectorLike): - """Set the position component of this Shape's Location to value""" - loc = self.location - if loc is not None: - loc.position = Vector(value) - self.location = loc - - @property - def orientation(self) -> Vector | None: - """Get the orientation component of this Shape's Location""" - if self.location is None: - return None - return self.location.orientation - - @orientation.setter - def orientation(self, rotations: VectorLike): - """Set the orientation component of this Shape's Location to rotations""" - loc = self.location - if loc is not None: - loc.orientation = Vector(rotations) - self.location = loc - - @property - def color(self) -> Union[None, Color]: - """Get the shape's color. If it's None, get the color of the nearest - ancestor, assign it to this Shape and return this value.""" - # Find the correct color for this node - if self._color is None: - # Find parent color - current_node: Compound | Shape | None = self - while current_node is not None: - parent_color = current_node._color - if parent_color is not None: - break - current_node = current_node.parent - node_color = parent_color - else: - node_color = self._color - self._color = node_color # Set the node's color for next time - return node_color - - @color.setter - def color(self, value): - """Set the shape's color""" - self._color = value - - @property - def is_planar_face(self) -> bool: - """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): - return False - surface = BRep_Tool.Surface_s(self.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() - - def copy_attributes_to( - self, target: Shape, exceptions: Iterable[str] | None = None - ): - """Copy common object attributes to target - - Note that preset attributes of target will not be overridden. - - Args: - target (Shape): object to gain attributes - exceptions (Iterable[str], optional): attributes not to copy - - Raises: - ValueError: invalid attribute - """ - # Find common attributes and eliminate exceptions - attrs1 = set(self.__dict__.keys()) - attrs2 = set(target.__dict__.keys()) - common_attrs = attrs1 & attrs2 - if exceptions is not None: - common_attrs -= set(exceptions) - - for attr in common_attrs: - # Copy the attribute only if the target's attribute not set - if not getattr(target, attr): - setattr(target, attr, getattr(self, attr)) - # Attach joints to the new part - if attr == "joints": - joint: Joint - for joint in target.joints.values(): - joint.parent = target - - @property - def is_manifold(self) -> bool: - """is_manifold - - Check if each edge in the given Shape has exactly two faces associated with it - (skipping degenerate edges). If so, the shape is manifold. - - Returns: - bool: is the shape manifold or water tight - """ - # Extract one or more (if a Compound) shape from self - if self.wrapped is None: - return False - shape_stack = get_top_level_topods_shapes(self.wrapped) - - while shape_stack: - shape = shape_stack.pop(0) - - # Create an empty indexed data map to store the edges and their corresponding faces. - shape_map = TopTools_IndexedDataMapOfShapeListOfShape() - - # Fill the map with edges and their associated faces in the given shape. Each edge in - # the map is associated with a list of faces that share that edge. - TopExp.MapShapesAndAncestors_s( - # shape.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map - shape, - ta.TopAbs_EDGE, - ta.TopAbs_FACE, - shape_map, - ) - - # Iterate over the edges in the map and checks if each edge is non-degenerate and has - # exactly two faces associated with it. - for i in range(shape_map.Extent()): - # Access each edge in the map sequentially - edge = TopoDS.Edge_s(shape_map.FindKey(i + 1)) - - vertex0 = TopoDS_Vertex() - vertex1 = TopoDS_Vertex() - - # Extract the two vertices of the current edge and stores them in vertex0/1. - TopExp.Vertices_s(edge, vertex0, vertex1) - - # Check if both vertices are null and if they are the same vertex. If so, the - # edge is considered degenerate (i.e., has zero length), and it is skipped. - if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): - continue - - # Check if the current edge has exactly two faces associated with it. If not, - # it means the edge is not shared by exactly two faces, indicating that the - # shape is not manifold. - if shape_map.FindFromIndex(i + 1).Extent() != 2: - return False - - return True - - class _DisplayNode(NodeMixin): - """Used to create anytree structures from TopoDS_Shapes""" - - def __init__( - self, - label: str = "", - address: int | None = None, - position: Union[Vector, Location, None] = None, - parent: Shape._DisplayNode | None = None, - ): - self.label = label - self.address = address - self.position = position - self.parent = parent - self.children: list[Shape] = [] - - _ordered_shapes = [ - TopAbs_ShapeEnum.TopAbs_COMPOUND, - TopAbs_ShapeEnum.TopAbs_SOLID, - TopAbs_ShapeEnum.TopAbs_SHELL, - TopAbs_ShapeEnum.TopAbs_FACE, - TopAbs_ShapeEnum.TopAbs_WIRE, - TopAbs_ShapeEnum.TopAbs_EDGE, - TopAbs_ShapeEnum.TopAbs_VERTEX, - ] - - @staticmethod - def _build_tree( - shape: TopoDS_Shape, - tree: list[_DisplayNode], - parent: _DisplayNode | None = None, - limit: TopAbs_ShapeEnum = TopAbs_ShapeEnum.TopAbs_VERTEX, - show_center: bool = True, - ) -> list[_DisplayNode]: - """Create an anytree copy of the TopoDS_Shape structure""" - - obj_type = Shape.shape_LUT[shape.ShapeType()] - loc: Vector | Location - if show_center: - loc = Shape(shape).bounding_box().center() - else: - loc = Location(shape.Location()) - tree.append(Shape._DisplayNode(obj_type, id(shape), loc, parent)) - iterator = TopoDS_Iterator() - iterator.Initialize(shape) - parent_node = tree[-1] - while iterator.More(): - child = iterator.Value() - if Shape._ordered_shapes.index( - child.ShapeType() - ) <= Shape._ordered_shapes.index(limit): - Shape._build_tree(child, tree, parent_node, limit) - iterator.Next() - return tree - - @staticmethod - def _show_tree(root_node, show_center: bool) -> str: - """Display an assembly or TopoDS_Shape anytree structure""" - - # Calculate the size of the tree labels - size_tuples = [(node.height, len(node.label)) for node in root_node.descendants] - size_tuples.append((root_node.height, len(root_node.label))) - # pylint: disable=cell-var-from-loop - size_tuples_per_level = [ - list(filter(lambda ll: ll[0] == l, size_tuples)) - for l in range(root_node.height + 1) - ] - max_sizes_per_level = [ - max(4, max(l[1] for l in level)) for level in size_tuples_per_level - ] - level_sizes_per_level = [ - l + i * 4 for i, l in enumerate(reversed(max_sizes_per_level)) - ] - tree_label_width = max(level_sizes_per_level) + 1 - - # Build the tree line by line - result = "" - for pre, _fill, node in RenderTree(root_node): - treestr = f"{pre}{node.label}".ljust(tree_label_width) - if hasattr(root_node, "address"): - address = node.address - name = "" - loc = ( - "Center" + str(node.position.to_tuple()) - if show_center - else "Position" + str(node.position.to_tuple()) - ) - else: - address = id(node) - name = node.__class__.__name__.ljust(9) - loc = ( - "Center" + str(node.center().to_tuple()) - if show_center - else "Location" + repr(node.location) - ) - result += f"{treestr}{name}at {address:#x}, {loc}\n" - return result - - def show_topology( - self, - limit_class: Literal[ - "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" - ] = "Vertex", - show_center: bool | None = None, - ) -> str: - """Display internal topology - - Display the internal structure of a Compound 'assembly' or Shape. Example: - - .. code:: - - >>> c1.show_topology() - - c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) - ├── Solid at 0x7f4a4cafafd0, Location(...)) - ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) - │ ├── Solid at 0x7f4a4cafad00, Location(...)) - │ └── Solid at 0x7f4a11a52790, Location(...)) - └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) - ├── Solid at 0x7f4a11a52700, Location(...)) - └── Solid at 0x7f4a11a58550, Location(...)) - - Args: - limit_class: type of displayed leaf node. Defaults to 'Vertex'. - show_center (bool, optional): If None, shows the Location of Compound 'assemblies' - and the bounding box center of Shapes. True or False forces the display. - Defaults to None. - - Returns: - str: tree representation of internal structure - """ - if ( - self.wrapped is not None - and isinstance(self.wrapped, TopoDS_Compound) - and self.children - ): - show_center = False if show_center is None else show_center - result = Shape._show_tree(self, show_center) - else: - tree = Shape._build_tree( - tcast(TopoDS_Shape, self.wrapped), - tree=[], - limit=Shape.inverse_shape_LUT[limit_class], - ) - show_center = True if show_center is None else show_center - result = Shape._show_tree(tree[0], show_center) - return result - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: - """fuse shape to self operator +""" - # Convert `other` to list of base objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self - - # Check that all dimensions are the same - addend_dim = self._dim - if addend_dim is None: - raise ValueError("Dimensions of objects to add to are inconsistent") - - if not all(summand._dim == addend_dim for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - sum_shape = summands[0].fuse(*summands[1:]) - else: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - return sum_shape - - def __sub__( - self, other: Union[None, Shape, Iterable[Shape]] - ) -> Self | ShapeList[Self]: - """cut shape from self operator -""" - - if self.wrapped is None: - raise ValueError("Cannot subtract shape from empty compound") - - # Convert `other` to list of base objects and filter out None values - if other is None: - subtrahends = [] - else: - subtrahends = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to subtract return the original object - if not subtrahends: - return self - - # Check that all dimensions are the same - minuend_dim = self._dim - if minuend_dim is None or any(s._dim is None for s in subtrahends): - raise ValueError("Dimensions of objects to subtract from are inconsistent") - - # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] - if any(d < minuend_dim for d in subtrahend_dims): - raise ValueError( - f"Only shapes with equal or greater dimension can be subtracted: " - f"not {type(self).__name__} ({minuend_dim}D) and " - f"{type(other).__name__} ({min(subtrahend_dims)}D)" - ) - - # Do the actual cut operation - difference = self.cut(*subtrahends) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: - """intersect shape with self operator &""" - others = other if isinstance(other, (list, tuple)) else [other] - - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot intersect shape with empty compound") - new_shape = self.intersect(*others) - - if ( - not isinstance(new_shape, list) - and new_shape is not None - and new_shape.wrapped is not None - and SkipClean.clean - ): - new_shape = new_shape.clean() - - return new_shape - - def __rmul__(self, other): - """right multiply for positioning operator *""" - if not ( - isinstance(other, (list, tuple)) - and all(isinstance(o, (Location, Plane)) for o in other) - ): - raise ValueError( - "shapes can only be multiplied list of locations or planes" - ) - return [loc * self for loc in other] - - # Actually creating the abstract method causes the subclass to pass center_of - # even when not required - possibly this could be improved. - # @abstractmethod - # def center(self, center_of: CenterOf) -> Vector: - # """Compute the center with a specific type of calculation.""" - - def clean(self) -> Self: - """clean - - Remove internal edges - - Returns: - Shape: Original object with extraneous internal edges removed - """ - if self.wrapped is None: - return self - upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) - upgrader.AllowInternalEdges(False) - # upgrader.SetAngularTolerance(1e-5) - try: - upgrader.Build() - self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) - except Exception: - warnings.warn(f"Unable to clean {self}", stacklevel=2) - return self - - def fix(self) -> Self: - """fix - try to fix shape if not valid""" - if self.wrapped is None: - return self - if not self.is_valid(): - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) - - return shape_copy - - return self - - @classmethod - @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: - """Returns the right type of wrapper, given a OCCT object""" - - @property - def geom_type(self) -> GeomType: - """Gets the underlying geometry type. - - Returns: - GeomType: The geometry type of the shape - - """ - if self.wrapped is None: - raise ValueError("Cannot determine geometry type of an empty shape") - - shape: TopAbs_ShapeEnum = shapetype(self.wrapped) - - if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[ - BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() - ] - elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[ - BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() - ] - else: - geom = GeomType.OTHER - - return geom - - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - - def is_same(self, other: Shape) -> bool: - """Returns True if other and this shape are same, i.e. if they share the - same TShape with the same Locations. Orientations may differ. Also see - :py:meth:`is_equal` - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsSame(other.wrapped) - - def is_equal(self, other: Shape) -> bool: - """Returns True if two shapes are equal, i.e. if they share the same - TShape with the same Locations and Orientations. Also see - :py:meth:`is_same`. - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsEqual(other.wrapped) - - def __eq__(self, other) -> bool: - """Check if two shapes are the same. - - This method checks if the current shape is the same as the other shape. - Two shapes are considered the same if they share the same TShape with - the same Locations. Orientations may differ. - - Args: - other (Shape): The shape to compare with. - - Returns: - bool: True if the shapes are the same, False otherwise. - """ - if isinstance(other, Shape): - return self.is_same(other) - return NotImplemented - - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - - def bounding_box( - self, tolerance: float | None = None, optimal: bool = True - ) -> BoundBox: - """Create a bounding box for this Shape. - - Args: - tolerance (float, optional): Defaults to None. - - Returns: - BoundBox: A box sized to contain this Shape - """ - if self.wrapped is None: - return BoundBox(Bnd_Box()) - tolerance = TOLERANCE if tolerance is None else tolerance - return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - - def mirror(self, mirror_plane: Plane | None = None) -> Self: - """ - Applies a mirror transform to this Shape. Does not duplicate objects - about the plane. - - Args: - mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY - Returns: - The mirrored shape - """ - if not mirror_plane: - mirror_plane = Plane.XY - - if self.wrapped is None: - return self - transformation = gp_Trsf() - transformation.SetMirror( - gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) - ) - - return self._apply_transform(transformation) - - @staticmethod - def combined_center( - objects: Iterable[Shape], center_of: CenterOf = CenterOf.MASS - ) -> Vector: - """combined center - - Calculates the center of a multiple objects. - - Args: - objects (Iterable[Shape]): list of objects - center_of (CenterOf, optional): centering option. Defaults to CenterOf.MASS. - - Raises: - ValueError: CenterOf.GEOMETRY not implemented - - Returns: - Vector: center of multiple objects - """ - objects = list(objects) - if center_of == CenterOf.MASS: - total_mass = sum(Shape.compute_mass(o) for o in objects) - weighted_centers = [ - o.center(CenterOf.MASS).multiply(Shape.compute_mass(o)) for o in objects - ] - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - elif center_of == CenterOf.BOUNDING_BOX: - total_mass = len(list(objects)) - - weighted_centers = [] - for obj in objects: - weighted_centers.append(obj.bounding_box().center()) - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - else: - raise ValueError("CenterOf.GEOMETRY not implemented") - - return middle - - @staticmethod - def compute_mass(obj: Shape) -> float: - """Calculates the 'mass' of an object. - - Args: - obj: Compute the mass of this object - obj: Shape: - - Returns: - - """ - if obj.wrapped is None: - return 0.0 - - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] - - if not calc_function: - raise NotImplementedError - - calc_function(obj.wrapped, properties) - return properties.Mass() - - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - - def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return all of the TopoDS sub entities of the given type""" - if self.wrapped is None: - return [] - return _topods_entities(self.wrapped, topo_type) - - # def _entities_from( - # self, child_type: Shapes, parent_type: Shapes - # ) -> Dict[Shape, list[Shape]]: - # """This function is very slow on M1 macs and is currently unused""" - # if self.wrapped is None: - # return {} - - # res = TopTools_IndexedDataMapOfShapeListOfShape() - - # TopExp.MapShapesAndAncestors_s( - # self.wrapped, - # Shape.inverse_shape_LUT[child_type], - # Shape.inverse_shape_LUT[parent_type], - # res, - # ) - - # out: Dict[Shape, list[Shape]] = {} - # for i in range(1, res.Extent() + 1): - # out[self.__class__.cast(res.FindKey(i))] = [ - # self.__class__.cast(el) for el in res.FindFromIndex(i) - # ] - - # return out - - def get_top_level_shapes(self) -> ShapeList[Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - ShapeList[Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if self.wrapped is None: - return ShapeList() - return ShapeList( - self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) - ) - - @staticmethod - def get_shape_list( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> ShapeList: - """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: - return ShapeList() - shape_list = ShapeList( - [shape.__class__.cast(i) for i in shape.entities(entity_type)] - ) - for item in shape_list: - item.topo_parent = shape - return shape_list - - @staticmethod - def get_single_shape( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> Shape: - """Helper to extract a single entity of a specific type from a shape, - with a warning if count != 1.""" - shape_list = Shape.get_shape_list(shape, entity_type) - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=3, - ) - return shape_list[0] if shape_list else None - - # Note all sub-classes have vertices and vertex methods - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() - - def edge(self) -> Edge | None: - """Return the Edge""" - return None - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return ShapeList() - - def wire(self) -> Wire | None: - """Return the Wire""" - return None - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return ShapeList() - - def face(self) -> Face | None: - """Return the Face""" - return None - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return ShapeList() - - def shell(self) -> Shell | None: - """Return the Shell""" - return None - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return ShapeList() - - def solid(self) -> Solid | None: - """Return the Solid""" - return None - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - return ShapeList() - - def compound(self) -> Compound | None: - """Return the Compound""" - return None - - @property - def area(self) -> float: - """area -the surface area of all faces in this Shape""" - if self.wrapped is None: - return 0.0 - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - - return properties.Mass() - - def _apply_transform(self, transformation: gp_Trsf) -> Self: - """Private Apply Transform - - Apply the provided transformation matrix to a copy of Shape - - Args: - transformation (gp_Trsf): transformation matrix - - Returns: - Shape: copy of transformed Shape - """ - if self.wrapped is None: - return self - shape_copy: Shape = copy.deepcopy(self, None) - transformed_shape = BRepBuilderAPI_Transform( - self.wrapped, - transformation, - True, - ).Shape() - shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) - return shape_copy - - def rotate(self, axis: Axis, angle: float) -> Self: - """rotate a copy - - Rotates a shape around an axis. - - Args: - axis (Axis): rotation Axis - angle (float): angle to rotate, in degrees - - Returns: - a copy of the shape, rotated - """ - transformation = gp_Trsf() - transformation.SetRotation(axis.wrapped, angle * DEG2RAD) - - return self._apply_transform(transformation) - - def translate(self, vector: VectorLike) -> Self: - """Translates this shape through a transformation. - - Args: - vector: VectorLike: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetTranslation(Vector(vector).wrapped) - - return self._apply_transform(transformation) - - def scale(self, factor: float) -> Self: - """Scales this shape through a transformation. - - Args: - factor: float: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetScale(gp_Pnt(), factor) - - return self._apply_transform(transformation) - - def __deepcopy__(self, memo) -> Self: - """Return deepcopy of self""" - # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied - # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this - # value already copied which causes deepcopy to skip it. - cls = self.__class__ - result = cls.__new__(cls) - memo[id(self)] = result - if self.wrapped is not None: - memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) - for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) - if key == "joints": - for joint in result.joints.values(): - joint.parent = result - return result - - def __copy__(self) -> Self: - """Return shallow copy or reference of self - - Create an copy of this Shape that shares the underlying TopoDS_TShape. - - Used when there is a need for many objects with the same CAD structure but at - different Locations, etc. - for examples fasteners in a larger assembly. By - sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. - - Changes to the CAD structure of the base object will be reflected in all instances. - """ - reference = copy.deepcopy(self) - if self.wrapped is not None: - assert ( - reference.wrapped is not None - ) # Ensure mypy knows reference.wrapped is not None - reference.wrapped.TShape(self.wrapped.TShape()) - return reference - - def transform_shape(self, t_matrix: Matrix) -> Self: - """Apply affine transform without changing type - - Transforms a copy of this Shape by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: copy of transformed shape with all objects keeping their type - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def transform_geometry(self, t_matrix: Matrix) -> Self: - """Apply affine transform - - WARNING: transform_geometry will sometimes convert lines and circles to - splines, but it also has the ability to handle skew and stretching - transformations. - - If your transformation is only translation and rotation, it is safer to - use :py:meth:`transform_shape`, which doesn't change the underlying type - of the geometry, but cannot handle skew transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: a copy of the object, but with geometry transformed - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def locate(self, loc: Location) -> Self: - """Apply a location in absolute sense to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - self.wrapped.Location(loc.wrapped) - - return self - - def located(self, loc: Location) -> Self: - """located - - Apply a location in absolute sense to a copy of self - - Args: - loc (Location): new absolute location - - Returns: - Shape: copy of Shape at location - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) # type: ignore - return shape_copy - - def move(self, loc: Location) -> Self: - """Apply a location in relative sense (i.e. update current location) to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - - self.wrapped.Move(loc.wrapped) - - return self - - def moved(self, loc: Location) -> Self: - """moved - - Apply a location in relative sense (i.e. update current location) to a copy of self - - Args: - loc (Location): new location relative to current location - - Returns: - Shape: copy of Shape moved to relative location - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) - return shape_copy - - def relocate(self, loc: Location): - """Change the location of self while keeping it geometrically similar - - Args: - loc (Location): new location to set for self - """ - if self.wrapped is None: - raise ValueError("Cannot relocate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot relocate a shape at an empty location") - - if self.location != loc: - old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore - - new_ax = gp_Ax3() - new_ax.Transform(loc.wrapped.Transformation()) - - trsf = gp_Trsf() - trsf.SetDisplacement(new_ax, old_ax) - builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - - self.wrapped = tcast(TOPODS, downcast(builder.Shape())) - self.wrapped.Location(loc.wrapped) - - def distance_to_with_closest_points( - self, other: Union[Shape, VectorLike] - ) -> tuple[float, Vector, Vector]: - """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot calculate distance to or from an empty shape") - - if isinstance(other, Shape): - topods_shape = tcast(TopoDS_Shape, other.wrapped) - else: - vec = Vector(other) - topods_shape = BRepBuilderAPI_MakeVertex( - gp_Pnt(vec.X, vec.Y, vec.Z) - ).Vertex() - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(topods_shape) - dist_calc.Perform() - return ( - dist_calc.Value(), - Vector(dist_calc.PointOnShape1(1)), - Vector(dist_calc.PointOnShape2(1)), - ) - - def distance_to(self, other: Union[Shape, VectorLike]) -> float: - """Minimal distance between two shapes""" - return self.distance_to_with_closest_points(other)[0] - - def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: - """Points on two shapes where the distance between them is minimal""" - return self.distance_to_with_closest_points(other)[1:3] - - def __hash__(self) -> int: - """Return has code""" - return self.hash_code() - - def _bool_op( - self, - args: Iterable[Shape], - tools: Iterable[Shape], - operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self | ShapeList[Self]: - """Generic boolean operation - - Args: - args: Iterable[Shape]: - tools: Iterable[Shape]: - operation: Union[BRepAlgoAPI_BooleanOperation: - BRepAlgoAPI_Splitter]: - - Returns: - - """ - args = list(args) - tools = list(tools) - # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} - highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] - - # The base of the operation - base = args[0] if isinstance(args, (list, tuple)) else args - - arg = TopTools_ListOfShape() - for obj in args: - if obj.wrapped is not None: - arg.Append(obj.wrapped) - - tool = TopTools_ListOfShape() - for obj in tools: - if obj.wrapped is not None: - tool.Append(obj.wrapped) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - topo_result = downcast(operation.Shape()) - - # Clean - if SkipClean.clean: - upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) - upgrader.AllowInternalEdges(False) - try: - upgrader.Build() - topo_result = downcast(upgrader.Shape()) - except Exception: - warnings.warn("Boolean operation unable to clean", stacklevel=2) - - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(topo_result, TopoDS_Compound): - topo_result = unwrap_topods_compound(topo_result, True) - - if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: - results = ShapeList( - highest_order[0].cast(s) - for s in get_top_level_topods_shapes(topo_result) - ) - for result in results: - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return results - - result = highest_order[0].cast(topo_result) - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - - return result - - def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: - """Remove the positional arguments from this Shape. - - Args: - *to_cut: Shape: - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - cut_op = BRepAlgoAPI_Cut() - - return self._bool_op((self,), to_cut, cut_op) - - def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float | None = None - ) -> Self | ShapeList[Self]: - """fuse - - Fuse a sequence of shapes into a single shape. - - Args: - to_fuse (sequence Shape): shapes to fuse - glue (bool, optional): performance improvement for some shapes. Defaults to False. - tol (float, optional): tolerance. Defaults to None. - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - return_value = self._bool_op((self,), to_fuse, fuse_op) - - return return_value - - def intersect( - self, *to_intersect: Union[Shape, Axis, Plane] - ) -> None | Self | ShapeList[Self]: - """Intersection of the arguments and this shape - - Args: - to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to - intersect with - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - def _to_vertex(vec: Vector) -> Vertex: - """Helper method to convert vector to shape""" - return self.__class__.cast( - downcast( - BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() - ) - ) - - def _to_edge(axis: Axis) -> Edge: - """Helper method to convert axis to shape""" - return self.__class__.cast( - BRepBuilderAPI_MakeEdge( - Geom_Line( - axis.position.to_pnt(), - axis.direction.to_dir(), - ) - ).Edge() - ) - - def _to_face(plane: Plane) -> Face: - """Helper method to convert plane to shape""" - return self.__class__.cast(BRepBuilderAPI_MakeFace(plane.wrapped).Face()) - - # Convert any geometry objects into their respective topology objects - objs = [] - for obj in to_intersect: - if isinstance(obj, Vector): - objs.append(_to_vertex(obj)) - elif isinstance(obj, Axis): - objs.append(_to_edge(obj)) - elif isinstance(obj, Plane): - objs.append(_to_face(obj)) - elif isinstance(obj, Location): - if obj.wrapped is None: - raise ValueError("Cannot intersect with an empty location") - objs.append(_to_vertex(tcast(Vector, obj.position))) - else: - objs.append(obj) - - # Find the shape intersections - intersect_op = BRepAlgoAPI_Common() - shape_intersections = self._bool_op((self,), objs, intersect_op) - if isinstance(shape_intersections, ShapeList) and not shape_intersections: - return None - if ( - not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null() - ): - return None - return shape_intersections - - @classmethod - @abstractmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge | Face | Shell | Solid | Compound: extruded shape - """ - - def _ocp_section( - self: Shape, other: Union[Vertex, Edge, Wire, Face] - ) -> tuple[list[Vertex], list[Edge]]: - """_ocp_section - - Create a BRepAlgoAPI_Section object - - The algorithm is to build a Section operation between arguments and tools. - The result of Section operation consists of vertices and edges. The result - of Section operation contains: - - new vertices that are subjects of V/V, E/E, E/F, F/F interferences - - vertices that are subjects of V/E, V/F interferences - - new edges that are subjects of F/F interferences - - edges that are Common Blocks - - - Args: - other (Union[Vertex, Edge, Wire, Face]): shape to section with - - Returns: - tuple[list[Vertex], list[Edge]]: section results - """ - if self.wrapped is None or other.wrapped is None: - return ([], []) - - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation - section.Build() - - # Get the resulting shapes from the intersection - intersection_shape = section.Shape() - - vertices = [] - # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) - while explorer.More(): - vertices.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - edges = [] - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - edges.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - - return (vertices, edges) - - def faces_intersected_by_axis( - self, - axis: Axis, - tol: float = 1e-4, - ) -> ShapeList[Face]: - """Line Intersection - - Computes the intersections between the provided axis and the faces of this Shape - - Args: - axis (Axis): Axis on which the intersection line rests - tol (float, optional): Intersection tolerance. Defaults to 1e-4. - - Returns: - list[Face]: A list of intersected faces sorted by distance from axis.position - """ - if self.wrapped is None: - return ShapeList() - - line = gce_MakeLin(axis.wrapped).Value() - - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, line, tol) - - faces_dist = [] # using a list instead of a dictionary to be able to sort it - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - - distance = axis.position.to_pnt().SquareDistance(inter_pt) - - faces_dist.append( - ( - intersect_maker.Face(), - abs(distance), - ) - ) # will sort all intersected faces by distance whatever the direction is - - intersect_maker.Next() - - faces_dist.sort(key=lambda x: x[1]) - faces = [face[0] for face in faces_dist] - - return ShapeList([self.__class__.cast(face) for face in faces]) - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside or outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] - ) -> tuple[ - Face | Shell | ShapeList[Face] | None, - Face | Shell | ShapeList[Face] | None, - ]: - """split_by_perimeter and keep inside and outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside (default)""" - - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE - ): - """split_by_perimeter - - Divide the faces of this object into those within the perimeter - and those outside the perimeter. - - Note: this method may fail if the perimeter intersects shape edges. - - Args: - perimeter (Union[Edge,Wire]): closed perimeter - keep (Keep, optional): which object(s) to return. Defaults to Keep.INSIDE. - - Raises: - ValueError: perimeter must be closed - ValueError: keep must be one of Keep.INSIDE|OUTSIDE|BOTH - - Returns: - Union[Face | Shell | ShapeList[Face] | None, - Tuple[Face | Shell | ShapeList[Face] | None]: The result of the split operation. - - - **Keep.INSIDE**: Returns the inside part as a `Shell` or `Face`, or `None` - if no inside part is found. - - **Keep.OUTSIDE**: Returns the outside part as a `Shell` or `Face`, or `None` - if no outside part is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Shell`, `Face`, or `None` if no corresponding part is found. - - """ - - def get(los: TopTools_ListOfShape) -> list: - """Return objects from TopTools_ListOfShape as list""" - shapes = [] - for _ in range(los.Size()): - first = los.First() - if not first.IsNull(): - shapes.append(self.__class__.cast(first)) - los.RemoveFirst() - return shapes - - def process_sides(sides): - """Process sides to determine if it should be None, a single element, - a Shell, or a ShapeList.""" - # if not sides: - # return None - if len(sides) == 1: - return sides[0] - # Attempt to create a shell - potential_shell = _sew_topods_faces([s.wrapped for s in sides]) - if isinstance(potential_shell, TopoDS_Shell): - return self.__class__.cast(potential_shell) - return ShapeList(sides) - - if keep not in {Keep.INSIDE, Keep.OUTSIDE, Keep.BOTH}: - raise ValueError( - "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" - ) - - if self.wrapped is None: - raise ValueError("Cannot split an empty shape") - - # Process the perimeter - if not perimeter.is_closed: - raise ValueError("perimeter must be a closed Wire or Edge") - perimeter_edges = TopTools_SequenceOfShape() - for perimeter_edge in perimeter.edges(): - perimeter_edges.Append(perimeter_edge.wrapped) - - # Split the shells by the perimeter edges - lefts: list[Shell] = [] - rights: list[Shell] = [] - for target_shell in self.shells(): - constructor = BRepFeat_SplitShape(target_shell.wrapped) - constructor.Add(perimeter_edges) - constructor.Build() - lefts.extend(get(constructor.Left())) - rights.extend(get(constructor.Right())) - - left = process_sides(lefts) - right = process_sides(rights) - - # Is left or right the inside? - perimeter_length = perimeter.length - left_perimeter_length = sum(e.length for e in left.edges()) if left else 0 - right_perimeter_length = sum(e.length for e in right.edges()) if right else 0 - left_inside = abs(perimeter_length - left_perimeter_length) < abs( - perimeter_length - right_perimeter_length - ) - if keep == Keep.BOTH: - return (left, right) if left_inside else (right, left) - if keep == Keep.INSIDE: - return left if left_inside else right - # keep == Keep.OUTSIDE: - return right if left_inside else left - - def distance(self, other: Shape) -> float: - """Minimal distance between two shapes - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() - - def distances(self, *others: Shape) -> Iterator[float]: - """Minimal distances to between self and other shapes - - Args: - *others: Shape: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - for other_shape in others: - if other_shape.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - dist_calc.LoadS2(other_shape.wrapped) - dist_calc.Perform() - - yield dist_calc.Value() - - def mesh(self, tolerance: float, angular_tolerance: float = 0.1): - """Generate triangulation if none exists. - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot mesh an empty shape") - - if not BRepTools.Triangulation_s(self.wrapped, tolerance): - BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - - def tessellate( - self, tolerance: float, angular_tolerance: float = 0.1 - ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: - """General triangulated approximation""" - if self.wrapped is None: - raise ValueError("Cannot tessellate an empty shape") - - self.mesh(tolerance, angular_tolerance) - - vertices: list[Vector] = [] - triangles: list[Tuple[int, int, int]] = [] - offset = 0 - - for face in self.faces(): - assert face.wrapped is not None - loc = TopLoc_Location() - poly = BRep_Tool.Triangulation_s(face.wrapped, loc) - trsf = loc.Transformation() - reverse = face.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED - - # add vertices - vertices += [ - Vector(v.X(), v.Y(), v.Z()) - for v in ( - poly.Node(i).Transformed(trsf) for i in range(1, poly.NbNodes() + 1) - ) - ] - # add triangles - triangles += [ - ( - ( - t.Value(1) + offset - 1, - t.Value(3) + offset - 1, - t.Value(2) + offset - 1, - ) - if reverse - else ( - t.Value(1) + offset - 1, - t.Value(2) + offset - 1, - t.Value(3) + offset - 1, - ) - ) - for t in poly.Triangles() - ] - - offset += poly.NbNodes() - - return vertices, triangles - - def to_splines( - self, degree: int = 3, tolerance: float = 1e-3, nurbs: bool = False - ) -> Self: - """to_splines - - Approximate shape with b-splines of the specified degree. - - Args: - degree (int, optional): Maximum degree. Defaults to 3. - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - nurbs (bool, optional): Use rational splines. Defaults to False. - - Returns: - Self: Approximated shape - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - params = ShapeCustom_RestrictionParameters() - - result = ShapeCustom.BSplineRestriction_s( - self.wrapped, - tolerance, # 3D tolerance - tolerance, # 2D tolerance - degree, - 1, # dummy value, degree is leading - ga.GeomAbs_C0, - ga.GeomAbs_C0, - True, # set degree to be leading - not nurbs, - params, - ) - - return self.__class__.cast(result) - - def to_vtk_poly_data( - self, - tolerance: float | None = None, - angular_tolerance: float | None = None, - normals: bool = False, - ) -> vtkPolyData: - """Convert shape to vtkPolyData - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - normals: bool: (Default value = True) - - Returns: data object in VTK consisting of points, vertices, lines, and polygons - """ - if self.wrapped is None: - raise ValueError("Cannot convert an empty shape") - - vtk_shape = IVtkOCC_Shape(self.wrapped) - shape_data = IVtkVTK_ShapeData() - shape_mesher = IVtkOCC_ShapeMesher() - - drawer = vtk_shape.Attributes() - drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - - if tolerance: - drawer.SetDeviationCoefficient(tolerance) - - if angular_tolerance: - drawer.SetDeviationAngle(angular_tolerance) - - shape_mesher.Build(vtk_shape, shape_data) - - vtk_poly_data = shape_data.getVtkPolyData() - - # convert to triangles and split edges - t_filter = vtkTriangleFilter() - t_filter.SetInputData(vtk_poly_data) - t_filter.Update() - - return_value = t_filter.GetOutput() - - # compute normals - if normals: - n_filter = vtkPolyDataNormals() - n_filter.SetComputePointNormals(True) - n_filter.SetComputeCellNormals(True) - n_filter.SetFeatureAngle(360) - n_filter.SetInputData(return_value) - n_filter.Update() - - return_value = n_filter.GetOutput() - - return return_value - - def _repr_javascript_(self): - """Jupyter 3D representation support""" - - from build123d.jupyter_tools import display - - return display(self)._repr_javascript_() - - def transformed( - self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) - ) -> Self: - """Transform Shape - - Rotate and translate the Shape by the three angles (in degrees) and offset. - - Args: - rotate (VectorLike, optional): 3-tuple of angles to rotate, in degrees. - Defaults to (0, 0, 0). - offset (VectorLike, optional): 3-tuple to offset. Defaults to (0, 0, 0). - - Returns: - Shape: transformed object - - """ - # Convert to a Vector of radians - rotate_vector = Vector(rotate).multiply(DEG2RAD) - # Compute rotation matrix. - t_rx = gp_Trsf() - t_rx.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), rotate_vector.X) - t_ry = gp_Trsf() - t_ry.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), rotate_vector.Y) - t_rz = gp_Trsf() - t_rz.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), rotate_vector.Z) - t_o = gp_Trsf() - t_o.SetTranslation(Vector(offset).wrapped) - return self._apply_transform(t_o * t_rx * t_ry * t_rz) - - def project_faces( - self, - faces: Union[list[Face], Compound], - path: Union[Wire, Edge], - start: float = 0, - ) -> ShapeList[Face]: - """Projected Faces following the given path on Shape - - Project by positioning each face of to the shape along the path and - projecting onto the surface. - - Note that projection may result in distortion depending on - the shape at a position along the path. - - .. image:: projectText.png - - Args: - faces (Union[list[Face], Compound]): faces to project - path: Path on the Shape to follow - start: Relative location on path to start the faces. Defaults to 0. - - Returns: - The projected faces - - """ - # pylint: disable=too-many-locals - path_length = path.length - # The derived classes of Shape implement center - shape_center = self.center() # pylint: disable=no-member - - if ( - not isinstance(faces, (list, tuple)) - and faces.wrapped is not None - and isinstance(faces.wrapped, TopoDS_Compound) - ): - faces = faces.faces() - - first_face_min_x = faces[0].bounding_box().min.X - - logger.debug("projecting %d face(s)", len(faces)) - - # Position each face normal to the surface along the path and project to the surface - projected_faces = [] - for face in faces: - bbox = face.bounding_box() - face_center_x = (bbox.min.X + bbox.max.X) / 2 - relative_position_on_wire = ( - start + (face_center_x - first_face_min_x) / path_length - ) - path_position = path.position_at(relative_position_on_wire) - path_tangent = path.tangent_at(relative_position_on_wire) - projection_axis = Axis(path_position, shape_center - path_position) - (surface_point, surface_normal) = self.find_intersection_points( - projection_axis - )[0] - surface_normal_plane = Plane( - origin=surface_point, x_dir=path_tangent, z_dir=surface_normal - ) - projection_face: Face = surface_normal_plane.from_local_coords( - face.moved(Location((-face_center_x, 0, 0))) - ) - - logger.debug("projecting face at %0.2f", relative_position_on_wire) - projected_faces.append( - projection_face.project_to_shape(self, surface_normal * -1)[0] - ) - - logger.debug("finished projecting '%d' faces", len(faces)) - - return ShapeList(projected_faces) - - -class Comparable(ABC): - """Abstract base class that requires comparison methods""" - - @abstractmethod - def __lt__(self, other: Any) -> bool: ... - - @abstractmethod - def __eq__(self, other: Any) -> bool: ... - - -# This TypeVar allows IDEs to see the type of objects within the ShapeList -T = TypeVar("T", bound=Union[Shape, Vector]) -K = TypeVar("K", bound=Comparable) - - -class ShapePredicate(Protocol): - """Predicate for shape filters""" - - def __call__(self, shape: Shape) -> bool: ... - - -class ShapeList(list[T]): - """Subclass of list with custom filter and sort methods appropriate to CAD""" - - # pylint: disable=too-many-public-methods - - @property - def first(self) -> T: - """First element in the ShapeList""" - return self[0] - - @property - def last(self) -> T: - """Last element in the ShapeList""" - return self[-1] - - def center(self) -> Vector: - """The average of the center of objects within the ShapeList""" - if not self: - return Vector(0, 0, 0) - - total_center = sum((o.center() for o in self), Vector(0, 0, 0)) - return total_center / len(self) - - def filter_by( - self, - filter_by: Union[ShapePredicate, Axis, Plane, GeomType], - reverse: bool = False, - tolerance: float = 1e-5, - ) -> ShapeList[T]: - """filter by Axis, Plane, or GeomType - - Either: - - filter objects of type planar Face or linear Edge by their normal or tangent - (respectively) and sort the results by the given axis, or - - filter the objects by the provided type. Note that not all types apply to all - objects. - - Args: - filter_by (Union[Axis,Plane,GeomType]): axis, plane, or geom type to filter - and possibly sort by. Filtering by a plane returns faces/edges parallel - to that plane. - reverse (bool, optional): invert the geom type filter. Defaults to False. - tolerance (float, optional): maximum deviation from axis. Defaults to 1e-5. - - Raises: - ValueError: Invalid filter_by type - - Returns: - ShapeList: filtered list of objects - """ - - # could be moved out maybe? - def axis_parallel_predicate(axis: Axis, tolerance: float): - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt = gp_Pnt() - surface_normal = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector( - surface_normal.X(), surface_normal.Y(), surface_normal.Z() - ).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - elif ( - isinstance(shape.wrapped, TopoDS_Edge) - and shape.geom_type == GeomType.LINE - ): - curve = shape.geom_adaptor() - umin = curve.FirstParameter() - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(umin, tmp, res) - start_pos = Vector(tmp) - start_dir = Vector(gp_Dir(res)) - shape_axis = Axis(start_pos, start_dir) - else: - return False - return axis.is_parallel(shape_axis, tolerance) - - return pred - - def plane_parallel_predicate(plane: Plane, tolerance: float): - plane_axis = Axis(plane.origin, plane.z_dir) - plane_xyz = plane.z_dir.wrapped.XYZ() - - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt: gp_Pnt = gp_Pnt() - surface_normal: gp_Vec = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector(surface_normal).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - return plane_axis.is_parallel(shape_axis, tolerance) - if isinstance(shape.wrapped, TopoDS_Wire): - return all(pred(e) for e in shape.edges()) - if isinstance(shape.wrapped, TopoDS_Edge): - for curve in shape.wrapped.TShape().Curves(): - if curve.IsCurve3D(): - return ShapeAnalysis_Curve.IsPlanar_s( - curve.Curve3D(), plane_xyz, tolerance - ) - return False - return False - - return pred - - # convert input to callable predicate - if callable(filter_by): - predicate = filter_by - elif isinstance(filter_by, Axis): - predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, Plane): - predicate = plane_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, GeomType): - - def predicate(obj): - return obj.geom_type == filter_by - - else: - raise ValueError(f"Unsupported filter_by predicate: {filter_by}") - - # final predicate is negated if `reverse=True` - if reverse: - - def actual_predicate(shape): - return not predicate(shape) - - else: - actual_predicate = predicate - - return ShapeList(filter(actual_predicate, self)) - - def filter_by_position( - self, - axis: Axis, - minimum: float, - maximum: float, - inclusive: tuple[bool, bool] = (True, True), - ) -> ShapeList[T]: - """filter by position - - Filter and sort objects by the position of their centers along given axis. - min and max values can be inclusive or exclusive depending on the inclusive tuple. - - Args: - axis (Axis): axis to sort by - minimum (float): minimum value - maximum (float): maximum value - inclusive (tuple[bool, bool], optional): include min,max values. - Defaults to (True, True). - - Returns: - ShapeList: filtered object list - """ - if inclusive == (True, True): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (True, False): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - elif inclusive == (False, True): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (False, False): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - - return ShapeList(objects).sort_by(axis) - - def group_by( - self, - group_by: Union[Callable[[Shape], K], Axis, Edge, Wire, SortBy] = Axis.Z, - reverse=False, - tol_digits=6, - ) -> GroupBy[T, K]: - """group by - - Group objects by provided criteria and then sort the groups according to the criteria. - Note that not all group_by criteria apply to all objects. - - Args: - group_by (SortBy, optional): group and sort criteria. Defaults to Axis.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - tol_digits (int, optional): Tolerance for building the group keys by - round(key, tol_digits) - - Returns: - GroupBy[K, ShapeList]: sorted list of ShapeLists - """ - - if isinstance(group_by, Axis): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty axis") - assert group_by.location is not None - axis_as_location = group_by.location.inverse() - - def key_f(obj): - return round( - (axis_as_location * Location(obj.center())).position.Z, - tol_digits, - ) - - elif hasattr(group_by, "wrapped"): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty object") - - if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) - - elif isinstance(group_by, SortBy): - if group_by == SortBy.LENGTH: - - def key_f(obj): - return round(obj.length, tol_digits) - - elif group_by == SortBy.RADIUS: - - def key_f(obj): - return round(obj.radius, tol_digits) - - elif group_by == SortBy.DISTANCE: - - def key_f(obj): - return round(obj.center().length, tol_digits) - - elif group_by == SortBy.AREA: - - def key_f(obj): - return round(obj.area, tol_digits) - - elif group_by == SortBy.VOLUME: - - def key_f(obj): - return round(obj.volume, tol_digits) - - elif callable(group_by): - key_f = group_by - - else: - raise ValueError(f"Unsupported group_by function: {group_by}") - - return GroupBy(key_f, self, reverse=reverse) - - def sort_by( - self, sort_by: Union[Axis, Edge, Wire, SortBy] = Axis.Z, reverse: bool = False - ) -> ShapeList[T]: - """sort by - - Sort objects by provided criteria. Note that not all sort_by criteria apply to all - objects. - - Args: - sort_by (SortBy, optional): sort criteria. Defaults to SortBy.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: sorted list of objects - """ - - if isinstance(sort_by, Axis): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty axis") - assert sort_by.location is not None - axis_as_location = sort_by.location.inverse() - objects = sorted( - self, - key=lambda o: (axis_as_location * Location(o.center())).position.Z, - reverse=reverse, - ) - elif hasattr(sort_by, "wrapped"): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty object") - - if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) - - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) - - elif isinstance(sort_by, SortBy): - if sort_by == SortBy.LENGTH: - objects = sorted( - self, - key=lambda obj: obj.length, - reverse=reverse, - ) - elif sort_by == SortBy.RADIUS: - with_radius = [obj for obj in self if hasattr(obj, "radius")] - objects = sorted( - with_radius, - key=lambda obj: obj.radius, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.DISTANCE: - objects = sorted( - self, - key=lambda obj: obj.center().length, - reverse=reverse, - ) - elif sort_by == SortBy.AREA: - with_area = [obj for obj in self if hasattr(obj, "area")] - objects = sorted( - with_area, - key=lambda obj: obj.area, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.VOLUME: - with_volume = [obj for obj in self if hasattr(obj, "volume")] - objects = sorted( - with_volume, - key=lambda obj: obj.volume, # type: ignore - reverse=reverse, - ) - - return ShapeList(objects) - - def sort_by_distance( - self, other: Union[Shape, VectorLike], reverse: bool = False - ) -> ShapeList[T]: - """Sort by distance - - Sort by minimal distance between objects and other - - Args: - other (Union[Shape,VectorLike]): reference object - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: Sorted shapes - """ - distances = sorted( - [(obj.distance_to(other), obj) for obj in self], # type: ignore - key=lambda obj: obj[0], - reverse=reverse, - ) - return ShapeList([obj[1] for obj in distances]) - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore - - def vertex(self) -> Vertex: - """Return the Vertex""" - vertices = self.vertices() - vertex_count = len(vertices) - if vertex_count != 1: - warnings.warn( - f"Found {vertex_count} vertices, returning first", stacklevel=2 - ) - return vertices[0] - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore - - def edge(self) -> Edge: - """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) - return edges[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore - - def wire(self) -> Wire: - """Return the Wire""" - wires = self.wires() - wire_count = len(wires) - if wire_count != 1: - warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) - return wires[0] - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) - return solids[0] - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore - - def compound(self) -> Compound: - """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: - warnings.warn( - f"Found {compound_count} compounds, returning first", stacklevel=2 - ) - return compounds[0] - - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Sort operator >""" - return self.sort_by(sort_by) - - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Reverse sort operator <""" - return self.sort_by(sort_by, reverse=True) - - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select largest group operator >>""" - return self.group_by(group_by)[-1] - - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select smallest group operator <<""" - return self.group_by(group_by)[0] - - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: - """Filter by axis or geomtype operator |""" - return self.filter_by(filter_by) - - def __eq__(self, other: object) -> bool: - """ShapeLists equality operator ==""" - return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore - ) - - # Normally implementing __eq__ is enough, but ShapeList subclasses list, - # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList) -> bool: # type: ignore - """ShapeLists inequality operator !=""" - return ( - set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented - ) - - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) - - def __sub__(self, other: ShapeList) -> ShapeList[T]: - """Differences between two ShapeLists operator -""" - return ShapeList(set(self) - set(other)) - - def __and__(self, other: ShapeList) -> ShapeList[T]: - """Intersect two ShapeLists operator &""" - return ShapeList(set(self) & set(other)) - - @overload - def __getitem__(self, key: SupportsIndex) -> T: ... - - @overload - def __getitem__(self, key: slice) -> ShapeList[T]: ... - - def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: - """Return slices of ShapeList as ShapeList""" - if isinstance(key, slice): - return ShapeList(list(self).__getitem__(key)) - return list(self).__getitem__(key) - - -class GroupBy(Generic[T, K]): - """Result of a Shape.groupby operation. Groups can be accessed by index or key""" - - def __init__( - self, - key_f: Callable[[T], K], - shapelist: Iterable[T], - *, - reverse: bool = False, - ): - # can't be a dict because K may not be hashable - self.key_to_group_index: list[tuple[K, int]] = [] - self.groups: list[ShapeList[T]] = [] - self.key_f = key_f - - for i, (key, shapegroup) in enumerate( - itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) - ): - self.groups.append(ShapeList(shapegroup)) - self.key_to_group_index.append((key, i)) - - def __iter__(self): - return iter(self.groups) - - def __len__(self): - return len(self.groups) - - def __getitem__(self, key: int): - return self.groups[key] - - def __str__(self): - return pretty(self) - - def __repr__(self): - return repr(ShapeList(self)) - - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: - """ - Render a formatted representation of the object for pretty-printing in - interactive environments. - - Args: - printer (PrettyPrinter): The pretty printer instance handling the output. - cycle (bool): Indicates if a reference cycle is detected to - prevent infinite recursion. - """ - if cycle: - printer.text("(...)") - else: - with printer.group(1, "[", "]"): - for idx, item in enumerate(self): - if idx: - printer.text(",") - printer.breakable() - printer.pretty(item) - - def group(self, key: K): - """Select group by key""" - for k, i in self.key_to_group_index: - if key == k: - return self.groups[i] - raise KeyError(key) - - def group_for(self, shape: T): - """Select group by shape""" - return self.group(self.key_f(shape)) - - -class Mixin1D(Shape): - """Methods to add to the Edge and Wire classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Edges and Wires""" - return 1 - - def __add__( - self, other: None | Shape | Iterable[Shape] - ) -> Edge | Wire | ShapeList[Edge]: - """fuse shape to wire/edge operator +""" - - # Convert `other` to list of base topods objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] - # If there is nothing to add return the original object - if not summands: - return self - - if not all(topods_dim(summand) == 1 for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] - summand_edges = [e for summand in summands for e in summand.edges()] - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - try: - sum_shape = Wire(summand_edges) - except Exception: - sum_shape = summands[0].fuse(*summands[1:]) - if type(self).order == 4: - sum_shape = type(self)(sum_shape) - else: - try: - sum_shape = Wire(self.edges() + ShapeList(summand_edges)) - except Exception: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape - - return sum_shape - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" - - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of object - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - middle = self.position_at(0.5) - elif center_of == CenterOf.MASS: - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: - """common_plane - - Find the plane containing all the edges/wires (including self). If there - is no common plane return None. If the edges are coaxial, select one - of the infinite number of valid planes. - - Args: - lines (sequence of Union[Edge,Wire]): edges in common with self - - Returns: - Union[None, Plane]: Either the common plane or None - """ - # pylint: disable=too-many-locals - # Note: BRepLib_FindSurface is not helpful as it requires the - # Edges to form a surface perimeter. - points: list[Vector] = [] - all_lines: list[Edge | Wire] = [ - line for line in [self, *lines] if line is not None - ] - if any(not isinstance(line, (Edge, Wire)) for line in all_lines): - raise ValueError("Only Edges or Wires are valid") - - result = None - # Are they all co-axial - if so, select one of the infinite planes - all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all(e.geom_type == GeomType.LINE for e in all_edges): - as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): - origin = as_axis[0].position - x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir - c_plane = Plane(origin, z_dir=z_dir) - result = c_plane.shift_origin((0, 0)) - - if result is None: # not coaxial - # Shorten any infinite lines (from converted Axis) - normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) - infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] - all_lines = normal_lines + shortened_lines - - for line in all_lines: - num_points = 2 if line.geom_type == GeomType.LINE else 8 - points.extend( - [line.position_at(i / (num_points - 1)) for i in range(num_points)] - ) - points = list(set(points)) # unique points - extreme_areas = {} - for subset in combinations(points, 3): - vector1 = subset[1] - subset[0] - vector2 = subset[2] - subset[0] - area = 0.5 * (vector1.cross(vector2).length) - extreme_areas[area] = subset - # The points that create the largest area make the most accurate plane - extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] - - # Create a plane from these points - x_dir = (extremes[1] - extremes[0]).normalized() - z_dir = (extremes[2] - extremes[0]).cross(x_dir) - try: - c_plane = Plane( - origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir - ) - c_plane = c_plane.shift_origin((0, 0)) - except ValueError: - # There is no valid common plane - result = None - else: - # Are all of the points on the common plane - common = all(c_plane.contains(p) for p in points) - result = c_plane if common else None - - return result - - @property - def length(self) -> float: - """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) - - @property - def radius(self) -> float: - """Calculate the radius. - - Note that when applied to a Wire, the radius is simply the radius of the first edge. - - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] - - def location_at( - self, - distance: float, - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> Location: - """Locations along curve - - Generate a location along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - Location: A Location object representing local coordinate system - at the specified distance. - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - law: GeomFill_TrihedronLaw - if frame_method == FrameMethod.FRENET: - law = GeomFill_Frenet() - else: - law = GeomFill_CorrectedFrenet() - - law.SetCurve(curve) - - tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() - - law.D0(param, tangent, normal, binormal) - pnt = curve.Value(param) - - transformation = gp_Trsf() - if planar: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() - ) - else: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() - ) - - return Location(TopLoc_Location(transformation)) - - def locations( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> list[Location]: - """Locations along curve - - Generate location along the curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - list[Location]: A list of Location objects representing local coordinate - systems at the specified distances. - """ - return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances - ] - - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) - - def offset_2d( - self, - distance: float, - kind: Kind = Kind.ARC, - side: Side = Side.BOTH, - closed: bool = True, - ) -> Union[Edge, Wire]: - """2d Offset - - Offsets a planar edge/wire - - Args: - distance (float): distance from edge/wire to offset - kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. - side (Side, optional): side to place offset. Defaults to Side.BOTH. - closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT - offset. Defaults to True. - Raises: - RuntimeError: Multiple Wires generated - RuntimeError: Unexpected result type - - Returns: - Wire: offset wire - """ - # pylint: disable=too-many-branches, too-many-locals, too-many-statements - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - line = self if isinstance(self, Wire) else Wire([self]) - - # Avoiding a bug when the wire contains a single Edge - if len(line.edges()) == 1: - edge = line.edges()[0] - edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] - topods_wire = Wire(edges).wrapped - else: - topods_wire = line.wrapped - - offset_builder = BRepOffsetAPI_MakeOffset() - offset_builder.Init(kind_dict[kind]) - # offset_builder.SetApprox(True) - offset_builder.AddWire(topods_wire) - offset_builder.Perform(distance) - - obj = downcast(offset_builder.Shape()) - if isinstance(obj, TopoDS_Compound): - obj = unwrap_topods_compound(obj, fully=True) - if isinstance(obj, TopoDS_Wire): - offset_wire = Wire(obj) - else: # Likely multiple Wires were generated - raise RuntimeError("Unexpected result type") - - if side != Side.BOTH: - # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] - centers = [w.position_at(0.5) for w in wires] - angles = [ - line.tangent_at(0).get_signed_angle(c - line.position_at(0)) - for c in centers - ] - if side == Side.LEFT: - offset_wire = wires[int(angles[0] > angles[1])] - else: - offset_wire = wires[int(angles[0] <= angles[1])] - - if closed: - self0 = line.position_at(0) - self1 = line.position_at(1) - end0 = offset_wire.position_at(0) - end1 = offset_wire.position_at(1) - if (self0 - end0).length - abs(distance) <= TOLERANCE: - edge0 = Edge.make_line(self0, end0) - edge1 = Edge.make_line(self1, end1) - else: - edge0 = Edge.make_line(self0, end1) - edge1 = Edge.make_line(self1, end0) - offset_wire = Wire( - line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) - ) - - offset_edges = offset_wire.edges() - return offset_edges[0] if len(offset_edges) == 1 else offset_wire - - def perpendicular_line( - self, length: float, u_value: float, plane: Plane = Plane.XY - ) -> Edge: - """perpendicular_line - - Create a line on the given plane perpendicular to and centered on beginning of self - - Args: - length (float): line length - u_value (float): position along line between 0.0 and 1.0 - plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. - - Returns: - Edge: perpendicular line - """ - start = self.position_at(u_value) - local_plane = Plane( - origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir - ) - line = Edge.make_line( - start + local_plane.y_dir * length / 2, - start - local_plane.y_dir * length / 2, - ) - return line - - def project( - self, face: Face, direction: VectorLike, closest: bool = True - ) -> Edge | Wire | ShapeList[Edge | Wire]: - """Project onto a face along the specified direction - - Args: - face: Face: - direction: VectorLike: - closest: bool: (Default value = True) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") - - bldr = BRepProj_Projection( - self.wrapped, face.wrapped, Vector(direction).to_dir() - ) - shapes: TopoDS_Compound = bldr.Shape() - - # select the closest projection if requested - return_value: Edge | Wire | ShapeList[Edge | Wire] - - if closest: - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - min_dist = inf - - # for shape in shapes: - for shape in get_top_level_topods_shapes(shapes): - dist_calc.LoadS2(shape) - dist_calc.Perform() - dist = dist_calc.Value() - - if dist < min_dist: - min_dist = dist - return_value = Mixin1D.cast(shape) - - else: - return_value = ShapeList( - Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) - ) - - return return_value - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike | None = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - visible_edges = ShapeList(Edge(e) for e in visible_edges) - hidden_edges = ShapeList(Edge(e) for e in hidden_edges) - - return (visible_edges, hidden_edges) +from typing_extensions import Self + +from .one_d import Mixin1D, Edge, Wire +from .shape_core import ( + Shape, + ShapeList, + SkipClean, + downcast, + get_top_level_topods_shapes, + _sew_topods_faces, + shapetype, + _topods_entities, + _topods_face_normal_at, +) +from .utils import ( + _extrude_topods_shape, + find_max_dimension, + _make_loft, + _make_topods_face_from_wires, + _topods_bool_op, +) +from .zero_d import Vertex + + +if TYPE_CHECKING: # pragma: no cover + from .three_d import Solid # pylint: disable=R0801 + from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 class Mixin2D(Shape): """Additional methods to add to Face and Shell class""" - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented + project_to_viewport = Mixin1D.project_to_viewport + split = Mixin1D.split + + vertices = Mixin1D.vertices + vertex = Mixin1D.vertex + edges = Mixin1D.edges + edge = Mixin1D.edge + wires = Mixin1D.wires + # ---- Properties ---- @property def _dim(self) -> int: """Dimension of Faces and Shells""" return 2 - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split + # ---- Class Methods ---- @classmethod def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: @@ -3866,27 +167,14 @@ class Mixin2D(Shape): # NB downcast is needed to handle TopoDS_Shape types return constructor_lut[shape_type](downcast(obj)) - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires + @classmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """Unused - only here because Mixin1D is a subclass of Shape""" + return NotImplemented - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") + # ---- Instance Methods ---- def __neg__(self) -> Self: """Reverse normal operator -""" @@ -3897,9 +185,13 @@ class Mixin2D(Shape): return new_surface - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) + def face(self) -> Face: + """Return the Face""" + return Shape.get_single_shape(self, "Face") + + def faces(self) -> ShapeList[Face]: + """faces - all the faces in this Shape""" + return Shape.get_shape_list(self, "Face") def find_intersection_points( self, other: Axis, tolerance: float = TOLERANCE @@ -3948,2078 +240,17 @@ class Mixin2D(Shape): return result + def offset(self, amount: float) -> Self: + """Return a copy of self moved along the normal by amount""" + return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) -class Mixin3D(Shape): - """Additional methods to add to 3D Shape classes""" + def shell(self) -> Shell: + """Return the Shell""" + return Shape.get_single_shape(self, "Shell") - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int | None: - """Dimension of Solids""" - return 3 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") - - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") - - def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: - """Fillet - - Fillets the specified edges of this solid. - - Args: - radius (float): float > 0, the radius of the fillet - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - - Returns: - Any: Filleted solid - """ - native_edges = [e.wrapped for e in edge_list] - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(radius, native_edge) - - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - f"Failed creating a fillet with radius of {radius}, try a smaller value" - f" or use max_fillet() to find the largest valid fillet radius" - ) from err - - return new_shape - - def max_fillet( - self, - edge_list: Iterable[Edge], - tolerance=0.1, - max_iterations: int = 10, - ) -> float: - """Find Maximum Fillet Size - - Find the largest fillet radius for the given Shape and edges with a - recursive binary search. - - Example: - - max_fillet_radius = my_shape.max_fillet(shape_edges) - max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) - - - Args: - edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid - tolerance (float, optional): maximum error from actual value. Defaults to 0.1. - max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. - - Raises: - RuntimeError: failed to find the max value - ValueError: the provided Shape is invalid - - Returns: - float: maximum fillet radius - """ - - def __max_fillet(window_min: float, window_max: float, current_iteration: int): - window_mid = (window_min + window_max) / 2 - - if current_iteration == max_iterations: - raise RuntimeError( - f"Failed to find the max value within {tolerance} in {max_iterations}" - ) - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(window_mid, native_edge) - - # Do these numbers work? - if not try with the smaller window - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise fillet_exception - except fillet_exception: - return __max_fillet(window_min, window_mid, current_iteration + 1) - - # These numbers work, are they close enough? - if not try larger window - if window_mid - window_min <= tolerance: - return_value = window_mid - else: - return_value = __max_fillet( - window_mid, window_max, current_iteration + 1 - ) - return return_value - - if not self.is_valid(): - raise ValueError("Invalid Shape") - - native_edges = [e.wrapped for e in edge_list] - - # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform - # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone - - max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) - - return max_radius - - def chamfer( - self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face | None = None, - ) -> Self: - """Chamfer - - Chamfers the specified edges of this solid. - - Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face, optional): identifies the side where length is measured. The edge(s) - must be part of the face - - Returns: - Self: Chamfered solid - """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") - - native_edges = [e.wrapped for e in edge_list] - - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__.cast(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) - else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__.cast(sol.Shape()).fix() - - return return_value - - def offset_3d( - self, - openings: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Shell - - Make an offset solid of self. - - Args: - openings (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): offset amount - positive offset outwards, negative inwards - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A shelled solid. - """ - openings = list(openings) if openings else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - - occ_faces_list = TopTools_ListOfShape() - for face in openings: - occ_faces_list.Append(face.wrapped) - - offset_builder = BRepOffsetAPI_MakeThickSolid() - offset_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - RemoveIntEdges=True, - Join=kind_dict[kind], - ) - offset_builder.Build() - - try: - offset_occt_solid = offset_builder.Shape() - except (StdFail_NotDone, Standard_Failure) as err: - raise RuntimeError( - "offset Error, an alternative kind may resolve this error" - ) from err - - offset_solid = self.__class__.cast(offset_occt_solid) - assert offset_solid.wrapped is not None - - # The Solid can be inverted, if so reverse - if offset_solid.volume < 0: - offset_solid.wrapped.Reverse() - - return offset_solid - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. - - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float | None = None, - taper: float = 0, - up_to_face: Face | None = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] - else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) - - -class Compound(Mixin3D, Shape[TopoDS_Compound]): - """A Compound in build123d is a topological entity representing a collection of - geometric shapes grouped together within a single structure. It serves as a - container for organizing diverse shapes like edges, faces, or solids. This - hierarchical arrangement facilitates the construction of complex models by - combining simpler shapes. Compound plays a pivotal role in managing the - composition and structure of intricate 3D models in computer-aided design - (CAD) applications, allowing engineers and designers to work with assemblies - of shapes as unified entities for efficient modeling and analysis.""" - - order = 4.0 - - project_to_viewport = Mixin1D.project_to_viewport - - @classmethod - def cast( - cls, obj: TopoDS_Shape - ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def _dim(self) -> Union[int, None]: - """The dimension of the shapes within the Compound - None if inconsistent""" - return topods_dim(self.wrapped) - - def __init__( - self, - obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - children: Sequence[Shape] | None = None, - ): - """Build a Compound from Shapes - - Args: - obj (TopoDS_Compound | Iterable[Shape], optional): OCCT Compound or shapes - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - children (Sequence[Shape], optional): assembly children. Defaults to None. - """ - - if isinstance(obj, Iterable): - topods_compound = _make_topods_compound_from_shapes( - [s.wrapped for s in obj] - ) - else: - topods_compound = obj - - super().__init__( - obj=topods_compound, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - self.children = [] if children is None else children - - def __repr__(self): - """Return Compound info as string""" - if hasattr(self, "label") and hasattr(self, "children"): - result = ( - f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " - + f"#children({len(self.children)})" - ) - else: - result = f"{self.__class__.__name__} at {id(self):#x}" - return result - - @property - def volume(self) -> float: - """volume - the volume of this Compound""" - # when density == 1, mass == volume - return sum(i.volume for i in [*self.get_type(Solid), *self.get_type(Shell)]) - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def _remove(self, shape: Shape) -> Compound: - """Return self with the specified shape removed. - - Args: - shape: Shape: - """ - comp_builder = TopoDS_Builder() - comp_builder.Remove(self.wrapped, shape.wrapped) - return self - - def _post_detach(self, parent: Compound): - """Method call after detaching from `parent`.""" - logger.debug("Removing parent of %s (%s)", self.label, parent.label) - if parent.children: - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - else: - parent.wrapped = None - - def _pre_attach(self, parent: Compound): - """Method call before attaching to `parent`.""" - if not isinstance(parent, Compound): - raise ValueError("`parent` must be of type Compound") - - def _post_attach(self, parent: Compound): - """Method call after attaching to `parent`.""" - logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - - def _post_detach_children(self, children): - """Method call before detaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Removing no children from %s", self.label) - - def _pre_attach_children(self, children): - """Method call before attaching `children`.""" - if not all(isinstance(child, Shape) for child in children): - raise ValueError("Each child must be of type Shape") - - def _post_attach_children(self, children: Iterable[Shape]): - """Method call after attaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Adding no children to %s", self.label) - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Combine other to self `+` operator - - Note that if all of the objects are connected Edges/Wires the result - will be a Wire, otherwise a Shape. - """ - if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other - - summands: ShapeList[Shape] - if other is None: - summands = ShapeList() - else: - summands = ShapeList( - shape - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ) - # If there is nothing to add return the original object - if not summands: - return self - - summands = ShapeList( - s for s in self.get_top_level_shapes() + summands if s is not None - ) - - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = Compound(summands[0:1]) - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(bool_result, list): - result = Compound(bool_result) - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - else: - result = bool_result - - if SkipClean.clean: - result = result.clean() - - return result - - def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Cut other to self `-` operator""" - difference = Shape.__sub__(self, other) - difference = Compound( - difference if isinstance(difference, list) else [difference] - ) - self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> Compound: - """Intersect other to self `&` operator""" - intersection = Shape.__and__(self, other) - intersection = Compound( - intersection if isinstance(intersection, list) else [intersection] - ) - self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) - return intersection - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) - - def compound(self) -> Compound | None: - """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None - - @classmethod - def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: - """extrude - - Extrude a Shell into a Compound. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Compound( - TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) - ) - - def do_children_intersect( - self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: - """Do Children Intersect - - Determine if any of the child objects within a Compound/assembly intersect by - intersecting each of the shapes with each other and checking for - a common volume. - - Args: - include_parent (bool, optional): check parent for intersections. Defaults to False. - tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. - - Returns: - tuple[bool, tuple[Shape, Shape], float]: - do the object intersect, intersecting objects, volume of intersection - """ - children: list[Shape] = list(PreOrderIter(self)) - if not include_parent: - children.pop(0) # remove parent - # children_bbox = [child.bounding_box().to_solid() for child in children] - children_bbox = [ - Solid.from_bounding_box(child.bounding_box()) for child in children - ] - child_index_pairs = [ - tuple(map(int, comb)) - for comb in combinations(list(range(len(children))), 2) - ] - for child_index_pair in child_index_pairs: - # First check for bounding box intersections .. - # .. then confirm with actual object intersections which could be complex - bbox_intersection = children_bbox[child_index_pair[0]].intersect( - children_bbox[child_index_pair[1]] - ) - if bbox_intersection is not None: - obj_intersection = children[child_index_pair[0]].intersect( - children[child_index_pair[1]] - ) - if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - ( - children[child_index_pair[0]], - children[child_index_pair[1]], - ), - common_volume, - ) - return (False, (None, None), 0.0) - - @classmethod - def make_text( - cls, - txt: str, - font_size: float, - font: str = "Arial", - font_path: Optional[str] = None, - font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), - position_on_path: float = 0.0, - text_path: Union[Edge, Wire, None] = None, - ) -> "Compound": - """2D Text that optionally follows a path. - - The text that is created can be combined as with other sketch features by specifying - a mode or rotated by the given angle. In addition, edges have been previously created - with arc or segment, the text will follow the path defined by these edges. The start - parameter can be used to shift the text along the path to achieve precise positioning. - - Args: - txt: text to be rendered - font_size: size of the font in model units - font: font name - font_path: path to font file - font_style: text style. Defaults to FontStyle.REGULAR. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max - of object. Defaults to (Align.CENTER, Align.CENTER). - position_on_path: the relative location on path to position the text, - between 0.0 and 1.0. Defaults to 0.0. - text_path: a path for the text to follows. Defaults to None - linear text. - - Returns: - a Compound object containing multiple Faces representing the text - - Examples:: - - fox = Compound.make_text( - txt="The quick brown fox jumped over the lazy dog", - font_size=10, - position_on_path=0.1, - text_path=jump_edge, - ) - - """ - # pylint: disable=too-many-locals - - def position_face(orig_face: Face) -> Face: - """ - Reposition a face to the provided path - - Local coordinates are used to calculate the position of the face - relative to the path. Global coordinates to position the face. - """ - assert text_path is not None - bbox = orig_face.bounding_box() - face_bottom_center = Vector((bbox.min.X + bbox.max.X) / 2, 0, 0) - relative_position_on_wire = ( - position_on_path + face_bottom_center.X / path_length - ) - wire_tangent = text_path.tangent_at(relative_position_on_wire) - wire_angle = Vector(1, 0, 0).get_signed_angle(wire_tangent) - wire_position = text_path.position_at(relative_position_on_wire) - - return orig_face.translate(wire_position - face_bottom_center).rotate( - Axis(wire_position, (0, 0, 1)), - -wire_angle, - ) - - if sys.platform.startswith("linux"): - os.environ["FONTCONFIG_FILE"] = "/etc/fonts/fonts.conf" - os.environ["FONTCONFIG_PATH"] = "/etc/fonts/" - - font_kind = { - FontStyle.REGULAR: Font_FA_Regular, - FontStyle.BOLD: Font_FA_Bold, - FontStyle.ITALIC: Font_FA_Italic, - }[font_style] - - mgr = Font_FontMgr.GetInstance_s() - - if font_path and mgr.CheckFont(TCollection_AsciiString(font_path).ToCString()): - font_t = Font_SystemFont(TCollection_AsciiString(font_path)) - font_t.SetFontPath(font_kind, TCollection_AsciiString(font_path)) - mgr.RegisterFont(font_t, True) - - else: - font_t = mgr.FindFont(TCollection_AsciiString(font), font_kind) - - logger.info( - "Creating text with font %s located at %s", - font_t.FontName().ToCString(), - font_t.FontPath(font_kind).ToCString(), - ) - - builder = Font_BRepTextBuilder() - font_i = StdPrs_BRepFont( - NCollection_Utf8String(font_t.FontName().ToCString()), - font_kind, - float(font_size), - ) - text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) - - # Align the text from the bounding box - align_text = tuplify(align, 2) - text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align_text)) - ) - - if text_path is not None: - path_length = text_path.length - text_flat = Compound([position_face(f) for f in text_flat.faces()]) - - return text_flat - - @classmethod - def make_triad(cls, axes_scale: float) -> Compound: - """The coordinate system triad (X, Y, Z axes)""" - x_axis = Edge.make_line((0, 0, 0), (axes_scale, 0, 0)) - y_axis = Edge.make_line((0, 0, 0), (0, axes_scale, 0)) - z_axis = Edge.make_line((0, 0, 0), (0, 0, axes_scale)) - arrow_arc = Edge.make_spline( - [(0, 0, 0), (-axes_scale / 20, axes_scale / 30, 0)], - [(-1, 0, 0), (-1, 1.5, 0)], - ) - arrow = Wire([arrow_arc, copy.copy(arrow_arc).mirror(Plane.XZ)]) - x_label = ( - Compound.make_text( - "X", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .move(Location(x_axis @ 1)) - .edges() - ) - y_label = ( - Compound.make_text( - "Y", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .rotate(Axis.Z, 90) - .move(Location(y_axis @ 1)) - .edges() - ) - z_label = ( - Compound.make_text( - "Z", font_size=axes_scale / 4, align=(Align.CENTER, Align.MIN) - ) - .rotate(Axis.Y, 90) - .rotate(Axis.X, 90) - .move(Location(z_axis @ 1)) - .edges() - ) - triad = Curve( - [ - x_axis, - y_axis, - z_axis, - arrow.moved(Location(x_axis @ 1)), - arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), - arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), - *x_label, - *y_label, - *z_label, - ] - ) - - return triad - - def __iter__(self) -> Iterator[Shape]: - """ - Iterate over subshapes. - - """ - - iterator = TopoDS_Iterator(self.wrapped) - - while iterator.More(): - yield Compound.cast(iterator.Value()) - iterator.Next() - - def __len__(self) -> int: - """Return the number of subshapes""" - count = 0 - if self.wrapped is not None: - for _ in self: - count += 1 - return count - - def __bool__(self) -> bool: - """ - Check if empty. - """ - - return TopoDS_Iterator(self.wrapped).More() - - def get_type( - self, - obj_type: Union[ - Type[Vertex], Type[Edge], Type[Face], Type[Shell], Type[Solid], Type[Wire] - ], - ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: - """get_type - - Extract the objects of the given type from a Compound. Note that this - isn't the same as Faces() etc. which will extract Faces from Solids. - - Args: - obj_type (Union[Vertex, Edge, Face, Shell, Solid, Wire]): Object types to extract - - Returns: - list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: Extracted objects - """ - - type_map = { - Vertex: TopAbs_ShapeEnum.TopAbs_VERTEX, - Edge: TopAbs_ShapeEnum.TopAbs_EDGE, - Face: TopAbs_ShapeEnum.TopAbs_FACE, - Shell: TopAbs_ShapeEnum.TopAbs_SHELL, - Solid: TopAbs_ShapeEnum.TopAbs_SOLID, - Wire: TopAbs_ShapeEnum.TopAbs_WIRE, - Compound: TopAbs_ShapeEnum.TopAbs_COMPOUND, - } - results = [] - for comp in self.compounds(): - iterator = TopoDS_Iterator() - iterator.Initialize(comp.wrapped) - while iterator.More(): - child = iterator.Value() - if child.ShapeType() == type_map[obj_type]: - results.append(obj_type(downcast(child))) - iterator.Next() - - return results - - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: - """Strip unnecessary Compound wrappers - - Args: - fully (bool, optional): return base shape without any Compound - wrappers (otherwise one Compound is left). Defaults to True. - - Returns: - Union[Self, Shape]: base shape - """ - if len(self) == 1: - single_element = next(iter(self)) - self.copy_attributes_to(single_element, ["wrapped", "_NodeMixin__children"]) - - # If the single element is another Compound, unwrap it recursively - if isinstance(single_element, Compound): - # Unwrap recursively and copy attributes down - unwrapped = single_element.unwrap(fully) - if not fully: - unwrapped = type(self)(unwrapped.wrapped) - self.copy_attributes_to(unwrapped, ["wrapped", "_NodeMixin__children"]) - return unwrapped - - return single_element if fully else self - - # If there are no elements or more than one element, return self - return self - - -class Part(Compound): - """A Compound containing 3D objects - aka Solids""" - - @property - def _dim(self) -> int: - return 3 - - -class Sketch(Compound): - """A Compound containing 2D objects - aka Faces""" - - @property - def _dim(self) -> int: - return 2 - - -class Curve(Compound): - """A Compound containing 1D objects - aka Edges""" - - @property - def _dim(self) -> int: - return 1 - - __add__ = Mixin1D.__add__ # type: ignore - - def __matmul__(self, position: float) -> Vector: - """Position on curve operator @ - only works if continuous""" - return Wire(self.edges()).position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator % - only works if continuous""" - return Wire(self.edges()).tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^ - only works if continuous""" - return Wire(self.edges()).location_at(position) - - def wires(self) -> ShapeList[Wire]: # type: ignore - """A list of wires created from the edges""" - return Wire.combine(self.edges()) - - -class Edge(Mixin1D, Shape[TopoDS_Edge]): - """An Edge in build123d is a fundamental element in the topological data structure - representing a one-dimensional geometric entity within a 3D model. It encapsulates - information about a curve, which could be a line, arc, or other parametrically - defined shape. Edge is crucial in for precise modeling and manipulation of curves, - facilitating operations like filleting, chamfering, and Boolean operations. It - serves as a building block for constructing complex structures, such as wires - and faces.""" - - # pylint: disable=too-many-public-methods - - order = 1.0 - - def __init__( - self, - obj: Optional[TopoDS_Edge | Axis | None] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge - - Args: - obj (TopoDS_Edge | Axis, optional): OCCT Edge or Axis. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Axis): - obj = BRepBuilderAPI_MakeEdge( - Geom_Line( - obj.position.to_pnt(), - obj.direction.to_dir(), - ) - ).Edge() - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_Curve: - """Return the Geom Curve from this Edge""" - return BRepAdaptor_Curve(self.wrapped) - - def close(self) -> Union[Edge, Wire]: - """Close an Edge""" - if not self.is_closed: - return_value = Wire([self]).close() - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Edge as Wire""" - return Wire([self]) - - @property - def arc_center(self) -> Vector: - """center of an underlying circle or ellipse geometry.""" - - geom_type = self.geom_type - geom_adaptor = self.geom_adaptor() - - if geom_type == GeomType.CIRCLE: - return_value = Vector(geom_adaptor.Circle().Position().Location()) - elif geom_type == GeomType.ELLIPSE: - return_value = Vector(geom_adaptor.Ellipse().Position().Location()) - else: - raise ValueError(f"{geom_type} has no arc center") - - return return_value - - def find_tangent( - self, - angle: float, - ) -> list[float]: - """find_tangent - - Find the parameter values of self where the tangent is equal to angle. - - Args: - angle (float): target angle in degrees - - Returns: - list[float]: u values between 0.0 and 1.0 - """ - angle = angle % 360 # angle needs to always be positive 0..360 - u_values: list[float] - - if self.geom_type == GeomType.LINE: - if self.tangent_angle_at(0) == angle: - u_values = [0] - else: - u_values = [] - else: - # Solve this problem geometrically by creating a tangent curve and finding intercepts - periodic = int(self.is_closed) # if closed don't include end point - tan_pnts: list[VectorLike] = [] - previous_tangent = None - - # When angles go from 360 to 0 a discontinuity is created so add 360 to these - # values and intercept another line - discontinuities = 0.0 - for i in range(101 - periodic): - tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 - if ( - previous_tangent is not None - and abs(previous_tangent - tangent) > 300 - ): - discontinuities = copysign(1.0, previous_tangent - tangent) - tangent += 360 * discontinuities - previous_tangent = tangent - tan_pnts.append((i / 100, tangent)) - - # Generate a first differential curve from the tangent points - tan_curve = Edge.make_spline(tan_pnts) - - # Use the bounding box to find the min and max values - tan_curve_bbox = tan_curve.bounding_box() - min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) - max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) - - # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts: list[Vector] = [] - for i in range(min_range, max_range + 1, 360): - line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) - intercept_pnts.extend(tan_curve.find_intersection_points(line)) - - u_values = [p.X for p in intercept_pnts] - - return u_values - - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - - def find_intersection_points( - self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE - ) -> ShapeList[Vector]: - """find_intersection_points - - Determine the points where a 2D edge crosses itself or another 2D edge - - Args: - other (Axis | Edge): curve to compare with - tolerance (float, optional): the precision of computing the intersection points. - Defaults to TOLERANCE. - - Returns: - ShapeList[Vector]: list of intersection points - """ - # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) - other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, - ) - # To determine the 2D plane to work on - plane = self.common_plane(other) - if plane is None: - raise ValueError("All objects must be on the same plane") - # Convert the plane into a Geom_Surface - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - edge_surface = BRep_Tool.Surface_s(pln_shape) - - self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - self.wrapped, - edge_surface, - TopLoc_Location(), - self.param_at(0), - self.param_at(1), - ) - if other is not None: - edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - other.wrapped, - edge_surface, - TopLoc_Location(), - other.param_at(0), - other.param_at(1), - ) - intersector = Geom2dAPI_InterCurveCurve( - self_2d_curve, edge_2d_curve, tolerance - ) - else: - intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) - - crosses = [ - Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) - for i in range(intersector.NbPoints()) - ] - # Convert back to global coordinates - crosses = [plane.from_local_coords(p) for p in crosses] - - # crosses may contain points beyond the ends of the edge so - # .. filter those out - valid_crosses = [] - for pnt in crosses: - try: - if other is not None: - if ( - self.distance_to(pnt) <= TOLERANCE - and other.distance_to(pnt) <= TOLERANCE - ): - valid_crosses.append(pnt) - else: - if self.distance_to(pnt) <= TOLERANCE: - valid_crosses.append(pnt) - except ValueError: - pass # skip invalid points - - return ShapeList(valid_crosses) - - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Union[Edge, Axis]): other object - - Returns: - Union[Shape, None]: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None - - @classmethod - def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: - """extrude - - Extrude a Vertex into an Edge. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) - - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" - reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge - return reversed_edge - - def trim(self, start: float, end: float) -> Edge: - """trim - - Create a new edge by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Edge: trimmed edge - """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") - - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) - trimmed_curve = Geom_TrimmedCurve( - new_curve, - parm_start, - parm_end, - ) - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def trim_to_length(self, start: float, length: float) -> Edge: - """trim_to_length - - Create a new edge starting at the given normalized parameter of a - given length. - - Args: - start (float): 0.0 <= start < 1.0 - length (float): target length - - Returns: - Edge: trimmed edge - """ - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - - # Create an adaptor for the curve - adaptor_curve = GeomAdaptor_Curve(new_curve) - - # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) - abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - - # Get the parameter at the desired length - parm_end = abscissa_point.Parameter() - - # Trim the curve to the desired length - trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" - - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) - - point = Vector(point) - - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") - - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length - - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value - - @classmethod - def make_bezier( - cls, *cntl_pnts: VectorLike, weights: list[float] | None = None - ) -> Edge: - """make_bezier - - Create a rational (with weights) or non-rational bezier curve. The first and last - control points represent the start and end of the curve respectively. If weights - are provided, there must be one provided for each control point. - - Args: - cntl_pnts (sequence[VectorLike]): points defining the curve - weights (list[float], optional): control point weights list. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Edge: bezier curve - """ - if len(cntl_pnts) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(cntl_pnts) > 25: - raise ValueError("The maximum number of control points is 25") - if weights: - if len(cntl_pnts) != len(weights): - raise ValueError("A weight must be provided for each control point") - - cntl_gp_pnts = [Vector(cntl_pnt).to_pnt() for cntl_pnt in cntl_pnts] - - # The poles are stored in an OCCT Array object - poles = TColgp_Array1OfPnt(1, len(cntl_gp_pnts)) - for i, cntl_gp_pnt in enumerate(cntl_gp_pnts): - poles.SetValue(i + 1, cntl_gp_pnt) - - if weights: - pole_weights = TColStd_Array1OfReal(1, len(weights)) - for i, weight in enumerate(weights): - pole_weights.SetValue(i + 1, float(weight)) - bezier_curve = Geom_BezierCurve(poles, pole_weights) - else: - bezier_curve = Geom_BezierCurve(poles) - - return cls(BRepBuilderAPI_MakeEdge(bezier_curve).Edge()) - - @classmethod - def make_circle( - cls, - radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make circle - - Create a circle centered on the origin of plane - - Args: - radius (float): circle radius - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): start of arc angle. Defaults to 360.0. - end_angle (float, optional): end of arc angle. Defaults to 360. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial circle - """ - circle_gp = gp_Circ(plane.to_gp_ax2(), radius) - - if start_angle == end_angle: # full circle case - return_value = cls(BRepBuilderAPI_MakeEdge(circle_gp).Edge()) - else: # arc case - ccw = angular_direction == AngularDirection.COUNTER_CLOCKWISE - if ccw: - start = radians(start_angle) - end = radians(end_angle) - else: - start = radians(end_angle) - end = radians(start_angle) - circle_geom = GC_MakeArcOfCircle(circle_gp, start, end, ccw).Value() - return_value = cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - return return_value - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): Defaults to 360.0. - end_angle (float, optional): Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial ellipse - """ - ax1 = gp_Ax1(plane.origin.to_pnt(), plane.z_dir.to_dir()) - - if y_radius > x_radius: - # swap x and y radius and rotate by 90° afterwards to create an ellipse - # with x_radius < y_radius - correction_angle = 90.0 * DEG2RAD - ellipse_gp = gp_Elips(plane.to_gp_ax2(), y_radius, x_radius).Rotated( - ax1, correction_angle - ) - else: - correction_angle = 0.0 - ellipse_gp = gp_Elips(plane.to_gp_ax2(), x_radius, y_radius) - - if start_angle == end_angle: # full ellipse case - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_gp).Edge()) - else: # arc case - # take correction_angle into account - ellipse_geom = GC_MakeArcOfEllipse( - ellipse_gp, - start_angle * DEG2RAD - correction_angle, - end_angle * DEG2RAD - correction_angle, - angular_direction == AngularDirection.COUNTER_CLOCKWISE, - ).Value() - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_geom).Edge()) - - return ellipse - - @classmethod - def make_mid_way(cls, first: Edge, second: Edge, middle: float = 0.5) -> Edge: - """make line between edges - - Create a new linear Edge between the two provided Edges. If the Edges are parallel - but in the opposite directions one Edge is flipped such that the mid way Edge isn't - truncated. - - Args: - first (Edge): first reference Edge - second (Edge): second reference Edge - middle (float, optional): factional distance between Edges. Defaults to 0.5. - - Returns: - Edge: linear Edge between two Edges - """ - flip = first.to_axis().is_opposite(second.to_axis()) - pnts = [ - Edge.make_line( - first.position_at(i), second.position_at(1 - i if flip else i) - ).position_at(middle) - for i in [0, 1] - ] - return Edge.make_line(*pnts) - - @classmethod - def make_spline( - cls, - points: list[VectorLike], - tangents: list[VectorLike] | None = None, - periodic: bool = False, - parameters: list[float] | None = None, - scale: bool = True, - tol: float = 1e-6, - ) -> Edge: - """Spline - - Interpolate a spline through the provided points. - - Args: - points (list[VectorLike]): the points defining the spline - tangents (list[VectorLike], optional): start and finish tangent. - Defaults to None. - periodic (bool, optional): creation of periodic curves. Defaults to False. - parameters (list[float], optional): the value of the parameter at each - interpolation point. (The interpolated curve is represented as a vector-valued - function of a scalar parameter.) If periodic == True, then len(parameters) - must be len(interpolation points) + 1, otherwise len(parameters) - must be equal to len(interpolation points). Defaults to None. - scale (bool, optional): whether to scale the specified tangent vectors before - interpolating. Each tangent is scaled, so it's length is equal to the derivative - of the Lagrange interpolated curve. I.e., set this to True, if you want to use - only the direction of the tangent vectors specified by `tangents` , but not - their magnitude. Defaults to True. - tol (float, optional): tolerance of the algorithm (consult OCC documentation). - Used to check that the specified points are not too close to each other, and - that tangent vectors are not too short. (In either case interpolation may fail.). - Defaults to 1e-6. - - Raises: - ValueError: Parameter for each interpolation point - ValueError: Tangent for each interpolation point - ValueError: B-spline interpolation failed - - Returns: - Edge: the spline - """ - # pylint: disable=too-many-locals - point_vectors = [Vector(point) for point in points] - if tangents: - tangent_vectors = tuple(Vector(v) for v in tangents) - pnts = TColgp_HArray1OfPnt(1, len(point_vectors)) - for i, point in enumerate(point_vectors): - pnts.SetValue(i + 1, point.to_pnt()) - - if parameters is None: - spline_builder = GeomAPI_Interpolate(pnts, periodic, tol) - else: - if len(parameters) != (len(point_vectors) + periodic): - raise ValueError( - "There must be one parameter for each interpolation point " - "(plus one if periodic), or none specified. Parameter count: " - f"{len(parameters)}, point count: {len(point_vectors)}" - ) - parameters_array = TColStd_HArray1OfReal(1, len(parameters)) - for p_index, p_value in enumerate(parameters): - parameters_array.SetValue(p_index + 1, p_value) - - spline_builder = GeomAPI_Interpolate(pnts, parameters_array, periodic, tol) - - if tangents: - if len(tangent_vectors) == 2 and len(point_vectors) != 2: - # Specify only initial and final tangent: - spline_builder.Load( - tangent_vectors[0].wrapped, tangent_vectors[1].wrapped, scale - ) - else: - if len(tangent_vectors) != len(point_vectors): - raise ValueError( - f"There must be one tangent for each interpolation point, " - f"or just two end point tangents. Tangent count: " - f"{len(tangent_vectors)}, point count: {len(point_vectors)}" - ) - - # Specify a tangent for each interpolation point: - tangents_array = TColgp_Array1OfVec(1, len(tangent_vectors)) - tangent_enabled_array = TColStd_HArray1OfBoolean( - 1, len(tangent_vectors) - ) - for t_index, t_value in enumerate(tangent_vectors): - tangent_enabled_array.SetValue(t_index + 1, t_value is not None) - tangent_vec = t_value if t_value is not None else Vector() - tangents_array.SetValue(t_index + 1, tangent_vec.wrapped) - - spline_builder.Load(tangents_array, tangent_enabled_array, scale) - - spline_builder.Perform() - if not spline_builder.IsDone(): - raise ValueError("B-spline interpolation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_spline_approx( - cls, - points: list[VectorLike], - tol: float = 1e-3, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 6, - ) -> Edge: - """make_spline_approx - - Approximate a spline through the provided points. - - Args: - points (list[Vector]): - tol (float, optional): tolerance of the algorithm. Defaults to 1e-3. - smoothing (Tuple[float, float, float], optional): optional tuple of 3 weights - use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when smoothing - is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 6. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Edge: spline - """ - pnts = TColgp_HArray1OfPnt(1, len(points)) - for i, point in enumerate(points): - pnts.SetValue(i + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSpline( - pnts, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSpline( - pnts, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_three_point_arc( - cls, point1: VectorLike, point2: VectorLike, point3: VectorLike - ) -> Edge: - """Three Point Arc - - Makes a three point arc through the provided points - - Args: - point1 (VectorLike): start point - point2 (VectorLike): middle point - point3 (VectorLike): end point - - Returns: - Edge: a circular arc through the three points - """ - circle_geom = GC_MakeArcOfCircle( - Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_tangent_arc( - cls, start: VectorLike, tangent: VectorLike, end: VectorLike - ) -> Edge: - """Tangent Arc - - Makes a tangent arc from point start, in the direction of tangent and ends at end. - - Args: - start (VectorLike): start point - tangent (VectorLike): start tangent - end (VectorLike): end point - - Returns: - Edge: circular arc - """ - circle_geom = GC_MakeArcOfCircle( - Vector(start).to_pnt(), Vector(tangent).wrapped, Vector(end).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: - """Create a line between two points - - Args: - point1: VectorLike: that represents the first point - point2: VectorLike: that represents the second point - - Returns: - A linear edge between the two provided points - - """ - return cls( - BRepBuilderAPI_MakeEdge( - Vector(point1).to_pnt(), Vector(point2).to_pnt() - ).Edge() - ) - - @classmethod - def make_helix( - cls, - pitch: float, - height: float, - radius: float, - center: VectorLike = (0, 0, 0), - normal: VectorLike = (0, 0, 1), - angle: float = 0.0, - lefthand: bool = False, - ) -> Wire: - """make_helix - - Make a helix with a given pitch, height and radius. By default a cylindrical surface is - used to create the helix. If the :angle: is set (the apex given in degree) a conical - surface is used instead. - - Args: - pitch (float): distance per revolution along normal - height (float): total height - radius (float): - center (VectorLike, optional): Defaults to (0, 0, 0). - normal (VectorLike, optional): Defaults to (0, 0, 1). - angle (float, optional): conical angle. Defaults to 0.0. - lefthand (bool, optional): Defaults to False. - - Returns: - Wire: helix - """ - # pylint: disable=too-many-locals - # 1. build underlying cylindrical/conical surface - if angle == 0.0: - geom_surf: Geom_Surface = Geom_CylindricalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius - ) - else: - geom_surf = Geom_ConicalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), - angle * DEG2RAD, - radius, - ) - - # 2. construct an segment in the u,v domain - - # Determine the length of the 2d line which will be wrapped around the surface - line_sign = -1 if lefthand else 1 - line_dir = Vector(line_sign * 2 * pi, pitch).normalized() - line_len = (height / line_dir.Y) / cos(radians(angle)) - - # Create an infinite 2d line in the direction of the helix - helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) - # Trim the line to the desired length - helix_curve = Geom2d_TrimmedCurve( - helix_line, 0, line_len, theAdjustPeriodic=True - ) - - # 3. Wrap the line around the surface - edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) - topods_edge = edge_builder.Edge() - - # 4. Convert the edge made with 2d geometry to 3d - BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) - - return cls(topods_edge) - - def distribute_locations( - self: Union[Wire, Edge], - count: int, - start: float = 0.0, - stop: float = 1.0, - positions_only: bool = False, - ) -> list[Location]: - """Distribute Locations - - Distribute locations along edge or wire. - - Args: - self: Union[Wire:Edge]: - count(int): Number of locations to generate - start(float): position along Edge|Wire to start. Defaults to 0.0. - stop(float): position along Edge|Wire to end. Defaults to 1.0. - positions_only(bool): only generate position not orientation. Defaults to False. - - Returns: - list[Location]: locations distributed along Edge|Wire - - Raises: - ValueError: count must be two or greater - - """ - if count < 2: - raise ValueError("count must be two or greater") - - t_values = [start + i * (stop - start) / (count - 1) for i in range(count)] - - locations = self.locations(t_values) - if positions_only: - for loc in locations: - loc.orientation = Vector(0, 0, 0) - - return locations - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Edge]: - """Project Edge - - Project an Edge onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected Edge(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - wire = Wire([self]) - projected_wires = wire.project_to_shape(target_object, direction, center) - projected_edges = [w.edges()[0] for w in projected_wires] - return projected_edges - - def to_axis(self) -> Axis: - """Translate a linear Edge to an Axis""" - if self.geom_type != GeomType.LINE: - raise ValueError( - f"to_axis is only valid for linear Edges not {self.geom_type}" - ) - return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) + def shells(self) -> ShapeList[Shell]: + """shells - all the shells in this Shape""" + return Shape.get_shape_list(self, "Shell") class Face(Mixin2D, Shape[TopoDS_Face]): @@ -6032,6 +263,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): # pylint: disable=too-many-public-methods order = 2.0 + # ---- Constructor ---- @overload def __init__( @@ -6118,32 +350,13 @@ class Face(Mixin2D, Shape[TopoDS_Face]): # Faces can optionally record the plane it was created on for later extrusion self.created_on: Plane | None = None - @property - def length(self) -> None | float: - """length of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.X) - result = face_vertices[-1].X - face_vertices[0].X - return result + # ---- Properties ---- @property - def volume(self) -> float: - """volume - the volume of this Face, which is always zero""" - return 0.0 - - @property - def width(self) -> None | float: - """width of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.Y) - result = face_vertices[-1].Y - face_vertices[0].Y - return result + def center_location(self) -> Location: + """Location at the center of face""" + origin = self.position_at(0.5, 0.5) + return Plane(origin, z_dir=self.normal_at(origin)).location @property def geometry(self) -> None | str: @@ -6174,197 +387,39 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return result - @property - def center_location(self) -> Location: - """Location at the center of face""" - origin = self.position_at(0.5, 0.5) - return Plane(origin, z_dir=self.normal_at(origin)).location - @property def is_planar(self) -> bool: """Is the face planar even though its geom_type may not be PLANE""" return self.is_planar_face - def geom_adaptor(self) -> Geom_Surface: - """Return the Geom Surface for this Face""" - return BRep_Tool.Surface_s(self.wrapped) + @property + def length(self) -> None | float: + """length of planar face""" + result = None + if self.is_planar: + # Reposition on Plane.XY + flat_face = Plane(self).to_local_coords(self) + face_vertices = flat_face.vertices().sort_by(Axis.X) + result = face_vertices[-1].X - face_vertices[0].X + return result - def _uv_bounds(self) -> Tuple[float, float, float, float]: - """Return the u min, u max, v min, v max values""" - return BRepTools.UVBounds_s(self.wrapped) + @property + def volume(self) -> float: + """volume - the volume of this Face, which is always zero""" + return 0.0 - @overload - def normal_at(self, surface_point: VectorLike | None = None) -> Vector: - """normal_at point on surface + @property + def width(self) -> None | float: + """width of planar face""" + result = None + if self.is_planar: + # Reposition on Plane.XY + flat_face = Plane(self).to_local_coords(self) + face_vertices = flat_face.vertices().sort_by(Axis.Y) + result = face_vertices[-1].Y - face_vertices[0].Y + return result - Args: - surface_point (VectorLike, optional): a point that lies on the surface where - the normal. Defaults to the center (None). - - Returns: - Vector: surface normal direction - """ - - @overload - def normal_at(self, u: float, v: float) -> Vector: - """normal_at u, v values on Face - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - Defaults to the center (None/None) - - Raises: - ValueError: Either neither or both u v values must be provided - - Returns: - Vector: surface normal direction - """ - - def normal_at(self, *args, **kwargs) -> Vector: - """normal_at - - Computes the normal vector at the desired location on the face. - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where the normal. - Defaults to None. - - Returns: - Vector: surface normal direction - """ - surface_point, u, v = None, -1.0, -1.0 - - if args: - if isinstance(args[0], Sequence): - surface_point = args[0] - elif isinstance(args[0], (int, float)): - u = args[0] - if len(args) == 2 and isinstance(args[1], (int, float)): - v = args[1] - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["surface_point", "u", "v"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - surface_point = kwargs.get("surface_point", surface_point) - u = kwargs.get("u", u) - v = kwargs.get("v", v) - if surface_point is None and u < 0 and v < 0: - u, v = 0.5, 0.5 - elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: - raise ValueError("Both u & v values must be specified") - - # get the geometry - surface = self.geom_adaptor() - - if surface_point is None: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) - else: - # project point on surface - projector = GeomAPI_ProjectPointOnSurf( - Vector(surface_point).to_pnt(), surface - ) - - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - def position_at(self, u: float, v: float) -> Vector: - """position_at - - Computes a point on the Face given u, v coordinates. - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - - Returns: - Vector: point on Face - """ - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u_val0 + u * (u_val1 - u_val0) - v_val = v_val0 + v * (v_val1 - v_val0) - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(gp_pnt) - - def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) - else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) - return Location(pln) - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of Face - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if (center_of == CenterOf.MASS) or ( - center_of == CenterOf.GEOMETRY and self.is_planar - ): - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - center_point = properties.CentreOfMass() - - elif center_of == CenterOf.BOUNDING_BOX: - center_point = self.bounding_box().center() - - elif center_of == CenterOf.GEOMETRY: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = 0.5 * (u_val0 + u_val1) - v_val = 0.5 * (v_val0 + v_val1) - - center_point = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) - - return Vector(center_point) - - def outer_wire(self) -> Wire: - """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) - - def inner_wires(self) -> ShapeList[Wire]: - """Extract the inner or hole wires from this Face""" - outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) - - def wire(self) -> Wire: - """Return the outerwire, generate a warning if inner_wires present""" - if self.inner_wires(): - warnings.warn( - "Found holes, returning outer_wire", - stacklevel=2, - ) - return self.outer_wire() + # ---- Class Methods ---- @classmethod def extrude(cls, obj: Edge, direction: VectorLike) -> Face: @@ -6384,228 +439,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): """ return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - @classmethod - def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: - """make_rect - - Make a Rectangle centered on center with the given normal - - Args: - width (float, optional): width (local x). - height (float, optional): height (local y). - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Face: The centered rectangle - """ - pln_shape = BRepBuilderAPI_MakeFace( - plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 - ).Face() - - return cls(pln_shape) - - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - - @overload - @classmethod - def make_surface_from_curves( - cls, edge1: Edge, edge2: Edge - ) -> Face: # pragma: no cover - ... - - @overload - @classmethod - def make_surface_from_curves( - cls, wire1: Wire, wire2: Wire - ) -> Face: # pragma: no cover - ... - - @classmethod - def make_surface_from_curves(cls, *args, **kwargs) -> Face: - """make_surface_from_curves - - Create a ruled surface out of two edges or two wires. If wires are used then - these must have the same number of edges. - - Args: - curve1 (Union[Edge,Wire]): side of surface - curve2 (Union[Edge,Wire]): opposite side of surface - - Returns: - Face: potentially non planar surface - """ - curve1, curve2 = None, None - if args: - if len(args) != 2 or type(args[0]) is not type(args[1]): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - curve1, curve2 = args - - curve1 = kwargs.pop("edge1", curve1) - curve2 = kwargs.pop("edge2", curve2) - curve1 = kwargs.pop("wire1", curve1) - curve2 = kwargs.pop("wire2", curve2) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - - if isinstance(curve1, Wire): - return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) - else: - return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) - return return_value - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: - """sew faces - - Group contiguous faces and return them in a list of ShapeList - - Args: - faces (Iterable[Face]): Faces to sew together - - Raises: - RuntimeError: OCCT SewedShape generated unexpected output - - Returns: - list[ShapeList[Face]]: grouped contiguous faces - """ - # Sew the faces - sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) - top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces: list[ShapeList] = [] - - # For each of the top level shapes create a ShapeList of Face - for top_level_shape in top_level_shapes: - if isinstance(top_level_shape, TopoDS_Face): - sewn_faces.append(ShapeList([Face(top_level_shape)])) - elif isinstance(top_level_shape, TopoDS_Shell): - sewn_faces.append(Shell(top_level_shape).faces()) - elif isinstance(top_level_shape, TopoDS_Solid): - sewn_faces.append( - ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") - ) - ) - else: - raise RuntimeError( - f"SewedShape returned a {type(top_level_shape)} which was unexpected" - ) - - return sewn_faces - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Face: - """sweep - - Sweep a 1D profile along a 1D path. Both the profile and path must be composed - of only 1 Edge. - - Args: - profile (Union[Curve,Edge,Wire]): the object to sweep - path (Union[Curve,Edge,Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Raises: - ValueError: Only 1 Edge allowed in profile & path - - Returns: - Face: resulting face, may be non-planar - """ - # Note: BRepOffsetAPI_MakePipe is an option here - # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) - # pipe_sweep.Build() - # return Face(pipe_sweep.Shape()) - - if len(profile.edges()) != 1 or len(path.edges()) != 1: - raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Face(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_surface_from_array_of_points( - cls, - points: list[list[VectorLike]], - tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 3, - ) -> Face: - """make_surface_from_array_of_points - - Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter - space of the face. The second dimension correspond to points on the horizontal - direction in the parameter space of the face. The 2 dimensions are U,V dimensions - of the parameter space of the face. - - Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V - parameters second is U parameters. - tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. - smoothing (Tuple[float, float, float], optional): optional tuple of - 3 weights use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when - smoothing is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 3. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Face: a potentially non-planar face defined by points - """ - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - - for i, point_row in enumerate(points): - for j, point in enumerate(point_row): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Surface() - - return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) - @classmethod def make_bezier_surface( cls, @@ -6655,10 +488,39 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) + @classmethod + def make_plane( + cls, + plane: Plane = Plane.XY, + ) -> Face: + """Create a unlimited size Face aligned with plane""" + pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() + return cls(pln_shape) + + @classmethod + def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: + """make_rect + + Make a Rectangle centered on center with the given normal + + Args: + width (float, optional): width (local x). + height (float, optional): height (local y). + plane (Plane, optional): base plane. Defaults to Plane.XY. + + Returns: + Face: The centered rectangle + """ + pln_shape = BRepBuilderAPI_MakeFace( + plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 + ).Face() + + return cls(pln_shape) + @classmethod def make_surface( cls, - exterior: Union[Wire, Iterable[Edge]], + exterior: Wire | Iterable[Edge], surface_points: Iterable[VectorLike] | None = None, interior_wires: Iterable[Wire] | None = None, ) -> Face: @@ -6764,25 +626,232 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return surface_face - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: - """Apply 2D fillet to a face + @classmethod + def make_surface_from_array_of_points( + cls, + points: list[list[VectorLike]], + tol: float = 1e-2, + smoothing: Tuple[float, float, float] | None = None, + min_deg: int = 1, + max_deg: int = 3, + ) -> Face: + """make_surface_from_array_of_points + + Approximate a spline surface through the provided 2d array of points. + The first dimension correspond to points on the vertical direction in the parameter + space of the face. The second dimension correspond to points on the horizontal + direction in the parameter space of the face. The 2 dimensions are U,V dimensions + of the parameter space of the face. Args: - radius: float: - vertices: Iterable[Vertex]: + points (list[list[VectorLike]]): a 2D list of points, first dimension is V + parameters second is U parameters. + tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. + smoothing (Tuple[float, float, float], optional): optional tuple of + 3 weights use for variational smoothing. Defaults to None. + min_deg (int, optional): minimum spline degree. Enforced only when + smoothing is None. Defaults to 1. + max_deg (int, optional): maximum spline degree. Defaults to 3. + + Raises: + ValueError: B-spline approximation failed Returns: - + Face: a potentially non-planar face defined by points """ + points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) + for i, point_row in enumerate(points): + for j, point in enumerate(point_row): + points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) + if smoothing: + spline_builder = GeomAPI_PointsToBSplineSurface( + points_, *smoothing, DegMax=max_deg, Tol3D=tol + ) + else: + spline_builder = GeomAPI_PointsToBSplineSurface( + points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol + ) - fillet_builder.Build() + if not spline_builder.IsDone(): + raise ValueError("B-spline approximation failed") - return self.__class__.cast(fillet_builder.Shape()) + spline_geom = spline_builder.Surface() + + return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) + + @overload + @classmethod + def make_surface_from_curves( + cls, edge1: Edge, edge2: Edge + ) -> Face: # pragma: no cover + ... + + @overload + @classmethod + def make_surface_from_curves( + cls, wire1: Wire, wire2: Wire + ) -> Face: # pragma: no cover + ... + + @classmethod + def make_surface_from_curves(cls, *args, **kwargs) -> Face: + """make_surface_from_curves + + Create a ruled surface out of two edges or two wires. If wires are used then + these must have the same number of edges. + + Args: + curve1 (Union[Edge,Wire]): side of surface + curve2 (Union[Edge,Wire]): opposite side of surface + + Returns: + Face: potentially non planar surface + """ + curve1, curve2 = None, None + if args: + if len(args) != 2 or type(args[0]) is not type(args[1]): + raise TypeError( + "Both curves must be of the same type (both Edge or both Wire)." + ) + curve1, curve2 = args + + curve1 = kwargs.pop("edge1", curve1) + curve2 = kwargs.pop("edge2", curve2) + curve1 = kwargs.pop("wire1", curve1) + curve2 = kwargs.pop("wire2", curve2) + + # Handle unexpected kwargs + if kwargs: + raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + + if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): + raise TypeError( + "Both curves must be of the same type (both Edge or both Wire)." + ) + + if isinstance(curve1, Wire): + return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) + else: + return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) + return return_value + + @classmethod + def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: + """sew faces + + Group contiguous faces and return them in a list of ShapeList + + Args: + faces (Iterable[Face]): Faces to sew together + + Raises: + RuntimeError: OCCT SewedShape generated unexpected output + + Returns: + list[ShapeList[Face]]: grouped contiguous faces + """ + # Sew the faces + sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) + top_level_shapes = get_top_level_topods_shapes(sewed_shape) + sewn_faces: list[ShapeList] = [] + + # For each of the top level shapes create a ShapeList of Face + for top_level_shape in top_level_shapes: + if isinstance(top_level_shape, TopoDS_Face): + sewn_faces.append(ShapeList([Face(top_level_shape)])) + elif isinstance(top_level_shape, TopoDS_Shell): + sewn_faces.append(Shell(top_level_shape).faces()) + elif isinstance(top_level_shape, TopoDS_Solid): + sewn_faces.append( + ShapeList( + Face(f) for f in _topods_entities(top_level_shape, "Face") + ) + ) + else: + raise RuntimeError( + f"SewedShape returned a {type(top_level_shape)} which was unexpected" + ) + + return sewn_faces + + @classmethod + def sweep( + cls, + profile: Curve | Edge | Wire, + path: Curve | Edge | Wire, + transition=Transition.TRANSFORMED, + ) -> Face: + """sweep + + Sweep a 1D profile along a 1D path. Both the profile and path must be composed + of only 1 Edge. + + Args: + profile (Union[Curve,Edge,Wire]): the object to sweep + path (Union[Curve,Edge,Wire]): the path to follow when sweeping + transition (Transition, optional): handling of profile orientation at C1 path + discontinuities. Defaults to Transition.TRANSFORMED. + + Raises: + ValueError: Only 1 Edge allowed in profile & path + + Returns: + Face: resulting face, may be non-planar + """ + # Note: BRepOffsetAPI_MakePipe is an option here + # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) + # pipe_sweep.Build() + # return Face(pipe_sweep.Shape()) + + if len(profile.edges()) != 1 or len(path.edges()) != 1: + raise ValueError("Use Shell.sweep for multi Edge objects") + profile = Wire([profile.edge()]) + path = Wire([path.edge()]) + builder = BRepOffsetAPI_MakePipeShell(path.wrapped) + builder.Add(profile.wrapped, False, False) + builder.SetTransitionMode(Shape._transModeDict[transition]) + builder.Build() + result = Face(builder.Shape()) + if SkipClean.clean: + result = result.clean() + + return result + + # ---- Instance Methods ---- + + def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: + """Center of Face + + Return the center based on center_of + + Args: + center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. + + Returns: + Vector: center + """ + if (center_of == CenterOf.MASS) or ( + center_of == CenterOf.GEOMETRY and self.is_planar + ): + properties = GProp_GProps() + BRepGProp.SurfaceProperties_s(self.wrapped, properties) + center_point = properties.CentreOfMass() + + elif center_of == CenterOf.BOUNDING_BOX: + center_point = self.bounding_box().center() + + elif center_of == CenterOf.GEOMETRY: + u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() + u_val = 0.5 * (u_val0 + u_val1) + v_val = 0.5 * (v_val0 + v_val1) + + center_point = gp_Pnt() + normal = gp_Vec() + BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) + + return Vector(center_point) def chamfer_2d( self, @@ -6836,6 +905,36 @@ class Face(Mixin2D, Shape[TopoDS_Face]): chamfer_builder.Build() return self.__class__.cast(chamfer_builder.Shape()).fix() + def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: + """Apply 2D fillet to a face + + Args: + radius: float: + vertices: Iterable[Vertex]: + + Returns: + + """ + + fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) + + for vertex in vertices: + fillet_builder.AddFillet(vertex.wrapped, radius) + + fillet_builder.Build() + + return self.__class__.cast(fillet_builder.Shape()) + + def geom_adaptor(self) -> Geom_Surface: + """Return the Geom Surface for this Face""" + return BRep_Tool.Surface_s(self.wrapped) + + def inner_wires(self) -> ShapeList[Wire]: + """Extract the inner or hole wires from this Face""" + outer = self.outer_wire() + + return ShapeList([w for w in self.wires() if not w.is_same(outer)]) + def is_coplanar(self, plane: Plane) -> bool: """Is this planar face coplanar with the provided plane""" u_val0, _u_val1, v_val0, _v_val1 = self._uv_bounds() @@ -6848,6 +947,199 @@ class Face(Mixin2D, Shape[TopoDS_Face]): and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE ) + def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: + """Point inside Face + + Returns whether or not the point is inside a Face within the specified tolerance. + Points on the edge of the Face are considered inside. + + Args: + point(VectorLike): tuple or Vector representing 3D point to be tested + tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. + point: VectorLike: + tolerance: float: (Default value = 1.0e-6) + + Returns: + bool: indicating whether or not point is within Face + + """ + solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) + solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) + return solid_classifier.IsOnAFace() + + # surface = BRep_Tool.Surface_s(self.wrapped) + # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) + # return projector.LowerDistance() <= TOLERANCE + + def location_at( + self, u: float, v: float, x_dir: VectorLike | None = None + ) -> Location: + """Location at the u/v position of face""" + origin = self.position_at(u, v) + if x_dir is None: + pln = Plane(origin, z_dir=self.normal_at(origin)) + else: + pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) + return Location(pln) + + def make_holes(self, interior_wires: list[Wire]) -> Face: + """Make Holes in Face + + Create holes in the Face 'self' from interior_wires which must be entirely interior. + Note that making holes in faces is more efficient than using boolean operations + with solid object. Also note that OCCT core may fail unless the orientation of the wire + is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. + + Example: + + For example, make a series of slots on the curved walls of a cylinder. + + .. image:: slotted_cylinder.png + + Args: + interior_wires: a list of hole outline wires + interior_wires: list[Wire]: + + Returns: + Face: 'self' with holes + + Raises: + RuntimeError: adding interior hole in non-planar face with provided interior_wires + RuntimeError: resulting face is not valid + + """ + # Add wires that define interior holes - note these wires must be entirely interior + makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) + for interior_wire in interior_wires: + makeface_object.Add(interior_wire.wrapped) + try: + surface_face = Face(makeface_object.Face()) + except StdFail_NotDone as err: + raise RuntimeError( + "Error adding interior hole in non-planar face with provided interior_wires" + ) from err + + surface_face = surface_face.fix() + # if not surface_face.is_valid(): + # raise RuntimeError("non planar face is invalid") + + return surface_face + + @overload + def normal_at(self, surface_point: VectorLike | None = None) -> Vector: + """normal_at point on surface + + Args: + surface_point (VectorLike, optional): a point that lies on the surface where + the normal. Defaults to the center (None). + + Returns: + Vector: surface normal direction + """ + + @overload + def normal_at(self, u: float, v: float) -> Vector: + """normal_at u, v values on Face + + Args: + u (float): the horizontal coordinate in the parameter space of the Face, + between 0.0 and 1.0 + v (float): the vertical coordinate in the parameter space of the Face, + between 0.0 and 1.0 + Defaults to the center (None/None) + + Raises: + ValueError: Either neither or both u v values must be provided + + Returns: + Vector: surface normal direction + """ + + def normal_at(self, *args, **kwargs) -> Vector: + """normal_at + + Computes the normal vector at the desired location on the face. + + Args: + surface_point (VectorLike, optional): a point that lies on the surface where the normal. + Defaults to None. + + Returns: + Vector: surface normal direction + """ + surface_point, u, v = None, -1.0, -1.0 + + if args: + if isinstance(args[0], Sequence): + surface_point = args[0] + elif isinstance(args[0], (int, float)): + u = args[0] + if len(args) == 2 and isinstance(args[1], (int, float)): + v = args[1] + + unknown_args = ", ".join( + set(kwargs.keys()).difference(["surface_point", "u", "v"]) + ) + if unknown_args: + raise ValueError(f"Unexpected argument(s) {unknown_args}") + + surface_point = kwargs.get("surface_point", surface_point) + u = kwargs.get("u", u) + v = kwargs.get("v", v) + if surface_point is None and u < 0 and v < 0: + u, v = 0.5, 0.5 + elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: + raise ValueError("Both u & v values must be specified") + + # get the geometry + surface = self.geom_adaptor() + + if surface_point is None: + u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() + u_val = u * (u_val0 + u_val1) + v_val = v * (v_val0 + v_val1) + else: + # project point on surface + projector = GeomAPI_ProjectPointOnSurf( + Vector(surface_point).to_pnt(), surface + ) + + u_val, v_val = projector.LowerDistanceParameters() + + gp_pnt = gp_Pnt() + normal = gp_Vec() + BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) + + return Vector(normal).normalized() + + def outer_wire(self) -> Wire: + """Extract the perimeter wire from this Face""" + return Wire(BRepTools.OuterWire_s(self.wrapped)) + + def position_at(self, u: float, v: float) -> Vector: + """position_at + + Computes a point on the Face given u, v coordinates. + + Args: + u (float): the horizontal coordinate in the parameter space of the Face, + between 0.0 and 1.0 + v (float): the vertical coordinate in the parameter space of the Face, + between 0.0 and 1.0 + + Returns: + Vector: point on Face + """ + u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() + u_val = u_val0 + u * (u_val1 - u_val0) + v_val = v_val0 + v * (v_val1 - v_val0) + + gp_pnt = gp_Pnt() + normal = gp_Vec() + BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) + + return Vector(gp_pnt) + def project_to_shape( self, target_object: Shape, direction: VectorLike ) -> ShapeList[Face | Shell]: @@ -6902,73 +1194,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) return intersected_shapes - def make_holes(self, interior_wires: list[Wire]) -> Face: - """Make Holes in Face - - Create holes in the Face 'self' from interior_wires which must be entirely interior. - Note that making holes in faces is more efficient than using boolean operations - with solid object. Also note that OCCT core may fail unless the orientation of the wire - is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. - - Example: - - For example, make a series of slots on the curved walls of a cylinder. - - .. image:: slotted_cylinder.png - - Args: - interior_wires: a list of hole outline wires - interior_wires: list[Wire]: - - Returns: - Face: 'self' with holes - - Raises: - RuntimeError: adding interior hole in non-planar face with provided interior_wires - RuntimeError: resulting face is not valid - - """ - # Add wires that define interior holes - note these wires must be entirely interior - makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) - for interior_wire in interior_wires: - makeface_object.Add(interior_wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - # if not surface_face.is_valid(): - # raise RuntimeError("non planar face is invalid") - - return surface_face - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Point inside Face - - Returns whether or not the point is inside a Face within the specified tolerance. - Points on the edge of the Face are considered inside. - - Args: - point(VectorLike): tuple or Vector representing 3D point to be tested - tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool: indicating whether or not point is within Face - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - return solid_classifier.IsOnAFace() - - # surface = BRep_Tool.Surface_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) - # return projector.LowerDistance() <= TOLERANCE - def to_arcs(self, tolerance: float = 1e-3) -> Face: """to_arcs @@ -6985,6 +1210,19 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) + def wire(self) -> Wire: + """Return the outerwire, generate a warning if inner_wires present""" + if self.inner_wires(): + warnings.warn( + "Found holes, returning outer_wire", + stacklevel=2, + ) + return self.outer_wire() + + def _uv_bounds(self) -> Tuple[float, float, float, float]: + """Return the u min, u max, v min, v max values""" + return BRepTools.UVBounds_s(self.wrapped) + class Shell(Mixin2D, Shape[TopoDS_Shell]): """A Shell is a fundamental component in build123d's topological data structure @@ -6996,10 +1234,11 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): operations and analyses.""" order = 2.5 + # ---- Constructor ---- def __init__( self, - obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, + obj: TopoDS_Shell | Face | Iterable[Face] | None = None, label: str = "", color: Color | None = None, parent: Compound | None = None, @@ -7031,6 +1270,8 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): parent=parent, ) + # ---- Properties ---- + @property def volume(self) -> float: """volume - the volume of this Shell if manifold, otherwise zero""" @@ -7042,11 +1283,7 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): return properties.Mass() return 0.0 - def center(self) -> Vector: - """Center of mass of the shell""" - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - return Vector(properties.CentreOfMass()) + # ---- Class Methods ---- @classmethod def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: @@ -7066,11 +1303,33 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): """ return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) + @classmethod + def make_loft( + cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False + ) -> Shell: + """make loft + + Makes a loft from a list of wires and vertices. Vertices can appear only at the + beginning or end of the list, but cannot appear consecutively within the list nor + between wires. Wires may be closed or opened. + + Args: + objs (list[Vertex, Wire]): wire perimeters or vertices + ruled (bool, optional): stepped or smooth. Defaults to False (smooth). + + Raises: + ValueError: Too few wires + + Returns: + Shell: Lofted object + """ + return cls(_make_loft(objs, False, ruled)) + @classmethod def sweep( cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], + profile: Curve | Edge | Wire, + path: Curve | Edge | Wire, transition=Transition.TRANSFORMED, ) -> Shell: """sweep @@ -7098,2137 +1357,13 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): return result - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Shell: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list nor - between wires. Wires may be closed or opened. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Shell: Lofted object - """ - return cls(_make_loft(objs, False, ruled)) - - -class Solid(Mixin3D, Shape[TopoDS_Solid]): - """A Solid in build123d represents a three-dimensional solid geometry - in a topological structure. A solid is a closed and bounded volume, enclosing - a region in 3D space. It comprises faces, edges, and vertices connected in a - well-defined manner. Solid modeling operations, such as Boolean - operations (union, intersection, and difference), are often performed on - Solid objects to create or modify complex geometries.""" - - order = 3.0 - - def __init__( - self, - obj: TopoDS_Solid | Shell | None = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - ): - """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid - - Args: - obj (TopoDS_Shape | Shell, optional): OCCT Solid or Shell. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Shell): - obj = Solid._make_solid(obj) - - super().__init__( - obj=obj, - # label="" if label is None else label, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - - @property - def volume(self) -> float: - """volume - the volume of this Solid""" - # when density == 1, mass == volume - return Shape.compute_mass(self) - - @classmethod - def _make_solid(cls, shell: Shell) -> TopoDS_Solid: - """Create a Solid object from the surface shell""" - return ShapeFix_Solid().SolidFromShell(shell.wrapped) - - @classmethod - def extrude(cls, obj: Face, direction: VectorLike) -> Solid: - """extrude - - Extrude a Face into a Solid. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: - """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) - - @classmethod - def make_box( - cls, length: float, width: float, height: float, plane: Plane = Plane.XY - ) -> Solid: - """make box - - Make a box at the origin of plane extending in positive direction of each axis. - - Args: - length (float): - width (float): - height (float): - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Solid: Box - """ - return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() - ) - - @classmethod - def make_cone( - cls, - base_radius: float, - top_radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cone - - Make a cone with given radii and height - - Args: - base_radius (float): - top_radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cone - """ - return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_cylinder( - cls, - radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cylinder - - Make a cylinder with a given radius and height with the base center on plane origin. - - Args: - radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cylinder - """ - return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_torus( - cls, - major_radius: float, - minor_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 0, - end_angle: float = 360, - major_angle: float = 360, - ) -> Solid: - """make torus - - Make a torus with a given radii and angles - - Args: - major_radius (float): - minor_radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - start_angle (float, optional): start major arc. Defaults to 0. - end_angle (float, optional): end major arc. Defaults to 360. - - Returns: - Solid: Full or partial torus - """ - return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Solid: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Solid: Lofted object - """ - return cls(_make_loft(objs, True, ruled)) - - @classmethod - def make_wedge( - cls, - delta_x: float, - delta_y: float, - delta_z: float, - min_x: float, - min_z: float, - max_x: float, - max_z: float, - plane: Plane = Plane.XY, - ) -> Solid: - """Make a wedge - - Args: - delta_x (float): - delta_y (float): - delta_z (float): - min_x (float): - min_z (float): - max_x (float): - max_z (float): - plane (Plane): base plane. Defaults to Plane.XY. - - Returns: - Solid: wedge - """ - return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() - ) - - @classmethod - def make_sphere( - cls, - radius: float, - plane: Plane = Plane.XY, - angle1: float = -90, - angle2: float = 90, - angle3: float = 360, - ) -> Solid: - """Sphere - - Make a full or partial sphere - with a given radius center on the origin or plane. - - Args: - radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle1 (float, optional): Defaults to -90. - angle2 (float, optional): Defaults to 90. - angle3 (float, optional): Defaults to 360. - - Returns: - Solid: sphere - """ - return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() - ) - - @classmethod - def extrude_taper( - cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True - ) -> Solid: - """Extrude a cross section with a taper - - Extrude a cross section into a prismatic solid in the provided direction. - - Note that two difference algorithms are used. If direction aligns with - the profile normal (which must be positive), the taper is positive and the profile - contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most - accurate results. Otherwise, a loft is created between the profile and the profile - with a 2D offset set at the appropriate direction. - - Args: - section (Face]): cross section - normal (VectorLike): a vector along which to extrude the wires. The length - of the vector controls the length of the extrusion. - taper (float): taper angle in degrees. - flip_inner (bool, optional): outer and inner geometry have opposite tapers to - allow for part extraction when injection molding. - - Returns: - Solid: extruded cross section - """ - # pylint: disable=too-many-locals - direction = Vector(direction) - - if ( - direction.normalized() == profile.normal_at() - and Plane(profile).z_dir.Z > 0 - and taper > 0 - and not profile.inner_wires() - ): - prism_builder = LocOpe_DPrism( - profile.wrapped, - direction.length / cos(radians(taper)), - radians(taper), - ) - new_solid = Solid(prism_builder.Shape()) - else: - # Determine the offset to get the taper - offset_amt = -direction.length * tan(radians(taper)) - - outer = profile.outer_wire() - local_outer: Wire = Plane(profile).to_local_coords(outer) - local_taper_outer = local_outer.offset_2d( - offset_amt, kind=Kind.INTERSECTION - ) - taper_outer = Plane(profile).from_local_coords(local_taper_outer) - taper_outer.move(Location(direction)) - - profile_wires = [profile.outer_wire()] + profile.inner_wires() - - taper_wires = [] - for i, wire in enumerate(profile_wires): - flip = -1 if i > 0 and flip_inner else 1 - local: Wire = Plane(profile).to_local_coords(wire) - local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper_wire: Wire = Plane(profile).from_local_coords(local_taper) - taper_wire.move(Location(direction)) - taper_wires.append(taper_wire) - - solids = [ - Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) - ] - if len(solids) > 1: - complex_solid = solids[0].cut(*solids[1:]) - assert isinstance(complex_solid, Solid) # Can't be a list - new_solid = complex_solid - else: - new_solid = solids[0] - - return new_solid - - @classmethod - def extrude_linear_with_rotation( - cls, - section: Union[Face, Wire], - center: VectorLike, - normal: VectorLike, - angle: float, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Extrude with Rotation - - Creates a 'twisted prism' by extruding, while simultaneously rotating around the - extrusion vector. - - Args: - section (Union[Face,Wire]): cross section - vec_center (VectorLike): the center point about which to rotate - vec_normal (VectorLike): a vector along which to extrude the wires - angle (float): the angle to rotate through while extruding - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to None. - - Returns: - Solid: extruded object - """ - # Though the signature may appear to be similar enough to extrude to merit - # combining them, the construction methods used here are different enough that they - # should be separate. - - # At a high level, the steps followed are: - # (1) accept a set of wires - # (2) create another set of wires like this one, but which are transformed and rotated - # (3) create a ruledSurface between the sets of wires - # (4) create a shell and compute the resulting object - - inner_wires = inner_wires if inner_wires else [] - center = Vector(center) - normal = Vector(normal) - - def extrude_aux_spine( - wire: TopoDS_Wire, spine: TopoDS_Wire, aux_spine: TopoDS_Wire - ) -> TopoDS_Shape: - """Helper function""" - extrude_builder = BRepOffsetAPI_MakePipeShell(spine) - extrude_builder.SetMode(aux_spine, False) # auxiliary spine - extrude_builder.Add(wire) - extrude_builder.Build() - extrude_builder.MakeSolid() - return extrude_builder.Shape() - - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - - # make straight spine - straight_spine_e = Edge.make_line(center, center.add(normal)) - straight_spine_w = Wire.combine([straight_spine_e])[0].wrapped - - # make an auxiliary spine - pitch = 360.0 / angle * normal.length - aux_spine_w = Wire( - [Edge.make_helix(pitch, normal.length, 1, center=center, normal=normal)] - ).wrapped - - # extrude the outer wire - outer_solid = extrude_aux_spine( - outer_wire.wrapped, straight_spine_w, aux_spine_w - ) - - # extrude inner wires - inner_solids = [ - extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w) - for w in inner_wires - ] - - # combine the inner solids into compound - inner_comp = _make_topods_compound_from_shapes(inner_solids) - - # subtract from the outer solid - return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) - - @classmethod - def extrude_until( - cls, - section: Face, - target_object: Union[Compound, Solid], - direction: VectorLike, - until: Until = Until.NEXT, - ) -> Union[Compound, Solid]: - """extrude_until - - Extrude section in provided direction until it encounters either the - NEXT or LAST surface of target_object. Note that the bounding surface - must be larger than the extruded face where they contact. - - Args: - section (Face): Face to extrude - target_object (Union[Compound, Solid]): object to limit extrusion - direction (VectorLike): extrusion direction - until (Until, optional): surface to limit extrusion. Defaults to Until.NEXT. - - Raises: - ValueError: provided face does not intersect target_object - - Returns: - Union[Compound, Solid]: extruded Face - """ - direction = Vector(direction) - if until in [Until.PREVIOUS, Until.FIRST]: - direction *= -1 - until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - - max_dimension = find_max_dimension([section, target_object]) - clipping_direction = ( - direction * max_dimension - if until == Until.NEXT - else -direction * max_dimension - ) - direction_axis = Axis(section.center(), clipping_direction) - # Create a linear extrusion to start - extrusion = Solid.extrude(section, direction * max_dimension) - - # Project section onto the shape to generate faces that will clip the extrusion - # and exclude the planar faces normal to the direction of extrusion and these - # will have no volume when extruded - faces = [] - for face in section.project_to_shape(target_object, direction): - if isinstance(face, Face): - faces.append(face) - else: - faces += face.faces() - - clip_faces = [ - f - for f in faces - if not (f.is_planar and f.normal_at().dot(direction) == 0.0) - ] - if not clip_faces: - raise ValueError("provided face does not intersect target_object") - - # Create the objects that will clip the linear extrusion - clipping_objects = [ - Solid.extrude(f, clipping_direction).fix() for f in clip_faces - ] - clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] - - if until == Until.NEXT: - trimmed_extrusion = extrusion.cut(target_object) - if isinstance(trimmed_extrusion, ShapeList): - closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] - else: - closest_extrusion = trimmed_extrusion - for clipping_object in clipping_objects: - # It's possible for clipping faces to self intersect when they are extruded - # thus they could be non manifold which results failed boolean operations - # - so skip these objects - try: - extrusion_shapes = closest_extrusion.cut(clipping_object) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - else: - base_part = extrusion.intersect(target_object) - if isinstance(base_part, ShapeList): - extrusion_parts = base_part - elif base_part is None: - extrusion_parts = ShapeList() - else: - extrusion_parts = ShapeList([base_part]) - for clipping_object in clipping_objects: - try: - clipped_extrusion = extrusion.intersect(clipping_object) - if clipped_extrusion is not None: - extrusion_parts.append( - clipped_extrusion.solids().sort_by(direction_axis)[0] - ) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - extrusion_shapes = Solid.fuse(*extrusion_parts) - - result = extrusion_shapes.solids().sort_by(direction_axis)[0] - - return result - - @classmethod - def revolve( - cls, - section: Union[Face, Wire], - angle: float, - axis: Axis, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Revolve - - Revolve a cross section about the given Axis by the given angle. - - Args: - section (Union[Face,Wire]): cross section - angle (float): the angle to revolve through - axis (Axis): rotation Axis - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to []. - - Returns: - Solid: the revolved cross section - """ - inner_wires = inner_wires if inner_wires else [] - if isinstance(section, Wire): - section_face = Face(section, inner_wires) - else: - section_face = section - - revol_builder = BRepPrimAPI_MakeRevol( - section_face.wrapped, - axis.wrapped, - angle * DEG2RAD, - True, - ) - - return cls(revol_builder.Shape()) - - @classmethod - def _set_sweep_mode( - cls, - builder: BRepOffsetAPI_MakePipeShell, - path: Union[Wire, Edge], - binormal: Union[Vector, Wire, Edge], - ) -> bool: - rotate = False - - if isinstance(binormal, Vector): - coordinate_system = gp_Ax2() - coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(binormal.to_dir()) - builder.SetMode(coordinate_system) - rotate = True - elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) - - return rotate - - @classmethod - def sweep( - cls, - section: Union[Face, Wire], - path: Union[Wire, Edge], - inner_wires: list[Wire] | None = None, - make_solid: bool = True, - is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, - transition: Transition = Transition.TRANSFORMED, - ) -> Solid: - """Sweep - - Sweep the given cross section into a prismatic solid along the provided path - - Args: - section (Union[Face, Wire]): cross section to sweep - path (Union[Wire, Edge]): sweep path - inner_wires (list[Wire]): holes - only used if section is a wire - make_solid (bool, optional): return Solid or Shell. Defaults to True. - is_frenet (bool, optional): Frenet mode. Defaults to False. - mode (Union[Vector, Wire, Edge, None], optional): additional sweep - mode parameters. Defaults to None. - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Solid: the swept cross section - """ - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - inner_wires = inner_wires if inner_wires else [] - - shapes = [] - for wire in [outer_wire] + inner_wires: - builder = BRepOffsetAPI_MakePipeShell(path.to_wire().wrapped) - - rotate = False - - # handle sweep mode - if mode: - rotate = Solid._set_sweep_mode(builder, path, mode) - else: - builder.SetMode(is_frenet) - - builder.SetTransitionMode(Shape._transModeDict[transition]) - - builder.Add(wire.wrapped, False, rotate) - - builder.Build() - if make_solid: - builder.MakeSolid() - - shapes.append(Mixin3D.cast(builder.Shape())) - - outer_shape, inner_shapes = shapes[0], shapes[1:] - - if inner_shapes: - hollow_outer_shape = outer_shape.cut(*inner_shapes) - assert isinstance(hollow_outer_shape, Solid) - return hollow_outer_shape - - return outer_shape - - @classmethod - def sweep_multi( - cls, - profiles: Iterable[Union[Wire, Face]], - path: Union[Wire, Edge], - make_solid: bool = True, - is_frenet: bool = False, - binormal: Union[Vector, Wire, Edge, None] = None, - ) -> Solid: - """Multi section sweep - - Sweep through a sequence of profiles following a path. - - Args: - profiles (Iterable[Union[Wire, Face]]): list of profiles - path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over - make_solid (bool, optional): Solid or Shell. Defaults to True. - is_frenet (bool, optional): Select frenet mode. Defaults to False. - binormal (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. - Defaults to None. - - Returns: - Solid: swept object - """ - path_as_wire = path.to_wire().wrapped - - builder = BRepOffsetAPI_MakePipeShell(path_as_wire) - - translate = False - rotate = False - - if binormal: - rotate = cls._set_sweep_mode(builder, path, binormal) - else: - builder.SetMode(is_frenet) - - for profile in profiles: - path_as_wire = ( - profile.wrapped - if isinstance(profile, Wire) - else profile.outer_wire().wrapped - ) - builder.Add(path_as_wire, translate, rotate) - - builder.Build() - - if make_solid: - builder.MakeSolid() - - return cls(builder.Shape()) - - @classmethod - def thicken( - cls, - surface: Face | Shell, - depth: float, - normal_override: Optional[VectorLike] = None, - ) -> Solid: - """Thicken Face or Shell - - Create a solid from a potentially non planar face or shell by thickening along - the normals. - - .. image:: thickenFace.png - - Non-planar faces are thickened both towards and away from the center of the sphere. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - normal_override (Vector, optional): Face only. The normal_override vector can be - used to indicate which way is 'up', potentially flipping the face normal - direction such that many faces with different normals all go in the same - direction (direction need only be +/- 90 degrees from the face normal). - Defaults to None. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - # Check to see if the normal needs to be flipped - adjusted_depth = depth - if isinstance(surface, Face) and normal_override is not None: - surface_center = surface.center() - surface_normal = surface.normal_at(surface_center).normalized() - if surface_normal.dot(Vector(normal_override).normalized()) < 0: - adjusted_depth = -depth - - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - surface.wrapped, - Offset=adjusted_depth, - Tol=1.0e-5, - Mode=BRepOffset_Skin, - # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both - # sides of the surface but doesn't seem to work - Intersection=True, - SelfInter=False, - Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection - Thickening=True, - RemoveIntEdges=True, - ) - offset_builder.MakeOffsetShape() - try: - result = Solid(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error applying thicken to given surface") from err - - return result - - -class Vertex(Shape[TopoDS_Vertex]): - """A Vertex in build123d represents a zero-dimensional point in the topological - data structure. It marks the endpoints of edges within a 3D model, defining precise - locations in space. Vertices play a crucial role in defining the geometry of objects - and the connectivity between edges, facilitating accurate representation and - manipulation of 3D shapes. They hold coordinate information and are essential - for constructing complex structures like wires, faces, and solids.""" - - order = 0.0 - - @property - def _dim(self) -> int: - return 0 - - @overload - def __init__(self): # pragma: no cover - """Default Vertext at the origin""" - - @overload - def __init__(self, ocp_vx: TopoDS_Vertex): # pragma: no cover - """Vertex from OCCT TopoDS_Vertex object""" - - @overload - def __init__(self, X: float, Y: float, Z: float): # pragma: no cover - """Vertex from three float values""" - - @overload - def __init__(self, v: Iterable[float]): - """Vertex from Vector or other iterators""" - - def __init__(self, *args, **kwargs): - self.vertex_index = 0 - - ocp_vx = kwargs.pop("ocp_vx", None) - v = kwargs.pop("v", None) - x = kwargs.pop("X", 0) - y = kwargs.pop("Y", 0) - z = kwargs.pop("Z", 0) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if args: - if isinstance(args[0], TopoDS_Vertex): - ocp_vx = args[0] - elif isinstance(args[0], Iterable): - v = args[0] - else: - x, y, z = args[:3] + (0,) * (3 - len(args)) - - if v is not None: - x, y, z = itertools.islice(itertools.chain(v, [0, 0, 0]), 3) - - ocp_vx = ( - downcast(BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z)).Vertex()) - if ocp_vx is None - else ocp_vx - ) - - super().__init__(ocp_vx) - self.X, self.Y, self.Z = self.to_tuple() - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def volume(self) -> float: - """volume - the volume of this Vertex, which is always zero""" - return 0.0 - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return ShapeList((self,)) # Vertex is an iterable - - def vertex(self) -> Vertex: - """Return the Vertex""" - return self - - def to_tuple(self) -> tuple[float, float, float]: - """Return vertex as three tuple of floats""" - geom_point = BRep_Tool.Pnt_s(self.wrapped) - return (geom_point.X(), geom_point.Y(), geom_point.Z()) + # ---- Instance Methods ---- def center(self) -> Vector: - """The center of a vertex is itself!""" - return Vector(self) - - def __add__( # type: ignore - self, other: Vertex | Vector | tuple[float, float, float] - ) -> Vertex: - """Add - - Add to a Vertex with a Vertex, Vector or Tuple - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" Vertex: # type: ignore - """Subtract - - Substract a Vertex with a Vertex, Vector or Tuple from self - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" str: - """To String - - Convert Vertex to String for display - - Returns: - Vertex as String - """ - return f"Vertex({self.X}, {self.Y}, {self.Z})" - - def __iter__(self): - """Initialize to beginning""" - self.vertex_index = 0 - return self - - def __next__(self): - """return the next value""" - if self.vertex_index == 0: - self.vertex_index += 1 - value = self.X - elif self.vertex_index == 1: - self.vertex_index += 1 - value = self.Y - elif self.vertex_index == 2: - self.vertex_index += 1 - value = self.Z - else: - raise StopIteration - return value - - def transform_shape(self, t_matrix: Matrix) -> Vertex: - """Apply affine transform without changing type - - Transforms a copy of this Vertex by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Vertex: copy of transformed shape with all objects keeping their type - """ - return Vertex(*t_matrix.multiply(Vector(self))) - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: - """extrude - invalid operation for Vertex""" - raise NotImplementedError("Vertices can't be created by extrusion") - - -class Wire(Mixin1D, Shape[TopoDS_Wire]): - """A Wire in build123d is a topological entity representing a connected sequence - of edges forming a continuous curve or path in 3D space. Wires are essential - components in modeling complex objects, defining boundaries for surfaces or - solids. They store information about the connectivity and order of edges, - allowing precise definition of paths within a 3D model.""" - - order = 1.5 - - @overload - def __init__( - self, - obj: TopoDS_Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from an OCCT TopoDS_Wire - - Args: - obj (TopoDS_Wire, optional): OCCT Wire. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edge: Edge, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Edge - - Args: - edge (Edge): Edge to convert to Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Wire - used when the input could be an Edge or Wire. - - Args: - wire (Wire): Wire to convert to another Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Curve, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Curve. - - Args: - curve (Curve): Curve to convert to a Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edges: Iterable[Edge], - sequenced: bool = False, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from Edges - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - curve, edge, edges, wire, sequenced, obj, label, color, parent = (None,) * 9 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Wire): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Edge): - edge, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - # elif isinstance(args[0], Curve): - elif ( - hasattr(args[0], "wrapped") - and isinstance(args[0].wrapped, TopoDS_Compound) - and topods_dim(args[0].wrapped) == 1 - ): # Curve - curve, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Iterable): - edges, sequenced, label, color, parent = args[:5] + (None,) * (5 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "curve", - "wire", - "edge", - "edges", - "sequenced", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - edge = kwargs.get("edge", edge) - edges = kwargs.get("edges", edges) - sequenced = kwargs.get("sequenced", sequenced) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - wire = kwargs.get("wire", wire) - curve = kwargs.get("curve", curve) - - if edge is not None: - edges = [edge] - elif curve is not None: - edges = curve.edges() - if wire is not None: - obj = wire.wrapped - elif edges: - obj = Wire._make_wire(edges, False if sequenced is None else sequenced) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_CompCurve: - """Return the Geom Comp Curve for this Wire""" - return BRepAdaptor_CompCurve(self.wrapped) - - def close(self) -> Wire: - """Close a Wire""" - if not self.is_closed: - edge = Edge.make_line(self.end_point(), self.start_point()) - return_value = Wire.combine((self, edge))[0] - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" - return self - - @classmethod - def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 - ) -> ShapeList[Wire]: - """combine - - Combine a list of wires and edges into a list of Wires. - - Args: - wires (Iterable[Union[Wire, Edge]]): unsorted - tol (float, optional): tolerance. Defaults to 1e-9. - - Returns: - ShapeList[Wire]: Wires - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) - - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires = ShapeList() - for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) - - return wires - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: - """extrude - invalid operation for Wire""" - raise NotImplementedError("Wires can't be created by extrusion") - - def fix_degenerate_edges(self, precision: float) -> Wire: - """fix_degenerate_edges - - Fix a Wire that contains degenerate (very small) edges - - Args: - precision (float): minimum value edge length - - Returns: - Wire: fixed wire - """ - sf_w = ShapeFix_Wireframe(self.wrapped) - sf_w.SetPrecision(precision) - sf_w.SetMaxTolerance(1e-6) - sf_w.FixSmallEdges() - sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) - - def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" - - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. - - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False - - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) - - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length - break - distance += edge.length - - if not found: - raise ValueError(f"{point} not on wire") - - return distance / wire_length - - def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Wire: trimmed wire - """ - - # pylint: disable=too-many-branches - if start >= end: - raise ValueError("start must be less than end") - - edges = self.edges() - - # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) - - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) - - trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue - - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) - - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) - - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) - - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) - - return Wire(trimmed_edges) - - def order_edges(self) -> ShapeList[Edge]: - """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) - - @classmethod - def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: - """_make_wire - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - - Raises: - ValueError: Edges are disconnected and can't be sequenced. - RuntimeError: Wire is empty - - Returns: - Wire: assembled edges - """ - - def closest_to_end(current: Wire, unplaced_edges: list[Edge]) -> Edge: - """Return the Edge closest to the end of last_edge""" - target_point = current.position_at(1) - - sorted_edges = sorted( - unplaced_edges, - key=lambda e: min( - (target_point - e.position_at(0)).length, - (target_point - e.position_at(1)).length, - ), - ) - return sorted_edges[0] - - edges = list(edges) - if sequenced: - placed_edges = [edges.pop(0)] - unplaced_edges = edges - - while unplaced_edges: - next_edge = closest_to_end(Wire(placed_edges), unplaced_edges) - next_edge_index = unplaced_edges.index(next_edge) - placed_edges.append(unplaced_edges.pop(next_edge_index)) - - edges = placed_edges - - wire_builder = BRepBuilderAPI_MakeWire() - combined_edges = TopTools_ListOfShape() - for edge in edges: - combined_edges.Append(edge.wrapped) - wire_builder.Add(combined_edges) - - wire_builder.Build() - if not wire_builder.IsDone(): - if wire_builder.Error() == BRepBuilderAPI_NonManifoldWire: - warnings.warn( - "Wire is non manifold (e.g. branching, self intersecting)", - stacklevel=2, - ) - elif wire_builder.Error() == BRepBuilderAPI_EmptyWire: - raise RuntimeError("Wire is empty") - elif wire_builder.Error() == BRepBuilderAPI_DisconnectedWire: - raise ValueError("Edges are disconnected") - - return wire_builder.Wire() - - @classmethod - def make_circle(cls, radius: float, plane: Plane = Plane.XY) -> Wire: - """make_circle - - Makes a circle centered at the origin of plane - - Args: - radius (float): circle radius - plane (Plane): base plane. Defaults to Plane.XY - - Returns: - Wire: a circle - """ - circle_edge = Edge.make_circle(radius, plane=plane) - return Wire([circle_edge]) - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - closed: bool = True, - ) -> Wire: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): _description_. Defaults to 360.0. - end_angle (float, optional): _description_. Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - closed (bool, optional): close the arc. Defaults to True. - - Returns: - Wire: an ellipse - """ - ellipse_edge = Edge.make_ellipse( - x_radius, y_radius, plane, start_angle, end_angle, angular_direction - ) - - if start_angle != end_angle and closed: - line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) - wire = Wire([ellipse_edge, line]) - else: - wire = Wire([ellipse_edge]) - - return wire - - @classmethod - def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: - """make_polygon - - Create an irregular polygon by defining vertices - - Args: - vertices (Iterable[VectorLike]): - close (bool, optional): close the polygon. Defaults to True. - - Returns: - Wire: an irregular polygon - """ - vectors = [Vector(v) for v in vertices] - if (vectors[0] - vectors[-1]).length > TOLERANCE and close: - vectors.append(vectors[0]) - - wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vectors: - wire_builder.Add(vertex.to_pnt()) - - return cls(wire_builder.Wire()) - - def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires - - Args: - other: Wire: - - Returns: - - """ - - wire_builder = BRepBuilderAPI_MakeWire() - wire_builder.Add(TopoDS.Wire_s(self.wrapped)) - wire_builder.Add(TopoDS.Wire_s(other.wrapped)) - wire_builder.Build() - - return self.__class__.cast(wire_builder.Wire()) - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: - """fillet_2d - - Apply 2D fillet to a wire - - Args: - radius (float): - vertices (Iterable[Vertex]): vertices to fillet - - Returns: - Wire: filleted wire - """ - # Create a face to fillet - unfilleted_face = _make_topods_face_from_wires(self.wrapped) - # Fillet the face - fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - fillet_builder.Build() - filleted_face = downcast(fillet_builder.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(filleted_face)) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Wire: - """chamfer_2d - - Apply 2D chamfer to a wire - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Returns: - Wire: chamfered wire - """ - reference_edge = edge - - # Create a face to chamfer - unchamfered_face = _make_topods_face_from_wires(self.wrapped) - chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - chamfered_face = chamfer_builder.Shape() - # Fix the shape - shape_fix = ShapeFix_Shape(chamfered_face) - shape_fix.Perform() - chamfered_face = downcast(shape_fix.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(chamfered_face)) - - @staticmethod - def order_chamfer_edges( - reference_edge: Optional[Edge], edges: tuple[Edge, Edge] - ) -> tuple[Edge, Edge]: - """Order the edges of a chamfer relative to a reference Edge""" - if reference_edge: - edge1, edge2 = edges - if edge1 == reference_edge: - return edge1, edge2 - if edge2 == reference_edge: - return edge2, edge1 - raise ValueError("reference edge not in edges") - return edges - - @classmethod - def make_rect( - cls, - width: float, - height: float, - plane: Plane = Plane.XY, - ) -> Wire: - """Make Rectangle - - Make a Rectangle centered on center with the given normal - - Args: - width (float): width (local x) - height (float): height (local y) - plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. - - Returns: - Wire: The centered rectangle - """ - corners_local = [ - (width / 2, height / 2), - (width / 2, height / -2), - (width / -2, height / -2), - (width / -2, height / 2), - ] - corners_world = [plane.from_local_coords(c) for c in corners_local] - return Wire.make_polygon(corners_world, close=True) - - @classmethod - def make_convex_hull(cls, edges: Iterable[Edge], tolerance: float = 1e-3) -> Wire: - """make_convex_hull - - Create a wire of minimum length enclosing all of the provided edges. - - Note that edges can't overlap each other. - - Args: - edges (Iterable[Edge]): edges defining the convex hull - tolerance (float): allowable error as a fraction of each edge length. - Defaults to 1e-3. - - Raises: - ValueError: edges overlap - - Returns: - Wire: convex hull perimeter - """ - # pylint: disable=too-many-branches, too-many-locals - # Algorithm: - # 1) create a cloud of points along all edges - # 2) create a convex hull which returns facets/simplices as pairs of point indices - # 3) find facets that are within an edge but not adjacent and store trim and - # new connecting edge data - # 4) find facets between edges and store trim and new connecting edge data - # 5) post process the trim data to remove duplicates and store in pairs - # 6) create connecting edges - # 7) create trim edges from the original edges and the trim data - # 8) return a wire version of all the edges - - # Possible enhancement: The accuracy of the result could be improved and the - # execution time reduced by adaptively placing more points around where the - # connecting edges contact the arc. - - # if any( - # [ - # edge_pair[0].overlaps(edge_pair[1]) - # for edge_pair in combinations(edges, 2) - # ] - # ): - # raise ValueError("edges overlap") - edges = list(edges) - fragments_per_edge = int(2 / tolerance) - points_lookup = {} # lookup from point index to edge/position on edge - points = [] # convex hull point cloud - - # Create points along each edge and the lookup structure - for edge_index, edge in enumerate(edges): - for i in range(fragments_per_edge): - param = i / (fragments_per_edge - 1) - points.append(edge.position_at(param).to_tuple()[:2]) - points_lookup[edge_index * fragments_per_edge + i] = (edge_index, param) - - convex_hull = ConvexHull(points) - - # Filter the fragments - connecting_edge_data = [] - trim_points: dict[int, list[int]] = {} - for simplice in convex_hull.simplices: - edge0 = points_lookup[simplice[0]][0] - edge1 = points_lookup[simplice[1]][0] - # Look for connecting edges between edges - if edge0 != edge1: - if edge0 not in trim_points: - trim_points[edge0] = [simplice[0]] - else: - trim_points[edge0].append(simplice[0]) - if edge1 not in trim_points: - trim_points[edge1] = [simplice[1]] - else: - trim_points[edge1].append(simplice[1]) - connecting_edge_data.append( - ( - (edge0, points_lookup[simplice[0]][1], simplice[0]), - (edge1, points_lookup[simplice[1]][1], simplice[1]), - ) - ) - # Look for connecting edges within an edge - elif abs(simplice[0] - simplice[1]) != 1: - start_pnt = min(simplice.tolist()) - end_pnt = max(simplice.tolist()) - if edge0 not in trim_points: - trim_points[edge0] = [start_pnt, end_pnt] - else: - trim_points[edge0].extend([start_pnt, end_pnt]) - connecting_edge_data.append( - ( - (edge0, points_lookup[start_pnt][1], start_pnt), - (edge0, points_lookup[end_pnt][1], end_pnt), - ) - ) - - trim_data = {} - for edge_index, start_end_pnts in trim_points.items(): - s_points = sorted(start_end_pnts) - f_points = [] - for i in range(0, len(s_points) - 1, 2): - if s_points[i] != s_points[i + 1]: - f_points.append(tuple(s_points[i : i + 2])) - trim_data[edge_index] = f_points - - connecting_edges = [ - Edge.make_line( - edges[line[0][0]] @ line[0][1], edges[line[1][0]] @ line[1][1] - ) - for line in connecting_edge_data - ] - trimmed_edges = [ - edges[edge_index].trim( - points_lookup[trim_pair[0]][1], points_lookup[trim_pair[1]][1] - ) - for edge_index, trim_pairs in trim_data.items() - for trim_pair in trim_pairs - ] - hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) - return hull_wire - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Wire]: - """Project Wire - - Project a Wire onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected wire(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - # pylint: disable=too-many-branches - if self.wrapped is None or target_object.wrapped is None: - raise ValueError("Can't project empty Wires or to empty Shapes") - - if not (direction is None) ^ (center is None): - raise ValueError("One of either direction or center must be provided") - if direction is not None: - direction_vector = Vector(direction).normalized() - center_point = Vector() # for typing, never used - else: - direction_vector = None - center_point = Vector(center) - - # Project the wire on the target object - if direction_vector is not None: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Dir(*direction_vector.to_tuple()), - ) - else: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Pnt(*center_point.to_tuple()), - ) - - # Generate a list of the projected wires with aligned orientation - output_wires = [] - target_orientation = self.wrapped.Orientation() - while projection_object.More(): - projected_wire = projection_object.Current() - if target_orientation == projected_wire.Orientation(): - output_wires.append(Wire(projected_wire)) - else: - output_wires.append(Wire(projected_wire.Reversed())) - projection_object.Next() - - logger.debug("wire generated %d projected wires", len(output_wires)) - - # BRepProj_Projection is inconsistent in the order that it returns projected - # wires, sometimes front first and sometimes back - so sort this out by sorting - # by distance from the original planar wire - if len(output_wires) > 1: - output_wires_distances = [] - planar_wire_center = self.center() - for output_wire in output_wires: - output_wire_center = output_wire.center() - if direction_vector is not None: - output_wire_direction = ( - output_wire_center - planar_wire_center - ).normalized() - if output_wire_direction.dot(direction_vector) >= 0: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - planar_wire_center).length, - ) - ) - else: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - center_point).length, - ) - ) - - output_wires_distances.sort(key=lambda x: x[1]) - logger.debug( - "projected, filtered and sorted wire list is of length %d", - len(output_wires_distances), - ) - output_wires = [w[0] for w in output_wires_distances] - - return output_wires - - -class Joint(ABC): - """Joint - - Abstract Base Joint class - used to join two components together - - Args: - parent (Union[Solid, Compound]): object that joint to bound to - - Attributes: - label (str): user assigned label - parent (Shape): object joint is bound to - connected_to (Joint): joint that is connect to this joint - - """ - - def __init__(self, label: str, parent: Union[Solid, Compound]): - self.label = label - self.parent = parent - self.connected_to: Joint | None = None - - def _connect_to(self, other: Joint, **kwargs): # pragma: no cover - """Connect Joint self by repositioning other""" - - if not isinstance(other, Joint): - raise TypeError(f"other must of type Joint not {type(other)}") - if self.parent.location is None: - raise ValueError("Parent location is not set") - relative_location = self.relative_to(other, **kwargs) - other.parent.locate(self.parent.location * relative_location) - self.connected_to = other - - @abstractmethod - def connect_to(self, other: Joint): - """All derived classes must provide a connect_to method""" - - @abstractmethod - def relative_to(self, other: Joint) -> Location: - """Return relative location to another joint""" - - @property - @abstractmethod - def location(self) -> Location: - """Location of joint""" - - @property - @abstractmethod - def symbol(self) -> Compound: - """A CAD object positioned in global space to illustrate the joint""" - - -def _make_loft( - objs: Iterable[Union[Vertex, Wire]], - filled: bool, - ruled: bool = False, -) -> TopoDS_Shape: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - wires (list[Wire]): section perimeters - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - TopoDS_Shape: Lofted object - """ - objs = list(objs) # To determine its length - if len(objs) < 2: - raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] - vertex_count = len(vertices) - - if vertex_count > 2: - raise ValueError("Only two vertices are allowed") - - if vertex_count == 1 and not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - or isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertex must be either at the beginning or end of the list" - ) - - if vertex_count == 2: - if len(objs) == 2: - raise ValueError( - "You can't have only 2 vertices to loft; try adding some wires" - ) - if not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - and isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertices must be at the beginning and end of the list" - ) - - loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) - - for obj in objs: - if isinstance(obj.wrapped, TopoDS_Vertex): - loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj.wrapped, TopoDS_Wire): - loft_builder.AddWire(obj.wrapped) - - loft_builder.Build() - - return loft_builder.Shape() - - -def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: - """Downcasts a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - f_downcast: Any = Shape.downcast_LUT[shapetype(obj)] - return_value = f_downcast(obj) - - return return_value - - -def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: - """Convert edges to a list of wires. - - Args: - edges: Iterable[Edge]: - tol: float: (Default value = 1e-6) - - Returns: - - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in edges: - if edge.wrapped is not None: - edges_in.Append(edge.wrapped) - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires: ShapeList[Wire] = ShapeList() - for i in range(wires_out.Length()): - # wires.append(Wire(downcast(wires_out.Value(i + 1)))) - wires.append(Wire(TopoDS.Wire_s(wires_out.Value(i + 1)))) - - return wires - - -def fix(obj: TopoDS_Shape) -> TopoDS_Shape: - """Fix a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - shape_fix = ShapeFix_Shape(obj) - shape_fix.Perform() - - return downcast(shape_fix.Shape()) - - -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: - """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj is None or obj.IsNull(): - raise ValueError("Null TopoDS_Shape object") - - return obj.ShapeType() - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) - if len(shapetypes) == 1: - result = shapetypes.pop() - else: - result = shapetype(obj) - else: - result = shapetype(obj.wrapped) - return result + """Center of mass of the shell""" + properties = GProp_GProps() + BRepGProp.LinearProperties_s(self.wrapped, properties) + return Vector(properties.CentreOfMass()) def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: @@ -9273,401 +1408,3 @@ def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: ) return return_value - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - -def topo_explore_connected_edges( - edge: Edge, parent: Shape | None = None -) -> ShapeList[Edge]: - """Given an edge extracted from a Shape, return the edges connected to it""" - - parent = parent if parent is not None else edge.topo_parent - if parent is None: - raise ValueError("edge has no valid parent") - given_topods_edge = edge.wrapped - if given_topods_edge is None: - raise ValueError("edge is empty") - connected_edges = set() - - # Find all the TopoDS_Edges for this Shape - topods_edges = [e.wrapped for e in parent.edges() if e.wrapped is not None] - - for topods_edge in topods_edges: - # # Don't match with the given edge - if given_topods_edge.IsSame(topods_edge): - continue - # If the edge shares a vertex with the given edge they are connected - if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: - connected_edges.add(topods_edge) - - return ShapeList(Edge(e) for e in connected_edges) - - -def topo_explore_common_vertex( - edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge -) -> Optional[Vertex]: - """Given two edges, find the common vertex""" - topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped - topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped - - if topods_edge1 is None or topods_edge2 is None: - raise ValueError("edge is empty") - - # Explore vertices of the first edge - vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) - while vert_exp.More(): - vertex1 = vert_exp.Current() - - # Explore vertices of the second edge - explorer2 = TopExp_Explorer(topods_edge2, ta.TopAbs_VERTEX) - while explorer2.More(): - vertex2 = explorer2.Current() - - # Check if the vertices are the same - if vertex1.IsSame(vertex2): - return Vertex(TopoDS.Vertex_s(vertex1)) # Common vertex found - - explorer2.Next() - vert_exp.Next() - - return None # No common vertex found - - -def unwrap_topods_compound( - compound: TopoDS_Compound, fully: bool = True -) -> TopoDS_Compound | TopoDS_Shape: - """Strip unnecessary Compound wrappers - - Args: - compound (TopoDS_Compound): The TopoDS_Compound to unwrap. - fully (bool, optional): return base shape without any TopoDS_Compound - wrappers (otherwise one TopoDS_Compound is left). Defaults to True. - - Returns: - TopoDS_Compound | TopoDS_Shape: base shape - """ - if compound.NbChildren() == 1: - iterator = TopoDS_Iterator(compound) - single_element = downcast(iterator.Value()) - - # If the single element is another TopoDS_Compound, unwrap it recursively - if isinstance(single_element, TopoDS_Compound): - return unwrap_topods_compound(single_element, fully) - - return single_element if fully else compound - - # If there are no elements or more than one element, return TopoDS_Compound - return compound - - -def get_top_level_topods_shapes( - topods_shape: TopoDS_Shape | None, -) -> list[TopoDS_Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - list[TopoDS_Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if topods_shape is None: - return ShapeList() - - first_level_shapes = [] - stack = [topods_shape] - - while stack: - current_shape = stack.pop() - if isinstance(current_shape, TopoDS_Compound): - iterator = TopoDS_Iterator() - iterator.Initialize(current_shape) - while iterator.More(): - child_shape = downcast(iterator.Value()) - if isinstance(child_shape, TopoDS_Compound): - # Traverse further into the compound - stack.append(child_shape) - else: - # Add non-compound shape - first_level_shapes.append(child_shape) - iterator.Next() - else: - first_level_shapes.append(current_shape) - - return first_level_shapes - - -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - -def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None -) -> TopoDS_Face: - """_make_topods_face_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error - - Returns: - TopoDS_Face: planar face potentially with holes - """ - if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = list(inner_wires) if inner_wires else [] - - # check if wires are coplanar - verification_compound = _make_topods_compound_from_shapes( - [outer_wire] + inner_wires - ) - if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): - raise ValueError("Cannot build face(s): wires not planar") - - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) - - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) - - for inner_wire in inner_wires: - if not BRep_Tool.IsClosed_s(inner_wire): - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) - - face_builder.Build() - - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") - - face = face_builder.Face() - - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() - - return TopoDS.Face_s(sf_f.Result()) - - -def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: - """Sew faces into a shell if possible""" - shell_builder = BRepBuilderAPI_Sewing() - for face in faces: - shell_builder.Add(face) - shell_builder.Perform() - return downcast(shell_builder.SewedShape()) - - -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound - """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) - - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) - - return comp - - -def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: - """Return the maximum dimension of one or more shapes""" - shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) - bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) - return bbox.diagonal - - -def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) - - -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - TopoDS_Shape: extruded shape - """ - direction = Vector(direction) - - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") - - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion - - -class SkipClean: - """Skip clean context for use in operator driven code where clean=False wouldn't work""" - - clean = True - - def __enter__(self): - SkipClean.clean = False - - def __exit__(self, exception_type, exception_value, traceback): - SkipClean.clean = True From daa02d81ab1e9e1cce33099af06bd30ffdf00e28 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:53:17 -0500 Subject: [PATCH 077/518] Step 7 - composite.py --- src/build123d/{topology.py => topology/composite.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/build123d/{topology.py => topology/composite.py} (100%) diff --git a/src/build123d/topology.py b/src/build123d/topology/composite.py similarity index 100% rename from src/build123d/topology.py rename to src/build123d/topology/composite.py From beb31f1c500bd8dc15f36734c63a932e5a68a7e9 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:53:17 -0500 Subject: [PATCH 078/518] Step 6b split - three_d.py --- src/build123d/topology/three_d.py | 9585 ++--------------------------- 1 file changed, 649 insertions(+), 8936 deletions(-) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 5986e08..7a01caf 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -1,17 +1,42 @@ """ build123d topology -name: topology.py +name: three_d.py by: Gumyr -date: Oct 14, 2022 +date: January 07, 2025 desc: - This python module is a CAD library based on OpenCascade containing - the base Shape class and all of its derived classes. + +This module defines the `Solid` class and associated methods for creating, manipulating, and +querying three-dimensional solid geometries in the build123d CAD system. It provides powerful tools +for constructing complex 3D models, including operations such as extrusion, sweeping, filleting, +chamfering, and Boolean operations. The module integrates with OpenCascade to leverage its robust +geometric kernel for precise 3D modeling. + +Key Features: +- **Solid Class**: + - Represents closed, bounded 3D shapes with methods for volume calculation, bounding box + computation, and validity checks. + - Includes constructors for primitive solids (e.g., box, cylinder, cone, torus) and advanced + operations like lofting, revolving, and sweeping profiles along paths. + +- **Mixin3D**: + - Adds shared methods for operations like filleting, chamfering, splitting, and hollowing solids. + - Supports advanced workflows such as finding maximum fillet radii and extruding with rotation or + taper. + +- **Boolean Operations**: + - Provides utilities for union, subtraction, and intersection of solids. + +- **Thickening and Offsetting**: + - Allows transformation of faces or shells into solids through thickening. + +This module is essential for generating and manipulating complex 3D geometries in the build123d +library, offering a comprehensive API for CAD modeling. license: - Copyright 2022 Gumyr + Copyright 2025 Gumyr Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,3944 +54,92 @@ license: from __future__ import annotations -# pylint has trouble with the OCP imports -# pylint: disable=no-name-in-module, import-error -# pylint: disable=too-many-lines -# other pylint warning to temp remove: -# too-many-arguments, too-many-locals, too-many-public-methods, -# too-many-statements, too-many-instance-attributes, too-many-branches -import copy -import itertools -import os import platform -import sys import warnings -from abc import ABC, abstractmethod -from itertools import combinations -from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose -from typing import ( - Any, - Callable, - Dict, - Generic, - Iterable, - Iterator, - Optional, - Protocol, - Sequence, - SupportsIndex, - Tuple, - Type, - TypeVar, - Union, - overload, - TYPE_CHECKING, -) -from typing import cast as tcast -from typing_extensions import Self, Literal -from anytree import NodeMixin, PreOrderIter, RenderTree -from IPython.lib.pretty import pretty, PrettyPrinter -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter +from math import radians, cos, tan +from typing import Iterable, Union, TYPE_CHECKING -import OCP.GeomAbs as ga # Geometry type enum -import OCP.TopAbs as ta # Topology type enum -from OCP.Aspect import Aspect_TOL_SOLID -from OCP.Bnd import Bnd_Box -from OCP.BOPAlgo import BOPAlgo_GlueEnum - -from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import ( - BRepAdaptor_CompCurve, - BRepAdaptor_Curve, - BRepAdaptor_Surface, -) -from OCP.BRepAlgo import BRepAlgo -from OCP.BRepAlgoAPI import ( - BRepAlgoAPI_BooleanOperation, - BRepAlgoAPI_Common, - BRepAlgoAPI_Cut, - BRepAlgoAPI_Fuse, - BRepAlgoAPI_Section, - BRepAlgoAPI_Splitter, -) -from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_Copy, - BRepBuilderAPI_DisconnectedWire, - BRepBuilderAPI_EmptyWire, - BRepBuilderAPI_GTransform, - BRepBuilderAPI_MakeEdge, - BRepBuilderAPI_MakeFace, - BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeShell, - BRepBuilderAPI_MakeSolid, - BRepBuilderAPI_MakeVertex, - BRepBuilderAPI_MakeWire, - BRepBuilderAPI_NonManifoldWire, - BRepBuilderAPI_RightCorner, - BRepBuilderAPI_RoundCorner, - BRepBuilderAPI_Sewing, - BRepBuilderAPI_Transform, - BRepBuilderAPI_Transformed, -) -from OCP.BRepCheck import BRepCheck_Analyzer +import OCP.TopAbs as ta +from OCP.BRepAlgoAPI import BRepAlgoAPI_Cut +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeSolid from OCP.BRepClass3d import BRepClass3d_SolidClassifier -from OCP.BRepExtrema import BRepExtrema_DistShapeShape -from OCP.BRepFeat import BRepFeat_MakeDPrism, BRepFeat_SplitShape -from OCP.BRepFill import BRepFill -from OCP.BRepFilletAPI import ( - BRepFilletAPI_MakeChamfer, - BRepFilletAPI_MakeFillet, - BRepFilletAPI_MakeFillet2d, -) -from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation -from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter -from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepMesh import BRepMesh_IncrementalMesh +from OCP.BRepFeat import BRepFeat_MakeDPrism +from OCP.BRepFilletAPI import BRepFilletAPI_MakeChamfer, BRepFilletAPI_MakeFillet from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import ( - BRepOffsetAPI_MakeFilling, - BRepOffsetAPI_MakeOffset, - BRepOffsetAPI_MakePipeShell, - BRepOffsetAPI_MakeThickSolid, - BRepOffsetAPI_ThruSections, -) +from OCP.BRepOffsetAPI import BRepOffsetAPI_MakePipeShell, BRepOffsetAPI_MakeThickSolid from OCP.BRepPrimAPI import ( BRepPrimAPI_MakeBox, BRepPrimAPI_MakeCone, BRepPrimAPI_MakeCylinder, - BRepPrimAPI_MakePrism, BRepPrimAPI_MakeRevol, BRepPrimAPI_MakeSphere, BRepPrimAPI_MakeTorus, BRepPrimAPI_MakeWedge, ) -from OCP.BRepProj import BRepProj_Projection -from OCP.BRepTools import BRepTools -from OCP.Font import ( - Font_FA_Bold, - Font_FA_Italic, - Font_FA_Regular, - Font_FontMgr, - Font_SystemFont, -) -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse # geometry construction -from OCP.gce import gce_MakeLin -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import ( - Geom_BezierCurve, - Geom_BezierSurface, - Geom_ConicalSurface, - Geom_CylindricalSurface, - Geom_Plane, - Geom_Surface, - Geom_TrimmedCurve, - Geom_Line, -) -from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve -from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType -from OCP.GeomAPI import ( - GeomAPI_IntCS, - GeomAPI_Interpolate, - GeomAPI_PointsToBSpline, - GeomAPI_PointsToBSplineSurface, - GeomAPI_ProjectPointOnSurf, - GeomAPI_ProjectPointOnCurve, -) -from OCP.GeomFill import ( - GeomFill_CorrectedFrenet, - GeomFill_Frenet, - GeomFill_TrihedronLaw, -) -from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, -) - -# properties used to store mass calculation result from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher -from OCP.IVtkVTK import IVtkVTK_ShapeData +from OCP.GeomAbs import GeomAbs_Intersection, GeomAbs_JoinType from OCP.LocOpe import LocOpe_DPrism -from OCP.NCollection import NCollection_Utf8String -from OCP.Precision import Precision -from OCP.Prs3d import Prs3d_IsoAspect -from OCP.Quantity import Quantity_Color -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds, ShapeAnalysis_Curve -from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters -from OCP.ShapeFix import ( - ShapeFix_Face, - ShapeFix_Shape, - ShapeFix_Solid, - ShapeFix_Wireframe, -) -from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain - -# for catching exceptions -from OCP.Standard import ( - Standard_Failure, - Standard_NoSuchObject, - Standard_ConstructionError, -) +from OCP.ShapeFix import ShapeFix_Solid +from OCP.Standard import Standard_Failure from OCP.StdFail import StdFail_NotDone -from OCP.StdPrs import StdPrs_BRepFont -from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder - -# Array of vectors (used for B-spline interpolation): -# Array of points (used for B-spline construction): -from OCP.TColgp import ( - TColgp_Array1OfPnt, - TColgp_Array1OfVec, - TColgp_HArray1OfPnt, - TColgp_HArray2OfPnt, -) -from OCP.TCollection import TCollection_AsciiString - -# Array of floats (used for B-spline interpolation): -# Array of booleans (used for B-spline interpolation): -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, - TColStd_HArray2OfReal, -) -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer # Topology explorer -from OCP.TopLoc import TopLoc_Location -from OCP.TopoDS import ( - TopoDS, - TopoDS_Builder, - TopoDS_Compound, - TopoDS_Face, - TopoDS_Iterator, - TopoDS_Shape, - TopoDS_Shell, - TopoDS_Solid, - TopoDS_Vertex, - TopoDS_Edge, - TopoDS_Wire, -) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) -from build123d.build_enums import ( - Align, - AngularDirection, - CenterOf, - FontStyle, - FrameMethod, - GeomType, - Keep, - Kind, - PositionMode, - Side, - SortBy, - Transition, - Until, -) +from OCP.TopExp import TopExp +from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape +from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Solid, TopoDS_Wire +from OCP.gp import gp_Ax2, gp_Pnt +from build123d.build_enums import CenterOf, Kind, Transition, Until from build123d.geometry import ( DEG2RAD, - TOLERANCE, Axis, BoundBox, Color, Location, - Matrix, Plane, Vector, VectorLike, - logger, ) +from typing_extensions import Self +from .one_d import Edge, Wire, Mixin1D +from .shape_core import Shape, ShapeList, Joint, downcast, shapetype +from .two_d import sort_wires_by_build_order, Mixin2D, Face, Shell +from .utils import ( + _extrude_topods_shape, + find_max_dimension, + _make_loft, + _make_topods_compound_from_shapes, +) +from .zero_d import Vertex -def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: - """Find the normal at a point on surface""" - surface = BRep_Tool.Surface_s(face) - # project point on surface - projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) - u_val, v_val = projector.LowerDistanceParameters() +if TYPE_CHECKING: # pragma: no cover + from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) - return Vector(normal).normalized() - - -def topods_dim(topods: TopoDS_Shape) -> int | None: - """Return the dimension of this TopoDS_Shape""" - shape_dim_map = { - (TopoDS_Vertex,): 0, - (TopoDS_Edge, TopoDS_Wire): 1, - (TopoDS_Face, TopoDS_Shell): 2, - (TopoDS_Solid,): 3, - } - - for shape_types, dim in shape_dim_map.items(): - if isinstance(topods, shape_types): - return dim - - if isinstance(topods, TopoDS_Compound): - sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - return None - - -HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode - - -Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] - -TrimmingTool = Union[Plane, "Shell", "Face"] - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - -TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) - - -class Shape(NodeMixin, Generic[TOPODS]): - """Shape - - Base class for all CAD objects such as Edge, Face, Solid, etc. - - Args: - obj (TopoDS_Shape, optional): OCCT object. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - - Attributes: - wrapped (TopoDS_Shape): the OCP object - label (str): user assigned label - color (Color): object color - joints (dict[str:Joint]): dictionary of joints bound to this object (Solid only) - children (Shape): list of assembly children of this object (Compound only) - topo_parent (Shape): assembly parent of this object - - """ - - # pylint: disable=too-many-instance-attributes, too-many-public-methods - - @property - @abstractmethod - def _dim(self) -> int | None: - """Dimension of the object""" - - shape_LUT = { - ta.TopAbs_VERTEX: "Vertex", - ta.TopAbs_EDGE: "Edge", - ta.TopAbs_WIRE: "Wire", - ta.TopAbs_FACE: "Face", - ta.TopAbs_SHELL: "Shell", - ta.TopAbs_SOLID: "Solid", - ta.TopAbs_COMPOUND: "Compound", - ta.TopAbs_COMPSOLID: "CompSolid", - } - - shape_properties_LUT = { - ta.TopAbs_VERTEX: None, - ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, - ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, - ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, - } - - inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} - - downcast_LUT = { - ta.TopAbs_VERTEX: TopoDS.Vertex_s, - ta.TopAbs_EDGE: TopoDS.Edge_s, - ta.TopAbs_WIRE: TopoDS.Wire_s, - ta.TopAbs_FACE: TopoDS.Face_s, - ta.TopAbs_SHELL: TopoDS.Shell_s, - ta.TopAbs_SOLID: TopoDS.Solid_s, - ta.TopAbs_COMPOUND: TopoDS.Compound_s, - ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, - } - - geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { - ga.GeomAbs_Line: GeomType.LINE, - ga.GeomAbs_Circle: GeomType.CIRCLE, - ga.GeomAbs_Ellipse: GeomType.ELLIPSE, - ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, - ga.GeomAbs_Parabola: GeomType.PARABOLA, - ga.GeomAbs_BezierCurve: GeomType.BEZIER, - ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, - ga.GeomAbs_OffsetCurve: GeomType.OFFSET, - ga.GeomAbs_OtherCurve: GeomType.OTHER, - } - geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { - ga.GeomAbs_Plane: GeomType.PLANE, - ga.GeomAbs_Cylinder: GeomType.CYLINDER, - ga.GeomAbs_Cone: GeomType.CONE, - ga.GeomAbs_Sphere: GeomType.SPHERE, - ga.GeomAbs_Torus: GeomType.TORUS, - ga.GeomAbs_BezierSurface: GeomType.BEZIER, - ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, - ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, - ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, - ga.GeomAbs_OffsetSurface: GeomType.OFFSET, - ga.GeomAbs_OtherSurface: GeomType.OTHER, - } - _transModeDict = { - Transition.TRANSFORMED: BRepBuilderAPI_Transformed, - Transition.ROUND: BRepBuilderAPI_RoundCorner, - Transition.RIGHT: BRepBuilderAPI_RightCorner, - } - - def __init__( - self, - obj: TopoDS_Shape | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - self.wrapped: TOPODS | None = ( - tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None - ) - self.for_construction = False - self.label = label - self._color = color - - # parent must be set following children as post install accesses children - self.parent = parent - - # Extracted objects like Vertices and Edges may need to know where they came from - self.topo_parent: Shape | None = None - - @property - def location(self) -> Location | None: - """Get this Shape's Location""" - if self.wrapped is None: - return None - return Location(self.wrapped.Location()) - - @location.setter - def location(self, value: Location): - """Set Shape's Location to value""" - if self.wrapped is not None: - self.wrapped.Location(value.wrapped) - - @property - def position(self) -> Vector | None: - """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: - return None - return self.location.position - - @position.setter - def position(self, value: VectorLike): - """Set the position component of this Shape's Location to value""" - loc = self.location - if loc is not None: - loc.position = Vector(value) - self.location = loc - - @property - def orientation(self) -> Vector | None: - """Get the orientation component of this Shape's Location""" - if self.location is None: - return None - return self.location.orientation - - @orientation.setter - def orientation(self, rotations: VectorLike): - """Set the orientation component of this Shape's Location to rotations""" - loc = self.location - if loc is not None: - loc.orientation = Vector(rotations) - self.location = loc - - @property - def color(self) -> Union[None, Color]: - """Get the shape's color. If it's None, get the color of the nearest - ancestor, assign it to this Shape and return this value.""" - # Find the correct color for this node - if self._color is None: - # Find parent color - current_node: Compound | Shape | None = self - while current_node is not None: - parent_color = current_node._color - if parent_color is not None: - break - current_node = current_node.parent - node_color = parent_color - else: - node_color = self._color - self._color = node_color # Set the node's color for next time - return node_color - - @color.setter - def color(self, value): - """Set the shape's color""" - self._color = value - - @property - def is_planar_face(self) -> bool: - """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): - return False - surface = BRep_Tool.Surface_s(self.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() - - def copy_attributes_to( - self, target: Shape, exceptions: Iterable[str] | None = None - ): - """Copy common object attributes to target - - Note that preset attributes of target will not be overridden. - - Args: - target (Shape): object to gain attributes - exceptions (Iterable[str], optional): attributes not to copy - - Raises: - ValueError: invalid attribute - """ - # Find common attributes and eliminate exceptions - attrs1 = set(self.__dict__.keys()) - attrs2 = set(target.__dict__.keys()) - common_attrs = attrs1 & attrs2 - if exceptions is not None: - common_attrs -= set(exceptions) - - for attr in common_attrs: - # Copy the attribute only if the target's attribute not set - if not getattr(target, attr): - setattr(target, attr, getattr(self, attr)) - # Attach joints to the new part - if attr == "joints": - joint: Joint - for joint in target.joints.values(): - joint.parent = target - - @property - def is_manifold(self) -> bool: - """is_manifold - - Check if each edge in the given Shape has exactly two faces associated with it - (skipping degenerate edges). If so, the shape is manifold. - - Returns: - bool: is the shape manifold or water tight - """ - # Extract one or more (if a Compound) shape from self - if self.wrapped is None: - return False - shape_stack = get_top_level_topods_shapes(self.wrapped) - - while shape_stack: - shape = shape_stack.pop(0) - - # Create an empty indexed data map to store the edges and their corresponding faces. - shape_map = TopTools_IndexedDataMapOfShapeListOfShape() - - # Fill the map with edges and their associated faces in the given shape. Each edge in - # the map is associated with a list of faces that share that edge. - TopExp.MapShapesAndAncestors_s( - # shape.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map - shape, - ta.TopAbs_EDGE, - ta.TopAbs_FACE, - shape_map, - ) - - # Iterate over the edges in the map and checks if each edge is non-degenerate and has - # exactly two faces associated with it. - for i in range(shape_map.Extent()): - # Access each edge in the map sequentially - edge = TopoDS.Edge_s(shape_map.FindKey(i + 1)) - - vertex0 = TopoDS_Vertex() - vertex1 = TopoDS_Vertex() - - # Extract the two vertices of the current edge and stores them in vertex0/1. - TopExp.Vertices_s(edge, vertex0, vertex1) - - # Check if both vertices are null and if they are the same vertex. If so, the - # edge is considered degenerate (i.e., has zero length), and it is skipped. - if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): - continue - - # Check if the current edge has exactly two faces associated with it. If not, - # it means the edge is not shared by exactly two faces, indicating that the - # shape is not manifold. - if shape_map.FindFromIndex(i + 1).Extent() != 2: - return False - - return True - - class _DisplayNode(NodeMixin): - """Used to create anytree structures from TopoDS_Shapes""" - - def __init__( - self, - label: str = "", - address: int | None = None, - position: Union[Vector, Location, None] = None, - parent: Shape._DisplayNode | None = None, - ): - self.label = label - self.address = address - self.position = position - self.parent = parent - self.children: list[Shape] = [] - - _ordered_shapes = [ - TopAbs_ShapeEnum.TopAbs_COMPOUND, - TopAbs_ShapeEnum.TopAbs_SOLID, - TopAbs_ShapeEnum.TopAbs_SHELL, - TopAbs_ShapeEnum.TopAbs_FACE, - TopAbs_ShapeEnum.TopAbs_WIRE, - TopAbs_ShapeEnum.TopAbs_EDGE, - TopAbs_ShapeEnum.TopAbs_VERTEX, - ] - - @staticmethod - def _build_tree( - shape: TopoDS_Shape, - tree: list[_DisplayNode], - parent: _DisplayNode | None = None, - limit: TopAbs_ShapeEnum = TopAbs_ShapeEnum.TopAbs_VERTEX, - show_center: bool = True, - ) -> list[_DisplayNode]: - """Create an anytree copy of the TopoDS_Shape structure""" - - obj_type = Shape.shape_LUT[shape.ShapeType()] - loc: Vector | Location - if show_center: - loc = Shape(shape).bounding_box().center() - else: - loc = Location(shape.Location()) - tree.append(Shape._DisplayNode(obj_type, id(shape), loc, parent)) - iterator = TopoDS_Iterator() - iterator.Initialize(shape) - parent_node = tree[-1] - while iterator.More(): - child = iterator.Value() - if Shape._ordered_shapes.index( - child.ShapeType() - ) <= Shape._ordered_shapes.index(limit): - Shape._build_tree(child, tree, parent_node, limit) - iterator.Next() - return tree - - @staticmethod - def _show_tree(root_node, show_center: bool) -> str: - """Display an assembly or TopoDS_Shape anytree structure""" - - # Calculate the size of the tree labels - size_tuples = [(node.height, len(node.label)) for node in root_node.descendants] - size_tuples.append((root_node.height, len(root_node.label))) - # pylint: disable=cell-var-from-loop - size_tuples_per_level = [ - list(filter(lambda ll: ll[0] == l, size_tuples)) - for l in range(root_node.height + 1) - ] - max_sizes_per_level = [ - max(4, max(l[1] for l in level)) for level in size_tuples_per_level - ] - level_sizes_per_level = [ - l + i * 4 for i, l in enumerate(reversed(max_sizes_per_level)) - ] - tree_label_width = max(level_sizes_per_level) + 1 - - # Build the tree line by line - result = "" - for pre, _fill, node in RenderTree(root_node): - treestr = f"{pre}{node.label}".ljust(tree_label_width) - if hasattr(root_node, "address"): - address = node.address - name = "" - loc = ( - "Center" + str(node.position.to_tuple()) - if show_center - else "Position" + str(node.position.to_tuple()) - ) - else: - address = id(node) - name = node.__class__.__name__.ljust(9) - loc = ( - "Center" + str(node.center().to_tuple()) - if show_center - else "Location" + repr(node.location) - ) - result += f"{treestr}{name}at {address:#x}, {loc}\n" - return result - - def show_topology( - self, - limit_class: Literal[ - "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" - ] = "Vertex", - show_center: bool | None = None, - ) -> str: - """Display internal topology - - Display the internal structure of a Compound 'assembly' or Shape. Example: - - .. code:: - - >>> c1.show_topology() - - c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) - ├── Solid at 0x7f4a4cafafd0, Location(...)) - ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) - │ ├── Solid at 0x7f4a4cafad00, Location(...)) - │ └── Solid at 0x7f4a11a52790, Location(...)) - └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) - ├── Solid at 0x7f4a11a52700, Location(...)) - └── Solid at 0x7f4a11a58550, Location(...)) - - Args: - limit_class: type of displayed leaf node. Defaults to 'Vertex'. - show_center (bool, optional): If None, shows the Location of Compound 'assemblies' - and the bounding box center of Shapes. True or False forces the display. - Defaults to None. - - Returns: - str: tree representation of internal structure - """ - if ( - self.wrapped is not None - and isinstance(self.wrapped, TopoDS_Compound) - and self.children - ): - show_center = False if show_center is None else show_center - result = Shape._show_tree(self, show_center) - else: - tree = Shape._build_tree( - tcast(TopoDS_Shape, self.wrapped), - tree=[], - limit=Shape.inverse_shape_LUT[limit_class], - ) - show_center = True if show_center is None else show_center - result = Shape._show_tree(tree[0], show_center) - return result - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: - """fuse shape to self operator +""" - # Convert `other` to list of base objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self - - # Check that all dimensions are the same - addend_dim = self._dim - if addend_dim is None: - raise ValueError("Dimensions of objects to add to are inconsistent") - - if not all(summand._dim == addend_dim for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - sum_shape = summands[0].fuse(*summands[1:]) - else: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - return sum_shape - - def __sub__( - self, other: Union[None, Shape, Iterable[Shape]] - ) -> Self | ShapeList[Self]: - """cut shape from self operator -""" - - if self.wrapped is None: - raise ValueError("Cannot subtract shape from empty compound") - - # Convert `other` to list of base objects and filter out None values - if other is None: - subtrahends = [] - else: - subtrahends = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to subtract return the original object - if not subtrahends: - return self - - # Check that all dimensions are the same - minuend_dim = self._dim - if minuend_dim is None or any(s._dim is None for s in subtrahends): - raise ValueError("Dimensions of objects to subtract from are inconsistent") - - # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] - if any(d < minuend_dim for d in subtrahend_dims): - raise ValueError( - f"Only shapes with equal or greater dimension can be subtracted: " - f"not {type(self).__name__} ({minuend_dim}D) and " - f"{type(other).__name__} ({min(subtrahend_dims)}D)" - ) - - # Do the actual cut operation - difference = self.cut(*subtrahends) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: - """intersect shape with self operator &""" - others = other if isinstance(other, (list, tuple)) else [other] - - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot intersect shape with empty compound") - new_shape = self.intersect(*others) - - if ( - not isinstance(new_shape, list) - and new_shape is not None - and new_shape.wrapped is not None - and SkipClean.clean - ): - new_shape = new_shape.clean() - - return new_shape - - def __rmul__(self, other): - """right multiply for positioning operator *""" - if not ( - isinstance(other, (list, tuple)) - and all(isinstance(o, (Location, Plane)) for o in other) - ): - raise ValueError( - "shapes can only be multiplied list of locations or planes" - ) - return [loc * self for loc in other] - - # Actually creating the abstract method causes the subclass to pass center_of - # even when not required - possibly this could be improved. - # @abstractmethod - # def center(self, center_of: CenterOf) -> Vector: - # """Compute the center with a specific type of calculation.""" - - def clean(self) -> Self: - """clean - - Remove internal edges - - Returns: - Shape: Original object with extraneous internal edges removed - """ - if self.wrapped is None: - return self - upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) - upgrader.AllowInternalEdges(False) - # upgrader.SetAngularTolerance(1e-5) - try: - upgrader.Build() - self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) - except Exception: - warnings.warn(f"Unable to clean {self}", stacklevel=2) - return self - - def fix(self) -> Self: - """fix - try to fix shape if not valid""" - if self.wrapped is None: - return self - if not self.is_valid(): - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) - - return shape_copy - - return self - - @classmethod - @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: - """Returns the right type of wrapper, given a OCCT object""" - - @property - def geom_type(self) -> GeomType: - """Gets the underlying geometry type. - - Returns: - GeomType: The geometry type of the shape - - """ - if self.wrapped is None: - raise ValueError("Cannot determine geometry type of an empty shape") - - shape: TopAbs_ShapeEnum = shapetype(self.wrapped) - - if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[ - BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() - ] - elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[ - BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() - ] - else: - geom = GeomType.OTHER - - return geom - - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - - def is_same(self, other: Shape) -> bool: - """Returns True if other and this shape are same, i.e. if they share the - same TShape with the same Locations. Orientations may differ. Also see - :py:meth:`is_equal` - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsSame(other.wrapped) - - def is_equal(self, other: Shape) -> bool: - """Returns True if two shapes are equal, i.e. if they share the same - TShape with the same Locations and Orientations. Also see - :py:meth:`is_same`. - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsEqual(other.wrapped) - - def __eq__(self, other) -> bool: - """Check if two shapes are the same. - - This method checks if the current shape is the same as the other shape. - Two shapes are considered the same if they share the same TShape with - the same Locations. Orientations may differ. - - Args: - other (Shape): The shape to compare with. - - Returns: - bool: True if the shapes are the same, False otherwise. - """ - if isinstance(other, Shape): - return self.is_same(other) - return NotImplemented - - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - - def bounding_box( - self, tolerance: float | None = None, optimal: bool = True - ) -> BoundBox: - """Create a bounding box for this Shape. - - Args: - tolerance (float, optional): Defaults to None. - - Returns: - BoundBox: A box sized to contain this Shape - """ - if self.wrapped is None: - return BoundBox(Bnd_Box()) - tolerance = TOLERANCE if tolerance is None else tolerance - return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - - def mirror(self, mirror_plane: Plane | None = None) -> Self: - """ - Applies a mirror transform to this Shape. Does not duplicate objects - about the plane. - - Args: - mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY - Returns: - The mirrored shape - """ - if not mirror_plane: - mirror_plane = Plane.XY - - if self.wrapped is None: - return self - transformation = gp_Trsf() - transformation.SetMirror( - gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) - ) - - return self._apply_transform(transformation) - - @staticmethod - def combined_center( - objects: Iterable[Shape], center_of: CenterOf = CenterOf.MASS - ) -> Vector: - """combined center - - Calculates the center of a multiple objects. - - Args: - objects (Iterable[Shape]): list of objects - center_of (CenterOf, optional): centering option. Defaults to CenterOf.MASS. - - Raises: - ValueError: CenterOf.GEOMETRY not implemented - - Returns: - Vector: center of multiple objects - """ - objects = list(objects) - if center_of == CenterOf.MASS: - total_mass = sum(Shape.compute_mass(o) for o in objects) - weighted_centers = [ - o.center(CenterOf.MASS).multiply(Shape.compute_mass(o)) for o in objects - ] - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - elif center_of == CenterOf.BOUNDING_BOX: - total_mass = len(list(objects)) - - weighted_centers = [] - for obj in objects: - weighted_centers.append(obj.bounding_box().center()) - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - else: - raise ValueError("CenterOf.GEOMETRY not implemented") - - return middle - - @staticmethod - def compute_mass(obj: Shape) -> float: - """Calculates the 'mass' of an object. - - Args: - obj: Compute the mass of this object - obj: Shape: - - Returns: - - """ - if obj.wrapped is None: - return 0.0 - - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] - - if not calc_function: - raise NotImplementedError - - calc_function(obj.wrapped, properties) - return properties.Mass() - - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - - def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return all of the TopoDS sub entities of the given type""" - if self.wrapped is None: - return [] - return _topods_entities(self.wrapped, topo_type) - - # def _entities_from( - # self, child_type: Shapes, parent_type: Shapes - # ) -> Dict[Shape, list[Shape]]: - # """This function is very slow on M1 macs and is currently unused""" - # if self.wrapped is None: - # return {} - - # res = TopTools_IndexedDataMapOfShapeListOfShape() - - # TopExp.MapShapesAndAncestors_s( - # self.wrapped, - # Shape.inverse_shape_LUT[child_type], - # Shape.inverse_shape_LUT[parent_type], - # res, - # ) - - # out: Dict[Shape, list[Shape]] = {} - # for i in range(1, res.Extent() + 1): - # out[self.__class__.cast(res.FindKey(i))] = [ - # self.__class__.cast(el) for el in res.FindFromIndex(i) - # ] - - # return out - - def get_top_level_shapes(self) -> ShapeList[Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - ShapeList[Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if self.wrapped is None: - return ShapeList() - return ShapeList( - self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) - ) - - @staticmethod - def get_shape_list( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> ShapeList: - """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: - return ShapeList() - shape_list = ShapeList( - [shape.__class__.cast(i) for i in shape.entities(entity_type)] - ) - for item in shape_list: - item.topo_parent = shape - return shape_list - - @staticmethod - def get_single_shape( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> Shape: - """Helper to extract a single entity of a specific type from a shape, - with a warning if count != 1.""" - shape_list = Shape.get_shape_list(shape, entity_type) - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=3, - ) - return shape_list[0] if shape_list else None - - # Note all sub-classes have vertices and vertex methods - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() - - def edge(self) -> Edge | None: - """Return the Edge""" - return None - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return ShapeList() - - def wire(self) -> Wire | None: - """Return the Wire""" - return None - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return ShapeList() - - def face(self) -> Face | None: - """Return the Face""" - return None - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return ShapeList() - - def shell(self) -> Shell | None: - """Return the Shell""" - return None - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return ShapeList() - - def solid(self) -> Solid | None: - """Return the Solid""" - return None - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - return ShapeList() - - def compound(self) -> Compound | None: - """Return the Compound""" - return None - - @property - def area(self) -> float: - """area -the surface area of all faces in this Shape""" - if self.wrapped is None: - return 0.0 - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - - return properties.Mass() - - def _apply_transform(self, transformation: gp_Trsf) -> Self: - """Private Apply Transform - - Apply the provided transformation matrix to a copy of Shape - - Args: - transformation (gp_Trsf): transformation matrix - - Returns: - Shape: copy of transformed Shape - """ - if self.wrapped is None: - return self - shape_copy: Shape = copy.deepcopy(self, None) - transformed_shape = BRepBuilderAPI_Transform( - self.wrapped, - transformation, - True, - ).Shape() - shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) - return shape_copy - - def rotate(self, axis: Axis, angle: float) -> Self: - """rotate a copy - - Rotates a shape around an axis. - - Args: - axis (Axis): rotation Axis - angle (float): angle to rotate, in degrees - - Returns: - a copy of the shape, rotated - """ - transformation = gp_Trsf() - transformation.SetRotation(axis.wrapped, angle * DEG2RAD) - - return self._apply_transform(transformation) - - def translate(self, vector: VectorLike) -> Self: - """Translates this shape through a transformation. - - Args: - vector: VectorLike: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetTranslation(Vector(vector).wrapped) - - return self._apply_transform(transformation) - - def scale(self, factor: float) -> Self: - """Scales this shape through a transformation. - - Args: - factor: float: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetScale(gp_Pnt(), factor) - - return self._apply_transform(transformation) - - def __deepcopy__(self, memo) -> Self: - """Return deepcopy of self""" - # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied - # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this - # value already copied which causes deepcopy to skip it. - cls = self.__class__ - result = cls.__new__(cls) - memo[id(self)] = result - if self.wrapped is not None: - memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) - for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) - if key == "joints": - for joint in result.joints.values(): - joint.parent = result - return result - - def __copy__(self) -> Self: - """Return shallow copy or reference of self - - Create an copy of this Shape that shares the underlying TopoDS_TShape. - - Used when there is a need for many objects with the same CAD structure but at - different Locations, etc. - for examples fasteners in a larger assembly. By - sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. - - Changes to the CAD structure of the base object will be reflected in all instances. - """ - reference = copy.deepcopy(self) - if self.wrapped is not None: - assert ( - reference.wrapped is not None - ) # Ensure mypy knows reference.wrapped is not None - reference.wrapped.TShape(self.wrapped.TShape()) - return reference - - def transform_shape(self, t_matrix: Matrix) -> Self: - """Apply affine transform without changing type - - Transforms a copy of this Shape by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: copy of transformed shape with all objects keeping their type - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def transform_geometry(self, t_matrix: Matrix) -> Self: - """Apply affine transform - - WARNING: transform_geometry will sometimes convert lines and circles to - splines, but it also has the ability to handle skew and stretching - transformations. - - If your transformation is only translation and rotation, it is safer to - use :py:meth:`transform_shape`, which doesn't change the underlying type - of the geometry, but cannot handle skew transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: a copy of the object, but with geometry transformed - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def locate(self, loc: Location) -> Self: - """Apply a location in absolute sense to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - self.wrapped.Location(loc.wrapped) - - return self - - def located(self, loc: Location) -> Self: - """located - - Apply a location in absolute sense to a copy of self - - Args: - loc (Location): new absolute location - - Returns: - Shape: copy of Shape at location - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) # type: ignore - return shape_copy - - def move(self, loc: Location) -> Self: - """Apply a location in relative sense (i.e. update current location) to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - - self.wrapped.Move(loc.wrapped) - - return self - - def moved(self, loc: Location) -> Self: - """moved - - Apply a location in relative sense (i.e. update current location) to a copy of self - - Args: - loc (Location): new location relative to current location - - Returns: - Shape: copy of Shape moved to relative location - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) - return shape_copy - - def relocate(self, loc: Location): - """Change the location of self while keeping it geometrically similar - - Args: - loc (Location): new location to set for self - """ - if self.wrapped is None: - raise ValueError("Cannot relocate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot relocate a shape at an empty location") - - if self.location != loc: - old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore - - new_ax = gp_Ax3() - new_ax.Transform(loc.wrapped.Transformation()) - - trsf = gp_Trsf() - trsf.SetDisplacement(new_ax, old_ax) - builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - - self.wrapped = tcast(TOPODS, downcast(builder.Shape())) - self.wrapped.Location(loc.wrapped) - - def distance_to_with_closest_points( - self, other: Union[Shape, VectorLike] - ) -> tuple[float, Vector, Vector]: - """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot calculate distance to or from an empty shape") - - if isinstance(other, Shape): - topods_shape = tcast(TopoDS_Shape, other.wrapped) - else: - vec = Vector(other) - topods_shape = BRepBuilderAPI_MakeVertex( - gp_Pnt(vec.X, vec.Y, vec.Z) - ).Vertex() - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(topods_shape) - dist_calc.Perform() - return ( - dist_calc.Value(), - Vector(dist_calc.PointOnShape1(1)), - Vector(dist_calc.PointOnShape2(1)), - ) - - def distance_to(self, other: Union[Shape, VectorLike]) -> float: - """Minimal distance between two shapes""" - return self.distance_to_with_closest_points(other)[0] - - def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: - """Points on two shapes where the distance between them is minimal""" - return self.distance_to_with_closest_points(other)[1:3] - - def __hash__(self) -> int: - """Return has code""" - return self.hash_code() - - def _bool_op( - self, - args: Iterable[Shape], - tools: Iterable[Shape], - operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self | ShapeList[Self]: - """Generic boolean operation - - Args: - args: Iterable[Shape]: - tools: Iterable[Shape]: - operation: Union[BRepAlgoAPI_BooleanOperation: - BRepAlgoAPI_Splitter]: - - Returns: - - """ - args = list(args) - tools = list(tools) - # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} - highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] - - # The base of the operation - base = args[0] if isinstance(args, (list, tuple)) else args - - arg = TopTools_ListOfShape() - for obj in args: - if obj.wrapped is not None: - arg.Append(obj.wrapped) - - tool = TopTools_ListOfShape() - for obj in tools: - if obj.wrapped is not None: - tool.Append(obj.wrapped) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - topo_result = downcast(operation.Shape()) - - # Clean - if SkipClean.clean: - upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) - upgrader.AllowInternalEdges(False) - try: - upgrader.Build() - topo_result = downcast(upgrader.Shape()) - except Exception: - warnings.warn("Boolean operation unable to clean", stacklevel=2) - - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(topo_result, TopoDS_Compound): - topo_result = unwrap_topods_compound(topo_result, True) - - if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: - results = ShapeList( - highest_order[0].cast(s) - for s in get_top_level_topods_shapes(topo_result) - ) - for result in results: - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return results - - result = highest_order[0].cast(topo_result) - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - - return result - - def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: - """Remove the positional arguments from this Shape. - - Args: - *to_cut: Shape: - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - cut_op = BRepAlgoAPI_Cut() - - return self._bool_op((self,), to_cut, cut_op) - - def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float | None = None - ) -> Self | ShapeList[Self]: - """fuse - - Fuse a sequence of shapes into a single shape. - - Args: - to_fuse (sequence Shape): shapes to fuse - glue (bool, optional): performance improvement for some shapes. Defaults to False. - tol (float, optional): tolerance. Defaults to None. - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - return_value = self._bool_op((self,), to_fuse, fuse_op) - - return return_value - - def intersect( - self, *to_intersect: Union[Shape, Axis, Plane] - ) -> None | Self | ShapeList[Self]: - """Intersection of the arguments and this shape - - Args: - to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to - intersect with - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - def _to_vertex(vec: Vector) -> Vertex: - """Helper method to convert vector to shape""" - return self.__class__.cast( - downcast( - BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() - ) - ) - - def _to_edge(axis: Axis) -> Edge: - """Helper method to convert axis to shape""" - return self.__class__.cast( - BRepBuilderAPI_MakeEdge( - Geom_Line( - axis.position.to_pnt(), - axis.direction.to_dir(), - ) - ).Edge() - ) - - def _to_face(plane: Plane) -> Face: - """Helper method to convert plane to shape""" - return self.__class__.cast(BRepBuilderAPI_MakeFace(plane.wrapped).Face()) - - # Convert any geometry objects into their respective topology objects - objs = [] - for obj in to_intersect: - if isinstance(obj, Vector): - objs.append(_to_vertex(obj)) - elif isinstance(obj, Axis): - objs.append(_to_edge(obj)) - elif isinstance(obj, Plane): - objs.append(_to_face(obj)) - elif isinstance(obj, Location): - if obj.wrapped is None: - raise ValueError("Cannot intersect with an empty location") - objs.append(_to_vertex(tcast(Vector, obj.position))) - else: - objs.append(obj) - - # Find the shape intersections - intersect_op = BRepAlgoAPI_Common() - shape_intersections = self._bool_op((self,), objs, intersect_op) - if isinstance(shape_intersections, ShapeList) and not shape_intersections: - return None - if ( - not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null() - ): - return None - return shape_intersections - - @classmethod - @abstractmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge | Face | Shell | Solid | Compound: extruded shape - """ - - def _ocp_section( - self: Shape, other: Union[Vertex, Edge, Wire, Face] - ) -> tuple[list[Vertex], list[Edge]]: - """_ocp_section - - Create a BRepAlgoAPI_Section object - - The algorithm is to build a Section operation between arguments and tools. - The result of Section operation consists of vertices and edges. The result - of Section operation contains: - - new vertices that are subjects of V/V, E/E, E/F, F/F interferences - - vertices that are subjects of V/E, V/F interferences - - new edges that are subjects of F/F interferences - - edges that are Common Blocks - - - Args: - other (Union[Vertex, Edge, Wire, Face]): shape to section with - - Returns: - tuple[list[Vertex], list[Edge]]: section results - """ - if self.wrapped is None or other.wrapped is None: - return ([], []) - - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation - section.Build() - - # Get the resulting shapes from the intersection - intersection_shape = section.Shape() - - vertices = [] - # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) - while explorer.More(): - vertices.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - edges = [] - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - edges.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - - return (vertices, edges) - - def faces_intersected_by_axis( - self, - axis: Axis, - tol: float = 1e-4, - ) -> ShapeList[Face]: - """Line Intersection - - Computes the intersections between the provided axis and the faces of this Shape - - Args: - axis (Axis): Axis on which the intersection line rests - tol (float, optional): Intersection tolerance. Defaults to 1e-4. - - Returns: - list[Face]: A list of intersected faces sorted by distance from axis.position - """ - if self.wrapped is None: - return ShapeList() - - line = gce_MakeLin(axis.wrapped).Value() - - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, line, tol) - - faces_dist = [] # using a list instead of a dictionary to be able to sort it - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - - distance = axis.position.to_pnt().SquareDistance(inter_pt) - - faces_dist.append( - ( - intersect_maker.Face(), - abs(distance), - ) - ) # will sort all intersected faces by distance whatever the direction is - - intersect_maker.Next() - - faces_dist.sort(key=lambda x: x[1]) - faces = [face[0] for face in faces_dist] - - return ShapeList([self.__class__.cast(face) for face in faces]) - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside or outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] - ) -> tuple[ - Face | Shell | ShapeList[Face] | None, - Face | Shell | ShapeList[Face] | None, - ]: - """split_by_perimeter and keep inside and outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside (default)""" - - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE - ): - """split_by_perimeter - - Divide the faces of this object into those within the perimeter - and those outside the perimeter. - - Note: this method may fail if the perimeter intersects shape edges. - - Args: - perimeter (Union[Edge,Wire]): closed perimeter - keep (Keep, optional): which object(s) to return. Defaults to Keep.INSIDE. - - Raises: - ValueError: perimeter must be closed - ValueError: keep must be one of Keep.INSIDE|OUTSIDE|BOTH - - Returns: - Union[Face | Shell | ShapeList[Face] | None, - Tuple[Face | Shell | ShapeList[Face] | None]: The result of the split operation. - - - **Keep.INSIDE**: Returns the inside part as a `Shell` or `Face`, or `None` - if no inside part is found. - - **Keep.OUTSIDE**: Returns the outside part as a `Shell` or `Face`, or `None` - if no outside part is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Shell`, `Face`, or `None` if no corresponding part is found. - - """ - - def get(los: TopTools_ListOfShape) -> list: - """Return objects from TopTools_ListOfShape as list""" - shapes = [] - for _ in range(los.Size()): - first = los.First() - if not first.IsNull(): - shapes.append(self.__class__.cast(first)) - los.RemoveFirst() - return shapes - - def process_sides(sides): - """Process sides to determine if it should be None, a single element, - a Shell, or a ShapeList.""" - # if not sides: - # return None - if len(sides) == 1: - return sides[0] - # Attempt to create a shell - potential_shell = _sew_topods_faces([s.wrapped for s in sides]) - if isinstance(potential_shell, TopoDS_Shell): - return self.__class__.cast(potential_shell) - return ShapeList(sides) - - if keep not in {Keep.INSIDE, Keep.OUTSIDE, Keep.BOTH}: - raise ValueError( - "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" - ) - - if self.wrapped is None: - raise ValueError("Cannot split an empty shape") - - # Process the perimeter - if not perimeter.is_closed: - raise ValueError("perimeter must be a closed Wire or Edge") - perimeter_edges = TopTools_SequenceOfShape() - for perimeter_edge in perimeter.edges(): - perimeter_edges.Append(perimeter_edge.wrapped) - - # Split the shells by the perimeter edges - lefts: list[Shell] = [] - rights: list[Shell] = [] - for target_shell in self.shells(): - constructor = BRepFeat_SplitShape(target_shell.wrapped) - constructor.Add(perimeter_edges) - constructor.Build() - lefts.extend(get(constructor.Left())) - rights.extend(get(constructor.Right())) - - left = process_sides(lefts) - right = process_sides(rights) - - # Is left or right the inside? - perimeter_length = perimeter.length - left_perimeter_length = sum(e.length for e in left.edges()) if left else 0 - right_perimeter_length = sum(e.length for e in right.edges()) if right else 0 - left_inside = abs(perimeter_length - left_perimeter_length) < abs( - perimeter_length - right_perimeter_length - ) - if keep == Keep.BOTH: - return (left, right) if left_inside else (right, left) - if keep == Keep.INSIDE: - return left if left_inside else right - # keep == Keep.OUTSIDE: - return right if left_inside else left - - def distance(self, other: Shape) -> float: - """Minimal distance between two shapes - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() - - def distances(self, *others: Shape) -> Iterator[float]: - """Minimal distances to between self and other shapes - - Args: - *others: Shape: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - for other_shape in others: - if other_shape.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - dist_calc.LoadS2(other_shape.wrapped) - dist_calc.Perform() - - yield dist_calc.Value() - - def mesh(self, tolerance: float, angular_tolerance: float = 0.1): - """Generate triangulation if none exists. - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot mesh an empty shape") - - if not BRepTools.Triangulation_s(self.wrapped, tolerance): - BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - - def tessellate( - self, tolerance: float, angular_tolerance: float = 0.1 - ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: - """General triangulated approximation""" - if self.wrapped is None: - raise ValueError("Cannot tessellate an empty shape") - - self.mesh(tolerance, angular_tolerance) - - vertices: list[Vector] = [] - triangles: list[Tuple[int, int, int]] = [] - offset = 0 - - for face in self.faces(): - assert face.wrapped is not None - loc = TopLoc_Location() - poly = BRep_Tool.Triangulation_s(face.wrapped, loc) - trsf = loc.Transformation() - reverse = face.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED - - # add vertices - vertices += [ - Vector(v.X(), v.Y(), v.Z()) - for v in ( - poly.Node(i).Transformed(trsf) for i in range(1, poly.NbNodes() + 1) - ) - ] - # add triangles - triangles += [ - ( - ( - t.Value(1) + offset - 1, - t.Value(3) + offset - 1, - t.Value(2) + offset - 1, - ) - if reverse - else ( - t.Value(1) + offset - 1, - t.Value(2) + offset - 1, - t.Value(3) + offset - 1, - ) - ) - for t in poly.Triangles() - ] - - offset += poly.NbNodes() - - return vertices, triangles - - def to_splines( - self, degree: int = 3, tolerance: float = 1e-3, nurbs: bool = False - ) -> Self: - """to_splines - - Approximate shape with b-splines of the specified degree. - - Args: - degree (int, optional): Maximum degree. Defaults to 3. - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - nurbs (bool, optional): Use rational splines. Defaults to False. - - Returns: - Self: Approximated shape - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - params = ShapeCustom_RestrictionParameters() - - result = ShapeCustom.BSplineRestriction_s( - self.wrapped, - tolerance, # 3D tolerance - tolerance, # 2D tolerance - degree, - 1, # dummy value, degree is leading - ga.GeomAbs_C0, - ga.GeomAbs_C0, - True, # set degree to be leading - not nurbs, - params, - ) - - return self.__class__.cast(result) - - def to_vtk_poly_data( - self, - tolerance: float | None = None, - angular_tolerance: float | None = None, - normals: bool = False, - ) -> vtkPolyData: - """Convert shape to vtkPolyData - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - normals: bool: (Default value = True) - - Returns: data object in VTK consisting of points, vertices, lines, and polygons - """ - if self.wrapped is None: - raise ValueError("Cannot convert an empty shape") - - vtk_shape = IVtkOCC_Shape(self.wrapped) - shape_data = IVtkVTK_ShapeData() - shape_mesher = IVtkOCC_ShapeMesher() - - drawer = vtk_shape.Attributes() - drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - - if tolerance: - drawer.SetDeviationCoefficient(tolerance) - - if angular_tolerance: - drawer.SetDeviationAngle(angular_tolerance) - - shape_mesher.Build(vtk_shape, shape_data) - - vtk_poly_data = shape_data.getVtkPolyData() - - # convert to triangles and split edges - t_filter = vtkTriangleFilter() - t_filter.SetInputData(vtk_poly_data) - t_filter.Update() - - return_value = t_filter.GetOutput() - - # compute normals - if normals: - n_filter = vtkPolyDataNormals() - n_filter.SetComputePointNormals(True) - n_filter.SetComputeCellNormals(True) - n_filter.SetFeatureAngle(360) - n_filter.SetInputData(return_value) - n_filter.Update() - - return_value = n_filter.GetOutput() - - return return_value - - def _repr_javascript_(self): - """Jupyter 3D representation support""" - - from build123d.jupyter_tools import display - - return display(self)._repr_javascript_() - - def transformed( - self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) - ) -> Self: - """Transform Shape - - Rotate and translate the Shape by the three angles (in degrees) and offset. - - Args: - rotate (VectorLike, optional): 3-tuple of angles to rotate, in degrees. - Defaults to (0, 0, 0). - offset (VectorLike, optional): 3-tuple to offset. Defaults to (0, 0, 0). - - Returns: - Shape: transformed object - - """ - # Convert to a Vector of radians - rotate_vector = Vector(rotate).multiply(DEG2RAD) - # Compute rotation matrix. - t_rx = gp_Trsf() - t_rx.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), rotate_vector.X) - t_ry = gp_Trsf() - t_ry.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), rotate_vector.Y) - t_rz = gp_Trsf() - t_rz.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), rotate_vector.Z) - t_o = gp_Trsf() - t_o.SetTranslation(Vector(offset).wrapped) - return self._apply_transform(t_o * t_rx * t_ry * t_rz) - - def project_faces( - self, - faces: Union[list[Face], Compound], - path: Union[Wire, Edge], - start: float = 0, - ) -> ShapeList[Face]: - """Projected Faces following the given path on Shape - - Project by positioning each face of to the shape along the path and - projecting onto the surface. - - Note that projection may result in distortion depending on - the shape at a position along the path. - - .. image:: projectText.png - - Args: - faces (Union[list[Face], Compound]): faces to project - path: Path on the Shape to follow - start: Relative location on path to start the faces. Defaults to 0. - - Returns: - The projected faces - - """ - # pylint: disable=too-many-locals - path_length = path.length - # The derived classes of Shape implement center - shape_center = self.center() # pylint: disable=no-member - - if ( - not isinstance(faces, (list, tuple)) - and faces.wrapped is not None - and isinstance(faces.wrapped, TopoDS_Compound) - ): - faces = faces.faces() - - first_face_min_x = faces[0].bounding_box().min.X - - logger.debug("projecting %d face(s)", len(faces)) - - # Position each face normal to the surface along the path and project to the surface - projected_faces = [] - for face in faces: - bbox = face.bounding_box() - face_center_x = (bbox.min.X + bbox.max.X) / 2 - relative_position_on_wire = ( - start + (face_center_x - first_face_min_x) / path_length - ) - path_position = path.position_at(relative_position_on_wire) - path_tangent = path.tangent_at(relative_position_on_wire) - projection_axis = Axis(path_position, shape_center - path_position) - (surface_point, surface_normal) = self.find_intersection_points( - projection_axis - )[0] - surface_normal_plane = Plane( - origin=surface_point, x_dir=path_tangent, z_dir=surface_normal - ) - projection_face: Face = surface_normal_plane.from_local_coords( - face.moved(Location((-face_center_x, 0, 0))) - ) - - logger.debug("projecting face at %0.2f", relative_position_on_wire) - projected_faces.append( - projection_face.project_to_shape(self, surface_normal * -1)[0] - ) - - logger.debug("finished projecting '%d' faces", len(faces)) - - return ShapeList(projected_faces) - - -class Comparable(ABC): - """Abstract base class that requires comparison methods""" - - @abstractmethod - def __lt__(self, other: Any) -> bool: ... - - @abstractmethod - def __eq__(self, other: Any) -> bool: ... - - -# This TypeVar allows IDEs to see the type of objects within the ShapeList -T = TypeVar("T", bound=Union[Shape, Vector]) -K = TypeVar("K", bound=Comparable) - - -class ShapePredicate(Protocol): - """Predicate for shape filters""" - - def __call__(self, shape: Shape) -> bool: ... - - -class ShapeList(list[T]): - """Subclass of list with custom filter and sort methods appropriate to CAD""" - - # pylint: disable=too-many-public-methods - - @property - def first(self) -> T: - """First element in the ShapeList""" - return self[0] - - @property - def last(self) -> T: - """Last element in the ShapeList""" - return self[-1] - - def center(self) -> Vector: - """The average of the center of objects within the ShapeList""" - if not self: - return Vector(0, 0, 0) - - total_center = sum((o.center() for o in self), Vector(0, 0, 0)) - return total_center / len(self) - - def filter_by( - self, - filter_by: Union[ShapePredicate, Axis, Plane, GeomType], - reverse: bool = False, - tolerance: float = 1e-5, - ) -> ShapeList[T]: - """filter by Axis, Plane, or GeomType - - Either: - - filter objects of type planar Face or linear Edge by their normal or tangent - (respectively) and sort the results by the given axis, or - - filter the objects by the provided type. Note that not all types apply to all - objects. - - Args: - filter_by (Union[Axis,Plane,GeomType]): axis, plane, or geom type to filter - and possibly sort by. Filtering by a plane returns faces/edges parallel - to that plane. - reverse (bool, optional): invert the geom type filter. Defaults to False. - tolerance (float, optional): maximum deviation from axis. Defaults to 1e-5. - - Raises: - ValueError: Invalid filter_by type - - Returns: - ShapeList: filtered list of objects - """ - - # could be moved out maybe? - def axis_parallel_predicate(axis: Axis, tolerance: float): - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt = gp_Pnt() - surface_normal = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector( - surface_normal.X(), surface_normal.Y(), surface_normal.Z() - ).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - elif ( - isinstance(shape.wrapped, TopoDS_Edge) - and shape.geom_type == GeomType.LINE - ): - curve = shape.geom_adaptor() - umin = curve.FirstParameter() - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(umin, tmp, res) - start_pos = Vector(tmp) - start_dir = Vector(gp_Dir(res)) - shape_axis = Axis(start_pos, start_dir) - else: - return False - return axis.is_parallel(shape_axis, tolerance) - - return pred - - def plane_parallel_predicate(plane: Plane, tolerance: float): - plane_axis = Axis(plane.origin, plane.z_dir) - plane_xyz = plane.z_dir.wrapped.XYZ() - - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt: gp_Pnt = gp_Pnt() - surface_normal: gp_Vec = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector(surface_normal).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - return plane_axis.is_parallel(shape_axis, tolerance) - if isinstance(shape.wrapped, TopoDS_Wire): - return all(pred(e) for e in shape.edges()) - if isinstance(shape.wrapped, TopoDS_Edge): - for curve in shape.wrapped.TShape().Curves(): - if curve.IsCurve3D(): - return ShapeAnalysis_Curve.IsPlanar_s( - curve.Curve3D(), plane_xyz, tolerance - ) - return False - return False - - return pred - - # convert input to callable predicate - if callable(filter_by): - predicate = filter_by - elif isinstance(filter_by, Axis): - predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, Plane): - predicate = plane_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, GeomType): - - def predicate(obj): - return obj.geom_type == filter_by - - else: - raise ValueError(f"Unsupported filter_by predicate: {filter_by}") - - # final predicate is negated if `reverse=True` - if reverse: - - def actual_predicate(shape): - return not predicate(shape) - - else: - actual_predicate = predicate - - return ShapeList(filter(actual_predicate, self)) - - def filter_by_position( - self, - axis: Axis, - minimum: float, - maximum: float, - inclusive: tuple[bool, bool] = (True, True), - ) -> ShapeList[T]: - """filter by position - - Filter and sort objects by the position of their centers along given axis. - min and max values can be inclusive or exclusive depending on the inclusive tuple. - - Args: - axis (Axis): axis to sort by - minimum (float): minimum value - maximum (float): maximum value - inclusive (tuple[bool, bool], optional): include min,max values. - Defaults to (True, True). - - Returns: - ShapeList: filtered object list - """ - if inclusive == (True, True): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (True, False): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - elif inclusive == (False, True): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (False, False): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - - return ShapeList(objects).sort_by(axis) - - def group_by( - self, - group_by: Union[Callable[[Shape], K], Axis, Edge, Wire, SortBy] = Axis.Z, - reverse=False, - tol_digits=6, - ) -> GroupBy[T, K]: - """group by - - Group objects by provided criteria and then sort the groups according to the criteria. - Note that not all group_by criteria apply to all objects. - - Args: - group_by (SortBy, optional): group and sort criteria. Defaults to Axis.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - tol_digits (int, optional): Tolerance for building the group keys by - round(key, tol_digits) - - Returns: - GroupBy[K, ShapeList]: sorted list of ShapeLists - """ - - if isinstance(group_by, Axis): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty axis") - assert group_by.location is not None - axis_as_location = group_by.location.inverse() - - def key_f(obj): - return round( - (axis_as_location * Location(obj.center())).position.Z, - tol_digits, - ) - - elif hasattr(group_by, "wrapped"): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty object") - - if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) - - elif isinstance(group_by, SortBy): - if group_by == SortBy.LENGTH: - - def key_f(obj): - return round(obj.length, tol_digits) - - elif group_by == SortBy.RADIUS: - - def key_f(obj): - return round(obj.radius, tol_digits) - - elif group_by == SortBy.DISTANCE: - - def key_f(obj): - return round(obj.center().length, tol_digits) - - elif group_by == SortBy.AREA: - - def key_f(obj): - return round(obj.area, tol_digits) - - elif group_by == SortBy.VOLUME: - - def key_f(obj): - return round(obj.volume, tol_digits) - - elif callable(group_by): - key_f = group_by - - else: - raise ValueError(f"Unsupported group_by function: {group_by}") - - return GroupBy(key_f, self, reverse=reverse) - - def sort_by( - self, sort_by: Union[Axis, Edge, Wire, SortBy] = Axis.Z, reverse: bool = False - ) -> ShapeList[T]: - """sort by - - Sort objects by provided criteria. Note that not all sort_by criteria apply to all - objects. - - Args: - sort_by (SortBy, optional): sort criteria. Defaults to SortBy.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: sorted list of objects - """ - - if isinstance(sort_by, Axis): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty axis") - assert sort_by.location is not None - axis_as_location = sort_by.location.inverse() - objects = sorted( - self, - key=lambda o: (axis_as_location * Location(o.center())).position.Z, - reverse=reverse, - ) - elif hasattr(sort_by, "wrapped"): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty object") - - if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) - - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) - - elif isinstance(sort_by, SortBy): - if sort_by == SortBy.LENGTH: - objects = sorted( - self, - key=lambda obj: obj.length, - reverse=reverse, - ) - elif sort_by == SortBy.RADIUS: - with_radius = [obj for obj in self if hasattr(obj, "radius")] - objects = sorted( - with_radius, - key=lambda obj: obj.radius, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.DISTANCE: - objects = sorted( - self, - key=lambda obj: obj.center().length, - reverse=reverse, - ) - elif sort_by == SortBy.AREA: - with_area = [obj for obj in self if hasattr(obj, "area")] - objects = sorted( - with_area, - key=lambda obj: obj.area, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.VOLUME: - with_volume = [obj for obj in self if hasattr(obj, "volume")] - objects = sorted( - with_volume, - key=lambda obj: obj.volume, # type: ignore - reverse=reverse, - ) - - return ShapeList(objects) - - def sort_by_distance( - self, other: Union[Shape, VectorLike], reverse: bool = False - ) -> ShapeList[T]: - """Sort by distance - - Sort by minimal distance between objects and other - - Args: - other (Union[Shape,VectorLike]): reference object - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: Sorted shapes - """ - distances = sorted( - [(obj.distance_to(other), obj) for obj in self], # type: ignore - key=lambda obj: obj[0], - reverse=reverse, - ) - return ShapeList([obj[1] for obj in distances]) - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore - - def vertex(self) -> Vertex: - """Return the Vertex""" - vertices = self.vertices() - vertex_count = len(vertices) - if vertex_count != 1: - warnings.warn( - f"Found {vertex_count} vertices, returning first", stacklevel=2 - ) - return vertices[0] - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore - - def edge(self) -> Edge: - """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) - return edges[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore - - def wire(self) -> Wire: - """Return the Wire""" - wires = self.wires() - wire_count = len(wires) - if wire_count != 1: - warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) - return wires[0] - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) - return solids[0] - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore - - def compound(self) -> Compound: - """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: - warnings.warn( - f"Found {compound_count} compounds, returning first", stacklevel=2 - ) - return compounds[0] - - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Sort operator >""" - return self.sort_by(sort_by) - - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Reverse sort operator <""" - return self.sort_by(sort_by, reverse=True) - - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select largest group operator >>""" - return self.group_by(group_by)[-1] - - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select smallest group operator <<""" - return self.group_by(group_by)[0] - - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: - """Filter by axis or geomtype operator |""" - return self.filter_by(filter_by) - - def __eq__(self, other: object) -> bool: - """ShapeLists equality operator ==""" - return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore - ) - - # Normally implementing __eq__ is enough, but ShapeList subclasses list, - # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList) -> bool: # type: ignore - """ShapeLists inequality operator !=""" - return ( - set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented - ) - - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) - - def __sub__(self, other: ShapeList) -> ShapeList[T]: - """Differences between two ShapeLists operator -""" - return ShapeList(set(self) - set(other)) - - def __and__(self, other: ShapeList) -> ShapeList[T]: - """Intersect two ShapeLists operator &""" - return ShapeList(set(self) & set(other)) - - @overload - def __getitem__(self, key: SupportsIndex) -> T: ... - - @overload - def __getitem__(self, key: slice) -> ShapeList[T]: ... - - def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: - """Return slices of ShapeList as ShapeList""" - if isinstance(key, slice): - return ShapeList(list(self).__getitem__(key)) - return list(self).__getitem__(key) - - -class GroupBy(Generic[T, K]): - """Result of a Shape.groupby operation. Groups can be accessed by index or key""" - - def __init__( - self, - key_f: Callable[[T], K], - shapelist: Iterable[T], - *, - reverse: bool = False, - ): - # can't be a dict because K may not be hashable - self.key_to_group_index: list[tuple[K, int]] = [] - self.groups: list[ShapeList[T]] = [] - self.key_f = key_f - - for i, (key, shapegroup) in enumerate( - itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) - ): - self.groups.append(ShapeList(shapegroup)) - self.key_to_group_index.append((key, i)) - - def __iter__(self): - return iter(self.groups) - - def __len__(self): - return len(self.groups) - - def __getitem__(self, key: int): - return self.groups[key] - - def __str__(self): - return pretty(self) - - def __repr__(self): - return repr(ShapeList(self)) - - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: - """ - Render a formatted representation of the object for pretty-printing in - interactive environments. - - Args: - printer (PrettyPrinter): The pretty printer instance handling the output. - cycle (bool): Indicates if a reference cycle is detected to - prevent infinite recursion. - """ - if cycle: - printer.text("(...)") - else: - with printer.group(1, "[", "]"): - for idx, item in enumerate(self): - if idx: - printer.text(",") - printer.breakable() - printer.pretty(item) - - def group(self, key: K): - """Select group by key""" - for k, i in self.key_to_group_index: - if key == k: - return self.groups[i] - raise KeyError(key) - - def group_for(self, shape: T): - """Select group by shape""" - return self.group(self.key_f(shape)) - - -class Mixin1D(Shape): - """Methods to add to the Edge and Wire classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Edges and Wires""" - return 1 - - def __add__( - self, other: None | Shape | Iterable[Shape] - ) -> Edge | Wire | ShapeList[Edge]: - """fuse shape to wire/edge operator +""" - - # Convert `other` to list of base topods objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] - # If there is nothing to add return the original object - if not summands: - return self - - if not all(topods_dim(summand) == 1 for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] - summand_edges = [e for summand in summands for e in summand.edges()] - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - try: - sum_shape = Wire(summand_edges) - except Exception: - sum_shape = summands[0].fuse(*summands[1:]) - if type(self).order == 4: - sum_shape = type(self)(sum_shape) - else: - try: - sum_shape = Wire(self.edges() + ShapeList(summand_edges)) - except Exception: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape - - return sum_shape - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" - - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of object - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - middle = self.position_at(0.5) - elif center_of == CenterOf.MASS: - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: - """common_plane - - Find the plane containing all the edges/wires (including self). If there - is no common plane return None. If the edges are coaxial, select one - of the infinite number of valid planes. - - Args: - lines (sequence of Union[Edge,Wire]): edges in common with self - - Returns: - Union[None, Plane]: Either the common plane or None - """ - # pylint: disable=too-many-locals - # Note: BRepLib_FindSurface is not helpful as it requires the - # Edges to form a surface perimeter. - points: list[Vector] = [] - all_lines: list[Edge | Wire] = [ - line for line in [self, *lines] if line is not None - ] - if any(not isinstance(line, (Edge, Wire)) for line in all_lines): - raise ValueError("Only Edges or Wires are valid") - - result = None - # Are they all co-axial - if so, select one of the infinite planes - all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all(e.geom_type == GeomType.LINE for e in all_edges): - as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): - origin = as_axis[0].position - x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir - c_plane = Plane(origin, z_dir=z_dir) - result = c_plane.shift_origin((0, 0)) - - if result is None: # not coaxial - # Shorten any infinite lines (from converted Axis) - normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) - infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] - all_lines = normal_lines + shortened_lines - - for line in all_lines: - num_points = 2 if line.geom_type == GeomType.LINE else 8 - points.extend( - [line.position_at(i / (num_points - 1)) for i in range(num_points)] - ) - points = list(set(points)) # unique points - extreme_areas = {} - for subset in combinations(points, 3): - vector1 = subset[1] - subset[0] - vector2 = subset[2] - subset[0] - area = 0.5 * (vector1.cross(vector2).length) - extreme_areas[area] = subset - # The points that create the largest area make the most accurate plane - extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] - - # Create a plane from these points - x_dir = (extremes[1] - extremes[0]).normalized() - z_dir = (extremes[2] - extremes[0]).cross(x_dir) - try: - c_plane = Plane( - origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir - ) - c_plane = c_plane.shift_origin((0, 0)) - except ValueError: - # There is no valid common plane - result = None - else: - # Are all of the points on the common plane - common = all(c_plane.contains(p) for p in points) - result = c_plane if common else None - - return result - - @property - def length(self) -> float: - """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) - - @property - def radius(self) -> float: - """Calculate the radius. - - Note that when applied to a Wire, the radius is simply the radius of the first edge. - - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] - - def location_at( - self, - distance: float, - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> Location: - """Locations along curve - - Generate a location along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - Location: A Location object representing local coordinate system - at the specified distance. - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - law: GeomFill_TrihedronLaw - if frame_method == FrameMethod.FRENET: - law = GeomFill_Frenet() - else: - law = GeomFill_CorrectedFrenet() - - law.SetCurve(curve) - - tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() - - law.D0(param, tangent, normal, binormal) - pnt = curve.Value(param) - - transformation = gp_Trsf() - if planar: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() - ) - else: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() - ) - - return Location(TopLoc_Location(transformation)) - - def locations( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> list[Location]: - """Locations along curve - - Generate location along the curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - list[Location]: A list of Location objects representing local coordinate - systems at the specified distances. - """ - return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances - ] - - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) - - def offset_2d( - self, - distance: float, - kind: Kind = Kind.ARC, - side: Side = Side.BOTH, - closed: bool = True, - ) -> Union[Edge, Wire]: - """2d Offset - - Offsets a planar edge/wire - - Args: - distance (float): distance from edge/wire to offset - kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. - side (Side, optional): side to place offset. Defaults to Side.BOTH. - closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT - offset. Defaults to True. - Raises: - RuntimeError: Multiple Wires generated - RuntimeError: Unexpected result type - - Returns: - Wire: offset wire - """ - # pylint: disable=too-many-branches, too-many-locals, too-many-statements - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - line = self if isinstance(self, Wire) else Wire([self]) - - # Avoiding a bug when the wire contains a single Edge - if len(line.edges()) == 1: - edge = line.edges()[0] - edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] - topods_wire = Wire(edges).wrapped - else: - topods_wire = line.wrapped - - offset_builder = BRepOffsetAPI_MakeOffset() - offset_builder.Init(kind_dict[kind]) - # offset_builder.SetApprox(True) - offset_builder.AddWire(topods_wire) - offset_builder.Perform(distance) - - obj = downcast(offset_builder.Shape()) - if isinstance(obj, TopoDS_Compound): - obj = unwrap_topods_compound(obj, fully=True) - if isinstance(obj, TopoDS_Wire): - offset_wire = Wire(obj) - else: # Likely multiple Wires were generated - raise RuntimeError("Unexpected result type") - - if side != Side.BOTH: - # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] - centers = [w.position_at(0.5) for w in wires] - angles = [ - line.tangent_at(0).get_signed_angle(c - line.position_at(0)) - for c in centers - ] - if side == Side.LEFT: - offset_wire = wires[int(angles[0] > angles[1])] - else: - offset_wire = wires[int(angles[0] <= angles[1])] - - if closed: - self0 = line.position_at(0) - self1 = line.position_at(1) - end0 = offset_wire.position_at(0) - end1 = offset_wire.position_at(1) - if (self0 - end0).length - abs(distance) <= TOLERANCE: - edge0 = Edge.make_line(self0, end0) - edge1 = Edge.make_line(self1, end1) - else: - edge0 = Edge.make_line(self0, end1) - edge1 = Edge.make_line(self1, end0) - offset_wire = Wire( - line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) - ) - - offset_edges = offset_wire.edges() - return offset_edges[0] if len(offset_edges) == 1 else offset_wire - - def perpendicular_line( - self, length: float, u_value: float, plane: Plane = Plane.XY - ) -> Edge: - """perpendicular_line - - Create a line on the given plane perpendicular to and centered on beginning of self - - Args: - length (float): line length - u_value (float): position along line between 0.0 and 1.0 - plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. - - Returns: - Edge: perpendicular line - """ - start = self.position_at(u_value) - local_plane = Plane( - origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir - ) - line = Edge.make_line( - start + local_plane.y_dir * length / 2, - start - local_plane.y_dir * length / 2, - ) - return line - - def project( - self, face: Face, direction: VectorLike, closest: bool = True - ) -> Edge | Wire | ShapeList[Edge | Wire]: - """Project onto a face along the specified direction - - Args: - face: Face: - direction: VectorLike: - closest: bool: (Default value = True) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") - - bldr = BRepProj_Projection( - self.wrapped, face.wrapped, Vector(direction).to_dir() - ) - shapes: TopoDS_Compound = bldr.Shape() - - # select the closest projection if requested - return_value: Edge | Wire | ShapeList[Edge | Wire] - - if closest: - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - min_dist = inf - - # for shape in shapes: - for shape in get_top_level_topods_shapes(shapes): - dist_calc.LoadS2(shape) - dist_calc.Perform() - dist = dist_calc.Value() - - if dist < min_dist: - min_dist = dist - return_value = Mixin1D.cast(shape) - - else: - return_value = ShapeList( - Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) - ) - - return return_value - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike | None = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - visible_edges = ShapeList(Edge(e) for e in visible_edges) - hidden_edges = ShapeList(Edge(e) for e in hidden_edges) - - return (visible_edges, hidden_edges) - - -class Mixin2D(Shape): - """Additional methods to add to Face and Shell class""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Faces and Shells""" - return 2 +class Mixin3D(Shape): + """Additional methods to add to 3D Shape classes""" project_to_viewport = Mixin1D.project_to_viewport split = Mixin1D.split - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) + find_intersection_points = Mixin2D.find_intersection_points vertices = Mixin1D.vertices vertex = Mixin1D.vertex edges = Mixin1D.edges edge = Mixin1D.edge wires = Mixin1D.wires - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") - - def __neg__(self) -> Self: - """Reverse normal operator -""" - if self.wrapped is None: - raise ValueError("Invalid Shape") - new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) - - return new_surface - - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - - def find_intersection_points( - self, other: Axis, tolerance: float = TOLERANCE - ) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape - - Args: - axis (Axis): axis defining the intersection line - - Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection - """ - if self.wrapped is None: - return [] - - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, tolerance) - - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) - ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - - -class Mixin3D(Shape): - """Additional methods to add to 3D Shape classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented + wire = Mixin1D.wire + faces = Mixin2D.faces + face = Mixin2D.face + shells = Mixin2D.shells + shell = Mixin2D.shell + # ---- Properties ---- @property def _dim(self) -> int | None: """Dimension of Solids""" return 3 - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points + # ---- Class Methods ---- @classmethod def cast(cls, obj: TopoDS_Shape) -> Self: @@ -3986,24 +159,161 @@ class Mixin3D(Shape): # NB downcast is needed to handle TopoDS_Shape types return constructor_lut[shape_type](downcast(obj)) - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell + @classmethod + def extrude( + cls, obj: Shape, direction: VectorLike + ) -> Edge | Face | Shell | Solid | Compound: + """Unused - only here because Mixin1D is a subclass of Shape""" + return NotImplemented - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") + # ---- Instance Methods ---- - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") + def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: + """Return center of object + + Find center of object + + Args: + center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. + + Raises: + ValueError: Center of GEOMETRY is not supported for this object + NotImplementedError: Unable to calculate center of mass of this object + + Returns: + Vector: center + """ + if center_of == CenterOf.GEOMETRY: + raise ValueError("Center of GEOMETRY is not supported for this object") + if center_of == CenterOf.MASS: + properties = GProp_GProps() + calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] + calc_function(self.wrapped, properties) + middle = Vector(properties.CentreOfMass()) + elif center_of == CenterOf.BOUNDING_BOX: + middle = self.bounding_box().center() + return middle + + def chamfer( + self, + length: float, + length2: float | None, + edge_list: Iterable[Edge], + face: Face | None = None, + ) -> Self: + """Chamfer + + Chamfers the specified edges of this solid. + + Args: + length (float): length > 0, the length (length) of the chamfer + length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical + chamfer. Should be `None` if not required. + edge_list (Iterable[Edge]): a list of Edge objects, which must belong to + this solid + face (Face, optional): identifies the side where length is measured. The edge(s) + must be part of the face + + Returns: + Self: Chamfered solid + """ + edge_list = list(edge_list) + if face: + if any((edge for edge in edge_list if edge not in face.edges())): + raise ValueError("Some edges are not part of the face") + + native_edges = [e.wrapped for e in edge_list] + + # make a edge --> faces mapping + edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() + TopExp.MapShapesAndAncestors_s( + self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map + ) + + # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API + chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) + + if length2: + distance1 = length + distance2 = length2 + else: + distance1 = length + distance2 = length + + for native_edge in native_edges: + if face: + topo_face = face.wrapped + else: + topo_face = edge_face_map.FindFromKey(native_edge).First() + + chamfer_builder.Add( + distance1, distance2, native_edge, TopoDS.Face_s(topo_face) + ) # NB: edge_face_map return a generic TopoDS_Shape + + try: + new_shape = self.__class__(chamfer_builder.Shape()) + if not new_shape.is_valid(): + raise Standard_Failure + except (StdFail_NotDone, Standard_Failure) as err: + raise ValueError( + "Failed creating a chamfer, try a smaller length value(s)" + ) from err + + return new_shape + + def dprism( + self, + basis: Face | None, + bounds: list[Union[Face, Wire]], + depth: float | None = None, + taper: float = 0, + up_to_face: Face | None = None, + thru_all: bool = True, + additive: bool = True, + ) -> Solid: + """dprism + + Make a prismatic feature (additive or subtractive) + + Args: + basis (Optional[Face]): face to perform the operation on + bounds (list[Union[Face,Wire]]): list of profiles + depth (float, optional): depth of the cut or extrusion. Defaults to None. + taper (float, optional): in degrees. Defaults to 0. + up_to_face (Face, optional): a face to extrude until. Defaults to None. + thru_all (bool, optional): cut thru_all. Defaults to True. + additive (bool, optional): Defaults to True. + + Returns: + Solid: prismatic feature + """ + if isinstance(bounds[0], Wire): + sorted_profiles = sort_wires_by_build_order(bounds) + faces = [Face(p[0], p[1:]) for p in sorted_profiles] + else: + faces = bounds + + shape: TopoDS_Shape | TopoDS_Solid = self.wrapped + for face in faces: + feat = BRepFeat_MakeDPrism( + shape, + face.wrapped, + basis.wrapped if basis else TopoDS_Face(), + taper * DEG2RAD, + additive, + False, + ) + + if up_to_face is not None: + feat.Perform(up_to_face.wrapped) + elif thru_all or depth is None: + feat.PerformThruAll() + else: + feat.Perform(depth) + + shape = feat.Shape() + + return self.__class__(shape) def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: """Fillet @@ -4036,6 +346,92 @@ class Mixin3D(Shape): return new_shape + def hollow( + self, + faces: Iterable[Face] | None, + thickness: float, + tolerance: float = 0.0001, + kind: Kind = Kind.ARC, + ) -> Solid: + """Hollow + + Return the outer shelled solid of self. + + Args: + faces (Optional[Iterable[Face]]): faces to be removed, + which must be part of the solid. Can be an empty list. + thickness (float): shell thickness - positive shells outwards, negative + shells inwards. + tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. + kind (Kind, optional): intersection type. Defaults to Kind.ARC. + + Raises: + ValueError: Kind.TANGENT not supported + + Returns: + Solid: A hollow solid. + """ + faces = list(faces) if faces else [] + if kind == Kind.TANGENT: + raise ValueError("Kind.TANGENT not supported") + + kind_dict = { + Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, + Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, + } + + occ_faces_list = TopTools_ListOfShape() + for face in faces: + occ_faces_list.Append(face.wrapped) + + shell_builder = BRepOffsetAPI_MakeThickSolid() + shell_builder.MakeThickSolidByJoin( + self.wrapped, + occ_faces_list, + thickness, + tolerance, + Intersection=True, + Join=kind_dict[kind], + ) + shell_builder.Build() + + if faces: + return_value = self.__class__.cast(shell_builder.Shape()) + + else: # if no faces provided a watertight solid will be constructed + shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped + shell2 = self.shells()[0].wrapped + + # s1 can be outer or inner shell depending on the thickness sign + if thickness > 0: + sol = BRepBuilderAPI_MakeSolid(shell1, shell2) + else: + sol = BRepBuilderAPI_MakeSolid(shell2, shell1) + + # fix needed for the orientations + return_value = self.__class__.cast(sol.Shape()).fix() + + return return_value + + def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: + """Returns whether or not the point is inside a solid or compound + object within the specified tolerance. + + Args: + point: tuple or Vector representing 3D point to be tested + tolerance: tolerance for inside determination, default=1.0e-6 + point: VectorLike: + tolerance: float: (Default value = 1.0e-6) + + Returns: + bool indicating whether or not point is within solid + + """ + solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) + solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) + + return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() + def max_fillet( self, edge_list: Iterable[Edge], @@ -4112,169 +508,9 @@ class Mixin3D(Shape): return max_radius - def chamfer( - self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face | None = None, - ) -> Self: - """Chamfer - - Chamfers the specified edges of this solid. - - Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face, optional): identifies the side where length is measured. The edge(s) - must be part of the face - - Returns: - Self: Chamfered solid - """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") - - native_edges = [e.wrapped for e in edge_list] - - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__.cast(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) - else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__.cast(sol.Shape()).fix() - - return return_value - def offset_3d( self, - openings: Optional[Iterable[Face]], + openings: Iterable[Face] | None, thickness: float, tolerance: float = 0.0001, kind: Kind = Kind.ARC, @@ -4338,2787 +574,13 @@ class Mixin3D(Shape): return offset_solid - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. + def solid(self) -> Solid: + """Return the Solid""" + return Shape.get_single_shape(self, "Solid") - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float | None = None, - taper: float = 0, - up_to_face: Face | None = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] - else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) - - -class Compound(Mixin3D, Shape[TopoDS_Compound]): - """A Compound in build123d is a topological entity representing a collection of - geometric shapes grouped together within a single structure. It serves as a - container for organizing diverse shapes like edges, faces, or solids. This - hierarchical arrangement facilitates the construction of complex models by - combining simpler shapes. Compound plays a pivotal role in managing the - composition and structure of intricate 3D models in computer-aided design - (CAD) applications, allowing engineers and designers to work with assemblies - of shapes as unified entities for efficient modeling and analysis.""" - - order = 4.0 - - project_to_viewport = Mixin1D.project_to_viewport - - @classmethod - def cast( - cls, obj: TopoDS_Shape - ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def _dim(self) -> Union[int, None]: - """The dimension of the shapes within the Compound - None if inconsistent""" - return topods_dim(self.wrapped) - - def __init__( - self, - obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - children: Sequence[Shape] | None = None, - ): - """Build a Compound from Shapes - - Args: - obj (TopoDS_Compound | Iterable[Shape], optional): OCCT Compound or shapes - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - children (Sequence[Shape], optional): assembly children. Defaults to None. - """ - - if isinstance(obj, Iterable): - topods_compound = _make_topods_compound_from_shapes( - [s.wrapped for s in obj] - ) - else: - topods_compound = obj - - super().__init__( - obj=topods_compound, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - self.children = [] if children is None else children - - def __repr__(self): - """Return Compound info as string""" - if hasattr(self, "label") and hasattr(self, "children"): - result = ( - f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " - + f"#children({len(self.children)})" - ) - else: - result = f"{self.__class__.__name__} at {id(self):#x}" - return result - - @property - def volume(self) -> float: - """volume - the volume of this Compound""" - # when density == 1, mass == volume - return sum(i.volume for i in [*self.get_type(Solid), *self.get_type(Shell)]) - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def _remove(self, shape: Shape) -> Compound: - """Return self with the specified shape removed. - - Args: - shape: Shape: - """ - comp_builder = TopoDS_Builder() - comp_builder.Remove(self.wrapped, shape.wrapped) - return self - - def _post_detach(self, parent: Compound): - """Method call after detaching from `parent`.""" - logger.debug("Removing parent of %s (%s)", self.label, parent.label) - if parent.children: - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - else: - parent.wrapped = None - - def _pre_attach(self, parent: Compound): - """Method call before attaching to `parent`.""" - if not isinstance(parent, Compound): - raise ValueError("`parent` must be of type Compound") - - def _post_attach(self, parent: Compound): - """Method call after attaching to `parent`.""" - logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - - def _post_detach_children(self, children): - """Method call before detaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Removing no children from %s", self.label) - - def _pre_attach_children(self, children): - """Method call before attaching `children`.""" - if not all(isinstance(child, Shape) for child in children): - raise ValueError("Each child must be of type Shape") - - def _post_attach_children(self, children: Iterable[Shape]): - """Method call after attaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Adding no children to %s", self.label) - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Combine other to self `+` operator - - Note that if all of the objects are connected Edges/Wires the result - will be a Wire, otherwise a Shape. - """ - if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other - - summands: ShapeList[Shape] - if other is None: - summands = ShapeList() - else: - summands = ShapeList( - shape - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ) - # If there is nothing to add return the original object - if not summands: - return self - - summands = ShapeList( - s for s in self.get_top_level_shapes() + summands if s is not None - ) - - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = Compound(summands[0:1]) - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(bool_result, list): - result = Compound(bool_result) - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - else: - result = bool_result - - if SkipClean.clean: - result = result.clean() - - return result - - def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Cut other to self `-` operator""" - difference = Shape.__sub__(self, other) - difference = Compound( - difference if isinstance(difference, list) else [difference] - ) - self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> Compound: - """Intersect other to self `&` operator""" - intersection = Shape.__and__(self, other) - intersection = Compound( - intersection if isinstance(intersection, list) else [intersection] - ) - self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) - return intersection - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) - - def compound(self) -> Compound | None: - """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None - - @classmethod - def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: - """extrude - - Extrude a Shell into a Compound. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Compound( - TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) - ) - - def do_children_intersect( - self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: - """Do Children Intersect - - Determine if any of the child objects within a Compound/assembly intersect by - intersecting each of the shapes with each other and checking for - a common volume. - - Args: - include_parent (bool, optional): check parent for intersections. Defaults to False. - tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. - - Returns: - tuple[bool, tuple[Shape, Shape], float]: - do the object intersect, intersecting objects, volume of intersection - """ - children: list[Shape] = list(PreOrderIter(self)) - if not include_parent: - children.pop(0) # remove parent - # children_bbox = [child.bounding_box().to_solid() for child in children] - children_bbox = [ - Solid.from_bounding_box(child.bounding_box()) for child in children - ] - child_index_pairs = [ - tuple(map(int, comb)) - for comb in combinations(list(range(len(children))), 2) - ] - for child_index_pair in child_index_pairs: - # First check for bounding box intersections .. - # .. then confirm with actual object intersections which could be complex - bbox_intersection = children_bbox[child_index_pair[0]].intersect( - children_bbox[child_index_pair[1]] - ) - if bbox_intersection is not None: - obj_intersection = children[child_index_pair[0]].intersect( - children[child_index_pair[1]] - ) - if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - ( - children[child_index_pair[0]], - children[child_index_pair[1]], - ), - common_volume, - ) - return (False, (None, None), 0.0) - - @classmethod - def make_text( - cls, - txt: str, - font_size: float, - font: str = "Arial", - font_path: Optional[str] = None, - font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), - position_on_path: float = 0.0, - text_path: Union[Edge, Wire, None] = None, - ) -> "Compound": - """2D Text that optionally follows a path. - - The text that is created can be combined as with other sketch features by specifying - a mode or rotated by the given angle. In addition, edges have been previously created - with arc or segment, the text will follow the path defined by these edges. The start - parameter can be used to shift the text along the path to achieve precise positioning. - - Args: - txt: text to be rendered - font_size: size of the font in model units - font: font name - font_path: path to font file - font_style: text style. Defaults to FontStyle.REGULAR. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max - of object. Defaults to (Align.CENTER, Align.CENTER). - position_on_path: the relative location on path to position the text, - between 0.0 and 1.0. Defaults to 0.0. - text_path: a path for the text to follows. Defaults to None - linear text. - - Returns: - a Compound object containing multiple Faces representing the text - - Examples:: - - fox = Compound.make_text( - txt="The quick brown fox jumped over the lazy dog", - font_size=10, - position_on_path=0.1, - text_path=jump_edge, - ) - - """ - # pylint: disable=too-many-locals - - def position_face(orig_face: Face) -> Face: - """ - Reposition a face to the provided path - - Local coordinates are used to calculate the position of the face - relative to the path. Global coordinates to position the face. - """ - assert text_path is not None - bbox = orig_face.bounding_box() - face_bottom_center = Vector((bbox.min.X + bbox.max.X) / 2, 0, 0) - relative_position_on_wire = ( - position_on_path + face_bottom_center.X / path_length - ) - wire_tangent = text_path.tangent_at(relative_position_on_wire) - wire_angle = Vector(1, 0, 0).get_signed_angle(wire_tangent) - wire_position = text_path.position_at(relative_position_on_wire) - - return orig_face.translate(wire_position - face_bottom_center).rotate( - Axis(wire_position, (0, 0, 1)), - -wire_angle, - ) - - if sys.platform.startswith("linux"): - os.environ["FONTCONFIG_FILE"] = "/etc/fonts/fonts.conf" - os.environ["FONTCONFIG_PATH"] = "/etc/fonts/" - - font_kind = { - FontStyle.REGULAR: Font_FA_Regular, - FontStyle.BOLD: Font_FA_Bold, - FontStyle.ITALIC: Font_FA_Italic, - }[font_style] - - mgr = Font_FontMgr.GetInstance_s() - - if font_path and mgr.CheckFont(TCollection_AsciiString(font_path).ToCString()): - font_t = Font_SystemFont(TCollection_AsciiString(font_path)) - font_t.SetFontPath(font_kind, TCollection_AsciiString(font_path)) - mgr.RegisterFont(font_t, True) - - else: - font_t = mgr.FindFont(TCollection_AsciiString(font), font_kind) - - logger.info( - "Creating text with font %s located at %s", - font_t.FontName().ToCString(), - font_t.FontPath(font_kind).ToCString(), - ) - - builder = Font_BRepTextBuilder() - font_i = StdPrs_BRepFont( - NCollection_Utf8String(font_t.FontName().ToCString()), - font_kind, - float(font_size), - ) - text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) - - # Align the text from the bounding box - align_text = tuplify(align, 2) - text_flat = text_flat.translate( - Vector(*text_flat.bounding_box().to_align_offset(align_text)) - ) - - if text_path is not None: - path_length = text_path.length - text_flat = Compound([position_face(f) for f in text_flat.faces()]) - - return text_flat - - @classmethod - def make_triad(cls, axes_scale: float) -> Compound: - """The coordinate system triad (X, Y, Z axes)""" - x_axis = Edge.make_line((0, 0, 0), (axes_scale, 0, 0)) - y_axis = Edge.make_line((0, 0, 0), (0, axes_scale, 0)) - z_axis = Edge.make_line((0, 0, 0), (0, 0, axes_scale)) - arrow_arc = Edge.make_spline( - [(0, 0, 0), (-axes_scale / 20, axes_scale / 30, 0)], - [(-1, 0, 0), (-1, 1.5, 0)], - ) - arrow = Wire([arrow_arc, copy.copy(arrow_arc).mirror(Plane.XZ)]) - x_label = ( - Compound.make_text( - "X", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .move(Location(x_axis @ 1)) - .edges() - ) - y_label = ( - Compound.make_text( - "Y", font_size=axes_scale / 4, align=(Align.MIN, Align.CENTER) - ) - .rotate(Axis.Z, 90) - .move(Location(y_axis @ 1)) - .edges() - ) - z_label = ( - Compound.make_text( - "Z", font_size=axes_scale / 4, align=(Align.CENTER, Align.MIN) - ) - .rotate(Axis.Y, 90) - .rotate(Axis.X, 90) - .move(Location(z_axis @ 1)) - .edges() - ) - triad = Curve( - [ - x_axis, - y_axis, - z_axis, - arrow.moved(Location(x_axis @ 1)), - arrow.rotate(Axis.Z, 90).moved(Location(y_axis @ 1)), - arrow.rotate(Axis.Y, -90).moved(Location(z_axis @ 1)), - *x_label, - *y_label, - *z_label, - ] - ) - - return triad - - def __iter__(self) -> Iterator[Shape]: - """ - Iterate over subshapes. - - """ - - iterator = TopoDS_Iterator(self.wrapped) - - while iterator.More(): - yield Compound.cast(iterator.Value()) - iterator.Next() - - def __len__(self) -> int: - """Return the number of subshapes""" - count = 0 - if self.wrapped is not None: - for _ in self: - count += 1 - return count - - def __bool__(self) -> bool: - """ - Check if empty. - """ - - return TopoDS_Iterator(self.wrapped).More() - - def get_type( - self, - obj_type: Union[ - Type[Vertex], Type[Edge], Type[Face], Type[Shell], Type[Solid], Type[Wire] - ], - ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: - """get_type - - Extract the objects of the given type from a Compound. Note that this - isn't the same as Faces() etc. which will extract Faces from Solids. - - Args: - obj_type (Union[Vertex, Edge, Face, Shell, Solid, Wire]): Object types to extract - - Returns: - list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: Extracted objects - """ - - type_map = { - Vertex: TopAbs_ShapeEnum.TopAbs_VERTEX, - Edge: TopAbs_ShapeEnum.TopAbs_EDGE, - Face: TopAbs_ShapeEnum.TopAbs_FACE, - Shell: TopAbs_ShapeEnum.TopAbs_SHELL, - Solid: TopAbs_ShapeEnum.TopAbs_SOLID, - Wire: TopAbs_ShapeEnum.TopAbs_WIRE, - Compound: TopAbs_ShapeEnum.TopAbs_COMPOUND, - } - results = [] - for comp in self.compounds(): - iterator = TopoDS_Iterator() - iterator.Initialize(comp.wrapped) - while iterator.More(): - child = iterator.Value() - if child.ShapeType() == type_map[obj_type]: - results.append(obj_type(downcast(child))) - iterator.Next() - - return results - - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: - """Strip unnecessary Compound wrappers - - Args: - fully (bool, optional): return base shape without any Compound - wrappers (otherwise one Compound is left). Defaults to True. - - Returns: - Union[Self, Shape]: base shape - """ - if len(self) == 1: - single_element = next(iter(self)) - self.copy_attributes_to(single_element, ["wrapped", "_NodeMixin__children"]) - - # If the single element is another Compound, unwrap it recursively - if isinstance(single_element, Compound): - # Unwrap recursively and copy attributes down - unwrapped = single_element.unwrap(fully) - if not fully: - unwrapped = type(self)(unwrapped.wrapped) - self.copy_attributes_to(unwrapped, ["wrapped", "_NodeMixin__children"]) - return unwrapped - - return single_element if fully else self - - # If there are no elements or more than one element, return self - return self - - -class Part(Compound): - """A Compound containing 3D objects - aka Solids""" - - @property - def _dim(self) -> int: - return 3 - - -class Sketch(Compound): - """A Compound containing 2D objects - aka Faces""" - - @property - def _dim(self) -> int: - return 2 - - -class Curve(Compound): - """A Compound containing 1D objects - aka Edges""" - - @property - def _dim(self) -> int: - return 1 - - __add__ = Mixin1D.__add__ # type: ignore - - def __matmul__(self, position: float) -> Vector: - """Position on curve operator @ - only works if continuous""" - return Wire(self.edges()).position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator % - only works if continuous""" - return Wire(self.edges()).tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^ - only works if continuous""" - return Wire(self.edges()).location_at(position) - - def wires(self) -> ShapeList[Wire]: # type: ignore - """A list of wires created from the edges""" - return Wire.combine(self.edges()) - - -class Edge(Mixin1D, Shape[TopoDS_Edge]): - """An Edge in build123d is a fundamental element in the topological data structure - representing a one-dimensional geometric entity within a 3D model. It encapsulates - information about a curve, which could be a line, arc, or other parametrically - defined shape. Edge is crucial in for precise modeling and manipulation of curves, - facilitating operations like filleting, chamfering, and Boolean operations. It - serves as a building block for constructing complex structures, such as wires - and faces.""" - - # pylint: disable=too-many-public-methods - - order = 1.0 - - def __init__( - self, - obj: Optional[TopoDS_Edge | Axis | None] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge - - Args: - obj (TopoDS_Edge | Axis, optional): OCCT Edge or Axis. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Axis): - obj = BRepBuilderAPI_MakeEdge( - Geom_Line( - obj.position.to_pnt(), - obj.direction.to_dir(), - ) - ).Edge() - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_Curve: - """Return the Geom Curve from this Edge""" - return BRepAdaptor_Curve(self.wrapped) - - def close(self) -> Union[Edge, Wire]: - """Close an Edge""" - if not self.is_closed: - return_value = Wire([self]).close() - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Edge as Wire""" - return Wire([self]) - - @property - def arc_center(self) -> Vector: - """center of an underlying circle or ellipse geometry.""" - - geom_type = self.geom_type - geom_adaptor = self.geom_adaptor() - - if geom_type == GeomType.CIRCLE: - return_value = Vector(geom_adaptor.Circle().Position().Location()) - elif geom_type == GeomType.ELLIPSE: - return_value = Vector(geom_adaptor.Ellipse().Position().Location()) - else: - raise ValueError(f"{geom_type} has no arc center") - - return return_value - - def find_tangent( - self, - angle: float, - ) -> list[float]: - """find_tangent - - Find the parameter values of self where the tangent is equal to angle. - - Args: - angle (float): target angle in degrees - - Returns: - list[float]: u values between 0.0 and 1.0 - """ - angle = angle % 360 # angle needs to always be positive 0..360 - u_values: list[float] - - if self.geom_type == GeomType.LINE: - if self.tangent_angle_at(0) == angle: - u_values = [0] - else: - u_values = [] - else: - # Solve this problem geometrically by creating a tangent curve and finding intercepts - periodic = int(self.is_closed) # if closed don't include end point - tan_pnts: list[VectorLike] = [] - previous_tangent = None - - # When angles go from 360 to 0 a discontinuity is created so add 360 to these - # values and intercept another line - discontinuities = 0.0 - for i in range(101 - periodic): - tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 - if ( - previous_tangent is not None - and abs(previous_tangent - tangent) > 300 - ): - discontinuities = copysign(1.0, previous_tangent - tangent) - tangent += 360 * discontinuities - previous_tangent = tangent - tan_pnts.append((i / 100, tangent)) - - # Generate a first differential curve from the tangent points - tan_curve = Edge.make_spline(tan_pnts) - - # Use the bounding box to find the min and max values - tan_curve_bbox = tan_curve.bounding_box() - min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) - max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) - - # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts: list[Vector] = [] - for i in range(min_range, max_range + 1, 360): - line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) - intercept_pnts.extend(tan_curve.find_intersection_points(line)) - - u_values = [p.X for p in intercept_pnts] - - return u_values - - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - - def find_intersection_points( - self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE - ) -> ShapeList[Vector]: - """find_intersection_points - - Determine the points where a 2D edge crosses itself or another 2D edge - - Args: - other (Axis | Edge): curve to compare with - tolerance (float, optional): the precision of computing the intersection points. - Defaults to TOLERANCE. - - Returns: - ShapeList[Vector]: list of intersection points - """ - # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) - other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, - ) - # To determine the 2D plane to work on - plane = self.common_plane(other) - if plane is None: - raise ValueError("All objects must be on the same plane") - # Convert the plane into a Geom_Surface - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - edge_surface = BRep_Tool.Surface_s(pln_shape) - - self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - self.wrapped, - edge_surface, - TopLoc_Location(), - self.param_at(0), - self.param_at(1), - ) - if other is not None: - edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - other.wrapped, - edge_surface, - TopLoc_Location(), - other.param_at(0), - other.param_at(1), - ) - intersector = Geom2dAPI_InterCurveCurve( - self_2d_curve, edge_2d_curve, tolerance - ) - else: - intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) - - crosses = [ - Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) - for i in range(intersector.NbPoints()) - ] - # Convert back to global coordinates - crosses = [plane.from_local_coords(p) for p in crosses] - - # crosses may contain points beyond the ends of the edge so - # .. filter those out - valid_crosses = [] - for pnt in crosses: - try: - if other is not None: - if ( - self.distance_to(pnt) <= TOLERANCE - and other.distance_to(pnt) <= TOLERANCE - ): - valid_crosses.append(pnt) - else: - if self.distance_to(pnt) <= TOLERANCE: - valid_crosses.append(pnt) - except ValueError: - pass # skip invalid points - - return ShapeList(valid_crosses) - - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Union[Edge, Axis]): other object - - Returns: - Union[Shape, None]: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None - - @classmethod - def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: - """extrude - - Extrude a Vertex into an Edge. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) - - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" - reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge - return reversed_edge - - def trim(self, start: float, end: float) -> Edge: - """trim - - Create a new edge by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Edge: trimmed edge - """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") - - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) - trimmed_curve = Geom_TrimmedCurve( - new_curve, - parm_start, - parm_end, - ) - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def trim_to_length(self, start: float, length: float) -> Edge: - """trim_to_length - - Create a new edge starting at the given normalized parameter of a - given length. - - Args: - start (float): 0.0 <= start < 1.0 - length (float): target length - - Returns: - Edge: trimmed edge - """ - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - - # Create an adaptor for the curve - adaptor_curve = GeomAdaptor_Curve(new_curve) - - # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) - abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - - # Get the parameter at the desired length - parm_end = abscissa_point.Parameter() - - # Trim the curve to the desired length - trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" - - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) - - point = Vector(point) - - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") - - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length - - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value - - @classmethod - def make_bezier( - cls, *cntl_pnts: VectorLike, weights: list[float] | None = None - ) -> Edge: - """make_bezier - - Create a rational (with weights) or non-rational bezier curve. The first and last - control points represent the start and end of the curve respectively. If weights - are provided, there must be one provided for each control point. - - Args: - cntl_pnts (sequence[VectorLike]): points defining the curve - weights (list[float], optional): control point weights list. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Edge: bezier curve - """ - if len(cntl_pnts) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(cntl_pnts) > 25: - raise ValueError("The maximum number of control points is 25") - if weights: - if len(cntl_pnts) != len(weights): - raise ValueError("A weight must be provided for each control point") - - cntl_gp_pnts = [Vector(cntl_pnt).to_pnt() for cntl_pnt in cntl_pnts] - - # The poles are stored in an OCCT Array object - poles = TColgp_Array1OfPnt(1, len(cntl_gp_pnts)) - for i, cntl_gp_pnt in enumerate(cntl_gp_pnts): - poles.SetValue(i + 1, cntl_gp_pnt) - - if weights: - pole_weights = TColStd_Array1OfReal(1, len(weights)) - for i, weight in enumerate(weights): - pole_weights.SetValue(i + 1, float(weight)) - bezier_curve = Geom_BezierCurve(poles, pole_weights) - else: - bezier_curve = Geom_BezierCurve(poles) - - return cls(BRepBuilderAPI_MakeEdge(bezier_curve).Edge()) - - @classmethod - def make_circle( - cls, - radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make circle - - Create a circle centered on the origin of plane - - Args: - radius (float): circle radius - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): start of arc angle. Defaults to 360.0. - end_angle (float, optional): end of arc angle. Defaults to 360. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial circle - """ - circle_gp = gp_Circ(plane.to_gp_ax2(), radius) - - if start_angle == end_angle: # full circle case - return_value = cls(BRepBuilderAPI_MakeEdge(circle_gp).Edge()) - else: # arc case - ccw = angular_direction == AngularDirection.COUNTER_CLOCKWISE - if ccw: - start = radians(start_angle) - end = radians(end_angle) - else: - start = radians(end_angle) - end = radians(start_angle) - circle_geom = GC_MakeArcOfCircle(circle_gp, start, end, ccw).Value() - return_value = cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - return return_value - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): Defaults to 360.0. - end_angle (float, optional): Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial ellipse - """ - ax1 = gp_Ax1(plane.origin.to_pnt(), plane.z_dir.to_dir()) - - if y_radius > x_radius: - # swap x and y radius and rotate by 90° afterwards to create an ellipse - # with x_radius < y_radius - correction_angle = 90.0 * DEG2RAD - ellipse_gp = gp_Elips(plane.to_gp_ax2(), y_radius, x_radius).Rotated( - ax1, correction_angle - ) - else: - correction_angle = 0.0 - ellipse_gp = gp_Elips(plane.to_gp_ax2(), x_radius, y_radius) - - if start_angle == end_angle: # full ellipse case - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_gp).Edge()) - else: # arc case - # take correction_angle into account - ellipse_geom = GC_MakeArcOfEllipse( - ellipse_gp, - start_angle * DEG2RAD - correction_angle, - end_angle * DEG2RAD - correction_angle, - angular_direction == AngularDirection.COUNTER_CLOCKWISE, - ).Value() - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_geom).Edge()) - - return ellipse - - @classmethod - def make_mid_way(cls, first: Edge, second: Edge, middle: float = 0.5) -> Edge: - """make line between edges - - Create a new linear Edge between the two provided Edges. If the Edges are parallel - but in the opposite directions one Edge is flipped such that the mid way Edge isn't - truncated. - - Args: - first (Edge): first reference Edge - second (Edge): second reference Edge - middle (float, optional): factional distance between Edges. Defaults to 0.5. - - Returns: - Edge: linear Edge between two Edges - """ - flip = first.to_axis().is_opposite(second.to_axis()) - pnts = [ - Edge.make_line( - first.position_at(i), second.position_at(1 - i if flip else i) - ).position_at(middle) - for i in [0, 1] - ] - return Edge.make_line(*pnts) - - @classmethod - def make_spline( - cls, - points: list[VectorLike], - tangents: list[VectorLike] | None = None, - periodic: bool = False, - parameters: list[float] | None = None, - scale: bool = True, - tol: float = 1e-6, - ) -> Edge: - """Spline - - Interpolate a spline through the provided points. - - Args: - points (list[VectorLike]): the points defining the spline - tangents (list[VectorLike], optional): start and finish tangent. - Defaults to None. - periodic (bool, optional): creation of periodic curves. Defaults to False. - parameters (list[float], optional): the value of the parameter at each - interpolation point. (The interpolated curve is represented as a vector-valued - function of a scalar parameter.) If periodic == True, then len(parameters) - must be len(interpolation points) + 1, otherwise len(parameters) - must be equal to len(interpolation points). Defaults to None. - scale (bool, optional): whether to scale the specified tangent vectors before - interpolating. Each tangent is scaled, so it's length is equal to the derivative - of the Lagrange interpolated curve. I.e., set this to True, if you want to use - only the direction of the tangent vectors specified by `tangents` , but not - their magnitude. Defaults to True. - tol (float, optional): tolerance of the algorithm (consult OCC documentation). - Used to check that the specified points are not too close to each other, and - that tangent vectors are not too short. (In either case interpolation may fail.). - Defaults to 1e-6. - - Raises: - ValueError: Parameter for each interpolation point - ValueError: Tangent for each interpolation point - ValueError: B-spline interpolation failed - - Returns: - Edge: the spline - """ - # pylint: disable=too-many-locals - point_vectors = [Vector(point) for point in points] - if tangents: - tangent_vectors = tuple(Vector(v) for v in tangents) - pnts = TColgp_HArray1OfPnt(1, len(point_vectors)) - for i, point in enumerate(point_vectors): - pnts.SetValue(i + 1, point.to_pnt()) - - if parameters is None: - spline_builder = GeomAPI_Interpolate(pnts, periodic, tol) - else: - if len(parameters) != (len(point_vectors) + periodic): - raise ValueError( - "There must be one parameter for each interpolation point " - "(plus one if periodic), or none specified. Parameter count: " - f"{len(parameters)}, point count: {len(point_vectors)}" - ) - parameters_array = TColStd_HArray1OfReal(1, len(parameters)) - for p_index, p_value in enumerate(parameters): - parameters_array.SetValue(p_index + 1, p_value) - - spline_builder = GeomAPI_Interpolate(pnts, parameters_array, periodic, tol) - - if tangents: - if len(tangent_vectors) == 2 and len(point_vectors) != 2: - # Specify only initial and final tangent: - spline_builder.Load( - tangent_vectors[0].wrapped, tangent_vectors[1].wrapped, scale - ) - else: - if len(tangent_vectors) != len(point_vectors): - raise ValueError( - f"There must be one tangent for each interpolation point, " - f"or just two end point tangents. Tangent count: " - f"{len(tangent_vectors)}, point count: {len(point_vectors)}" - ) - - # Specify a tangent for each interpolation point: - tangents_array = TColgp_Array1OfVec(1, len(tangent_vectors)) - tangent_enabled_array = TColStd_HArray1OfBoolean( - 1, len(tangent_vectors) - ) - for t_index, t_value in enumerate(tangent_vectors): - tangent_enabled_array.SetValue(t_index + 1, t_value is not None) - tangent_vec = t_value if t_value is not None else Vector() - tangents_array.SetValue(t_index + 1, tangent_vec.wrapped) - - spline_builder.Load(tangents_array, tangent_enabled_array, scale) - - spline_builder.Perform() - if not spline_builder.IsDone(): - raise ValueError("B-spline interpolation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_spline_approx( - cls, - points: list[VectorLike], - tol: float = 1e-3, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 6, - ) -> Edge: - """make_spline_approx - - Approximate a spline through the provided points. - - Args: - points (list[Vector]): - tol (float, optional): tolerance of the algorithm. Defaults to 1e-3. - smoothing (Tuple[float, float, float], optional): optional tuple of 3 weights - use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when smoothing - is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 6. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Edge: spline - """ - pnts = TColgp_HArray1OfPnt(1, len(points)) - for i, point in enumerate(points): - pnts.SetValue(i + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSpline( - pnts, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSpline( - pnts, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_three_point_arc( - cls, point1: VectorLike, point2: VectorLike, point3: VectorLike - ) -> Edge: - """Three Point Arc - - Makes a three point arc through the provided points - - Args: - point1 (VectorLike): start point - point2 (VectorLike): middle point - point3 (VectorLike): end point - - Returns: - Edge: a circular arc through the three points - """ - circle_geom = GC_MakeArcOfCircle( - Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_tangent_arc( - cls, start: VectorLike, tangent: VectorLike, end: VectorLike - ) -> Edge: - """Tangent Arc - - Makes a tangent arc from point start, in the direction of tangent and ends at end. - - Args: - start (VectorLike): start point - tangent (VectorLike): start tangent - end (VectorLike): end point - - Returns: - Edge: circular arc - """ - circle_geom = GC_MakeArcOfCircle( - Vector(start).to_pnt(), Vector(tangent).wrapped, Vector(end).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: - """Create a line between two points - - Args: - point1: VectorLike: that represents the first point - point2: VectorLike: that represents the second point - - Returns: - A linear edge between the two provided points - - """ - return cls( - BRepBuilderAPI_MakeEdge( - Vector(point1).to_pnt(), Vector(point2).to_pnt() - ).Edge() - ) - - @classmethod - def make_helix( - cls, - pitch: float, - height: float, - radius: float, - center: VectorLike = (0, 0, 0), - normal: VectorLike = (0, 0, 1), - angle: float = 0.0, - lefthand: bool = False, - ) -> Wire: - """make_helix - - Make a helix with a given pitch, height and radius. By default a cylindrical surface is - used to create the helix. If the :angle: is set (the apex given in degree) a conical - surface is used instead. - - Args: - pitch (float): distance per revolution along normal - height (float): total height - radius (float): - center (VectorLike, optional): Defaults to (0, 0, 0). - normal (VectorLike, optional): Defaults to (0, 0, 1). - angle (float, optional): conical angle. Defaults to 0.0. - lefthand (bool, optional): Defaults to False. - - Returns: - Wire: helix - """ - # pylint: disable=too-many-locals - # 1. build underlying cylindrical/conical surface - if angle == 0.0: - geom_surf: Geom_Surface = Geom_CylindricalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius - ) - else: - geom_surf = Geom_ConicalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), - angle * DEG2RAD, - radius, - ) - - # 2. construct an segment in the u,v domain - - # Determine the length of the 2d line which will be wrapped around the surface - line_sign = -1 if lefthand else 1 - line_dir = Vector(line_sign * 2 * pi, pitch).normalized() - line_len = (height / line_dir.Y) / cos(radians(angle)) - - # Create an infinite 2d line in the direction of the helix - helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) - # Trim the line to the desired length - helix_curve = Geom2d_TrimmedCurve( - helix_line, 0, line_len, theAdjustPeriodic=True - ) - - # 3. Wrap the line around the surface - edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) - topods_edge = edge_builder.Edge() - - # 4. Convert the edge made with 2d geometry to 3d - BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) - - return cls(topods_edge) - - def distribute_locations( - self: Union[Wire, Edge], - count: int, - start: float = 0.0, - stop: float = 1.0, - positions_only: bool = False, - ) -> list[Location]: - """Distribute Locations - - Distribute locations along edge or wire. - - Args: - self: Union[Wire:Edge]: - count(int): Number of locations to generate - start(float): position along Edge|Wire to start. Defaults to 0.0. - stop(float): position along Edge|Wire to end. Defaults to 1.0. - positions_only(bool): only generate position not orientation. Defaults to False. - - Returns: - list[Location]: locations distributed along Edge|Wire - - Raises: - ValueError: count must be two or greater - - """ - if count < 2: - raise ValueError("count must be two or greater") - - t_values = [start + i * (stop - start) / (count - 1) for i in range(count)] - - locations = self.locations(t_values) - if positions_only: - for loc in locations: - loc.orientation = Vector(0, 0, 0) - - return locations - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Edge]: - """Project Edge - - Project an Edge onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected Edge(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - wire = Wire([self]) - projected_wires = wire.project_to_shape(target_object, direction, center) - projected_edges = [w.edges()[0] for w in projected_wires] - return projected_edges - - def to_axis(self) -> Axis: - """Translate a linear Edge to an Axis""" - if self.geom_type != GeomType.LINE: - raise ValueError( - f"to_axis is only valid for linear Edges not {self.geom_type}" - ) - return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) - - -class Face(Mixin2D, Shape[TopoDS_Face]): - """A Face in build123d represents a 3D bounded surface within the topological data - structure. It encapsulates geometric information, defining a face of a 3D shape. - These faces are integral components of complex structures, such as solids and - shells. Face enables precise modeling and manipulation of surfaces, supporting - operations like trimming, filleting, and Boolean operations.""" - - # pylint: disable=too-many-public-methods - - order = 2.0 - - @overload - def __init__( - self, - obj: TopoDS_Face, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face - - Args: - obj (TopoDS_Shape, optional): OCCT Face. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - outer_wire: Wire, - inner_wires: Iterable[Wire] | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a planar Face from a boundary Wire with optional hole Wires. - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (Iterable[Wire], optional): holes. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args: Any, **kwargs: Any): - outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - outer_wire, inner_wires, label, color, parent = args[:5] + (None,) * ( - 5 - l_a - ) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "outer_wire", - "inner_wires", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - outer_wire = kwargs.get("outer_wire", outer_wire) - inner_wires = kwargs.get("inner_wires", inner_wires) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if outer_wire is not None: - inner_topods_wires = ( - [w.wrapped for w in inner_wires] if inner_wires is not None else [] - ) - obj = _make_topods_face_from_wires(outer_wire.wrapped, inner_topods_wires) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - # Faces can optionally record the plane it was created on for later extrusion - self.created_on: Plane | None = None - - @property - def length(self) -> None | float: - """length of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.X) - result = face_vertices[-1].X - face_vertices[0].X - return result - - @property - def volume(self) -> float: - """volume - the volume of this Face, which is always zero""" - return 0.0 - - @property - def width(self) -> None | float: - """width of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.Y) - result = face_vertices[-1].Y - face_vertices[0].Y - return result - - @property - def geometry(self) -> None | str: - """geometry of planar face""" - result = None - if self.is_planar: - flat_face: Face = Plane(self).to_local_coords(self) - flat_face_edges = flat_face.edges() - if all(e.geom_type == GeomType.LINE for e in flat_face_edges): - flat_face_vertices = flat_face.vertices() - result = "POLYGON" - if len(flat_face_edges) == 4: - edge_pairs: list[list[Edge]] = [] - for vertex in flat_face_vertices: - edge_pairs.append( - [e for e in flat_face_edges if vertex in e.vertices()] - ) - edge_pair_directions = [ - [edge.tangent_at(0) for edge in pair] for pair in edge_pairs - ] - if all( - edge_directions[0].get_angle(edge_directions[1]) == 90 - for edge_directions in edge_pair_directions - ): - result = "RECTANGLE" - if len(flat_face_edges.group_by(SortBy.LENGTH)) == 1: - result = "SQUARE" - - return result - - @property - def center_location(self) -> Location: - """Location at the center of face""" - origin = self.position_at(0.5, 0.5) - return Plane(origin, z_dir=self.normal_at(origin)).location - - @property - def is_planar(self) -> bool: - """Is the face planar even though its geom_type may not be PLANE""" - return self.is_planar_face - - def geom_adaptor(self) -> Geom_Surface: - """Return the Geom Surface for this Face""" - return BRep_Tool.Surface_s(self.wrapped) - - def _uv_bounds(self) -> Tuple[float, float, float, float]: - """Return the u min, u max, v min, v max values""" - return BRepTools.UVBounds_s(self.wrapped) - - @overload - def normal_at(self, surface_point: VectorLike | None = None) -> Vector: - """normal_at point on surface - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where - the normal. Defaults to the center (None). - - Returns: - Vector: surface normal direction - """ - - @overload - def normal_at(self, u: float, v: float) -> Vector: - """normal_at u, v values on Face - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - Defaults to the center (None/None) - - Raises: - ValueError: Either neither or both u v values must be provided - - Returns: - Vector: surface normal direction - """ - - def normal_at(self, *args, **kwargs) -> Vector: - """normal_at - - Computes the normal vector at the desired location on the face. - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where the normal. - Defaults to None. - - Returns: - Vector: surface normal direction - """ - surface_point, u, v = None, -1.0, -1.0 - - if args: - if isinstance(args[0], Sequence): - surface_point = args[0] - elif isinstance(args[0], (int, float)): - u = args[0] - if len(args) == 2 and isinstance(args[1], (int, float)): - v = args[1] - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["surface_point", "u", "v"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - surface_point = kwargs.get("surface_point", surface_point) - u = kwargs.get("u", u) - v = kwargs.get("v", v) - if surface_point is None and u < 0 and v < 0: - u, v = 0.5, 0.5 - elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: - raise ValueError("Both u & v values must be specified") - - # get the geometry - surface = self.geom_adaptor() - - if surface_point is None: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) - else: - # project point on surface - projector = GeomAPI_ProjectPointOnSurf( - Vector(surface_point).to_pnt(), surface - ) - - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - def position_at(self, u: float, v: float) -> Vector: - """position_at - - Computes a point on the Face given u, v coordinates. - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - - Returns: - Vector: point on Face - """ - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u_val0 + u * (u_val1 - u_val0) - v_val = v_val0 + v * (v_val1 - v_val0) - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(gp_pnt) - - def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) - else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) - return Location(pln) - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of Face - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if (center_of == CenterOf.MASS) or ( - center_of == CenterOf.GEOMETRY and self.is_planar - ): - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - center_point = properties.CentreOfMass() - - elif center_of == CenterOf.BOUNDING_BOX: - center_point = self.bounding_box().center() - - elif center_of == CenterOf.GEOMETRY: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = 0.5 * (u_val0 + u_val1) - v_val = 0.5 * (v_val0 + v_val1) - - center_point = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) - - return Vector(center_point) - - def outer_wire(self) -> Wire: - """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) - - def inner_wires(self) -> ShapeList[Wire]: - """Extract the inner or hole wires from this Face""" - outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) - - def wire(self) -> Wire: - """Return the outerwire, generate a warning if inner_wires present""" - if self.inner_wires(): - warnings.warn( - "Found holes, returning outer_wire", - stacklevel=2, - ) - return self.outer_wire() - - @classmethod - def extrude(cls, obj: Edge, direction: VectorLike) -> Face: - """extrude - - Extrude an Edge into a Face. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Face: extruded shape - """ - return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: - """make_rect - - Make a Rectangle centered on center with the given normal - - Args: - width (float, optional): width (local x). - height (float, optional): height (local y). - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Face: The centered rectangle - """ - pln_shape = BRepBuilderAPI_MakeFace( - plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 - ).Face() - - return cls(pln_shape) - - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - - @overload - @classmethod - def make_surface_from_curves( - cls, edge1: Edge, edge2: Edge - ) -> Face: # pragma: no cover - ... - - @overload - @classmethod - def make_surface_from_curves( - cls, wire1: Wire, wire2: Wire - ) -> Face: # pragma: no cover - ... - - @classmethod - def make_surface_from_curves(cls, *args, **kwargs) -> Face: - """make_surface_from_curves - - Create a ruled surface out of two edges or two wires. If wires are used then - these must have the same number of edges. - - Args: - curve1 (Union[Edge,Wire]): side of surface - curve2 (Union[Edge,Wire]): opposite side of surface - - Returns: - Face: potentially non planar surface - """ - curve1, curve2 = None, None - if args: - if len(args) != 2 or type(args[0]) is not type(args[1]): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - curve1, curve2 = args - - curve1 = kwargs.pop("edge1", curve1) - curve2 = kwargs.pop("edge2", curve2) - curve1 = kwargs.pop("wire1", curve1) - curve2 = kwargs.pop("wire2", curve2) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - - if isinstance(curve1, Wire): - return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) - else: - return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) - return return_value - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: - """sew faces - - Group contiguous faces and return them in a list of ShapeList - - Args: - faces (Iterable[Face]): Faces to sew together - - Raises: - RuntimeError: OCCT SewedShape generated unexpected output - - Returns: - list[ShapeList[Face]]: grouped contiguous faces - """ - # Sew the faces - sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) - top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces: list[ShapeList] = [] - - # For each of the top level shapes create a ShapeList of Face - for top_level_shape in top_level_shapes: - if isinstance(top_level_shape, TopoDS_Face): - sewn_faces.append(ShapeList([Face(top_level_shape)])) - elif isinstance(top_level_shape, TopoDS_Shell): - sewn_faces.append(Shell(top_level_shape).faces()) - elif isinstance(top_level_shape, TopoDS_Solid): - sewn_faces.append( - ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") - ) - ) - else: - raise RuntimeError( - f"SewedShape returned a {type(top_level_shape)} which was unexpected" - ) - - return sewn_faces - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Face: - """sweep - - Sweep a 1D profile along a 1D path. Both the profile and path must be composed - of only 1 Edge. - - Args: - profile (Union[Curve,Edge,Wire]): the object to sweep - path (Union[Curve,Edge,Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Raises: - ValueError: Only 1 Edge allowed in profile & path - - Returns: - Face: resulting face, may be non-planar - """ - # Note: BRepOffsetAPI_MakePipe is an option here - # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) - # pipe_sweep.Build() - # return Face(pipe_sweep.Shape()) - - if len(profile.edges()) != 1 or len(path.edges()) != 1: - raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Face(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_surface_from_array_of_points( - cls, - points: list[list[VectorLike]], - tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 3, - ) -> Face: - """make_surface_from_array_of_points - - Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter - space of the face. The second dimension correspond to points on the horizontal - direction in the parameter space of the face. The 2 dimensions are U,V dimensions - of the parameter space of the face. - - Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V - parameters second is U parameters. - tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. - smoothing (Tuple[float, float, float], optional): optional tuple of - 3 weights use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when - smoothing is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 3. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Face: a potentially non-planar face defined by points - """ - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - - for i, point_row in enumerate(points): - for j, point in enumerate(point_row): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Surface() - - return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) - - @classmethod - def make_bezier_surface( - cls, - points: list[list[VectorLike]], - weights: list[list[float]] | None = None, - ) -> Face: - """make_bezier_surface - - Construct a Bézier surface from the provided 2d array of points. - - Args: - points (list[list[VectorLike]]): a 2D list of control points - weights (list[list[float]], optional): control point weights. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Face: a potentially non-planar face - """ - if len(points) < 2 or len(points[0]) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(points) > 25 or len(points[0]) > 25: - raise ValueError("The maximum number of control points is 25") - if weights and ( - len(points) != len(weights) or len(points[0]) != len(weights[0]) - ): - raise ValueError("A weight must be provided for each control point") - - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - for i, row_points in enumerate(points): - for j, point in enumerate(row_points): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if weights: - weights_ = TColStd_HArray2OfReal(1, len(weights), 1, len(weights[0])) - for i, row_weights in enumerate(weights): - for j, weight in enumerate(row_weights): - weights_.SetValue(i + 1, j + 1, float(weight)) - bezier = Geom_BezierSurface(points_, weights_) - else: - bezier = Geom_BezierSurface(points_) - - return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) - - @classmethod - def make_surface( - cls, - exterior: Union[Wire, Iterable[Edge]], - surface_points: Iterable[VectorLike] | None = None, - interior_wires: Iterable[Wire] | None = None, - ) -> Face: - """Create Non-Planar Face - - Create a potentially non-planar face bounded by exterior (wire or edges), - optionally refined by surface_points with optional holes defined by - interior_wires. - - Args: - exterior (Union[Wire, list[Edge]]): Perimeter of face - surface_points (list[VectorLike], optional): Points on the surface that - refine the shape. Defaults to None. - interior_wires (list[Wire], optional): Hole(s) in the face. Defaults to None. - - Raises: - RuntimeError: Internal error building face - RuntimeError: Error building non-planar face with provided surface_points - RuntimeError: Error adding interior hole - RuntimeError: Generated face is invalid - - Returns: - Face: Potentially non-planar face - """ - exterior = list(exterior) if isinstance(exterior, Iterable) else exterior - # pylint: disable=too-many-branches - if surface_points: - surface_point_vectors = [Vector(p) for p in surface_points] - else: - surface_point_vectors = None - - # First, create the non-planar surface - surface = BRepOffsetAPI_MakeFilling( - # order of energy criterion to minimize for computing the deformation of the surface - Degree=3, - # average number of points for discretisation of the edges - NbPtsOnCur=15, - NbIter=2, - Anisotropie=False, - # the maximum distance allowed between the support surface and the constraints - Tol2d=0.00001, - # the maximum distance allowed between the support surface and the constraints - Tol3d=0.0001, - # the maximum angle allowed between the normal of the surface and the constraints - TolAng=0.01, - # the maximum difference of curvature allowed between the surface and the constraint - TolCurv=0.1, - # the highest degree which the polynomial defining the filling surface can have - MaxDeg=8, - # the greatest number of segments which the filling surface can have - MaxSegments=9, - ) - if isinstance(exterior, Wire): - outside_edges = exterior.edges() - elif isinstance(exterior, Iterable) and all( - isinstance(o, Edge) for o in exterior - ): - outside_edges = ShapeList(exterior) - else: - raise ValueError("exterior must be a Wire or list of Edges") - - for edge in outside_edges: - surface.Add(edge.wrapped, GeomAbs_C0) - - try: - surface.Build() - surface_face = Face(surface.Shape()) - except ( - Standard_Failure, - StdFail_NotDone, - Standard_NoSuchObject, - Standard_ConstructionError, - ) as err: - raise RuntimeError( - "Error building non-planar face with provided exterior" - ) from err - if surface_point_vectors: - for point in surface_point_vectors: - surface.Add(gp_Pnt(*point.to_tuple())) - try: - surface.Build() - surface_face = Face(surface.Shape()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error building non-planar face with provided surface_points" - ) from err - - # Next, add wires that define interior holes - note these wires must be entirely interior - if interior_wires: - makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) - for wire in interior_wires: - makeface_object.Add(wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - if not surface_face.is_valid(): - raise RuntimeError("non planar face is invalid") - - return surface_face - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: - """Apply 2D fillet to a face - - Args: - radius: float: - vertices: Iterable[Vertex]: - - Returns: - - """ - - fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - - fillet_builder.Build() - - return self.__class__.cast(fillet_builder.Shape()) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Face: - """Apply 2D chamfer to a face - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Raises: - ValueError: Cannot chamfer at this location - ValueError: One or more vertices are not part of edge - - Returns: - Face: face with a chamfered corner(s) - - """ - reference_edge = edge - - chamfer_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - return self.__class__.cast(chamfer_builder.Shape()).fix() - - def is_coplanar(self, plane: Plane) -> bool: - """Is this planar face coplanar with the provided plane""" - u_val0, _u_val1, v_val0, _v_val1 = self._uv_bounds() - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val0, v_val0, gp_pnt, normal) - - return ( - plane.contains(Vector(gp_pnt)) - and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE - ) - - def project_to_shape( - self, target_object: Shape, direction: VectorLike - ) -> ShapeList[Face | Shell]: - """Project Face to target Object - - Project a Face onto a Shape generating new Face(s) on the surfaces of the object. - - A projection with no taper is illustrated below: - - .. image:: flatProjection.png - :alt: flatProjection - - Note that an array of faces is returned as the projection might result in faces - on the "front" and "back" of the object (or even more if there are intermediate - surfaces in the projection path). faces "behind" the projection are not - returned. - - Args: - target_object (Shape): Object to project onto - direction (VectorLike): projection direction - - Returns: - ShapeList[Face]: Face(s) projected on target object ordered by distance - """ - max_dimension = find_max_dimension([self, target_object]) - extruded_topods_self = _extrude_topods_shape( - self.wrapped, Vector(direction) * max_dimension - ) - - intersected_shapes: ShapeList[Face | Shell] = ShapeList() - if isinstance(target_object, Vertex): - raise TypeError("projection to a vertex is not supported") - if isinstance(target_object, Face): - topods_shape = _topods_bool_op( - (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() - ) - if not topods_shape.IsNull(): - intersected_shapes.append(Face(topods_shape)) - else: - for target_shell in target_object.shells(): - topods_shape = _topods_bool_op( - (extruded_topods_self,), - (target_shell.wrapped,), - BRepAlgoAPI_Common(), - ) - for topods_shell in get_top_level_topods_shapes(topods_shape): - intersected_shapes.append(Shell(topods_shell)) - - intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = ShapeList( - s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ) - return intersected_shapes - - def make_holes(self, interior_wires: list[Wire]) -> Face: - """Make Holes in Face - - Create holes in the Face 'self' from interior_wires which must be entirely interior. - Note that making holes in faces is more efficient than using boolean operations - with solid object. Also note that OCCT core may fail unless the orientation of the wire - is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. - - Example: - - For example, make a series of slots on the curved walls of a cylinder. - - .. image:: slotted_cylinder.png - - Args: - interior_wires: a list of hole outline wires - interior_wires: list[Wire]: - - Returns: - Face: 'self' with holes - - Raises: - RuntimeError: adding interior hole in non-planar face with provided interior_wires - RuntimeError: resulting face is not valid - - """ - # Add wires that define interior holes - note these wires must be entirely interior - makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) - for interior_wire in interior_wires: - makeface_object.Add(interior_wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - # if not surface_face.is_valid(): - # raise RuntimeError("non planar face is invalid") - - return surface_face - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Point inside Face - - Returns whether or not the point is inside a Face within the specified tolerance. - Points on the edge of the Face are considered inside. - - Args: - point(VectorLike): tuple or Vector representing 3D point to be tested - tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool: indicating whether or not point is within Face - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - return solid_classifier.IsOnAFace() - - # surface = BRep_Tool.Surface_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) - # return projector.LowerDistance() <= TOLERANCE - - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs - - Approximate planar face with arcs and straight line segments. - - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - - -class Shell(Mixin2D, Shape[TopoDS_Shell]): - """A Shell is a fundamental component in build123d's topological data structure - representing a connected set of faces forming a closed surface in 3D space. As - part of a geometric model, it defines a watertight enclosure, commonly encountered - in solid modeling. Shells group faces in a coherent manner, playing a crucial role - in representing complex shapes with voids and surfaces. This hierarchical structure - allows for efficient handling of surfaces within a model, supporting various - operations and analyses.""" - - order = 2.5 - - def __init__( - self, - obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell - - Args: - obj (TopoDS_Shape | Face | Iterable[Face], optional): OCCT Shell, Face or Faces. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - obj = list(obj) if isinstance(obj, Iterable) else obj - if isinstance(obj, Iterable) and len(obj_list := list(obj)) == 1: - obj = obj_list[0] - - if isinstance(obj, Face): - builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(obj.wrapped).Surface().Surface() - ) - obj = builder.Shape() - elif isinstance(obj, Iterable): - obj = _sew_topods_faces([f.wrapped for f in obj]) - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - @property - def volume(self) -> float: - """volume - the volume of this Shell if manifold, otherwise zero""" - if self.is_manifold: - solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] - calc_function(solid_shell, properties) - return properties.Mass() - return 0.0 - - def center(self) -> Vector: - """Center of mass of the shell""" - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - return Vector(properties.CentreOfMass()) - - @classmethod - def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: - """extrude - - Extrude a Wire into a Shell. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Shell: - """sweep - - Sweep a 1D profile along a 1D path - - Args: - profile (Union[Curve, Edge, Wire]): the object to sweep - path (Union[Curve, Edge, Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Shell: resulting Shell, may be non-planar - """ - profile = Wire(profile.edges()) - path = Wire(Wire(path.edges()).order_edges()) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Shell(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Shell: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list nor - between wires. Wires may be closed or opened. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Shell: Lofted object - """ - return cls(_make_loft(objs, False, ruled)) + def solids(self) -> ShapeList[Solid]: + """solids - all the solids in this Shape""" + return Shape.get_shape_list(self, "Solid") class Solid(Mixin3D, Shape[TopoDS_Solid]): @@ -7130,6 +592,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): Solid objects to create or modify complex geometries.""" order = 3.0 + # ---- Constructor ---- def __init__( self, @@ -7164,17 +627,41 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): self.material = "" if material is None else material self.joints = {} if joints is None else joints + # ---- Properties ---- + @property def volume(self) -> float: """volume - the volume of this Solid""" # when density == 1, mass == volume return Shape.compute_mass(self) + # ---- Class Methods ---- + @classmethod def _make_solid(cls, shell: Shell) -> TopoDS_Solid: """Create a Solid object from the surface shell""" return ShapeFix_Solid().SolidFromShell(shell.wrapped) + @classmethod + def _set_sweep_mode( + cls, + builder: BRepOffsetAPI_MakePipeShell, + path: Wire | Edge, + binormal: Vector | Wire | Edge, + ) -> bool: + rotate = False + + if isinstance(binormal, Vector): + coordinate_system = gp_Ax2() + coordinate_system.SetLocation(path.start_point().to_pnt()) + coordinate_system.SetDirection(binormal.to_dir()) + builder.SetMode(coordinate_system) + rotate = True + elif isinstance(binormal, (Wire, Edge)): + builder.SetMode(binormal.to_wire().wrapped, True) + + return rotate + @classmethod def extrude(cls, obj: Face, direction: VectorLike) -> Solid: """extrude @@ -7193,309 +680,10 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): """ return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) - @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: - """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) - - @classmethod - def make_box( - cls, length: float, width: float, height: float, plane: Plane = Plane.XY - ) -> Solid: - """make box - - Make a box at the origin of plane extending in positive direction of each axis. - - Args: - length (float): - width (float): - height (float): - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Solid: Box - """ - return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() - ) - - @classmethod - def make_cone( - cls, - base_radius: float, - top_radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cone - - Make a cone with given radii and height - - Args: - base_radius (float): - top_radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cone - """ - return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_cylinder( - cls, - radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cylinder - - Make a cylinder with a given radius and height with the base center on plane origin. - - Args: - radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cylinder - """ - return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_torus( - cls, - major_radius: float, - minor_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 0, - end_angle: float = 360, - major_angle: float = 360, - ) -> Solid: - """make torus - - Make a torus with a given radii and angles - - Args: - major_radius (float): - minor_radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - start_angle (float, optional): start major arc. Defaults to 0. - end_angle (float, optional): end major arc. Defaults to 360. - - Returns: - Solid: Full or partial torus - """ - return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Solid: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Solid: Lofted object - """ - return cls(_make_loft(objs, True, ruled)) - - @classmethod - def make_wedge( - cls, - delta_x: float, - delta_y: float, - delta_z: float, - min_x: float, - min_z: float, - max_x: float, - max_z: float, - plane: Plane = Plane.XY, - ) -> Solid: - """Make a wedge - - Args: - delta_x (float): - delta_y (float): - delta_z (float): - min_x (float): - min_z (float): - max_x (float): - max_z (float): - plane (Plane): base plane. Defaults to Plane.XY. - - Returns: - Solid: wedge - """ - return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() - ) - - @classmethod - def make_sphere( - cls, - radius: float, - plane: Plane = Plane.XY, - angle1: float = -90, - angle2: float = 90, - angle3: float = 360, - ) -> Solid: - """Sphere - - Make a full or partial sphere - with a given radius center on the origin or plane. - - Args: - radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle1 (float, optional): Defaults to -90. - angle2 (float, optional): Defaults to 90. - angle3 (float, optional): Defaults to 360. - - Returns: - Solid: sphere - """ - return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() - ) - - @classmethod - def extrude_taper( - cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True - ) -> Solid: - """Extrude a cross section with a taper - - Extrude a cross section into a prismatic solid in the provided direction. - - Note that two difference algorithms are used. If direction aligns with - the profile normal (which must be positive), the taper is positive and the profile - contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most - accurate results. Otherwise, a loft is created between the profile and the profile - with a 2D offset set at the appropriate direction. - - Args: - section (Face]): cross section - normal (VectorLike): a vector along which to extrude the wires. The length - of the vector controls the length of the extrusion. - taper (float): taper angle in degrees. - flip_inner (bool, optional): outer and inner geometry have opposite tapers to - allow for part extraction when injection molding. - - Returns: - Solid: extruded cross section - """ - # pylint: disable=too-many-locals - direction = Vector(direction) - - if ( - direction.normalized() == profile.normal_at() - and Plane(profile).z_dir.Z > 0 - and taper > 0 - and not profile.inner_wires() - ): - prism_builder = LocOpe_DPrism( - profile.wrapped, - direction.length / cos(radians(taper)), - radians(taper), - ) - new_solid = Solid(prism_builder.Shape()) - else: - # Determine the offset to get the taper - offset_amt = -direction.length * tan(radians(taper)) - - outer = profile.outer_wire() - local_outer: Wire = Plane(profile).to_local_coords(outer) - local_taper_outer = local_outer.offset_2d( - offset_amt, kind=Kind.INTERSECTION - ) - taper_outer = Plane(profile).from_local_coords(local_taper_outer) - taper_outer.move(Location(direction)) - - profile_wires = [profile.outer_wire()] + profile.inner_wires() - - taper_wires = [] - for i, wire in enumerate(profile_wires): - flip = -1 if i > 0 and flip_inner else 1 - local: Wire = Plane(profile).to_local_coords(wire) - local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper_wire: Wire = Plane(profile).from_local_coords(local_taper) - taper_wire.move(Location(direction)) - taper_wires.append(taper_wire) - - solids = [ - Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) - ] - if len(solids) > 1: - complex_solid = solids[0].cut(*solids[1:]) - assert isinstance(complex_solid, Solid) # Can't be a list - new_solid = complex_solid - else: - new_solid = solids[0] - - return new_solid - @classmethod def extrude_linear_with_rotation( cls, - section: Union[Face, Wire], + section: Face | Wire, center: VectorLike, normal: VectorLike, angle: float, @@ -7575,14 +763,89 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): # subtract from the outer solid return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) + @classmethod + def extrude_taper( + cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True + ) -> Solid: + """Extrude a cross section with a taper + + Extrude a cross section into a prismatic solid in the provided direction. + + Note that two difference algorithms are used. If direction aligns with + the profile normal (which must be positive), the taper is positive and the profile + contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most + accurate results. Otherwise, a loft is created between the profile and the profile + with a 2D offset set at the appropriate direction. + + Args: + section (Face]): cross section + normal (VectorLike): a vector along which to extrude the wires. The length + of the vector controls the length of the extrusion. + taper (float): taper angle in degrees. + flip_inner (bool, optional): outer and inner geometry have opposite tapers to + allow for part extraction when injection molding. + + Returns: + Solid: extruded cross section + """ + # pylint: disable=too-many-locals + direction = Vector(direction) + + if ( + direction.normalized() == profile.normal_at() + and Plane(profile).z_dir.Z > 0 + and taper > 0 + and not profile.inner_wires() + ): + prism_builder = LocOpe_DPrism( + profile.wrapped, + direction.length / cos(radians(taper)), + radians(taper), + ) + new_solid = Solid(prism_builder.Shape()) + else: + # Determine the offset to get the taper + offset_amt = -direction.length * tan(radians(taper)) + + outer = profile.outer_wire() + local_outer: Wire = Plane(profile).to_local_coords(outer) + local_taper_outer = local_outer.offset_2d( + offset_amt, kind=Kind.INTERSECTION + ) + taper_outer = Plane(profile).from_local_coords(local_taper_outer) + taper_outer.move(Location(direction)) + + profile_wires = [profile.outer_wire()] + profile.inner_wires() + + taper_wires = [] + for i, wire in enumerate(profile_wires): + flip = -1 if i > 0 and flip_inner else 1 + local: Wire = Plane(profile).to_local_coords(wire) + local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) + taper_wire: Wire = Plane(profile).from_local_coords(local_taper) + taper_wire.move(Location(direction)) + taper_wires.append(taper_wire) + + solids = [ + Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) + ] + if len(solids) > 1: + complex_solid = solids[0].cut(*solids[1:]) + assert isinstance(complex_solid, Solid) # Can't be a list + new_solid = complex_solid + else: + new_solid = solids[0] + + return new_solid + @classmethod def extrude_until( cls, section: Face, - target_object: Union[Compound, Solid], + target_object: Compound | Solid, direction: VectorLike, until: Until = Until.NEXT, - ) -> Union[Compound, Solid]: + ) -> Compound | Solid: """extrude_until Extrude section in provided direction until it encounters either the @@ -7683,10 +946,234 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): return result + @classmethod + def from_bounding_box(cls, bbox: BoundBox) -> Solid: + """A box of the same dimensions and location""" + return Solid.make_box(*bbox.size).locate(Location(bbox.min)) + + @classmethod + def make_box( + cls, length: float, width: float, height: float, plane: Plane = Plane.XY + ) -> Solid: + """make box + + Make a box at the origin of plane extending in positive direction of each axis. + + Args: + length (float): + width (float): + height (float): + plane (Plane, optional): base plane. Defaults to Plane.XY. + + Returns: + Solid: Box + """ + return cls( + BRepPrimAPI_MakeBox( + plane.to_gp_ax2(), + length, + width, + height, + ).Shape() + ) + + @classmethod + def make_cone( + cls, + base_radius: float, + top_radius: float, + height: float, + plane: Plane = Plane.XY, + angle: float = 360, + ) -> Solid: + """make cone + + Make a cone with given radii and height + + Args: + base_radius (float): + top_radius (float): + height (float): + plane (Plane): base plane. Defaults to Plane.XY. + angle (float, optional): arc size. Defaults to 360. + + Returns: + Solid: Full or partial cone + """ + return cls( + BRepPrimAPI_MakeCone( + plane.to_gp_ax2(), + base_radius, + top_radius, + height, + angle * DEG2RAD, + ).Shape() + ) + + @classmethod + def make_cylinder( + cls, + radius: float, + height: float, + plane: Plane = Plane.XY, + angle: float = 360, + ) -> Solid: + """make cylinder + + Make a cylinder with a given radius and height with the base center on plane origin. + + Args: + radius (float): + height (float): + plane (Plane): base plane. Defaults to Plane.XY. + angle (float, optional): arc size. Defaults to 360. + + Returns: + Solid: Full or partial cylinder + """ + return cls( + BRepPrimAPI_MakeCylinder( + plane.to_gp_ax2(), + radius, + height, + angle * DEG2RAD, + ).Shape() + ) + + @classmethod + def make_loft( + cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False + ) -> Solid: + """make loft + + Makes a loft from a list of wires and vertices. Vertices can appear only at the + beginning or end of the list, but cannot appear consecutively within the list + nor between wires. + + Args: + objs (list[Vertex, Wire]): wire perimeters or vertices + ruled (bool, optional): stepped or smooth. Defaults to False (smooth). + + Raises: + ValueError: Too few wires + + Returns: + Solid: Lofted object + """ + return cls(_make_loft(objs, True, ruled)) + + @classmethod + def make_sphere( + cls, + radius: float, + plane: Plane = Plane.XY, + angle1: float = -90, + angle2: float = 90, + angle3: float = 360, + ) -> Solid: + """Sphere + + Make a full or partial sphere - with a given radius center on the origin or plane. + + Args: + radius (float): + plane (Plane): base plane. Defaults to Plane.XY. + angle1 (float, optional): Defaults to -90. + angle2 (float, optional): Defaults to 90. + angle3 (float, optional): Defaults to 360. + + Returns: + Solid: sphere + """ + return cls( + BRepPrimAPI_MakeSphere( + plane.to_gp_ax2(), + radius, + angle1 * DEG2RAD, + angle2 * DEG2RAD, + angle3 * DEG2RAD, + ).Shape() + ) + + @classmethod + def make_torus( + cls, + major_radius: float, + minor_radius: float, + plane: Plane = Plane.XY, + start_angle: float = 0, + end_angle: float = 360, + major_angle: float = 360, + ) -> Solid: + """make torus + + Make a torus with a given radii and angles + + Args: + major_radius (float): + minor_radius (float): + plane (Plane): base plane. Defaults to Plane.XY. + start_angle (float, optional): start major arc. Defaults to 0. + end_angle (float, optional): end major arc. Defaults to 360. + + Returns: + Solid: Full or partial torus + """ + return cls( + BRepPrimAPI_MakeTorus( + plane.to_gp_ax2(), + major_radius, + minor_radius, + start_angle * DEG2RAD, + end_angle * DEG2RAD, + major_angle * DEG2RAD, + ).Shape() + ) + + @classmethod + def make_wedge( + cls, + delta_x: float, + delta_y: float, + delta_z: float, + min_x: float, + min_z: float, + max_x: float, + max_z: float, + plane: Plane = Plane.XY, + ) -> Solid: + """Make a wedge + + Args: + delta_x (float): + delta_y (float): + delta_z (float): + min_x (float): + min_z (float): + max_x (float): + max_z (float): + plane (Plane): base plane. Defaults to Plane.XY. + + Returns: + Solid: wedge + """ + return cls( + BRepPrimAPI_MakeWedge( + plane.to_gp_ax2(), + delta_x, + delta_y, + delta_z, + min_x, + min_z, + max_x, + max_z, + ).Solid() + ) + @classmethod def revolve( cls, - section: Union[Face, Wire], + section: Face | Wire, angle: float, axis: Axis, inner_wires: list[Wire] | None = None, @@ -7720,35 +1207,15 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): return cls(revol_builder.Shape()) - @classmethod - def _set_sweep_mode( - cls, - builder: BRepOffsetAPI_MakePipeShell, - path: Union[Wire, Edge], - binormal: Union[Vector, Wire, Edge], - ) -> bool: - rotate = False - - if isinstance(binormal, Vector): - coordinate_system = gp_Ax2() - coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(binormal.to_dir()) - builder.SetMode(coordinate_system) - rotate = True - elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) - - return rotate - @classmethod def sweep( cls, - section: Union[Face, Wire], - path: Union[Wire, Edge], + section: Face | Wire, + path: Wire | Edge, inner_wires: list[Wire] | None = None, make_solid: bool = True, is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, + mode: Vector | Wire | Edge | None = None, transition: Transition = Transition.TRANSFORMED, ) -> Solid: """Sweep @@ -7811,10 +1278,10 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): def sweep_multi( cls, profiles: Iterable[Union[Wire, Face]], - path: Union[Wire, Edge], + path: Wire | Edge, make_solid: bool = True, is_frenet: bool = False, - binormal: Union[Vector, Wire, Edge, None] = None, + binormal: Vector | Wire | Edge | None = None, ) -> Solid: """Multi section sweep @@ -7863,7 +1330,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): cls, surface: Face | Shell, depth: float, - normal_override: Optional[VectorLike] = None, + normal_override: VectorLike | None = None, ) -> Solid: """Thicken Face or Shell @@ -7917,1757 +1384,3 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): raise RuntimeError("Error applying thicken to given surface") from err return result - - -class Vertex(Shape[TopoDS_Vertex]): - """A Vertex in build123d represents a zero-dimensional point in the topological - data structure. It marks the endpoints of edges within a 3D model, defining precise - locations in space. Vertices play a crucial role in defining the geometry of objects - and the connectivity between edges, facilitating accurate representation and - manipulation of 3D shapes. They hold coordinate information and are essential - for constructing complex structures like wires, faces, and solids.""" - - order = 0.0 - - @property - def _dim(self) -> int: - return 0 - - @overload - def __init__(self): # pragma: no cover - """Default Vertext at the origin""" - - @overload - def __init__(self, ocp_vx: TopoDS_Vertex): # pragma: no cover - """Vertex from OCCT TopoDS_Vertex object""" - - @overload - def __init__(self, X: float, Y: float, Z: float): # pragma: no cover - """Vertex from three float values""" - - @overload - def __init__(self, v: Iterable[float]): - """Vertex from Vector or other iterators""" - - def __init__(self, *args, **kwargs): - self.vertex_index = 0 - - ocp_vx = kwargs.pop("ocp_vx", None) - v = kwargs.pop("v", None) - x = kwargs.pop("X", 0) - y = kwargs.pop("Y", 0) - z = kwargs.pop("Z", 0) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if args: - if isinstance(args[0], TopoDS_Vertex): - ocp_vx = args[0] - elif isinstance(args[0], Iterable): - v = args[0] - else: - x, y, z = args[:3] + (0,) * (3 - len(args)) - - if v is not None: - x, y, z = itertools.islice(itertools.chain(v, [0, 0, 0]), 3) - - ocp_vx = ( - downcast(BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z)).Vertex()) - if ocp_vx is None - else ocp_vx - ) - - super().__init__(ocp_vx) - self.X, self.Y, self.Z = self.to_tuple() - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def volume(self) -> float: - """volume - the volume of this Vertex, which is always zero""" - return 0.0 - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return ShapeList((self,)) # Vertex is an iterable - - def vertex(self) -> Vertex: - """Return the Vertex""" - return self - - def to_tuple(self) -> tuple[float, float, float]: - """Return vertex as three tuple of floats""" - geom_point = BRep_Tool.Pnt_s(self.wrapped) - return (geom_point.X(), geom_point.Y(), geom_point.Z()) - - def center(self) -> Vector: - """The center of a vertex is itself!""" - return Vector(self) - - def __add__( # type: ignore - self, other: Vertex | Vector | tuple[float, float, float] - ) -> Vertex: - """Add - - Add to a Vertex with a Vertex, Vector or Tuple - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" Vertex: # type: ignore - """Subtract - - Substract a Vertex with a Vertex, Vector or Tuple from self - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" str: - """To String - - Convert Vertex to String for display - - Returns: - Vertex as String - """ - return f"Vertex({self.X}, {self.Y}, {self.Z})" - - def __iter__(self): - """Initialize to beginning""" - self.vertex_index = 0 - return self - - def __next__(self): - """return the next value""" - if self.vertex_index == 0: - self.vertex_index += 1 - value = self.X - elif self.vertex_index == 1: - self.vertex_index += 1 - value = self.Y - elif self.vertex_index == 2: - self.vertex_index += 1 - value = self.Z - else: - raise StopIteration - return value - - def transform_shape(self, t_matrix: Matrix) -> Vertex: - """Apply affine transform without changing type - - Transforms a copy of this Vertex by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Vertex: copy of transformed shape with all objects keeping their type - """ - return Vertex(*t_matrix.multiply(Vector(self))) - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: - """extrude - invalid operation for Vertex""" - raise NotImplementedError("Vertices can't be created by extrusion") - - -class Wire(Mixin1D, Shape[TopoDS_Wire]): - """A Wire in build123d is a topological entity representing a connected sequence - of edges forming a continuous curve or path in 3D space. Wires are essential - components in modeling complex objects, defining boundaries for surfaces or - solids. They store information about the connectivity and order of edges, - allowing precise definition of paths within a 3D model.""" - - order = 1.5 - - @overload - def __init__( - self, - obj: TopoDS_Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from an OCCT TopoDS_Wire - - Args: - obj (TopoDS_Wire, optional): OCCT Wire. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edge: Edge, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Edge - - Args: - edge (Edge): Edge to convert to Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Wire - used when the input could be an Edge or Wire. - - Args: - wire (Wire): Wire to convert to another Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Curve, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Curve. - - Args: - curve (Curve): Curve to convert to a Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edges: Iterable[Edge], - sequenced: bool = False, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from Edges - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - curve, edge, edges, wire, sequenced, obj, label, color, parent = (None,) * 9 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Wire): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Edge): - edge, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - # elif isinstance(args[0], Curve): - elif ( - hasattr(args[0], "wrapped") - and isinstance(args[0].wrapped, TopoDS_Compound) - and topods_dim(args[0].wrapped) == 1 - ): # Curve - curve, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Iterable): - edges, sequenced, label, color, parent = args[:5] + (None,) * (5 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "curve", - "wire", - "edge", - "edges", - "sequenced", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - edge = kwargs.get("edge", edge) - edges = kwargs.get("edges", edges) - sequenced = kwargs.get("sequenced", sequenced) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - wire = kwargs.get("wire", wire) - curve = kwargs.get("curve", curve) - - if edge is not None: - edges = [edge] - elif curve is not None: - edges = curve.edges() - if wire is not None: - obj = wire.wrapped - elif edges: - obj = Wire._make_wire(edges, False if sequenced is None else sequenced) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_CompCurve: - """Return the Geom Comp Curve for this Wire""" - return BRepAdaptor_CompCurve(self.wrapped) - - def close(self) -> Wire: - """Close a Wire""" - if not self.is_closed: - edge = Edge.make_line(self.end_point(), self.start_point()) - return_value = Wire.combine((self, edge))[0] - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" - return self - - @classmethod - def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 - ) -> ShapeList[Wire]: - """combine - - Combine a list of wires and edges into a list of Wires. - - Args: - wires (Iterable[Union[Wire, Edge]]): unsorted - tol (float, optional): tolerance. Defaults to 1e-9. - - Returns: - ShapeList[Wire]: Wires - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) - - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires = ShapeList() - for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) - - return wires - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: - """extrude - invalid operation for Wire""" - raise NotImplementedError("Wires can't be created by extrusion") - - def fix_degenerate_edges(self, precision: float) -> Wire: - """fix_degenerate_edges - - Fix a Wire that contains degenerate (very small) edges - - Args: - precision (float): minimum value edge length - - Returns: - Wire: fixed wire - """ - sf_w = ShapeFix_Wireframe(self.wrapped) - sf_w.SetPrecision(precision) - sf_w.SetMaxTolerance(1e-6) - sf_w.FixSmallEdges() - sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) - - def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" - - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. - - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False - - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) - - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length - break - distance += edge.length - - if not found: - raise ValueError(f"{point} not on wire") - - return distance / wire_length - - def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Wire: trimmed wire - """ - - # pylint: disable=too-many-branches - if start >= end: - raise ValueError("start must be less than end") - - edges = self.edges() - - # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) - - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) - - trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue - - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) - - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) - - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) - - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) - - return Wire(trimmed_edges) - - def order_edges(self) -> ShapeList[Edge]: - """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) - - @classmethod - def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: - """_make_wire - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - - Raises: - ValueError: Edges are disconnected and can't be sequenced. - RuntimeError: Wire is empty - - Returns: - Wire: assembled edges - """ - - def closest_to_end(current: Wire, unplaced_edges: list[Edge]) -> Edge: - """Return the Edge closest to the end of last_edge""" - target_point = current.position_at(1) - - sorted_edges = sorted( - unplaced_edges, - key=lambda e: min( - (target_point - e.position_at(0)).length, - (target_point - e.position_at(1)).length, - ), - ) - return sorted_edges[0] - - edges = list(edges) - if sequenced: - placed_edges = [edges.pop(0)] - unplaced_edges = edges - - while unplaced_edges: - next_edge = closest_to_end(Wire(placed_edges), unplaced_edges) - next_edge_index = unplaced_edges.index(next_edge) - placed_edges.append(unplaced_edges.pop(next_edge_index)) - - edges = placed_edges - - wire_builder = BRepBuilderAPI_MakeWire() - combined_edges = TopTools_ListOfShape() - for edge in edges: - combined_edges.Append(edge.wrapped) - wire_builder.Add(combined_edges) - - wire_builder.Build() - if not wire_builder.IsDone(): - if wire_builder.Error() == BRepBuilderAPI_NonManifoldWire: - warnings.warn( - "Wire is non manifold (e.g. branching, self intersecting)", - stacklevel=2, - ) - elif wire_builder.Error() == BRepBuilderAPI_EmptyWire: - raise RuntimeError("Wire is empty") - elif wire_builder.Error() == BRepBuilderAPI_DisconnectedWire: - raise ValueError("Edges are disconnected") - - return wire_builder.Wire() - - @classmethod - def make_circle(cls, radius: float, plane: Plane = Plane.XY) -> Wire: - """make_circle - - Makes a circle centered at the origin of plane - - Args: - radius (float): circle radius - plane (Plane): base plane. Defaults to Plane.XY - - Returns: - Wire: a circle - """ - circle_edge = Edge.make_circle(radius, plane=plane) - return Wire([circle_edge]) - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - closed: bool = True, - ) -> Wire: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): _description_. Defaults to 360.0. - end_angle (float, optional): _description_. Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - closed (bool, optional): close the arc. Defaults to True. - - Returns: - Wire: an ellipse - """ - ellipse_edge = Edge.make_ellipse( - x_radius, y_radius, plane, start_angle, end_angle, angular_direction - ) - - if start_angle != end_angle and closed: - line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) - wire = Wire([ellipse_edge, line]) - else: - wire = Wire([ellipse_edge]) - - return wire - - @classmethod - def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: - """make_polygon - - Create an irregular polygon by defining vertices - - Args: - vertices (Iterable[VectorLike]): - close (bool, optional): close the polygon. Defaults to True. - - Returns: - Wire: an irregular polygon - """ - vectors = [Vector(v) for v in vertices] - if (vectors[0] - vectors[-1]).length > TOLERANCE and close: - vectors.append(vectors[0]) - - wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vectors: - wire_builder.Add(vertex.to_pnt()) - - return cls(wire_builder.Wire()) - - def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires - - Args: - other: Wire: - - Returns: - - """ - - wire_builder = BRepBuilderAPI_MakeWire() - wire_builder.Add(TopoDS.Wire_s(self.wrapped)) - wire_builder.Add(TopoDS.Wire_s(other.wrapped)) - wire_builder.Build() - - return self.__class__.cast(wire_builder.Wire()) - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: - """fillet_2d - - Apply 2D fillet to a wire - - Args: - radius (float): - vertices (Iterable[Vertex]): vertices to fillet - - Returns: - Wire: filleted wire - """ - # Create a face to fillet - unfilleted_face = _make_topods_face_from_wires(self.wrapped) - # Fillet the face - fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - fillet_builder.Build() - filleted_face = downcast(fillet_builder.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(filleted_face)) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Wire: - """chamfer_2d - - Apply 2D chamfer to a wire - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Returns: - Wire: chamfered wire - """ - reference_edge = edge - - # Create a face to chamfer - unchamfered_face = _make_topods_face_from_wires(self.wrapped) - chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - chamfered_face = chamfer_builder.Shape() - # Fix the shape - shape_fix = ShapeFix_Shape(chamfered_face) - shape_fix.Perform() - chamfered_face = downcast(shape_fix.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(chamfered_face)) - - @staticmethod - def order_chamfer_edges( - reference_edge: Optional[Edge], edges: tuple[Edge, Edge] - ) -> tuple[Edge, Edge]: - """Order the edges of a chamfer relative to a reference Edge""" - if reference_edge: - edge1, edge2 = edges - if edge1 == reference_edge: - return edge1, edge2 - if edge2 == reference_edge: - return edge2, edge1 - raise ValueError("reference edge not in edges") - return edges - - @classmethod - def make_rect( - cls, - width: float, - height: float, - plane: Plane = Plane.XY, - ) -> Wire: - """Make Rectangle - - Make a Rectangle centered on center with the given normal - - Args: - width (float): width (local x) - height (float): height (local y) - plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. - - Returns: - Wire: The centered rectangle - """ - corners_local = [ - (width / 2, height / 2), - (width / 2, height / -2), - (width / -2, height / -2), - (width / -2, height / 2), - ] - corners_world = [plane.from_local_coords(c) for c in corners_local] - return Wire.make_polygon(corners_world, close=True) - - @classmethod - def make_convex_hull(cls, edges: Iterable[Edge], tolerance: float = 1e-3) -> Wire: - """make_convex_hull - - Create a wire of minimum length enclosing all of the provided edges. - - Note that edges can't overlap each other. - - Args: - edges (Iterable[Edge]): edges defining the convex hull - tolerance (float): allowable error as a fraction of each edge length. - Defaults to 1e-3. - - Raises: - ValueError: edges overlap - - Returns: - Wire: convex hull perimeter - """ - # pylint: disable=too-many-branches, too-many-locals - # Algorithm: - # 1) create a cloud of points along all edges - # 2) create a convex hull which returns facets/simplices as pairs of point indices - # 3) find facets that are within an edge but not adjacent and store trim and - # new connecting edge data - # 4) find facets between edges and store trim and new connecting edge data - # 5) post process the trim data to remove duplicates and store in pairs - # 6) create connecting edges - # 7) create trim edges from the original edges and the trim data - # 8) return a wire version of all the edges - - # Possible enhancement: The accuracy of the result could be improved and the - # execution time reduced by adaptively placing more points around where the - # connecting edges contact the arc. - - # if any( - # [ - # edge_pair[0].overlaps(edge_pair[1]) - # for edge_pair in combinations(edges, 2) - # ] - # ): - # raise ValueError("edges overlap") - edges = list(edges) - fragments_per_edge = int(2 / tolerance) - points_lookup = {} # lookup from point index to edge/position on edge - points = [] # convex hull point cloud - - # Create points along each edge and the lookup structure - for edge_index, edge in enumerate(edges): - for i in range(fragments_per_edge): - param = i / (fragments_per_edge - 1) - points.append(edge.position_at(param).to_tuple()[:2]) - points_lookup[edge_index * fragments_per_edge + i] = (edge_index, param) - - convex_hull = ConvexHull(points) - - # Filter the fragments - connecting_edge_data = [] - trim_points: dict[int, list[int]] = {} - for simplice in convex_hull.simplices: - edge0 = points_lookup[simplice[0]][0] - edge1 = points_lookup[simplice[1]][0] - # Look for connecting edges between edges - if edge0 != edge1: - if edge0 not in trim_points: - trim_points[edge0] = [simplice[0]] - else: - trim_points[edge0].append(simplice[0]) - if edge1 not in trim_points: - trim_points[edge1] = [simplice[1]] - else: - trim_points[edge1].append(simplice[1]) - connecting_edge_data.append( - ( - (edge0, points_lookup[simplice[0]][1], simplice[0]), - (edge1, points_lookup[simplice[1]][1], simplice[1]), - ) - ) - # Look for connecting edges within an edge - elif abs(simplice[0] - simplice[1]) != 1: - start_pnt = min(simplice.tolist()) - end_pnt = max(simplice.tolist()) - if edge0 not in trim_points: - trim_points[edge0] = [start_pnt, end_pnt] - else: - trim_points[edge0].extend([start_pnt, end_pnt]) - connecting_edge_data.append( - ( - (edge0, points_lookup[start_pnt][1], start_pnt), - (edge0, points_lookup[end_pnt][1], end_pnt), - ) - ) - - trim_data = {} - for edge_index, start_end_pnts in trim_points.items(): - s_points = sorted(start_end_pnts) - f_points = [] - for i in range(0, len(s_points) - 1, 2): - if s_points[i] != s_points[i + 1]: - f_points.append(tuple(s_points[i : i + 2])) - trim_data[edge_index] = f_points - - connecting_edges = [ - Edge.make_line( - edges[line[0][0]] @ line[0][1], edges[line[1][0]] @ line[1][1] - ) - for line in connecting_edge_data - ] - trimmed_edges = [ - edges[edge_index].trim( - points_lookup[trim_pair[0]][1], points_lookup[trim_pair[1]][1] - ) - for edge_index, trim_pairs in trim_data.items() - for trim_pair in trim_pairs - ] - hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) - return hull_wire - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Wire]: - """Project Wire - - Project a Wire onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected wire(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - # pylint: disable=too-many-branches - if self.wrapped is None or target_object.wrapped is None: - raise ValueError("Can't project empty Wires or to empty Shapes") - - if not (direction is None) ^ (center is None): - raise ValueError("One of either direction or center must be provided") - if direction is not None: - direction_vector = Vector(direction).normalized() - center_point = Vector() # for typing, never used - else: - direction_vector = None - center_point = Vector(center) - - # Project the wire on the target object - if direction_vector is not None: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Dir(*direction_vector.to_tuple()), - ) - else: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Pnt(*center_point.to_tuple()), - ) - - # Generate a list of the projected wires with aligned orientation - output_wires = [] - target_orientation = self.wrapped.Orientation() - while projection_object.More(): - projected_wire = projection_object.Current() - if target_orientation == projected_wire.Orientation(): - output_wires.append(Wire(projected_wire)) - else: - output_wires.append(Wire(projected_wire.Reversed())) - projection_object.Next() - - logger.debug("wire generated %d projected wires", len(output_wires)) - - # BRepProj_Projection is inconsistent in the order that it returns projected - # wires, sometimes front first and sometimes back - so sort this out by sorting - # by distance from the original planar wire - if len(output_wires) > 1: - output_wires_distances = [] - planar_wire_center = self.center() - for output_wire in output_wires: - output_wire_center = output_wire.center() - if direction_vector is not None: - output_wire_direction = ( - output_wire_center - planar_wire_center - ).normalized() - if output_wire_direction.dot(direction_vector) >= 0: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - planar_wire_center).length, - ) - ) - else: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - center_point).length, - ) - ) - - output_wires_distances.sort(key=lambda x: x[1]) - logger.debug( - "projected, filtered and sorted wire list is of length %d", - len(output_wires_distances), - ) - output_wires = [w[0] for w in output_wires_distances] - - return output_wires - - -class Joint(ABC): - """Joint - - Abstract Base Joint class - used to join two components together - - Args: - parent (Union[Solid, Compound]): object that joint to bound to - - Attributes: - label (str): user assigned label - parent (Shape): object joint is bound to - connected_to (Joint): joint that is connect to this joint - - """ - - def __init__(self, label: str, parent: Union[Solid, Compound]): - self.label = label - self.parent = parent - self.connected_to: Joint | None = None - - def _connect_to(self, other: Joint, **kwargs): # pragma: no cover - """Connect Joint self by repositioning other""" - - if not isinstance(other, Joint): - raise TypeError(f"other must of type Joint not {type(other)}") - if self.parent.location is None: - raise ValueError("Parent location is not set") - relative_location = self.relative_to(other, **kwargs) - other.parent.locate(self.parent.location * relative_location) - self.connected_to = other - - @abstractmethod - def connect_to(self, other: Joint): - """All derived classes must provide a connect_to method""" - - @abstractmethod - def relative_to(self, other: Joint) -> Location: - """Return relative location to another joint""" - - @property - @abstractmethod - def location(self) -> Location: - """Location of joint""" - - @property - @abstractmethod - def symbol(self) -> Compound: - """A CAD object positioned in global space to illustrate the joint""" - - -def _make_loft( - objs: Iterable[Union[Vertex, Wire]], - filled: bool, - ruled: bool = False, -) -> TopoDS_Shape: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - wires (list[Wire]): section perimeters - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - TopoDS_Shape: Lofted object - """ - objs = list(objs) # To determine its length - if len(objs) < 2: - raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] - vertex_count = len(vertices) - - if vertex_count > 2: - raise ValueError("Only two vertices are allowed") - - if vertex_count == 1 and not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - or isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertex must be either at the beginning or end of the list" - ) - - if vertex_count == 2: - if len(objs) == 2: - raise ValueError( - "You can't have only 2 vertices to loft; try adding some wires" - ) - if not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - and isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertices must be at the beginning and end of the list" - ) - - loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) - - for obj in objs: - if isinstance(obj.wrapped, TopoDS_Vertex): - loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj.wrapped, TopoDS_Wire): - loft_builder.AddWire(obj.wrapped) - - loft_builder.Build() - - return loft_builder.Shape() - - -def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: - """Downcasts a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - f_downcast: Any = Shape.downcast_LUT[shapetype(obj)] - return_value = f_downcast(obj) - - return return_value - - -def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: - """Convert edges to a list of wires. - - Args: - edges: Iterable[Edge]: - tol: float: (Default value = 1e-6) - - Returns: - - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in edges: - if edge.wrapped is not None: - edges_in.Append(edge.wrapped) - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires: ShapeList[Wire] = ShapeList() - for i in range(wires_out.Length()): - # wires.append(Wire(downcast(wires_out.Value(i + 1)))) - wires.append(Wire(TopoDS.Wire_s(wires_out.Value(i + 1)))) - - return wires - - -def fix(obj: TopoDS_Shape) -> TopoDS_Shape: - """Fix a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - shape_fix = ShapeFix_Shape(obj) - shape_fix.Perform() - - return downcast(shape_fix.Shape()) - - -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: - """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj is None or obj.IsNull(): - raise ValueError("Null TopoDS_Shape object") - - return obj.ShapeType() - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) - if len(shapetypes) == 1: - result = shapetypes.pop() - else: - result = shapetype(obj) - else: - result = shapetype(obj.wrapped) - return result - - -def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: - """Tries to determine how wires should be combined into faces. - - Assume: - The wires make up one or more faces, which could have 'holes' - Outer wires are listed ahead of inner wires - there are no wires inside wires inside wires - ( IE, islands -- we can deal with that later on ) - none of the wires are construction wires - - Compute: - one or more sets of wires, with the outer wire listed first, and inner - ones - - Returns, list of lists. - - Args: - wire_list: list[Wire]: - - Returns: - - """ - - # check if we have something to sort at all - if len(wire_list) < 2: - return [ - wire_list, - ] - - # make a Face, NB: this might return a compound of faces - faces = Face(wire_list[0], wire_list[1:]) - - return_value = [] - for face in faces.faces(): - return_value.append( - [ - face.outer_wire(), - ] - + face.inner_wires() - ) - - return return_value - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - -def topo_explore_connected_edges( - edge: Edge, parent: Shape | None = None -) -> ShapeList[Edge]: - """Given an edge extracted from a Shape, return the edges connected to it""" - - parent = parent if parent is not None else edge.topo_parent - if parent is None: - raise ValueError("edge has no valid parent") - given_topods_edge = edge.wrapped - if given_topods_edge is None: - raise ValueError("edge is empty") - connected_edges = set() - - # Find all the TopoDS_Edges for this Shape - topods_edges = [e.wrapped for e in parent.edges() if e.wrapped is not None] - - for topods_edge in topods_edges: - # # Don't match with the given edge - if given_topods_edge.IsSame(topods_edge): - continue - # If the edge shares a vertex with the given edge they are connected - if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: - connected_edges.add(topods_edge) - - return ShapeList(Edge(e) for e in connected_edges) - - -def topo_explore_common_vertex( - edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge -) -> Optional[Vertex]: - """Given two edges, find the common vertex""" - topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped - topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped - - if topods_edge1 is None or topods_edge2 is None: - raise ValueError("edge is empty") - - # Explore vertices of the first edge - vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) - while vert_exp.More(): - vertex1 = vert_exp.Current() - - # Explore vertices of the second edge - explorer2 = TopExp_Explorer(topods_edge2, ta.TopAbs_VERTEX) - while explorer2.More(): - vertex2 = explorer2.Current() - - # Check if the vertices are the same - if vertex1.IsSame(vertex2): - return Vertex(TopoDS.Vertex_s(vertex1)) # Common vertex found - - explorer2.Next() - vert_exp.Next() - - return None # No common vertex found - - -def unwrap_topods_compound( - compound: TopoDS_Compound, fully: bool = True -) -> TopoDS_Compound | TopoDS_Shape: - """Strip unnecessary Compound wrappers - - Args: - compound (TopoDS_Compound): The TopoDS_Compound to unwrap. - fully (bool, optional): return base shape without any TopoDS_Compound - wrappers (otherwise one TopoDS_Compound is left). Defaults to True. - - Returns: - TopoDS_Compound | TopoDS_Shape: base shape - """ - if compound.NbChildren() == 1: - iterator = TopoDS_Iterator(compound) - single_element = downcast(iterator.Value()) - - # If the single element is another TopoDS_Compound, unwrap it recursively - if isinstance(single_element, TopoDS_Compound): - return unwrap_topods_compound(single_element, fully) - - return single_element if fully else compound - - # If there are no elements or more than one element, return TopoDS_Compound - return compound - - -def get_top_level_topods_shapes( - topods_shape: TopoDS_Shape | None, -) -> list[TopoDS_Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - list[TopoDS_Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if topods_shape is None: - return ShapeList() - - first_level_shapes = [] - stack = [topods_shape] - - while stack: - current_shape = stack.pop() - if isinstance(current_shape, TopoDS_Compound): - iterator = TopoDS_Iterator() - iterator.Initialize(current_shape) - while iterator.More(): - child_shape = downcast(iterator.Value()) - if isinstance(child_shape, TopoDS_Compound): - # Traverse further into the compound - stack.append(child_shape) - else: - # Add non-compound shape - first_level_shapes.append(child_shape) - iterator.Next() - else: - first_level_shapes.append(current_shape) - - return first_level_shapes - - -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - -def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None -) -> TopoDS_Face: - """_make_topods_face_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error - - Returns: - TopoDS_Face: planar face potentially with holes - """ - if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = list(inner_wires) if inner_wires else [] - - # check if wires are coplanar - verification_compound = _make_topods_compound_from_shapes( - [outer_wire] + inner_wires - ) - if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): - raise ValueError("Cannot build face(s): wires not planar") - - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) - - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) - - for inner_wire in inner_wires: - if not BRep_Tool.IsClosed_s(inner_wire): - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) - - face_builder.Build() - - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") - - face = face_builder.Face() - - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() - - return TopoDS.Face_s(sf_f.Result()) - - -def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: - """Sew faces into a shell if possible""" - shell_builder = BRepBuilderAPI_Sewing() - for face in faces: - shell_builder.Add(face) - shell_builder.Perform() - return downcast(shell_builder.SewedShape()) - - -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound - """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) - - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) - - return comp - - -def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: - """Return the maximum dimension of one or more shapes""" - shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) - bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) - return bbox.diagonal - - -def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) - - -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - TopoDS_Shape: extruded shape - """ - direction = Vector(direction) - - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") - - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion - - -class SkipClean: - """Skip clean context for use in operator driven code where clean=False wouldn't work""" - - clean = True - - def __enter__(self): - SkipClean.clean = False - - def __exit__(self, exception_type, exception_value, traceback): - SkipClean.clean = True From fc32715a5f3ec66461dbf212a1778a46e1702529 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 13:53:27 -0500 Subject: [PATCH 079/518] Step 7b split - composite.py --- src/build123d/topology/composite.py | 9596 +-------------------------- 1 file changed, 355 insertions(+), 9241 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 5986e08..6014dda 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -1,17 +1,42 @@ """ build123d topology -name: topology.py +name: composite.py by: Gumyr -date: Oct 14, 2022 +date: January 07, 2025 desc: - This python module is a CAD library based on OpenCascade containing - the base Shape class and all of its derived classes. + +This module defines advanced composite geometric entities for the build123d CAD system. It +introduces the `Compound` class as a central concept for managing groups of shapes, alongside +specialized subclasses such as `Curve`, `Sketch`, and `Part` for 1D, 2D, and 3D objects, +respectively. These classes streamline the construction and manipulation of complex geometric +assemblies. + +Key Features: +- **Compound Class**: + - Represents a collection of geometric shapes (e.g., vertices, edges, faces, solids) grouped + hierarchically. + - Supports operations like adding, removing, and combining shapes, as well as querying volumes, + centers, and intersections. + - Provides utility methods for unwrapping nested compounds and generating 3D text or coordinate + system triads. + +- **Specialized Subclasses**: + - `Curve`: Handles 1D objects like edges and wires. + - `Sketch`: Focused on 2D objects, such as faces. + - `Part`: Manages 3D solids and assemblies. + +- **Advanced Features**: + - Includes Boolean operations, hierarchy traversal, and bounding box-based intersection detection. + - Supports transformations, child-parent relationships, and dynamic updates. + +This module leverages OpenCascade for robust geometric operations while offering a Pythonic +interface for efficient and extensible CAD modeling workflows. license: - Copyright 2022 Gumyr + Copyright 2025 Gumyr Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,123 +54,15 @@ license: from __future__ import annotations -# pylint has trouble with the OCP imports -# pylint: disable=no-name-in-module, import-error -# pylint: disable=too-many-lines -# other pylint warning to temp remove: -# too-many-arguments, too-many-locals, too-many-public-methods, -# too-many-statements, too-many-instance-attributes, too-many-branches import copy -import itertools import os -import platform import sys import warnings -from abc import ABC, abstractmethod from itertools import combinations -from math import radians, inf, pi, sin, cos, tan, copysign, ceil, floor, isclose -from typing import ( - Any, - Callable, - Dict, - Generic, - Iterable, - Iterator, - Optional, - Protocol, - Sequence, - SupportsIndex, - Tuple, - Type, - TypeVar, - Union, - overload, - TYPE_CHECKING, -) -from typing import cast as tcast -from typing_extensions import Self, Literal -from anytree import NodeMixin, PreOrderIter, RenderTree -from IPython.lib.pretty import pretty, PrettyPrinter -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull # pylint:disable=no-name-in-module -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter +from typing import Iterable, Iterator, Sequence, Type, Union -import OCP.GeomAbs as ga # Geometry type enum -import OCP.TopAbs as ta # Topology type enum -from OCP.Aspect import Aspect_TOL_SOLID -from OCP.Bnd import Bnd_Box -from OCP.BOPAlgo import BOPAlgo_GlueEnum - -from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import ( - BRepAdaptor_CompCurve, - BRepAdaptor_Curve, - BRepAdaptor_Surface, -) -from OCP.BRepAlgo import BRepAlgo -from OCP.BRepAlgoAPI import ( - BRepAlgoAPI_BooleanOperation, - BRepAlgoAPI_Common, - BRepAlgoAPI_Cut, - BRepAlgoAPI_Fuse, - BRepAlgoAPI_Section, - BRepAlgoAPI_Splitter, -) -from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_Copy, - BRepBuilderAPI_DisconnectedWire, - BRepBuilderAPI_EmptyWire, - BRepBuilderAPI_GTransform, - BRepBuilderAPI_MakeEdge, - BRepBuilderAPI_MakeFace, - BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeShell, - BRepBuilderAPI_MakeSolid, - BRepBuilderAPI_MakeVertex, - BRepBuilderAPI_MakeWire, - BRepBuilderAPI_NonManifoldWire, - BRepBuilderAPI_RightCorner, - BRepBuilderAPI_RoundCorner, - BRepBuilderAPI_Sewing, - BRepBuilderAPI_Transform, - BRepBuilderAPI_Transformed, -) -from OCP.BRepCheck import BRepCheck_Analyzer -from OCP.BRepClass3d import BRepClass3d_SolidClassifier -from OCP.BRepExtrema import BRepExtrema_DistShapeShape -from OCP.BRepFeat import BRepFeat_MakeDPrism, BRepFeat_SplitShape -from OCP.BRepFill import BRepFill -from OCP.BRepFilletAPI import ( - BRepFilletAPI_MakeChamfer, - BRepFilletAPI_MakeFillet, - BRepFilletAPI_MakeFillet2d, -) -from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation -from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter -from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepMesh import BRepMesh_IncrementalMesh -from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import ( - BRepOffsetAPI_MakeFilling, - BRepOffsetAPI_MakeOffset, - BRepOffsetAPI_MakePipeShell, - BRepOffsetAPI_MakeThickSolid, - BRepOffsetAPI_ThruSections, -) -from OCP.BRepPrimAPI import ( - BRepPrimAPI_MakeBox, - BRepPrimAPI_MakeCone, - BRepPrimAPI_MakeCylinder, - BRepPrimAPI_MakePrism, - BRepPrimAPI_MakeRevol, - BRepPrimAPI_MakeSphere, - BRepPrimAPI_MakeTorus, - BRepPrimAPI_MakeWedge, -) -from OCP.BRepProj import BRepProj_Projection -from OCP.BRepTools import BRepTools +import OCP.TopAbs as ta +from OCP.BRepAlgoAPI import BRepAlgoAPI_Fuse from OCP.Font import ( Font_FA_Bold, Font_FA_Italic, @@ -153,4263 +70,51 @@ from OCP.Font import ( Font_FontMgr, Font_SystemFont, ) -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse # geometry construction -from OCP.gce import gce_MakeLin -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import ( - Geom_BezierCurve, - Geom_BezierSurface, - Geom_ConicalSurface, - Geom_CylindricalSurface, - Geom_Plane, - Geom_Surface, - Geom_TrimmedCurve, - Geom_Line, -) -from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve -from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_Intersection, GeomAbs_JoinType -from OCP.GeomAPI import ( - GeomAPI_IntCS, - GeomAPI_Interpolate, - GeomAPI_PointsToBSpline, - GeomAPI_PointsToBSplineSurface, - GeomAPI_ProjectPointOnSurf, - GeomAPI_ProjectPointOnCurve, -) -from OCP.GeomFill import ( - GeomFill_CorrectedFrenet, - GeomFill_Frenet, - GeomFill_TrihedronLaw, -) -from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, -) - -# properties used to store mass calculation result from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher -from OCP.IVtkVTK import IVtkVTK_ShapeData -from OCP.LocOpe import LocOpe_DPrism from OCP.NCollection import NCollection_Utf8String -from OCP.Precision import Precision -from OCP.Prs3d import Prs3d_IsoAspect -from OCP.Quantity import Quantity_Color -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds, ShapeAnalysis_Curve -from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters -from OCP.ShapeFix import ( - ShapeFix_Face, - ShapeFix_Shape, - ShapeFix_Solid, - ShapeFix_Wireframe, -) -from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain - -# for catching exceptions -from OCP.Standard import ( - Standard_Failure, - Standard_NoSuchObject, - Standard_ConstructionError, -) -from OCP.StdFail import StdFail_NotDone -from OCP.StdPrs import StdPrs_BRepFont -from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder - -# Array of vectors (used for B-spline interpolation): -# Array of points (used for B-spline construction): -from OCP.TColgp import ( - TColgp_Array1OfPnt, - TColgp_Array1OfVec, - TColgp_HArray1OfPnt, - TColgp_HArray2OfPnt, -) +from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder, StdPrs_BRepFont from OCP.TCollection import TCollection_AsciiString - -# Array of floats (used for B-spline interpolation): -# Array of booleans (used for B-spline interpolation): -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, - TColStd_HArray2OfReal, -) -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer # Topology explorer -from OCP.TopLoc import TopLoc_Location +from OCP.TopAbs import TopAbs_ShapeEnum from OCP.TopoDS import ( TopoDS, TopoDS_Builder, TopoDS_Compound, - TopoDS_Face, TopoDS_Iterator, TopoDS_Shape, - TopoDS_Shell, - TopoDS_Solid, - TopoDS_Vertex, - TopoDS_Edge, - TopoDS_Wire, -) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) -from build123d.build_enums import ( - Align, - AngularDirection, - CenterOf, - FontStyle, - FrameMethod, - GeomType, - Keep, - Kind, - PositionMode, - Side, - SortBy, - Transition, - Until, ) +from anytree import PreOrderIter +from build123d.build_enums import Align, CenterOf, FontStyle from build123d.geometry import ( - DEG2RAD, TOLERANCE, Axis, - BoundBox, Color, Location, - Matrix, Plane, Vector, VectorLike, logger, ) - - -def _topods_face_normal_at(face: TopoDS_Face, surface_point: gp_Pnt) -> Vector: - """Find the normal at a point on surface""" - surface = BRep_Tool.Surface_s(face) - - # project point on surface - projector = GeomAPI_ProjectPointOnSurf(surface_point, surface) - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(face).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - -def topods_dim(topods: TopoDS_Shape) -> int | None: - """Return the dimension of this TopoDS_Shape""" - shape_dim_map = { - (TopoDS_Vertex,): 0, - (TopoDS_Edge, TopoDS_Wire): 1, - (TopoDS_Face, TopoDS_Shell): 2, - (TopoDS_Solid,): 3, - } - - for shape_types, dim in shape_dim_map.items(): - if isinstance(topods, shape_types): - return dim - - if isinstance(topods, TopoDS_Compound): - sub_dims = {topods_dim(s) for s in get_top_level_topods_shapes(topods)} - return sub_dims.pop() if len(sub_dims) == 1 else None - - return None - - -HASH_CODE_MAX = 2147483647 # max 32bit signed int, required by OCC.Core.HashCode - - -Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] - -TrimmingTool = Union[Plane, "Shell", "Face"] - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - -TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) - - -class Shape(NodeMixin, Generic[TOPODS]): - """Shape - - Base class for all CAD objects such as Edge, Face, Solid, etc. - - Args: - obj (TopoDS_Shape, optional): OCCT object. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - - Attributes: - wrapped (TopoDS_Shape): the OCP object - label (str): user assigned label - color (Color): object color - joints (dict[str:Joint]): dictionary of joints bound to this object (Solid only) - children (Shape): list of assembly children of this object (Compound only) - topo_parent (Shape): assembly parent of this object - - """ - - # pylint: disable=too-many-instance-attributes, too-many-public-methods - - @property - @abstractmethod - def _dim(self) -> int | None: - """Dimension of the object""" - - shape_LUT = { - ta.TopAbs_VERTEX: "Vertex", - ta.TopAbs_EDGE: "Edge", - ta.TopAbs_WIRE: "Wire", - ta.TopAbs_FACE: "Face", - ta.TopAbs_SHELL: "Shell", - ta.TopAbs_SOLID: "Solid", - ta.TopAbs_COMPOUND: "Compound", - ta.TopAbs_COMPSOLID: "CompSolid", - } - - shape_properties_LUT = { - ta.TopAbs_VERTEX: None, - ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, - ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, - ta.TopAbs_FACE: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SHELL: BRepGProp.SurfaceProperties_s, - ta.TopAbs_SOLID: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPOUND: BRepGProp.VolumeProperties_s, - ta.TopAbs_COMPSOLID: BRepGProp.VolumeProperties_s, - } - - inverse_shape_LUT = {v: k for k, v in shape_LUT.items()} - - downcast_LUT = { - ta.TopAbs_VERTEX: TopoDS.Vertex_s, - ta.TopAbs_EDGE: TopoDS.Edge_s, - ta.TopAbs_WIRE: TopoDS.Wire_s, - ta.TopAbs_FACE: TopoDS.Face_s, - ta.TopAbs_SHELL: TopoDS.Shell_s, - ta.TopAbs_SOLID: TopoDS.Solid_s, - ta.TopAbs_COMPOUND: TopoDS.Compound_s, - ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, - } - - geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { - ga.GeomAbs_Line: GeomType.LINE, - ga.GeomAbs_Circle: GeomType.CIRCLE, - ga.GeomAbs_Ellipse: GeomType.ELLIPSE, - ga.GeomAbs_Hyperbola: GeomType.HYPERBOLA, - ga.GeomAbs_Parabola: GeomType.PARABOLA, - ga.GeomAbs_BezierCurve: GeomType.BEZIER, - ga.GeomAbs_BSplineCurve: GeomType.BSPLINE, - ga.GeomAbs_OffsetCurve: GeomType.OFFSET, - ga.GeomAbs_OtherCurve: GeomType.OTHER, - } - geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { - ga.GeomAbs_Plane: GeomType.PLANE, - ga.GeomAbs_Cylinder: GeomType.CYLINDER, - ga.GeomAbs_Cone: GeomType.CONE, - ga.GeomAbs_Sphere: GeomType.SPHERE, - ga.GeomAbs_Torus: GeomType.TORUS, - ga.GeomAbs_BezierSurface: GeomType.BEZIER, - ga.GeomAbs_BSplineSurface: GeomType.BSPLINE, - ga.GeomAbs_SurfaceOfRevolution: GeomType.REVOLUTION, - ga.GeomAbs_SurfaceOfExtrusion: GeomType.EXTRUSION, - ga.GeomAbs_OffsetSurface: GeomType.OFFSET, - ga.GeomAbs_OtherSurface: GeomType.OTHER, - } - _transModeDict = { - Transition.TRANSFORMED: BRepBuilderAPI_Transformed, - Transition.ROUND: BRepBuilderAPI_RoundCorner, - Transition.RIGHT: BRepBuilderAPI_RightCorner, - } - - def __init__( - self, - obj: TopoDS_Shape | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - self.wrapped: TOPODS | None = ( - tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None - ) - self.for_construction = False - self.label = label - self._color = color - - # parent must be set following children as post install accesses children - self.parent = parent - - # Extracted objects like Vertices and Edges may need to know where they came from - self.topo_parent: Shape | None = None - - @property - def location(self) -> Location | None: - """Get this Shape's Location""" - if self.wrapped is None: - return None - return Location(self.wrapped.Location()) - - @location.setter - def location(self, value: Location): - """Set Shape's Location to value""" - if self.wrapped is not None: - self.wrapped.Location(value.wrapped) - - @property - def position(self) -> Vector | None: - """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: - return None - return self.location.position - - @position.setter - def position(self, value: VectorLike): - """Set the position component of this Shape's Location to value""" - loc = self.location - if loc is not None: - loc.position = Vector(value) - self.location = loc - - @property - def orientation(self) -> Vector | None: - """Get the orientation component of this Shape's Location""" - if self.location is None: - return None - return self.location.orientation - - @orientation.setter - def orientation(self, rotations: VectorLike): - """Set the orientation component of this Shape's Location to rotations""" - loc = self.location - if loc is not None: - loc.orientation = Vector(rotations) - self.location = loc - - @property - def color(self) -> Union[None, Color]: - """Get the shape's color. If it's None, get the color of the nearest - ancestor, assign it to this Shape and return this value.""" - # Find the correct color for this node - if self._color is None: - # Find parent color - current_node: Compound | Shape | None = self - while current_node is not None: - parent_color = current_node._color - if parent_color is not None: - break - current_node = current_node.parent - node_color = parent_color - else: - node_color = self._color - self._color = node_color # Set the node's color for next time - return node_color - - @color.setter - def color(self, value): - """Set the shape's color""" - self._color = value - - @property - def is_planar_face(self) -> bool: - """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): - return False - surface = BRep_Tool.Surface_s(self.wrapped) - is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) - return is_face_planar.IsPlanar() - - def copy_attributes_to( - self, target: Shape, exceptions: Iterable[str] | None = None - ): - """Copy common object attributes to target - - Note that preset attributes of target will not be overridden. - - Args: - target (Shape): object to gain attributes - exceptions (Iterable[str], optional): attributes not to copy - - Raises: - ValueError: invalid attribute - """ - # Find common attributes and eliminate exceptions - attrs1 = set(self.__dict__.keys()) - attrs2 = set(target.__dict__.keys()) - common_attrs = attrs1 & attrs2 - if exceptions is not None: - common_attrs -= set(exceptions) - - for attr in common_attrs: - # Copy the attribute only if the target's attribute not set - if not getattr(target, attr): - setattr(target, attr, getattr(self, attr)) - # Attach joints to the new part - if attr == "joints": - joint: Joint - for joint in target.joints.values(): - joint.parent = target - - @property - def is_manifold(self) -> bool: - """is_manifold - - Check if each edge in the given Shape has exactly two faces associated with it - (skipping degenerate edges). If so, the shape is manifold. - - Returns: - bool: is the shape manifold or water tight - """ - # Extract one or more (if a Compound) shape from self - if self.wrapped is None: - return False - shape_stack = get_top_level_topods_shapes(self.wrapped) - - while shape_stack: - shape = shape_stack.pop(0) - - # Create an empty indexed data map to store the edges and their corresponding faces. - shape_map = TopTools_IndexedDataMapOfShapeListOfShape() - - # Fill the map with edges and their associated faces in the given shape. Each edge in - # the map is associated with a list of faces that share that edge. - TopExp.MapShapesAndAncestors_s( - # shape.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, shape_map - shape, - ta.TopAbs_EDGE, - ta.TopAbs_FACE, - shape_map, - ) - - # Iterate over the edges in the map and checks if each edge is non-degenerate and has - # exactly two faces associated with it. - for i in range(shape_map.Extent()): - # Access each edge in the map sequentially - edge = TopoDS.Edge_s(shape_map.FindKey(i + 1)) - - vertex0 = TopoDS_Vertex() - vertex1 = TopoDS_Vertex() - - # Extract the two vertices of the current edge and stores them in vertex0/1. - TopExp.Vertices_s(edge, vertex0, vertex1) - - # Check if both vertices are null and if they are the same vertex. If so, the - # edge is considered degenerate (i.e., has zero length), and it is skipped. - if vertex0.IsNull() and vertex1.IsNull() and vertex0.IsSame(vertex1): - continue - - # Check if the current edge has exactly two faces associated with it. If not, - # it means the edge is not shared by exactly two faces, indicating that the - # shape is not manifold. - if shape_map.FindFromIndex(i + 1).Extent() != 2: - return False - - return True - - class _DisplayNode(NodeMixin): - """Used to create anytree structures from TopoDS_Shapes""" - - def __init__( - self, - label: str = "", - address: int | None = None, - position: Union[Vector, Location, None] = None, - parent: Shape._DisplayNode | None = None, - ): - self.label = label - self.address = address - self.position = position - self.parent = parent - self.children: list[Shape] = [] - - _ordered_shapes = [ - TopAbs_ShapeEnum.TopAbs_COMPOUND, - TopAbs_ShapeEnum.TopAbs_SOLID, - TopAbs_ShapeEnum.TopAbs_SHELL, - TopAbs_ShapeEnum.TopAbs_FACE, - TopAbs_ShapeEnum.TopAbs_WIRE, - TopAbs_ShapeEnum.TopAbs_EDGE, - TopAbs_ShapeEnum.TopAbs_VERTEX, - ] - - @staticmethod - def _build_tree( - shape: TopoDS_Shape, - tree: list[_DisplayNode], - parent: _DisplayNode | None = None, - limit: TopAbs_ShapeEnum = TopAbs_ShapeEnum.TopAbs_VERTEX, - show_center: bool = True, - ) -> list[_DisplayNode]: - """Create an anytree copy of the TopoDS_Shape structure""" - - obj_type = Shape.shape_LUT[shape.ShapeType()] - loc: Vector | Location - if show_center: - loc = Shape(shape).bounding_box().center() - else: - loc = Location(shape.Location()) - tree.append(Shape._DisplayNode(obj_type, id(shape), loc, parent)) - iterator = TopoDS_Iterator() - iterator.Initialize(shape) - parent_node = tree[-1] - while iterator.More(): - child = iterator.Value() - if Shape._ordered_shapes.index( - child.ShapeType() - ) <= Shape._ordered_shapes.index(limit): - Shape._build_tree(child, tree, parent_node, limit) - iterator.Next() - return tree - - @staticmethod - def _show_tree(root_node, show_center: bool) -> str: - """Display an assembly or TopoDS_Shape anytree structure""" - - # Calculate the size of the tree labels - size_tuples = [(node.height, len(node.label)) for node in root_node.descendants] - size_tuples.append((root_node.height, len(root_node.label))) - # pylint: disable=cell-var-from-loop - size_tuples_per_level = [ - list(filter(lambda ll: ll[0] == l, size_tuples)) - for l in range(root_node.height + 1) - ] - max_sizes_per_level = [ - max(4, max(l[1] for l in level)) for level in size_tuples_per_level - ] - level_sizes_per_level = [ - l + i * 4 for i, l in enumerate(reversed(max_sizes_per_level)) - ] - tree_label_width = max(level_sizes_per_level) + 1 - - # Build the tree line by line - result = "" - for pre, _fill, node in RenderTree(root_node): - treestr = f"{pre}{node.label}".ljust(tree_label_width) - if hasattr(root_node, "address"): - address = node.address - name = "" - loc = ( - "Center" + str(node.position.to_tuple()) - if show_center - else "Position" + str(node.position.to_tuple()) - ) - else: - address = id(node) - name = node.__class__.__name__.ljust(9) - loc = ( - "Center" + str(node.center().to_tuple()) - if show_center - else "Location" + repr(node.location) - ) - result += f"{treestr}{name}at {address:#x}, {loc}\n" - return result - - def show_topology( - self, - limit_class: Literal[ - "Compound", "Edge", "Face", "Shell", "Solid", "Vertex", "Wire" - ] = "Vertex", - show_center: bool | None = None, - ) -> str: - """Display internal topology - - Display the internal structure of a Compound 'assembly' or Shape. Example: - - .. code:: - - >>> c1.show_topology() - - c1 is the root Compound at 0x7f4a4cafafa0, Location(...)) - ├── Solid at 0x7f4a4cafafd0, Location(...)) - ├── c2 is 1st compound Compound at 0x7f4a4cafaee0, Location(...)) - │ ├── Solid at 0x7f4a4cafad00, Location(...)) - │ └── Solid at 0x7f4a11a52790, Location(...)) - └── c3 is 2nd Compound at 0x7f4a4cafad60, Location(...)) - ├── Solid at 0x7f4a11a52700, Location(...)) - └── Solid at 0x7f4a11a58550, Location(...)) - - Args: - limit_class: type of displayed leaf node. Defaults to 'Vertex'. - show_center (bool, optional): If None, shows the Location of Compound 'assemblies' - and the bounding box center of Shapes. True or False forces the display. - Defaults to None. - - Returns: - str: tree representation of internal structure - """ - if ( - self.wrapped is not None - and isinstance(self.wrapped, TopoDS_Compound) - and self.children - ): - show_center = False if show_center is None else show_center - result = Shape._show_tree(self, show_center) - else: - tree = Shape._build_tree( - tcast(TopoDS_Shape, self.wrapped), - tree=[], - limit=Shape.inverse_shape_LUT[limit_class], - ) - show_center = True if show_center is None else show_center - result = Shape._show_tree(tree[0], show_center) - return result - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: - """fuse shape to self operator +""" - # Convert `other` to list of base objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to add return the original object - if not summands: - return self - - # Check that all dimensions are the same - addend_dim = self._dim - if addend_dim is None: - raise ValueError("Dimensions of objects to add to are inconsistent") - - if not all(summand._dim == addend_dim for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - sum_shape = summands[0].fuse(*summands[1:]) - else: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - return sum_shape - - def __sub__( - self, other: Union[None, Shape, Iterable[Shape]] - ) -> Self | ShapeList[Self]: - """cut shape from self operator -""" - - if self.wrapped is None: - raise ValueError("Cannot subtract shape from empty compound") - - # Convert `other` to list of base objects and filter out None values - if other is None: - subtrahends = [] - else: - subtrahends = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ] - # If there is nothing to subtract return the original object - if not subtrahends: - return self - - # Check that all dimensions are the same - minuend_dim = self._dim - if minuend_dim is None or any(s._dim is None for s in subtrahends): - raise ValueError("Dimensions of objects to subtract from are inconsistent") - - # Check that the operation is valid - subtrahend_dims = [s._dim for s in subtrahends if s._dim is not None] - if any(d < minuend_dim for d in subtrahend_dims): - raise ValueError( - f"Only shapes with equal or greater dimension can be subtracted: " - f"not {type(self).__name__} ({minuend_dim}D) and " - f"{type(other).__name__} ({min(subtrahend_dims)}D)" - ) - - # Do the actual cut operation - difference = self.cut(*subtrahends) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> None | Self | ShapeList[Self]: - """intersect shape with self operator &""" - others = other if isinstance(other, (list, tuple)) else [other] - - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot intersect shape with empty compound") - new_shape = self.intersect(*others) - - if ( - not isinstance(new_shape, list) - and new_shape is not None - and new_shape.wrapped is not None - and SkipClean.clean - ): - new_shape = new_shape.clean() - - return new_shape - - def __rmul__(self, other): - """right multiply for positioning operator *""" - if not ( - isinstance(other, (list, tuple)) - and all(isinstance(o, (Location, Plane)) for o in other) - ): - raise ValueError( - "shapes can only be multiplied list of locations or planes" - ) - return [loc * self for loc in other] - - # Actually creating the abstract method causes the subclass to pass center_of - # even when not required - possibly this could be improved. - # @abstractmethod - # def center(self, center_of: CenterOf) -> Vector: - # """Compute the center with a specific type of calculation.""" - - def clean(self) -> Self: - """clean - - Remove internal edges - - Returns: - Shape: Original object with extraneous internal edges removed - """ - if self.wrapped is None: - return self - upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) - upgrader.AllowInternalEdges(False) - # upgrader.SetAngularTolerance(1e-5) - try: - upgrader.Build() - self.wrapped = tcast(TOPODS, downcast(upgrader.Shape())) - except Exception: - warnings.warn(f"Unable to clean {self}", stacklevel=2) - return self - - def fix(self) -> Self: - """fix - try to fix shape if not valid""" - if self.wrapped is None: - return self - if not self.is_valid(): - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) - - return shape_copy - - return self - - @classmethod - @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: - """Returns the right type of wrapper, given a OCCT object""" - - @property - def geom_type(self) -> GeomType: - """Gets the underlying geometry type. - - Returns: - GeomType: The geometry type of the shape - - """ - if self.wrapped is None: - raise ValueError("Cannot determine geometry type of an empty shape") - - shape: TopAbs_ShapeEnum = shapetype(self.wrapped) - - if shape == ta.TopAbs_EDGE: - geom = Shape.geom_LUT_EDGE[ - BRepAdaptor_Curve(tcast(TopoDS_Edge, self.wrapped)).GetType() - ] - elif shape == ta.TopAbs_FACE: - geom = Shape.geom_LUT_FACE[ - BRepAdaptor_Surface(tcast(TopoDS_Face, self.wrapped)).GetType() - ] - else: - geom = GeomType.OTHER - - return geom - - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - - def is_same(self, other: Shape) -> bool: - """Returns True if other and this shape are same, i.e. if they share the - same TShape with the same Locations. Orientations may differ. Also see - :py:meth:`is_equal` - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsSame(other.wrapped) - - def is_equal(self, other: Shape) -> bool: - """Returns True if two shapes are equal, i.e. if they share the same - TShape with the same Locations and Orientations. Also see - :py:meth:`is_same`. - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - return False - return self.wrapped.IsEqual(other.wrapped) - - def __eq__(self, other) -> bool: - """Check if two shapes are the same. - - This method checks if the current shape is the same as the other shape. - Two shapes are considered the same if they share the same TShape with - the same Locations. Orientations may differ. - - Args: - other (Shape): The shape to compare with. - - Returns: - bool: True if the shapes are the same, False otherwise. - """ - if isinstance(other, Shape): - return self.is_same(other) - return NotImplemented - - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - - def bounding_box( - self, tolerance: float | None = None, optimal: bool = True - ) -> BoundBox: - """Create a bounding box for this Shape. - - Args: - tolerance (float, optional): Defaults to None. - - Returns: - BoundBox: A box sized to contain this Shape - """ - if self.wrapped is None: - return BoundBox(Bnd_Box()) - tolerance = TOLERANCE if tolerance is None else tolerance - return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) - - def mirror(self, mirror_plane: Plane | None = None) -> Self: - """ - Applies a mirror transform to this Shape. Does not duplicate objects - about the plane. - - Args: - mirror_plane (Plane): The plane to mirror about. Defaults to Plane.XY - Returns: - The mirrored shape - """ - if not mirror_plane: - mirror_plane = Plane.XY - - if self.wrapped is None: - return self - transformation = gp_Trsf() - transformation.SetMirror( - gp_Ax2(mirror_plane.origin.to_pnt(), mirror_plane.z_dir.to_dir()) - ) - - return self._apply_transform(transformation) - - @staticmethod - def combined_center( - objects: Iterable[Shape], center_of: CenterOf = CenterOf.MASS - ) -> Vector: - """combined center - - Calculates the center of a multiple objects. - - Args: - objects (Iterable[Shape]): list of objects - center_of (CenterOf, optional): centering option. Defaults to CenterOf.MASS. - - Raises: - ValueError: CenterOf.GEOMETRY not implemented - - Returns: - Vector: center of multiple objects - """ - objects = list(objects) - if center_of == CenterOf.MASS: - total_mass = sum(Shape.compute_mass(o) for o in objects) - weighted_centers = [ - o.center(CenterOf.MASS).multiply(Shape.compute_mass(o)) for o in objects - ] - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - elif center_of == CenterOf.BOUNDING_BOX: - total_mass = len(list(objects)) - - weighted_centers = [] - for obj in objects: - weighted_centers.append(obj.bounding_box().center()) - - sum_wc = weighted_centers[0] - for weighted_center in weighted_centers[1:]: - sum_wc = sum_wc.add(weighted_center) - - middle = Vector(sum_wc.multiply(1.0 / total_mass)) - else: - raise ValueError("CenterOf.GEOMETRY not implemented") - - return middle - - @staticmethod - def compute_mass(obj: Shape) -> float: - """Calculates the 'mass' of an object. - - Args: - obj: Compute the mass of this object - obj: Shape: - - Returns: - - """ - if obj.wrapped is None: - return 0.0 - - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] - - if not calc_function: - raise NotImplementedError - - calc_function(obj.wrapped, properties) - return properties.Mass() - - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - - def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return all of the TopoDS sub entities of the given type""" - if self.wrapped is None: - return [] - return _topods_entities(self.wrapped, topo_type) - - # def _entities_from( - # self, child_type: Shapes, parent_type: Shapes - # ) -> Dict[Shape, list[Shape]]: - # """This function is very slow on M1 macs and is currently unused""" - # if self.wrapped is None: - # return {} - - # res = TopTools_IndexedDataMapOfShapeListOfShape() - - # TopExp.MapShapesAndAncestors_s( - # self.wrapped, - # Shape.inverse_shape_LUT[child_type], - # Shape.inverse_shape_LUT[parent_type], - # res, - # ) - - # out: Dict[Shape, list[Shape]] = {} - # for i in range(1, res.Extent() + 1): - # out[self.__class__.cast(res.FindKey(i))] = [ - # self.__class__.cast(el) for el in res.FindFromIndex(i) - # ] - - # return out - - def get_top_level_shapes(self) -> ShapeList[Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - ShapeList[Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if self.wrapped is None: - return ShapeList() - return ShapeList( - self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) - ) - - @staticmethod - def get_shape_list( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> ShapeList: - """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: - return ShapeList() - shape_list = ShapeList( - [shape.__class__.cast(i) for i in shape.entities(entity_type)] - ) - for item in shape_list: - item.topo_parent = shape - return shape_list - - @staticmethod - def get_single_shape( - shape: Shape, - entity_type: Literal[ - "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" - ], - ) -> Shape: - """Helper to extract a single entity of a specific type from a shape, - with a warning if count != 1.""" - shape_list = Shape.get_shape_list(shape, entity_type) - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} {entity_type.lower()}s, returning first", - stacklevel=3, - ) - return shape_list[0] if shape_list else None - - # Note all sub-classes have vertices and vertex methods - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() - - def edge(self) -> Edge | None: - """Return the Edge""" - return None - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return ShapeList() - - def wire(self) -> Wire | None: - """Return the Wire""" - return None - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return ShapeList() - - def face(self) -> Face | None: - """Return the Face""" - return None - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return ShapeList() - - def shell(self) -> Shell | None: - """Return the Shell""" - return None - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return ShapeList() - - def solid(self) -> Solid | None: - """Return the Solid""" - return None - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - return ShapeList() - - def compound(self) -> Compound | None: - """Return the Compound""" - return None - - @property - def area(self) -> float: - """area -the surface area of all faces in this Shape""" - if self.wrapped is None: - return 0.0 - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - - return properties.Mass() - - def _apply_transform(self, transformation: gp_Trsf) -> Self: - """Private Apply Transform - - Apply the provided transformation matrix to a copy of Shape - - Args: - transformation (gp_Trsf): transformation matrix - - Returns: - Shape: copy of transformed Shape - """ - if self.wrapped is None: - return self - shape_copy: Shape = copy.deepcopy(self, None) - transformed_shape = BRepBuilderAPI_Transform( - self.wrapped, - transformation, - True, - ).Shape() - shape_copy.wrapped = tcast(TOPODS, downcast(transformed_shape)) - return shape_copy - - def rotate(self, axis: Axis, angle: float) -> Self: - """rotate a copy - - Rotates a shape around an axis. - - Args: - axis (Axis): rotation Axis - angle (float): angle to rotate, in degrees - - Returns: - a copy of the shape, rotated - """ - transformation = gp_Trsf() - transformation.SetRotation(axis.wrapped, angle * DEG2RAD) - - return self._apply_transform(transformation) - - def translate(self, vector: VectorLike) -> Self: - """Translates this shape through a transformation. - - Args: - vector: VectorLike: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetTranslation(Vector(vector).wrapped) - - return self._apply_transform(transformation) - - def scale(self, factor: float) -> Self: - """Scales this shape through a transformation. - - Args: - factor: float: - - Returns: - - """ - - transformation = gp_Trsf() - transformation.SetScale(gp_Pnt(), factor) - - return self._apply_transform(transformation) - - def __deepcopy__(self, memo) -> Self: - """Return deepcopy of self""" - # The wrapped object is a OCCT TopoDS_Shape which can't be pickled or copied - # with the standard python copy/deepcopy, so create a deepcopy 'memo' with this - # value already copied which causes deepcopy to skip it. - cls = self.__class__ - result = cls.__new__(cls) - memo[id(self)] = result - if self.wrapped is not None: - memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) - for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) - if key == "joints": - for joint in result.joints.values(): - joint.parent = result - return result - - def __copy__(self) -> Self: - """Return shallow copy or reference of self - - Create an copy of this Shape that shares the underlying TopoDS_TShape. - - Used when there is a need for many objects with the same CAD structure but at - different Locations, etc. - for examples fasteners in a larger assembly. By - sharing the TopoDS_TShape, the memory size of such assemblies can be greatly reduced. - - Changes to the CAD structure of the base object will be reflected in all instances. - """ - reference = copy.deepcopy(self) - if self.wrapped is not None: - assert ( - reference.wrapped is not None - ) # Ensure mypy knows reference.wrapped is not None - reference.wrapped.TShape(self.wrapped.TShape()) - return reference - - def transform_shape(self, t_matrix: Matrix) -> Self: - """Apply affine transform without changing type - - Transforms a copy of this Shape by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: copy of transformed shape with all objects keeping their type - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_Transform(self.wrapped, t_matrix.wrapped.Trsf()).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def transform_geometry(self, t_matrix: Matrix) -> Self: - """Apply affine transform - - WARNING: transform_geometry will sometimes convert lines and circles to - splines, but it also has the ability to handle skew and stretching - transformations. - - If your transformation is only translation and rotation, it is safer to - use :py:meth:`transform_shape`, which doesn't change the underlying type - of the geometry, but cannot handle skew transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Shape: a copy of the object, but with geometry transformed - """ - if self.wrapped is None: - return self - new_shape = copy.deepcopy(self, None) - transformed = downcast( - BRepBuilderAPI_GTransform(self.wrapped, t_matrix.wrapped, True).Shape() - ) - new_shape.wrapped = tcast(TOPODS, transformed) - - return new_shape - - def locate(self, loc: Location) -> Self: - """Apply a location in absolute sense to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - self.wrapped.Location(loc.wrapped) - - return self - - def located(self, loc: Location) -> Self: - """located - - Apply a location in absolute sense to a copy of self - - Args: - loc (Location): new absolute location - - Returns: - Shape: copy of Shape at location - """ - if self.wrapped is None: - raise ValueError("Cannot locate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot locate a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped.Location(loc.wrapped) # type: ignore - return shape_copy - - def move(self, loc: Location) -> Self: - """Apply a location in relative sense (i.e. update current location) to self - - Args: - loc: Location: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - - self.wrapped.Move(loc.wrapped) - - return self - - def moved(self, loc: Location) -> Self: - """moved - - Apply a location in relative sense (i.e. update current location) to a copy of self - - Args: - loc (Location): new location relative to current location - - Returns: - Shape: copy of Shape moved to relative location - """ - if self.wrapped is None: - raise ValueError("Cannot move an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot move a shape at an empty location") - shape_copy: Shape = copy.deepcopy(self, None) - shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) - return shape_copy - - def relocate(self, loc: Location): - """Change the location of self while keeping it geometrically similar - - Args: - loc (Location): new location to set for self - """ - if self.wrapped is None: - raise ValueError("Cannot relocate an empty shape") - if loc.wrapped is None: - raise ValueError("Cannot relocate a shape at an empty location") - - if self.location != loc: - old_ax = gp_Ax3() - old_ax.Transform(self.location.wrapped.Transformation()) # type: ignore - - new_ax = gp_Ax3() - new_ax.Transform(loc.wrapped.Transformation()) - - trsf = gp_Trsf() - trsf.SetDisplacement(new_ax, old_ax) - builder = BRepBuilderAPI_Transform(self.wrapped, trsf, True, True) - - self.wrapped = tcast(TOPODS, downcast(builder.Shape())) - self.wrapped.Location(loc.wrapped) - - def distance_to_with_closest_points( - self, other: Union[Shape, VectorLike] - ) -> tuple[float, Vector, Vector]: - """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): - raise ValueError("Cannot calculate distance to or from an empty shape") - - if isinstance(other, Shape): - topods_shape = tcast(TopoDS_Shape, other.wrapped) - else: - vec = Vector(other) - topods_shape = BRepBuilderAPI_MakeVertex( - gp_Pnt(vec.X, vec.Y, vec.Z) - ).Vertex() - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - dist_calc.LoadS2(topods_shape) - dist_calc.Perform() - return ( - dist_calc.Value(), - Vector(dist_calc.PointOnShape1(1)), - Vector(dist_calc.PointOnShape2(1)), - ) - - def distance_to(self, other: Union[Shape, VectorLike]) -> float: - """Minimal distance between two shapes""" - return self.distance_to_with_closest_points(other)[0] - - def closest_points(self, other: Union[Shape, VectorLike]) -> tuple[Vector, Vector]: - """Points on two shapes where the distance between them is minimal""" - return self.distance_to_with_closest_points(other)[1:3] - - def __hash__(self) -> int: - """Return has code""" - return self.hash_code() - - def _bool_op( - self, - args: Iterable[Shape], - tools: Iterable[Shape], - operation: Union[BRepAlgoAPI_BooleanOperation, BRepAlgoAPI_Splitter], - ) -> Self | ShapeList[Self]: - """Generic boolean operation - - Args: - args: Iterable[Shape]: - tools: Iterable[Shape]: - operation: Union[BRepAlgoAPI_BooleanOperation: - BRepAlgoAPI_Splitter]: - - Returns: - - """ - args = list(args) - tools = list(tools) - # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} - highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] - - # The base of the operation - base = args[0] if isinstance(args, (list, tuple)) else args - - arg = TopTools_ListOfShape() - for obj in args: - if obj.wrapped is not None: - arg.Append(obj.wrapped) - - tool = TopTools_ListOfShape() - for obj in tools: - if obj.wrapped is not None: - tool.Append(obj.wrapped) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - topo_result = downcast(operation.Shape()) - - # Clean - if SkipClean.clean: - upgrader = ShapeUpgrade_UnifySameDomain(topo_result, True, True, True) - upgrader.AllowInternalEdges(False) - try: - upgrader.Build() - topo_result = downcast(upgrader.Shape()) - except Exception: - warnings.warn("Boolean operation unable to clean", stacklevel=2) - - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(topo_result, TopoDS_Compound): - topo_result = unwrap_topods_compound(topo_result, True) - - if isinstance(topo_result, TopoDS_Compound) and highest_order[1] != 4: - results = ShapeList( - highest_order[0].cast(s) - for s in get_top_level_topods_shapes(topo_result) - ) - for result in results: - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return results - - result = highest_order[0].cast(topo_result) - base.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - - return result - - def cut(self, *to_cut: Shape) -> Self | ShapeList[Self]: - """Remove the positional arguments from this Shape. - - Args: - *to_cut: Shape: - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - cut_op = BRepAlgoAPI_Cut() - - return self._bool_op((self,), to_cut, cut_op) - - def fuse( - self, *to_fuse: Shape, glue: bool = False, tol: float | None = None - ) -> Self | ShapeList[Self]: - """fuse - - Fuse a sequence of shapes into a single shape. - - Args: - to_fuse (sequence Shape): shapes to fuse - glue (bool, optional): performance improvement for some shapes. Defaults to False. - tol (float, optional): tolerance. Defaults to None. - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - - """ - - fuse_op = BRepAlgoAPI_Fuse() - if glue: - fuse_op.SetGlue(BOPAlgo_GlueEnum.BOPAlgo_GlueShift) - if tol: - fuse_op.SetFuzzyValue(tol) - - return_value = self._bool_op((self,), to_fuse, fuse_op) - - return return_value - - def intersect( - self, *to_intersect: Union[Shape, Axis, Plane] - ) -> None | Self | ShapeList[Self]: - """Intersection of the arguments and this shape - - Args: - to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to - intersect with - - Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created - """ - - def _to_vertex(vec: Vector) -> Vertex: - """Helper method to convert vector to shape""" - return self.__class__.cast( - downcast( - BRepBuilderAPI_MakeVertex(gp_Pnt(vec.X, vec.Y, vec.Z)).Vertex() - ) - ) - - def _to_edge(axis: Axis) -> Edge: - """Helper method to convert axis to shape""" - return self.__class__.cast( - BRepBuilderAPI_MakeEdge( - Geom_Line( - axis.position.to_pnt(), - axis.direction.to_dir(), - ) - ).Edge() - ) - - def _to_face(plane: Plane) -> Face: - """Helper method to convert plane to shape""" - return self.__class__.cast(BRepBuilderAPI_MakeFace(plane.wrapped).Face()) - - # Convert any geometry objects into their respective topology objects - objs = [] - for obj in to_intersect: - if isinstance(obj, Vector): - objs.append(_to_vertex(obj)) - elif isinstance(obj, Axis): - objs.append(_to_edge(obj)) - elif isinstance(obj, Plane): - objs.append(_to_face(obj)) - elif isinstance(obj, Location): - if obj.wrapped is None: - raise ValueError("Cannot intersect with an empty location") - objs.append(_to_vertex(tcast(Vector, obj.position))) - else: - objs.append(obj) - - # Find the shape intersections - intersect_op = BRepAlgoAPI_Common() - shape_intersections = self._bool_op((self,), objs, intersect_op) - if isinstance(shape_intersections, ShapeList) and not shape_intersections: - return None - if ( - not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null() - ): - return None - return shape_intersections - - @classmethod - @abstractmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge | Face | Shell | Solid | Compound: extruded shape - """ - - def _ocp_section( - self: Shape, other: Union[Vertex, Edge, Wire, Face] - ) -> tuple[list[Vertex], list[Edge]]: - """_ocp_section - - Create a BRepAlgoAPI_Section object - - The algorithm is to build a Section operation between arguments and tools. - The result of Section operation consists of vertices and edges. The result - of Section operation contains: - - new vertices that are subjects of V/V, E/E, E/F, F/F interferences - - vertices that are subjects of V/E, V/F interferences - - new edges that are subjects of F/F interferences - - edges that are Common Blocks - - - Args: - other (Union[Vertex, Edge, Wire, Face]): shape to section with - - Returns: - tuple[list[Vertex], list[Edge]]: section results - """ - if self.wrapped is None or other.wrapped is None: - return ([], []) - - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation - section.Build() - - # Get the resulting shapes from the intersection - intersection_shape = section.Shape() - - vertices = [] - # Iterate through the intersection shape to find intersection points/edges - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) - while explorer.More(): - vertices.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - edges = [] - explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - edges.append(self.__class__.cast(downcast(explorer.Current()))) - explorer.Next() - - return (vertices, edges) - - def faces_intersected_by_axis( - self, - axis: Axis, - tol: float = 1e-4, - ) -> ShapeList[Face]: - """Line Intersection - - Computes the intersections between the provided axis and the faces of this Shape - - Args: - axis (Axis): Axis on which the intersection line rests - tol (float, optional): Intersection tolerance. Defaults to 1e-4. - - Returns: - list[Face]: A list of intersected faces sorted by distance from axis.position - """ - if self.wrapped is None: - return ShapeList() - - line = gce_MakeLin(axis.wrapped).Value() - - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, line, tol) - - faces_dist = [] # using a list instead of a dictionary to be able to sort it - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - - distance = axis.position.to_pnt().SquareDistance(inter_pt) - - faces_dist.append( - ( - intersect_maker.Face(), - abs(distance), - ) - ) # will sort all intersected faces by distance whatever the direction is - - intersect_maker.Next() - - faces_dist.sort(key=lambda x: x[1]) - faces = [face[0] for face in faces_dist] - - return ShapeList([self.__class__.cast(face) for face in faces]) - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.INSIDE, Keep.OUTSIDE] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside or outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Literal[Keep.BOTH] - ) -> tuple[ - Face | Shell | ShapeList[Face] | None, - Face | Shell | ShapeList[Face] | None, - ]: - """split_by_perimeter and keep inside and outside""" - - @overload - def split_by_perimeter( - self, perimeter: Union[Edge, Wire] - ) -> Face | Shell | ShapeList[Face] | None: - """split_by_perimeter and keep inside (default)""" - - def split_by_perimeter( - self, perimeter: Union[Edge, Wire], keep: Keep = Keep.INSIDE - ): - """split_by_perimeter - - Divide the faces of this object into those within the perimeter - and those outside the perimeter. - - Note: this method may fail if the perimeter intersects shape edges. - - Args: - perimeter (Union[Edge,Wire]): closed perimeter - keep (Keep, optional): which object(s) to return. Defaults to Keep.INSIDE. - - Raises: - ValueError: perimeter must be closed - ValueError: keep must be one of Keep.INSIDE|OUTSIDE|BOTH - - Returns: - Union[Face | Shell | ShapeList[Face] | None, - Tuple[Face | Shell | ShapeList[Face] | None]: The result of the split operation. - - - **Keep.INSIDE**: Returns the inside part as a `Shell` or `Face`, or `None` - if no inside part is found. - - **Keep.OUTSIDE**: Returns the outside part as a `Shell` or `Face`, or `None` - if no outside part is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Shell`, `Face`, or `None` if no corresponding part is found. - - """ - - def get(los: TopTools_ListOfShape) -> list: - """Return objects from TopTools_ListOfShape as list""" - shapes = [] - for _ in range(los.Size()): - first = los.First() - if not first.IsNull(): - shapes.append(self.__class__.cast(first)) - los.RemoveFirst() - return shapes - - def process_sides(sides): - """Process sides to determine if it should be None, a single element, - a Shell, or a ShapeList.""" - # if not sides: - # return None - if len(sides) == 1: - return sides[0] - # Attempt to create a shell - potential_shell = _sew_topods_faces([s.wrapped for s in sides]) - if isinstance(potential_shell, TopoDS_Shell): - return self.__class__.cast(potential_shell) - return ShapeList(sides) - - if keep not in {Keep.INSIDE, Keep.OUTSIDE, Keep.BOTH}: - raise ValueError( - "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" - ) - - if self.wrapped is None: - raise ValueError("Cannot split an empty shape") - - # Process the perimeter - if not perimeter.is_closed: - raise ValueError("perimeter must be a closed Wire or Edge") - perimeter_edges = TopTools_SequenceOfShape() - for perimeter_edge in perimeter.edges(): - perimeter_edges.Append(perimeter_edge.wrapped) - - # Split the shells by the perimeter edges - lefts: list[Shell] = [] - rights: list[Shell] = [] - for target_shell in self.shells(): - constructor = BRepFeat_SplitShape(target_shell.wrapped) - constructor.Add(perimeter_edges) - constructor.Build() - lefts.extend(get(constructor.Left())) - rights.extend(get(constructor.Right())) - - left = process_sides(lefts) - right = process_sides(rights) - - # Is left or right the inside? - perimeter_length = perimeter.length - left_perimeter_length = sum(e.length for e in left.edges()) if left else 0 - right_perimeter_length = sum(e.length for e in right.edges()) if right else 0 - left_inside = abs(perimeter_length - left_perimeter_length) < abs( - perimeter_length - right_perimeter_length - ) - if keep == Keep.BOTH: - return (left, right) if left_inside else (right, left) - if keep == Keep.INSIDE: - return left if left_inside else right - # keep == Keep.OUTSIDE: - return right if left_inside else left - - def distance(self, other: Shape) -> float: - """Minimal distance between two shapes - - Args: - other: Shape: - - Returns: - - """ - if self.wrapped is None or other.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() - - def distances(self, *others: Shape) -> Iterator[float]: - """Minimal distances to between self and other shapes - - Args: - *others: Shape: - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - for other_shape in others: - if other_shape.wrapped is None: - raise ValueError("Cannot calculate distance to or from an empty shape") - dist_calc.LoadS2(other_shape.wrapped) - dist_calc.Perform() - - yield dist_calc.Value() - - def mesh(self, tolerance: float, angular_tolerance: float = 0.1): - """Generate triangulation if none exists. - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Cannot mesh an empty shape") - - if not BRepTools.Triangulation_s(self.wrapped, tolerance): - BRepMesh_IncrementalMesh( - self.wrapped, tolerance, True, angular_tolerance, True - ) - - def tessellate( - self, tolerance: float, angular_tolerance: float = 0.1 - ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: - """General triangulated approximation""" - if self.wrapped is None: - raise ValueError("Cannot tessellate an empty shape") - - self.mesh(tolerance, angular_tolerance) - - vertices: list[Vector] = [] - triangles: list[Tuple[int, int, int]] = [] - offset = 0 - - for face in self.faces(): - assert face.wrapped is not None - loc = TopLoc_Location() - poly = BRep_Tool.Triangulation_s(face.wrapped, loc) - trsf = loc.Transformation() - reverse = face.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED - - # add vertices - vertices += [ - Vector(v.X(), v.Y(), v.Z()) - for v in ( - poly.Node(i).Transformed(trsf) for i in range(1, poly.NbNodes() + 1) - ) - ] - # add triangles - triangles += [ - ( - ( - t.Value(1) + offset - 1, - t.Value(3) + offset - 1, - t.Value(2) + offset - 1, - ) - if reverse - else ( - t.Value(1) + offset - 1, - t.Value(2) + offset - 1, - t.Value(3) + offset - 1, - ) - ) - for t in poly.Triangles() - ] - - offset += poly.NbNodes() - - return vertices, triangles - - def to_splines( - self, degree: int = 3, tolerance: float = 1e-3, nurbs: bool = False - ) -> Self: - """to_splines - - Approximate shape with b-splines of the specified degree. - - Args: - degree (int, optional): Maximum degree. Defaults to 3. - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - nurbs (bool, optional): Use rational splines. Defaults to False. - - Returns: - Self: Approximated shape - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - params = ShapeCustom_RestrictionParameters() - - result = ShapeCustom.BSplineRestriction_s( - self.wrapped, - tolerance, # 3D tolerance - tolerance, # 2D tolerance - degree, - 1, # dummy value, degree is leading - ga.GeomAbs_C0, - ga.GeomAbs_C0, - True, # set degree to be leading - not nurbs, - params, - ) - - return self.__class__.cast(result) - - def to_vtk_poly_data( - self, - tolerance: float | None = None, - angular_tolerance: float | None = None, - normals: bool = False, - ) -> vtkPolyData: - """Convert shape to vtkPolyData - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - normals: bool: (Default value = True) - - Returns: data object in VTK consisting of points, vertices, lines, and polygons - """ - if self.wrapped is None: - raise ValueError("Cannot convert an empty shape") - - vtk_shape = IVtkOCC_Shape(self.wrapped) - shape_data = IVtkVTK_ShapeData() - shape_mesher = IVtkOCC_ShapeMesher() - - drawer = vtk_shape.Attributes() - drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - - if tolerance: - drawer.SetDeviationCoefficient(tolerance) - - if angular_tolerance: - drawer.SetDeviationAngle(angular_tolerance) - - shape_mesher.Build(vtk_shape, shape_data) - - vtk_poly_data = shape_data.getVtkPolyData() - - # convert to triangles and split edges - t_filter = vtkTriangleFilter() - t_filter.SetInputData(vtk_poly_data) - t_filter.Update() - - return_value = t_filter.GetOutput() - - # compute normals - if normals: - n_filter = vtkPolyDataNormals() - n_filter.SetComputePointNormals(True) - n_filter.SetComputeCellNormals(True) - n_filter.SetFeatureAngle(360) - n_filter.SetInputData(return_value) - n_filter.Update() - - return_value = n_filter.GetOutput() - - return return_value - - def _repr_javascript_(self): - """Jupyter 3D representation support""" - - from build123d.jupyter_tools import display - - return display(self)._repr_javascript_() - - def transformed( - self, rotate: VectorLike = (0, 0, 0), offset: VectorLike = (0, 0, 0) - ) -> Self: - """Transform Shape - - Rotate and translate the Shape by the three angles (in degrees) and offset. - - Args: - rotate (VectorLike, optional): 3-tuple of angles to rotate, in degrees. - Defaults to (0, 0, 0). - offset (VectorLike, optional): 3-tuple to offset. Defaults to (0, 0, 0). - - Returns: - Shape: transformed object - - """ - # Convert to a Vector of radians - rotate_vector = Vector(rotate).multiply(DEG2RAD) - # Compute rotation matrix. - t_rx = gp_Trsf() - t_rx.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), rotate_vector.X) - t_ry = gp_Trsf() - t_ry.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), rotate_vector.Y) - t_rz = gp_Trsf() - t_rz.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), rotate_vector.Z) - t_o = gp_Trsf() - t_o.SetTranslation(Vector(offset).wrapped) - return self._apply_transform(t_o * t_rx * t_ry * t_rz) - - def project_faces( - self, - faces: Union[list[Face], Compound], - path: Union[Wire, Edge], - start: float = 0, - ) -> ShapeList[Face]: - """Projected Faces following the given path on Shape - - Project by positioning each face of to the shape along the path and - projecting onto the surface. - - Note that projection may result in distortion depending on - the shape at a position along the path. - - .. image:: projectText.png - - Args: - faces (Union[list[Face], Compound]): faces to project - path: Path on the Shape to follow - start: Relative location on path to start the faces. Defaults to 0. - - Returns: - The projected faces - - """ - # pylint: disable=too-many-locals - path_length = path.length - # The derived classes of Shape implement center - shape_center = self.center() # pylint: disable=no-member - - if ( - not isinstance(faces, (list, tuple)) - and faces.wrapped is not None - and isinstance(faces.wrapped, TopoDS_Compound) - ): - faces = faces.faces() - - first_face_min_x = faces[0].bounding_box().min.X - - logger.debug("projecting %d face(s)", len(faces)) - - # Position each face normal to the surface along the path and project to the surface - projected_faces = [] - for face in faces: - bbox = face.bounding_box() - face_center_x = (bbox.min.X + bbox.max.X) / 2 - relative_position_on_wire = ( - start + (face_center_x - first_face_min_x) / path_length - ) - path_position = path.position_at(relative_position_on_wire) - path_tangent = path.tangent_at(relative_position_on_wire) - projection_axis = Axis(path_position, shape_center - path_position) - (surface_point, surface_normal) = self.find_intersection_points( - projection_axis - )[0] - surface_normal_plane = Plane( - origin=surface_point, x_dir=path_tangent, z_dir=surface_normal - ) - projection_face: Face = surface_normal_plane.from_local_coords( - face.moved(Location((-face_center_x, 0, 0))) - ) - - logger.debug("projecting face at %0.2f", relative_position_on_wire) - projected_faces.append( - projection_face.project_to_shape(self, surface_normal * -1)[0] - ) - - logger.debug("finished projecting '%d' faces", len(faces)) - - return ShapeList(projected_faces) - - -class Comparable(ABC): - """Abstract base class that requires comparison methods""" - - @abstractmethod - def __lt__(self, other: Any) -> bool: ... - - @abstractmethod - def __eq__(self, other: Any) -> bool: ... - - -# This TypeVar allows IDEs to see the type of objects within the ShapeList -T = TypeVar("T", bound=Union[Shape, Vector]) -K = TypeVar("K", bound=Comparable) - - -class ShapePredicate(Protocol): - """Predicate for shape filters""" - - def __call__(self, shape: Shape) -> bool: ... - - -class ShapeList(list[T]): - """Subclass of list with custom filter and sort methods appropriate to CAD""" - - # pylint: disable=too-many-public-methods - - @property - def first(self) -> T: - """First element in the ShapeList""" - return self[0] - - @property - def last(self) -> T: - """Last element in the ShapeList""" - return self[-1] - - def center(self) -> Vector: - """The average of the center of objects within the ShapeList""" - if not self: - return Vector(0, 0, 0) - - total_center = sum((o.center() for o in self), Vector(0, 0, 0)) - return total_center / len(self) - - def filter_by( - self, - filter_by: Union[ShapePredicate, Axis, Plane, GeomType], - reverse: bool = False, - tolerance: float = 1e-5, - ) -> ShapeList[T]: - """filter by Axis, Plane, or GeomType - - Either: - - filter objects of type planar Face or linear Edge by their normal or tangent - (respectively) and sort the results by the given axis, or - - filter the objects by the provided type. Note that not all types apply to all - objects. - - Args: - filter_by (Union[Axis,Plane,GeomType]): axis, plane, or geom type to filter - and possibly sort by. Filtering by a plane returns faces/edges parallel - to that plane. - reverse (bool, optional): invert the geom type filter. Defaults to False. - tolerance (float, optional): maximum deviation from axis. Defaults to 1e-5. - - Raises: - ValueError: Invalid filter_by type - - Returns: - ShapeList: filtered list of objects - """ - - # could be moved out maybe? - def axis_parallel_predicate(axis: Axis, tolerance: float): - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt = gp_Pnt() - surface_normal = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector( - surface_normal.X(), surface_normal.Y(), surface_normal.Z() - ).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - elif ( - isinstance(shape.wrapped, TopoDS_Edge) - and shape.geom_type == GeomType.LINE - ): - curve = shape.geom_adaptor() - umin = curve.FirstParameter() - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(umin, tmp, res) - start_pos = Vector(tmp) - start_dir = Vector(gp_Dir(res)) - shape_axis = Axis(start_pos, start_dir) - else: - return False - return axis.is_parallel(shape_axis, tolerance) - - return pred - - def plane_parallel_predicate(plane: Plane, tolerance: float): - plane_axis = Axis(plane.origin, plane.z_dir) - plane_xyz = plane.z_dir.wrapped.XYZ() - - def pred(shape: Shape): - if shape.is_planar_face: - assert shape.wrapped is not None and isinstance( - shape.wrapped, TopoDS_Face - ) - gp_pnt: gp_Pnt = gp_Pnt() - surface_normal: gp_Vec = gp_Vec() - u_val, _, v_val, _ = BRepTools.UVBounds_s(shape.wrapped) - BRepGProp_Face(shape.wrapped).Normal( - u_val, v_val, gp_pnt, surface_normal - ) - normalized_surface_normal = Vector(surface_normal).normalized() - shape_axis = Axis(shape.center(), normalized_surface_normal) - return plane_axis.is_parallel(shape_axis, tolerance) - if isinstance(shape.wrapped, TopoDS_Wire): - return all(pred(e) for e in shape.edges()) - if isinstance(shape.wrapped, TopoDS_Edge): - for curve in shape.wrapped.TShape().Curves(): - if curve.IsCurve3D(): - return ShapeAnalysis_Curve.IsPlanar_s( - curve.Curve3D(), plane_xyz, tolerance - ) - return False - return False - - return pred - - # convert input to callable predicate - if callable(filter_by): - predicate = filter_by - elif isinstance(filter_by, Axis): - predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, Plane): - predicate = plane_parallel_predicate(filter_by, tolerance=tolerance) - elif isinstance(filter_by, GeomType): - - def predicate(obj): - return obj.geom_type == filter_by - - else: - raise ValueError(f"Unsupported filter_by predicate: {filter_by}") - - # final predicate is negated if `reverse=True` - if reverse: - - def actual_predicate(shape): - return not predicate(shape) - - else: - actual_predicate = predicate - - return ShapeList(filter(actual_predicate, self)) - - def filter_by_position( - self, - axis: Axis, - minimum: float, - maximum: float, - inclusive: tuple[bool, bool] = (True, True), - ) -> ShapeList[T]: - """filter by position - - Filter and sort objects by the position of their centers along given axis. - min and max values can be inclusive or exclusive depending on the inclusive tuple. - - Args: - axis (Axis): axis to sort by - minimum (float): minimum value - maximum (float): maximum value - inclusive (tuple[bool, bool], optional): include min,max values. - Defaults to (True, True). - - Returns: - ShapeList: filtered object list - """ - if inclusive == (True, True): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (True, False): - objects = filter( - lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - elif inclusive == (False, True): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - <= maximum, - self, - ) - elif inclusive == (False, False): - objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - < maximum, - self, - ) - - return ShapeList(objects).sort_by(axis) - - def group_by( - self, - group_by: Union[Callable[[Shape], K], Axis, Edge, Wire, SortBy] = Axis.Z, - reverse=False, - tol_digits=6, - ) -> GroupBy[T, K]: - """group by - - Group objects by provided criteria and then sort the groups according to the criteria. - Note that not all group_by criteria apply to all objects. - - Args: - group_by (SortBy, optional): group and sort criteria. Defaults to Axis.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - tol_digits (int, optional): Tolerance for building the group keys by - round(key, tol_digits) - - Returns: - GroupBy[K, ShapeList]: sorted list of ShapeLists - """ - - if isinstance(group_by, Axis): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty axis") - assert group_by.location is not None - axis_as_location = group_by.location.inverse() - - def key_f(obj): - return round( - (axis_as_location * Location(obj.center())).position.Z, - tol_digits, - ) - - elif hasattr(group_by, "wrapped"): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty object") - - if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) - - elif isinstance(group_by, SortBy): - if group_by == SortBy.LENGTH: - - def key_f(obj): - return round(obj.length, tol_digits) - - elif group_by == SortBy.RADIUS: - - def key_f(obj): - return round(obj.radius, tol_digits) - - elif group_by == SortBy.DISTANCE: - - def key_f(obj): - return round(obj.center().length, tol_digits) - - elif group_by == SortBy.AREA: - - def key_f(obj): - return round(obj.area, tol_digits) - - elif group_by == SortBy.VOLUME: - - def key_f(obj): - return round(obj.volume, tol_digits) - - elif callable(group_by): - key_f = group_by - - else: - raise ValueError(f"Unsupported group_by function: {group_by}") - - return GroupBy(key_f, self, reverse=reverse) - - def sort_by( - self, sort_by: Union[Axis, Edge, Wire, SortBy] = Axis.Z, reverse: bool = False - ) -> ShapeList[T]: - """sort by - - Sort objects by provided criteria. Note that not all sort_by criteria apply to all - objects. - - Args: - sort_by (SortBy, optional): sort criteria. Defaults to SortBy.Z. - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: sorted list of objects - """ - - if isinstance(sort_by, Axis): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty axis") - assert sort_by.location is not None - axis_as_location = sort_by.location.inverse() - objects = sorted( - self, - key=lambda o: (axis_as_location * Location(o.center())).position.Z, - reverse=reverse, - ) - elif hasattr(sort_by, "wrapped"): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty object") - - if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): - - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) - - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) - - elif isinstance(sort_by, SortBy): - if sort_by == SortBy.LENGTH: - objects = sorted( - self, - key=lambda obj: obj.length, - reverse=reverse, - ) - elif sort_by == SortBy.RADIUS: - with_radius = [obj for obj in self if hasattr(obj, "radius")] - objects = sorted( - with_radius, - key=lambda obj: obj.radius, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.DISTANCE: - objects = sorted( - self, - key=lambda obj: obj.center().length, - reverse=reverse, - ) - elif sort_by == SortBy.AREA: - with_area = [obj for obj in self if hasattr(obj, "area")] - objects = sorted( - with_area, - key=lambda obj: obj.area, # type: ignore - reverse=reverse, - ) - elif sort_by == SortBy.VOLUME: - with_volume = [obj for obj in self if hasattr(obj, "volume")] - objects = sorted( - with_volume, - key=lambda obj: obj.volume, # type: ignore - reverse=reverse, - ) - - return ShapeList(objects) - - def sort_by_distance( - self, other: Union[Shape, VectorLike], reverse: bool = False - ) -> ShapeList[T]: - """Sort by distance - - Sort by minimal distance between objects and other - - Args: - other (Union[Shape,VectorLike]): reference object - reverse (bool, optional): flip order of sort. Defaults to False. - - Returns: - ShapeList: Sorted shapes - """ - distances = sorted( - [(obj.distance_to(other), obj) for obj in self], # type: ignore - key=lambda obj: obj[0], - reverse=reverse, - ) - return ShapeList([obj[1] for obj in distances]) - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this ShapeList""" - return ShapeList([v for shape in self for v in shape.vertices()]) # type: ignore - - def vertex(self) -> Vertex: - """Return the Vertex""" - vertices = self.vertices() - vertex_count = len(vertices) - if vertex_count != 1: - warnings.warn( - f"Found {vertex_count} vertices, returning first", stacklevel=2 - ) - return vertices[0] - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this ShapeList""" - return ShapeList([e for shape in self for e in shape.edges()]) # type: ignore - - def edge(self) -> Edge: - """Return the Edge""" - edges = self.edges() - edge_count = len(edges) - if edge_count != 1: - warnings.warn(f"Found {edge_count} edges, returning first", stacklevel=2) - return edges[0] - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this ShapeList""" - return ShapeList([w for shape in self for w in shape.wires()]) # type: ignore - - def wire(self) -> Wire: - """Return the Wire""" - wires = self.wires() - wire_count = len(wires) - if wire_count != 1: - warnings.warn(f"Found {wire_count} wires, returning first", stacklevel=2) - return wires[0] - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this ShapeList""" - return ShapeList([f for shape in self for f in shape.faces()]) # type: ignore - - def face(self) -> Face: - """Return the Face""" - faces = self.faces() - face_count = len(faces) - if face_count != 1: - msg = f"Found {face_count} faces, returning first" - warnings.warn(msg, stacklevel=2) - return faces[0] - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this ShapeList""" - return ShapeList([s for shape in self for s in shape.shells()]) # type: ignore - - def shell(self) -> Shell: - """Return the Shell""" - shells = self.shells() - shell_count = len(shells) - if shell_count != 1: - warnings.warn(f"Found {shell_count} shells, returning first", stacklevel=2) - return shells[0] - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this ShapeList""" - return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore - - def solid(self) -> Solid: - """Return the Solid""" - solids = self.solids() - solid_count = len(solids) - if solid_count != 1: - warnings.warn(f"Found {solid_count} solids, returning first", stacklevel=2) - return solids[0] - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this ShapeList""" - return ShapeList([c for shape in self for c in shape.compounds()]) # type: ignore - - def compound(self) -> Compound: - """Return the Compound""" - compounds = self.compounds() - compound_count = len(compounds) - if compound_count != 1: - warnings.warn( - f"Found {compound_count} compounds, returning first", stacklevel=2 - ) - return compounds[0] - - def __gt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Sort operator >""" - return self.sort_by(sort_by) - - def __lt__(self, sort_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: # type: ignore - """Reverse sort operator <""" - return self.sort_by(sort_by, reverse=True) - - def __rshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select largest group operator >>""" - return self.group_by(group_by)[-1] - - def __lshift__(self, group_by: Union[Axis, SortBy] = Axis.Z) -> ShapeList[T]: - """Group and select smallest group operator <<""" - return self.group_by(group_by)[0] - - def __or__(self, filter_by: Union[Axis, GeomType] = Axis.Z) -> ShapeList[T]: - """Filter by axis or geomtype operator |""" - return self.filter_by(filter_by) - - def __eq__(self, other: object) -> bool: - """ShapeLists equality operator ==""" - return ( - set(self) == set(other) if isinstance(other, ShapeList) else NotImplemented # type: ignore - ) - - # Normally implementing __eq__ is enough, but ShapeList subclasses list, - # which already implements __ne__, so we need to override it, too - def __ne__(self, other: ShapeList) -> bool: # type: ignore - """ShapeLists inequality operator !=""" - return ( - set(self) != set(other) if isinstance(other, ShapeList) else NotImplemented - ) - - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) - - def __sub__(self, other: ShapeList) -> ShapeList[T]: - """Differences between two ShapeLists operator -""" - return ShapeList(set(self) - set(other)) - - def __and__(self, other: ShapeList) -> ShapeList[T]: - """Intersect two ShapeLists operator &""" - return ShapeList(set(self) & set(other)) - - @overload - def __getitem__(self, key: SupportsIndex) -> T: ... - - @overload - def __getitem__(self, key: slice) -> ShapeList[T]: ... - - def __getitem__(self, key: Union[SupportsIndex, slice]) -> Union[T, ShapeList[T]]: - """Return slices of ShapeList as ShapeList""" - if isinstance(key, slice): - return ShapeList(list(self).__getitem__(key)) - return list(self).__getitem__(key) - - -class GroupBy(Generic[T, K]): - """Result of a Shape.groupby operation. Groups can be accessed by index or key""" - - def __init__( - self, - key_f: Callable[[T], K], - shapelist: Iterable[T], - *, - reverse: bool = False, - ): - # can't be a dict because K may not be hashable - self.key_to_group_index: list[tuple[K, int]] = [] - self.groups: list[ShapeList[T]] = [] - self.key_f = key_f - - for i, (key, shapegroup) in enumerate( - itertools.groupby(sorted(shapelist, key=key_f, reverse=reverse), key=key_f) - ): - self.groups.append(ShapeList(shapegroup)) - self.key_to_group_index.append((key, i)) - - def __iter__(self): - return iter(self.groups) - - def __len__(self): - return len(self.groups) - - def __getitem__(self, key: int): - return self.groups[key] - - def __str__(self): - return pretty(self) - - def __repr__(self): - return repr(ShapeList(self)) - - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: - """ - Render a formatted representation of the object for pretty-printing in - interactive environments. - - Args: - printer (PrettyPrinter): The pretty printer instance handling the output. - cycle (bool): Indicates if a reference cycle is detected to - prevent infinite recursion. - """ - if cycle: - printer.text("(...)") - else: - with printer.group(1, "[", "]"): - for idx, item in enumerate(self): - if idx: - printer.text(",") - printer.breakable() - printer.pretty(item) - - def group(self, key: K): - """Select group by key""" - for k, i in self.key_to_group_index: - if key == k: - return self.groups[i] - raise KeyError(key) - - def group_for(self, shape: T): - """Select group by shape""" - return self.group(self.key_f(shape)) - - -class Mixin1D(Shape): - """Methods to add to the Edge and Wire classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Edges and Wires""" - return 1 - - def __add__( - self, other: None | Shape | Iterable[Shape] - ) -> Edge | Wire | ShapeList[Edge]: - """fuse shape to wire/edge operator +""" - - # Convert `other` to list of base topods objects and filter out None values - if other is None: - summands = [] - else: - summands = [ - shape - # for o in (other if isinstance(other, (list, tuple)) else [other]) - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) - ] - # If there is nothing to add return the original object - if not summands: - return self - - if not all(topods_dim(summand) == 1 for summand in summands): - raise ValueError("Only shapes with the same dimension can be added") - - # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] - summand_edges = [e for summand in summands for e in summand.edges()] - - if self.wrapped is None: # an empty object - if len(summands) == 1: - sum_shape = summands[0] - else: - try: - sum_shape = Wire(summand_edges) - except Exception: - sum_shape = summands[0].fuse(*summands[1:]) - if type(self).order == 4: - sum_shape = type(self)(sum_shape) - else: - try: - sum_shape = Wire(self.edges() + ShapeList(summand_edges)) - except Exception: - sum_shape = self.fuse(*summands) - - if SkipClean.clean and not isinstance(sum_shape, list): - sum_shape = sum_shape.clean() - - # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape - - return sum_shape - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire: - "Returns the right type of wrapper, given a OCCT object" - - # Extend the lookup table with additional entries - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Union[Plane,Face]): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, - ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() - ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") - - def vertex(self) -> Vertex: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") - - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) - - def edge(self) -> Edge: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") - - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") - - def wire(self) -> Wire: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") - - def start_point(self) -> Vector: - """The start point of this edge - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umin = curve.FirstParameter() - - return Vector(curve.Value(umin)) - - def end_point(self) -> Vector: - """The end point of this edge. - - Note that circles may have identical start and end points. - """ - curve = self.geom_adaptor() - umax = curve.LastParameter() - - return Vector(curve.Value(umax)) - - def param_at(self, distance: float) -> float: - """Parameter along a curve - - Compute parameter value at the specified normalized distance. - - Args: - d (float): normalized distance (0.0 >= d >= 1.0) - - Returns: - float: parameter value - """ - curve = self.geom_adaptor() - - length = GCPnts_AbscissaPoint.Length_s(curve) - return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() - ).Parameter() - - def tangent_at( - self, - position: Union[float, VectorLike] = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> Vector: - """tangent_at - - Find the tangent at a given position on the 1D shape where the position - is either a float (or int) parameter or a point that lies on the shape. - - Args: - position (Union[float, VectorLike]): distance, parameter value, or - point on shape. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Raises: - ValueError: invalid position - - Returns: - Vector: tangent value - """ - if isinstance(position, (float, int)): - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - return Vector(gp_Dir(res)) - - def tangent_angle_at( - self, - location_param: float = 0.5, - position_mode: PositionMode = PositionMode.PARAMETER, - plane: Plane = Plane.XY, - ) -> float: - """tangent_angle_at - - Compute the tangent angle at the specified location - - Args: - location_param (float, optional): distance or parameter value. Defaults to 0.5. - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - plane (Plane, optional): plane line was constructed on. Defaults to Plane.XY. - - Returns: - float: angle in degrees between 0 and 360 - """ - tan_vector = self.tangent_at(location_param, position_mode) - angle = (plane.x_dir.get_signed_angle(tan_vector, plane.z_dir) + 360) % 360.0 - return angle - - def normal(self) -> Vector: - """Calculate the normal Vector. Only possible for planar curves. - - :return: normal vector - - Args: - - Returns: - - """ - curve = self.geom_adaptor() - gtype = self.geom_type - - if gtype == GeomType.CIRCLE: - circ = curve.Circle() - return_value = Vector(circ.Axis().Direction()) - elif gtype == GeomType.ELLIPSE: - ell = curve.Ellipse() - return_value = Vector(ell.Axis().Direction()) - else: - find_surface = BRepLib_FindSurface(self.wrapped, OnlyPlane=True) - surf = find_surface.Surface() - - if isinstance(surf, Geom_Plane): - pln = surf.Pln() - return_value = Vector(pln.Axis().Direction()) - else: - raise ValueError("Normal not defined") - - return return_value - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of object - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - middle = self.position_at(0.5) - elif center_of == CenterOf.MASS: - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def common_plane(self, *lines: Edge | Wire | None) -> Union[None, Plane]: - """common_plane - - Find the plane containing all the edges/wires (including self). If there - is no common plane return None. If the edges are coaxial, select one - of the infinite number of valid planes. - - Args: - lines (sequence of Union[Edge,Wire]): edges in common with self - - Returns: - Union[None, Plane]: Either the common plane or None - """ - # pylint: disable=too-many-locals - # Note: BRepLib_FindSurface is not helpful as it requires the - # Edges to form a surface perimeter. - points: list[Vector] = [] - all_lines: list[Edge | Wire] = [ - line for line in [self, *lines] if line is not None - ] - if any(not isinstance(line, (Edge, Wire)) for line in all_lines): - raise ValueError("Only Edges or Wires are valid") - - result = None - # Are they all co-axial - if so, select one of the infinite planes - all_edges: list[Edge] = [e for l in all_lines for e in l.edges()] - if all(e.geom_type == GeomType.LINE for e in all_edges): - as_axis = [Axis(e @ 0, e % 0) for e in all_edges] - if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): - origin = as_axis[0].position - x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir - c_plane = Plane(origin, z_dir=z_dir) - result = c_plane.shift_origin((0, 0)) - - if result is None: # not coaxial - # Shorten any infinite lines (from converted Axis) - normal_lines = list(filter(lambda line: line.length <= 1e50, all_lines)) - infinite_lines = filter(lambda line: line.length > 1e50, all_lines) - shortened_lines = [l.trim_to_length(0.5, 10) for l in infinite_lines] - all_lines = normal_lines + shortened_lines - - for line in all_lines: - num_points = 2 if line.geom_type == GeomType.LINE else 8 - points.extend( - [line.position_at(i / (num_points - 1)) for i in range(num_points)] - ) - points = list(set(points)) # unique points - extreme_areas = {} - for subset in combinations(points, 3): - vector1 = subset[1] - subset[0] - vector2 = subset[2] - subset[0] - area = 0.5 * (vector1.cross(vector2).length) - extreme_areas[area] = subset - # The points that create the largest area make the most accurate plane - extremes = extreme_areas[sorted(list(extreme_areas.keys()))[-1]] - - # Create a plane from these points - x_dir = (extremes[1] - extremes[0]).normalized() - z_dir = (extremes[2] - extremes[0]).cross(x_dir) - try: - c_plane = Plane( - origin=(sum(extremes, Vector(0, 0, 0)) / 3), z_dir=z_dir - ) - c_plane = c_plane.shift_origin((0, 0)) - except ValueError: - # There is no valid common plane - result = None - else: - # Are all of the points on the common plane - common = all(c_plane.contains(p) for p in points) - result = c_plane if common else None - - return result - - @property - def length(self) -> float: - """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) - - @property - def radius(self) -> float: - """Calculate the radius. - - Note that when applied to a Wire, the radius is simply the radius of the first edge. - - Args: - - Returns: - radius - - Raises: - ValueError: if kernel can not reduce the shape to a circular edge - - """ - geom = self.geom_adaptor() - try: - circ = geom.Circle() - except (Standard_NoSuchObject, Standard_Failure) as err: - raise ValueError("Shape could not be reduced to a circle") from err - return circ.Radius() - - @property - def is_forward(self) -> bool: - """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: - raise ValueError("Can't determine direction of empty Edge or Wire") - return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD - - @property - def is_closed(self) -> bool: - """Are the start and end points equal?""" - if self.wrapped is None: - raise ValueError("Can't determine if empty Edge or Wire is closed") - return BRep_Tool.IsClosed_s(self.wrapped) - - @property - def volume(self) -> float: - """volume - the volume of this Edge or Wire, which is always zero""" - return 0.0 - - def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> Vector: - """Position At - - Generate a position along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. Defaults to - PositionMode.PARAMETER. - - Returns: - Vector: position on the underlying curve - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) - - def positions( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - ) -> list[Vector]: - """Positions along curve - - Generate positions along the underlying curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - - Returns: - list[Vector]: positions along curve - """ - return [self.position_at(d, position_mode) for d in distances] - - def location_at( - self, - distance: float, - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> Location: - """Locations along curve - - Generate a location along the underlying curve. - - Args: - distance (float): distance or parameter value - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - Location: A Location object representing local coordinate system - at the specified distance. - """ - curve = self.geom_adaptor() - - if position_mode == PositionMode.PARAMETER: - param = self.param_at(distance) - else: - param = self.param_at(distance / self.length) - - law: GeomFill_TrihedronLaw - if frame_method == FrameMethod.FRENET: - law = GeomFill_Frenet() - else: - law = GeomFill_CorrectedFrenet() - - law.SetCurve(curve) - - tangent, normal, binormal = gp_Vec(), gp_Vec(), gp_Vec() - - law.D0(param, tangent, normal, binormal) - pnt = curve.Value(param) - - transformation = gp_Trsf() - if planar: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() - ) - else: - transformation.SetTransformation( - gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() - ) - - return Location(TopLoc_Location(transformation)) - - def locations( - self, - distances: Iterable[float], - position_mode: PositionMode = PositionMode.PARAMETER, - frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, - ) -> list[Location]: - """Locations along curve - - Generate location along the curve - - Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. - frame_method (FrameMethod, optional): moving frame calculation method. - Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. - - Returns: - list[Location]: A list of Location objects representing local coordinate - systems at the specified distances. - """ - return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances - ] - - def __matmul__(self, position: float) -> Vector: - """Position on wire operator @""" - return self.position_at(position) - - def __mod__(self, position: float) -> Vector: - """Tangent on wire operator %""" - return self.tangent_at(position) - - def __xor__(self, position: float) -> Location: - """Location on wire operator ^""" - return self.location_at(position) - - def offset_2d( - self, - distance: float, - kind: Kind = Kind.ARC, - side: Side = Side.BOTH, - closed: bool = True, - ) -> Union[Edge, Wire]: - """2d Offset - - Offsets a planar edge/wire - - Args: - distance (float): distance from edge/wire to offset - kind (Kind, optional): offset corner transition. Defaults to Kind.ARC. - side (Side, optional): side to place offset. Defaults to Side.BOTH. - closed (bool, optional): if Side!=BOTH, close the LEFT or RIGHT - offset. Defaults to True. - Raises: - RuntimeError: Multiple Wires generated - RuntimeError: Unexpected result type - - Returns: - Wire: offset wire - """ - # pylint: disable=too-many-branches, too-many-locals, too-many-statements - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - line = self if isinstance(self, Wire) else Wire([self]) - - # Avoiding a bug when the wire contains a single Edge - if len(line.edges()) == 1: - edge = line.edges()[0] - edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] - topods_wire = Wire(edges).wrapped - else: - topods_wire = line.wrapped - - offset_builder = BRepOffsetAPI_MakeOffset() - offset_builder.Init(kind_dict[kind]) - # offset_builder.SetApprox(True) - offset_builder.AddWire(topods_wire) - offset_builder.Perform(distance) - - obj = downcast(offset_builder.Shape()) - if isinstance(obj, TopoDS_Compound): - obj = unwrap_topods_compound(obj, fully=True) - if isinstance(obj, TopoDS_Wire): - offset_wire = Wire(obj) - else: # Likely multiple Wires were generated - raise RuntimeError("Unexpected result type") - - if side != Side.BOTH: - # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] - centers = [w.position_at(0.5) for w in wires] - angles = [ - line.tangent_at(0).get_signed_angle(c - line.position_at(0)) - for c in centers - ] - if side == Side.LEFT: - offset_wire = wires[int(angles[0] > angles[1])] - else: - offset_wire = wires[int(angles[0] <= angles[1])] - - if closed: - self0 = line.position_at(0) - self1 = line.position_at(1) - end0 = offset_wire.position_at(0) - end1 = offset_wire.position_at(1) - if (self0 - end0).length - abs(distance) <= TOLERANCE: - edge0 = Edge.make_line(self0, end0) - edge1 = Edge.make_line(self1, end1) - else: - edge0 = Edge.make_line(self0, end1) - edge1 = Edge.make_line(self1, end0) - offset_wire = Wire( - line.edges() + offset_wire.edges() + ShapeList([edge0, edge1]) - ) - - offset_edges = offset_wire.edges() - return offset_edges[0] if len(offset_edges) == 1 else offset_wire - - def perpendicular_line( - self, length: float, u_value: float, plane: Plane = Plane.XY - ) -> Edge: - """perpendicular_line - - Create a line on the given plane perpendicular to and centered on beginning of self - - Args: - length (float): line length - u_value (float): position along line between 0.0 and 1.0 - plane (Plane, optional): plane containing perpendicular line. Defaults to Plane.XY. - - Returns: - Edge: perpendicular line - """ - start = self.position_at(u_value) - local_plane = Plane( - origin=start, x_dir=self.tangent_at(u_value), z_dir=plane.z_dir - ) - line = Edge.make_line( - start + local_plane.y_dir * length / 2, - start - local_plane.y_dir * length / 2, - ) - return line - - def project( - self, face: Face, direction: VectorLike, closest: bool = True - ) -> Edge | Wire | ShapeList[Edge | Wire]: - """Project onto a face along the specified direction - - Args: - face: Face: - direction: VectorLike: - closest: bool: (Default value = True) - - Returns: - - """ - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") - - bldr = BRepProj_Projection( - self.wrapped, face.wrapped, Vector(direction).to_dir() - ) - shapes: TopoDS_Compound = bldr.Shape() - - # select the closest projection if requested - return_value: Edge | Wire | ShapeList[Edge | Wire] - - if closest: - dist_calc = BRepExtrema_DistShapeShape() - dist_calc.LoadS1(self.wrapped) - - min_dist = inf - - # for shape in shapes: - for shape in get_top_level_topods_shapes(shapes): - dist_calc.LoadS2(shape) - dist_calc.Perform() - dist = dist_calc.Value() - - if dist < min_dist: - min_dist = dist - return_value = Mixin1D.cast(shape) - - else: - return_value = ShapeList( - Mixin1D.cast(shape) for shape in get_top_level_topods_shapes(shapes) - ) - - return return_value - - def project_to_viewport( - self, - viewport_origin: VectorLike, - viewport_up: VectorLike = (0, 0, 1), - look_at: VectorLike | None = None, - ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: - """project_to_viewport - - Project a shape onto a viewport returning visible and hidden Edges. - - Args: - viewport_origin (VectorLike): location of viewport - viewport_up (VectorLike, optional): direction of the viewport y axis. - Defaults to (0, 0, 1). - look_at (VectorLike, optional): point to look at. - Defaults to None (center of shape). - - Returns: - tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges - """ - - def extract_edges(compound): - edges = [] # List to store the extracted edges - - # Create a TopExp_Explorer to traverse the sub-shapes of the compound - explorer = TopExp_Explorer(compound, TopAbs_ShapeEnum.TopAbs_EDGE) - - # Loop through the sub-shapes and extract edges - while explorer.More(): - edge = downcast(explorer.Current()) - edges.append(edge) - explorer.Next() - - return edges - - # Setup the projector - hidden_line_removal = HLRBRep_Algo() - hidden_line_removal.Add(self.wrapped) - - viewport_origin = Vector(viewport_origin) - look_at = Vector(look_at) if look_at else self.center() - projection_dir: Vector = (viewport_origin - look_at).normalized() - viewport_up = Vector(viewport_up).normalized() - camera_coordinate_system = gp_Ax2() - camera_coordinate_system.SetAxis( - gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) - ) - camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) - - hidden_line_removal.Projector(projector) - hidden_line_removal.Update() - hidden_line_removal.Hide() - - hlr_shapes = HLRBRep_HLRToShape(hidden_line_removal) - - # Create the visible edges - visible_edges = [] - for edges in [ - hlr_shapes.VCompound(), - hlr_shapes.Rg1LineVCompound(), - hlr_shapes.OutLineVCompound(), - ]: - if not edges.IsNull(): - visible_edges.extend(extract_edges(downcast(edges))) - - # Create the hidden edges - hidden_edges = [] - for edges in [ - hlr_shapes.HCompound(), - hlr_shapes.OutLineHCompound(), - hlr_shapes.Rg1LineHCompound(), - ]: - if not edges.IsNull(): - hidden_edges.extend(extract_edges(downcast(edges))) - - # Fix the underlying geometry - otherwise we will get segfaults - for edge in visible_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - for edge in hidden_edges: - BRepLib.BuildCurves3d_s(edge, TOLERANCE) - - # convert to native shape objects - visible_edges = ShapeList(Edge(e) for e in visible_edges) - hidden_edges = ShapeList(Edge(e) for e in hidden_edges) - - return (visible_edges, hidden_edges) - - -class Mixin2D(Shape): - """Additional methods to add to Face and Shell class""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int: - """Dimension of Faces and Shells""" - return 2 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Vertex | Edge | Wire | Face | Shell: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") - - def face(self) -> Face: - """Return the Face""" - return Shape.get_single_shape(self, "Face") - - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") - - def shell(self) -> Shell: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") - - def __neg__(self) -> Self: - """Reverse normal operator -""" - if self.wrapped is None: - raise ValueError("Invalid Shape") - new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) - - return new_surface - - def offset(self, amount: float) -> Self: - """Return a copy of self moved along the normal by amount""" - return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - - def find_intersection_points( - self, other: Axis, tolerance: float = TOLERANCE - ) -> list[tuple[Vector, Vector]]: - """Find point and normal at intersection - - Return both the point(s) and normal(s) of the intersection of the axis and the shape - - Args: - axis (Axis): axis defining the intersection line - - Returns: - list[tuple[Vector, Vector]]: Point and normal of intersection - """ - if self.wrapped is None: - return [] - - intersection_line = gce_MakeLin(other.wrapped).Value() - intersect_maker = BRepIntCurveSurface_Inter() - intersect_maker.Init(self.wrapped, intersection_line, tolerance) - - intersections = [] - while intersect_maker.More(): - inter_pt = intersect_maker.Pnt() - # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z - intersections.append( - ( - intersect_maker.Face(), # TopoDS_Face - Vector(inter_pt), - distance, - ) - ) - intersect_maker.Next() - - intersections.sort(key=lambda x: x[2]) - intersecting_faces = [i[0] for i in intersections] - intersecting_points = [i[1] for i in intersections] - intersecting_normals = [ - _topods_face_normal_at(f, intersecting_points[i].to_pnt()) - for i, f in enumerate(intersecting_faces) - ] - result = [] - for pnt, normal in zip(intersecting_points, intersecting_normals): - result.append((pnt, normal)) - - return result - - -class Mixin3D(Shape): - """Additional methods to add to 3D Shape classes""" - - @classmethod - def extrude( - cls, obj: Shape, direction: VectorLike - ) -> Edge | Face | Shell | Solid | Compound: - """Unused - only here because Mixin1D is a subclass of Shape""" - return NotImplemented - - @property - def _dim(self) -> int | None: - """Dimension of Solids""" - return 3 - - project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split - find_intersection_points = Mixin2D.find_intersection_points - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell - - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") - - def solid(self) -> Solid: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") - - def fillet(self, radius: float, edge_list: Iterable[Edge]) -> Self: - """Fillet - - Fillets the specified edges of this solid. - - Args: - radius (float): float > 0, the radius of the fillet - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to this solid - - Returns: - Any: Filleted solid - """ - native_edges = [e.wrapped for e in edge_list] - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(radius, native_edge) - - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - f"Failed creating a fillet with radius of {radius}, try a smaller value" - f" or use max_fillet() to find the largest valid fillet radius" - ) from err - - return new_shape - - def max_fillet( - self, - edge_list: Iterable[Edge], - tolerance=0.1, - max_iterations: int = 10, - ) -> float: - """Find Maximum Fillet Size - - Find the largest fillet radius for the given Shape and edges with a - recursive binary search. - - Example: - - max_fillet_radius = my_shape.max_fillet(shape_edges) - max_fillet_radius = my_shape.max_fillet(shape_edges, tolerance=0.5, max_iterations=8) - - - Args: - edge_list (Iterable[Edge]): a sequence of Edge objects, which must belong to this solid - tolerance (float, optional): maximum error from actual value. Defaults to 0.1. - max_iterations (int, optional): maximum number of recursive iterations. Defaults to 10. - - Raises: - RuntimeError: failed to find the max value - ValueError: the provided Shape is invalid - - Returns: - float: maximum fillet radius - """ - - def __max_fillet(window_min: float, window_max: float, current_iteration: int): - window_mid = (window_min + window_max) / 2 - - if current_iteration == max_iterations: - raise RuntimeError( - f"Failed to find the max value within {tolerance} in {max_iterations}" - ) - - fillet_builder = BRepFilletAPI_MakeFillet(self.wrapped) - - for native_edge in native_edges: - fillet_builder.Add(window_mid, native_edge) - - # Do these numbers work? - if not try with the smaller window - try: - new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): - raise fillet_exception - except fillet_exception: - return __max_fillet(window_min, window_mid, current_iteration + 1) - - # These numbers work, are they close enough? - if not try larger window - if window_mid - window_min <= tolerance: - return_value = window_mid - else: - return_value = __max_fillet( - window_mid, window_max, current_iteration + 1 - ) - return return_value - - if not self.is_valid(): - raise ValueError("Invalid Shape") - - native_edges = [e.wrapped for e in edge_list] - - # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform - # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone - - max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) - - return max_radius - - def chamfer( - self, - length: float, - length2: Optional[float], - edge_list: Iterable[Edge], - face: Face | None = None, - ) -> Self: - """Chamfer - - Chamfers the specified edges of this solid. - - Args: - length (float): length > 0, the length (length) of the chamfer - length2 (Optional[float]): length2 > 0, optional parameter for asymmetrical - chamfer. Should be `None` if not required. - edge_list (Iterable[Edge]): a list of Edge objects, which must belong to - this solid - face (Face, optional): identifies the side where length is measured. The edge(s) - must be part of the face - - Returns: - Self: Chamfered solid - """ - edge_list = list(edge_list) - if face: - if any((edge for edge in edge_list if edge not in face.edges())): - raise ValueError("Some edges are not part of the face") - - native_edges = [e.wrapped for e in edge_list] - - # make a edge --> faces mapping - edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map - ) - - # note: we prefer 'length' word to 'radius' as opposed to FreeCAD's API - chamfer_builder = BRepFilletAPI_MakeChamfer(self.wrapped) - - if length2: - distance1 = length - distance2 = length2 - else: - distance1 = length - distance2 = length - - for native_edge in native_edges: - if face: - topo_face = face.wrapped - else: - topo_face = edge_face_map.FindFromKey(native_edge).First() - - chamfer_builder.Add( - distance1, distance2, native_edge, TopoDS.Face_s(topo_face) - ) # NB: edge_face_map return a generic TopoDS_Shape - - try: - new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): - raise Standard_Failure - except (StdFail_NotDone, Standard_Failure) as err: - raise ValueError( - "Failed creating a chamfer, try a smaller length value(s)" - ) from err - - return new_shape - - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object - - Find center of object - - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. - - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def hollow( - self, - faces: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Hollow - - Return the outer shelled solid of self. - - Args: - faces (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): shell thickness - positive shells outwards, negative - shells inwards. - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A hollow solid. - """ - faces = list(faces) if faces else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - } - - occ_faces_list = TopTools_ListOfShape() - for face in faces: - occ_faces_list.Append(face.wrapped) - - shell_builder = BRepOffsetAPI_MakeThickSolid() - shell_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - Join=kind_dict[kind], - ) - shell_builder.Build() - - if faces: - return_value = self.__class__.cast(shell_builder.Shape()) - - else: # if no faces provided a watertight solid will be constructed - shell1 = self.__class__.cast(shell_builder.Shape()).shells()[0].wrapped - shell2 = self.shells()[0].wrapped - - # s1 can be outer or inner shell depending on the thickness sign - if thickness > 0: - sol = BRepBuilderAPI_MakeSolid(shell1, shell2) - else: - sol = BRepBuilderAPI_MakeSolid(shell2, shell1) - - # fix needed for the orientations - return_value = self.__class__.cast(sol.Shape()).fix() - - return return_value - - def offset_3d( - self, - openings: Optional[Iterable[Face]], - thickness: float, - tolerance: float = 0.0001, - kind: Kind = Kind.ARC, - ) -> Solid: - """Shell - - Make an offset solid of self. - - Args: - openings (Optional[Iterable[Face]]): faces to be removed, - which must be part of the solid. Can be an empty list. - thickness (float): offset amount - positive offset outwards, negative inwards - tolerance (float, optional): modelling tolerance of the method. Defaults to 0.0001. - kind (Kind, optional): intersection type. Defaults to Kind.ARC. - - Raises: - ValueError: Kind.TANGENT not supported - - Returns: - Solid: A shelled solid. - """ - openings = list(openings) if openings else [] - if kind == Kind.TANGENT: - raise ValueError("Kind.TANGENT not supported") - - kind_dict = { - Kind.ARC: GeomAbs_JoinType.GeomAbs_Arc, - Kind.INTERSECTION: GeomAbs_JoinType.GeomAbs_Intersection, - Kind.TANGENT: GeomAbs_JoinType.GeomAbs_Tangent, - } - - occ_faces_list = TopTools_ListOfShape() - for face in openings: - occ_faces_list.Append(face.wrapped) - - offset_builder = BRepOffsetAPI_MakeThickSolid() - offset_builder.MakeThickSolidByJoin( - self.wrapped, - occ_faces_list, - thickness, - tolerance, - Intersection=True, - RemoveIntEdges=True, - Join=kind_dict[kind], - ) - offset_builder.Build() - - try: - offset_occt_solid = offset_builder.Shape() - except (StdFail_NotDone, Standard_Failure) as err: - raise RuntimeError( - "offset Error, an alternative kind may resolve this error" - ) from err - - offset_solid = self.__class__.cast(offset_occt_solid) - assert offset_solid.wrapped is not None - - # The Solid can be inverted, if so reverse - if offset_solid.volume < 0: - offset_solid.wrapped.Reverse() - - return offset_solid - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Returns whether or not the point is inside a solid or compound - object within the specified tolerance. - - Args: - point: tuple or Vector representing 3D point to be tested - tolerance: tolerance for inside determination, default=1.0e-6 - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool indicating whether or not point is within solid - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - - return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() - - def dprism( - self, - basis: Optional[Face], - bounds: list[Union[Face, Wire]], - depth: float | None = None, - taper: float = 0, - up_to_face: Face | None = None, - thru_all: bool = True, - additive: bool = True, - ) -> Solid: - """dprism - - Make a prismatic feature (additive or subtractive) - - Args: - basis (Optional[Face]): face to perform the operation on - bounds (list[Union[Face,Wire]]): list of profiles - depth (float, optional): depth of the cut or extrusion. Defaults to None. - taper (float, optional): in degrees. Defaults to 0. - up_to_face (Face, optional): a face to extrude until. Defaults to None. - thru_all (bool, optional): cut thru_all. Defaults to True. - additive (bool, optional): Defaults to True. - - Returns: - Solid: prismatic feature - """ - if isinstance(bounds[0], Wire): - sorted_profiles = sort_wires_by_build_order(bounds) - faces = [Face(p[0], p[1:]) for p in sorted_profiles] - else: - faces = bounds - - shape: Union[TopoDS_Shape, TopoDS_Solid] = self.wrapped - for face in faces: - feat = BRepFeat_MakeDPrism( - shape, - face.wrapped, - basis.wrapped if basis else TopoDS_Face(), - taper * DEG2RAD, - additive, - False, - ) - - if up_to_face is not None: - feat.Perform(up_to_face.wrapped) - elif thru_all or depth is None: - feat.PerformThruAll() - else: - feat.Perform(depth) - - shape = feat.Shape() - - return self.__class__(shape) +from typing_extensions import Self + +from .one_d import Edge, Wire, Mixin1D +from .shape_core import ( + Shape, + ShapeList, + SkipClean, + Joint, + downcast, + shapetype, + topods_dim, +) +from .three_d import Mixin3D, Solid +from .two_d import Face, Shell +from .utils import ( + _extrude_topods_shape, + _make_topods_compound_from_shapes, + tuplify, + unwrapped_shapetype, +) +from .zero_d import Vertex class Compound(Mixin3D, Shape[TopoDS_Compound]): @@ -4425,36 +130,11 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): order = 4.0 project_to_viewport = Mixin1D.project_to_viewport - - @classmethod - def cast( - cls, obj: TopoDS_Shape - ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - ta.TopAbs_EDGE: Edge, - ta.TopAbs_WIRE: Wire, - ta.TopAbs_FACE: Face, - ta.TopAbs_SHELL: Shell, - ta.TopAbs_SOLID: Solid, - ta.TopAbs_COMPOUND: Compound, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) - - @property - def _dim(self) -> Union[int, None]: - """The dimension of the shapes within the Compound - None if inconsistent""" - return topods_dim(self.wrapped) + # ---- Constructor ---- def __init__( self, - obj: Optional[TopoDS_Compound | Iterable[Shape]] = None, + obj: TopoDS_Compound | Iterable[Shape] | None = None, label: str = "", color: Color | None = None, material: str = "", @@ -4491,16 +171,12 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): self.joints = {} if joints is None else joints self.children = [] if children is None else children - def __repr__(self): - """Return Compound info as string""" - if hasattr(self, "label") and hasattr(self, "children"): - result = ( - f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " - + f"#children({len(self.children)})" - ) - else: - result = f"{self.__class__.__name__} at {id(self):#x}" - return result + # ---- Properties ---- + + @property + def _dim(self) -> int | None: + """The dimension of the shapes within the Compound - None if inconsistent""" + return topods_dim(self.wrapped) @property def volume(self) -> float: @@ -4508,183 +184,28 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): # when density == 1, mass == volume return sum(i.volume for i in [*self.get_type(Solid), *self.get_type(Shell)]) - def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: - """Return center of object + # ---- Class Methods ---- - Find center of object + @classmethod + def cast( + cls, obj: TopoDS_Shape + ) -> Vertex | Edge | Wire | Face | Shell | Solid | Compound: + "Returns the right type of wrapper, given a OCCT object" - Args: - center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. + # define the shape lookup table for casting + constructor_lut = { + ta.TopAbs_VERTEX: Vertex, + ta.TopAbs_EDGE: Edge, + ta.TopAbs_WIRE: Wire, + ta.TopAbs_FACE: Face, + ta.TopAbs_SHELL: Shell, + ta.TopAbs_SOLID: Solid, + ta.TopAbs_COMPOUND: Compound, + } - Raises: - ValueError: Center of GEOMETRY is not supported for this object - NotImplementedError: Unable to calculate center of mass of this object - - Returns: - Vector: center - """ - if center_of == CenterOf.GEOMETRY: - raise ValueError("Center of GEOMETRY is not supported for this object") - if center_of == CenterOf.MASS: - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] - if calc_function: - calc_function(self.wrapped, properties) - middle = Vector(properties.CentreOfMass()) - else: - raise NotImplementedError - elif center_of == CenterOf.BOUNDING_BOX: - middle = self.bounding_box().center() - return middle - - def _remove(self, shape: Shape) -> Compound: - """Return self with the specified shape removed. - - Args: - shape: Shape: - """ - comp_builder = TopoDS_Builder() - comp_builder.Remove(self.wrapped, shape.wrapped) - return self - - def _post_detach(self, parent: Compound): - """Method call after detaching from `parent`.""" - logger.debug("Removing parent of %s (%s)", self.label, parent.label) - if parent.children: - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - else: - parent.wrapped = None - - def _pre_attach(self, parent: Compound): - """Method call before attaching to `parent`.""" - if not isinstance(parent, Compound): - raise ValueError("`parent` must be of type Compound") - - def _post_attach(self, parent: Compound): - """Method call after attaching to `parent`.""" - logger.debug("Updated parent of %s to %s", self.label, parent.label) - parent.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in parent.children] - ) - - def _post_detach_children(self, children): - """Method call before detaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Removing children %s from %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Removing no children from %s", self.label) - - def _pre_attach_children(self, children): - """Method call before attaching `children`.""" - if not all(isinstance(child, Shape) for child in children): - raise ValueError("Each child must be of type Shape") - - def _post_attach_children(self, children: Iterable[Shape]): - """Method call after attaching `children`.""" - if children: - kids = ",".join([child.label for child in children]) - logger.debug("Adding children %s to %s", kids, self.label) - self.wrapped = _make_topods_compound_from_shapes( - [c.wrapped for c in self.children] - ) - # else: - # logger.debug("Adding no children to %s", self.label) - - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Combine other to self `+` operator - - Note that if all of the objects are connected Edges/Wires the result - will be a Wire, otherwise a Shape. - """ - if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other - - summands: ShapeList[Shape] - if other is None: - summands = ShapeList() - else: - summands = ShapeList( - shape - for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in o.get_top_level_shapes() - ) - # If there is nothing to add return the original object - if not summands: - return self - - summands = ShapeList( - s for s in self.get_top_level_shapes() + summands if s is not None - ) - - # Only fuse the parts if necessary - if len(summands) <= 1: - result: Shape = Compound(summands[0:1]) - else: - fuse_op = BRepAlgoAPI_Fuse() - fuse_op.SetFuzzyValue(TOLERANCE) - self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) - bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) - if isinstance(bool_result, list): - result = Compound(bool_result) - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - else: - result = bool_result - - if SkipClean.clean: - result = result.clean() - - return result - - def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: - """Cut other to self `-` operator""" - difference = Shape.__sub__(self, other) - difference = Compound( - difference if isinstance(difference, list) else [difference] - ) - self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) - - return difference - - def __and__(self, other: Shape | Iterable[Shape]) -> Compound: - """Intersect other to self `&` operator""" - intersection = Shape.__and__(self, other) - intersection = Compound( - intersection if isinstance(intersection, list) else [intersection] - ) - self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) - return intersection - - def compounds(self) -> ShapeList[Compound]: - """compounds - all the compounds in this Shape""" - if self.wrapped is None: - return ShapeList() - if isinstance(self.wrapped, TopoDS_Compound): - # pylint: disable=not-an-iterable - sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] - sub_compounds.append(self) - else: - sub_compounds = [] - return ShapeList(sub_compounds) - - def compound(self) -> Compound | None: - """Return the Compound""" - shape_list = self.compounds() - entity_count = len(shape_list) - if entity_count != 1: - warnings.warn( - f"Found {entity_count} compounds, returning first", - stacklevel=2, - ) - return shape_list[0] if shape_list else None + shape_type = shapetype(obj) + # NB downcast is needed to handle TopoDS_Shape types + return constructor_lut[shape_type](downcast(obj)) @classmethod def extrude(cls, obj: Shell, direction: VectorLike) -> Compound: @@ -4706,72 +227,17 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): TopoDS.Compound_s(_extrude_topods_shape(obj.wrapped, direction)) ) - def do_children_intersect( - self, include_parent: bool = False, tolerance: float = 1e-5 - ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: - """Do Children Intersect - - Determine if any of the child objects within a Compound/assembly intersect by - intersecting each of the shapes with each other and checking for - a common volume. - - Args: - include_parent (bool, optional): check parent for intersections. Defaults to False. - tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. - - Returns: - tuple[bool, tuple[Shape, Shape], float]: - do the object intersect, intersecting objects, volume of intersection - """ - children: list[Shape] = list(PreOrderIter(self)) - if not include_parent: - children.pop(0) # remove parent - # children_bbox = [child.bounding_box().to_solid() for child in children] - children_bbox = [ - Solid.from_bounding_box(child.bounding_box()) for child in children - ] - child_index_pairs = [ - tuple(map(int, comb)) - for comb in combinations(list(range(len(children))), 2) - ] - for child_index_pair in child_index_pairs: - # First check for bounding box intersections .. - # .. then confirm with actual object intersections which could be complex - bbox_intersection = children_bbox[child_index_pair[0]].intersect( - children_bbox[child_index_pair[1]] - ) - if bbox_intersection is not None: - obj_intersection = children[child_index_pair[0]].intersect( - children[child_index_pair[1]] - ) - if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) - if common_volume > tolerance: - return ( - True, - ( - children[child_index_pair[0]], - children[child_index_pair[1]], - ), - common_volume, - ) - return (False, (None, None), 0.0) - @classmethod def make_text( cls, txt: str, font_size: float, font: str = "Arial", - font_path: Optional[str] = None, + font_path: str | None = None, font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), position_on_path: float = 0.0, - text_path: Union[Edge, Wire, None] = None, + text_path: Edge | Wire | None = None, ) -> "Compound": """2D Text that optionally follows a path. @@ -4926,6 +392,72 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): return triad + # ---- Instance Methods ---- + + def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: + """Combine other to self `+` operator + + Note that if all of the objects are connected Edges/Wires the result + will be a Wire, otherwise a Shape. + """ + if self._dim == 1: + curve = Curve() if self.wrapped is None else Curve(self.wrapped) + self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) + return curve + other + + summands: ShapeList[Shape] + if other is None: + summands = ShapeList() + else: + summands = ShapeList( + shape + for o in ([other] if isinstance(other, Shape) else other) + if o is not None + for shape in o.get_top_level_shapes() + ) + # If there is nothing to add return the original object + if not summands: + return self + + summands = ShapeList( + s for s in self.get_top_level_shapes() + summands if s is not None + ) + + # Only fuse the parts if necessary + if len(summands) <= 1: + result: Shape = Compound(summands[0:1]) + else: + fuse_op = BRepAlgoAPI_Fuse() + fuse_op.SetFuzzyValue(TOLERANCE) + self.copy_attributes_to(summands[0], ["wrapped", "_NodeMixin__children"]) + bool_result = self._bool_op(summands[:1], summands[1:], fuse_op) + if isinstance(bool_result, list): + result = Compound(bool_result) + self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) + else: + result = bool_result + + if SkipClean.clean: + result = result.clean() + + return result + + def __and__(self, other: Shape | Iterable[Shape]) -> Compound: + """Intersect other to self `&` operator""" + intersection = Shape.__and__(self, other) + intersection = Compound( + intersection if isinstance(intersection, list) else [intersection] + ) + self.copy_attributes_to(intersection, ["wrapped", "_NodeMixin__children"]) + return intersection + + def __bool__(self) -> bool: + """ + Check if empty. + """ + + return TopoDS_Iterator(self.wrapped).More() + def __iter__(self) -> Iterator[Shape]: """ Iterate over subshapes. @@ -4946,18 +478,144 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): count += 1 return count - def __bool__(self) -> bool: - """ - Check if empty. - """ + def __repr__(self): + """Return Compound info as string""" + if hasattr(self, "label") and hasattr(self, "children"): + result = ( + f"{self.__class__.__name__} at {id(self):#x}, label({self.label}), " + + f"#children({len(self.children)})" + ) + else: + result = f"{self.__class__.__name__} at {id(self):#x}" + return result - return TopoDS_Iterator(self.wrapped).More() + def __sub__(self, other: None | Shape | Iterable[Shape]) -> Compound: + """Cut other to self `-` operator""" + difference = Shape.__sub__(self, other) + difference = Compound( + difference if isinstance(difference, list) else [difference] + ) + self.copy_attributes_to(difference, ["wrapped", "_NodeMixin__children"]) + + return difference + + def center(self, center_of: CenterOf = CenterOf.MASS) -> Vector: + """Return center of object + + Find center of object + + Args: + center_of (CenterOf, optional): center option. Defaults to CenterOf.MASS. + + Raises: + ValueError: Center of GEOMETRY is not supported for this object + NotImplementedError: Unable to calculate center of mass of this object + + Returns: + Vector: center + """ + if center_of == CenterOf.GEOMETRY: + raise ValueError("Center of GEOMETRY is not supported for this object") + if center_of == CenterOf.MASS: + properties = GProp_GProps() + calc_function = Shape.shape_properties_LUT[unwrapped_shapetype(self)] + if calc_function: + calc_function(self.wrapped, properties) + middle = Vector(properties.CentreOfMass()) + else: + raise NotImplementedError + elif center_of == CenterOf.BOUNDING_BOX: + middle = self.bounding_box().center() + return middle + + def compound(self) -> Compound | None: + """Return the Compound""" + shape_list = self.compounds() + entity_count = len(shape_list) + if entity_count != 1: + warnings.warn( + f"Found {entity_count} compounds, returning first", + stacklevel=2, + ) + return shape_list[0] if shape_list else None + + def compounds(self) -> ShapeList[Compound]: + """compounds - all the compounds in this Shape""" + if self.wrapped is None: + return ShapeList() + if isinstance(self.wrapped, TopoDS_Compound): + # pylint: disable=not-an-iterable + sub_compounds = [c for c in self if isinstance(c.wrapped, TopoDS_Compound)] + sub_compounds.append(self) + else: + sub_compounds = [] + return ShapeList(sub_compounds) + + def do_children_intersect( + self, include_parent: bool = False, tolerance: float = 1e-5 + ) -> tuple[bool, tuple[Shape | None, Shape | None], float]: + """Do Children Intersect + + Determine if any of the child objects within a Compound/assembly intersect by + intersecting each of the shapes with each other and checking for + a common volume. + + Args: + include_parent (bool, optional): check parent for intersections. Defaults to False. + tolerance (float, optional): maximum allowable volume difference. Defaults to 1e-5. + + Returns: + tuple[bool, tuple[Shape, Shape], float]: + do the object intersect, intersecting objects, volume of intersection + """ + children: list[Shape] = list(PreOrderIter(self)) + if not include_parent: + children.pop(0) # remove parent + # children_bbox = [child.bounding_box().to_solid() for child in children] + children_bbox = [ + Solid.from_bounding_box(child.bounding_box()) for child in children + ] + child_index_pairs = [ + tuple(map(int, comb)) + for comb in combinations(list(range(len(children))), 2) + ] + for child_index_pair in child_index_pairs: + # First check for bounding box intersections .. + # .. then confirm with actual object intersections which could be complex + bbox_intersection = children_bbox[child_index_pair[0]].intersect( + children_bbox[child_index_pair[1]] + ) + if bbox_intersection is not None: + obj_intersection = children[child_index_pair[0]].intersect( + children[child_index_pair[1]] + ) + if obj_intersection is not None: + common_volume = ( + 0.0 + if isinstance(obj_intersection, list) + else obj_intersection.volume + ) + if common_volume > tolerance: + return ( + True, + ( + children[child_index_pair[0]], + children[child_index_pair[1]], + ), + common_volume, + ) + return (False, (None, None), 0.0) def get_type( self, - obj_type: Union[ - Type[Vertex], Type[Edge], Type[Face], Type[Shell], Type[Solid], Type[Wire] - ], + obj_type: ( + Type[Vertex] + | Type[Edge] + | Type[Face] + | Type[Shell] + | Type[Solid] + | Type[Wire] + ), ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: """get_type @@ -4992,7 +650,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): return results - def unwrap(self, fully: bool = True) -> Union[Self, Shape]: + def unwrap(self, fully: bool = True) -> Self | Shape: """Strip unnecessary Compound wrappers Args: @@ -5020,31 +678,77 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): # If there are no elements or more than one element, return self return self + def _post_attach(self, parent: Compound): + """Method call after attaching to `parent`.""" + logger.debug("Updated parent of %s to %s", self.label, parent.label) + parent.wrapped = _make_topods_compound_from_shapes( + [c.wrapped for c in parent.children] + ) -class Part(Compound): - """A Compound containing 3D objects - aka Solids""" + def _post_attach_children(self, children: Iterable[Shape]): + """Method call after attaching `children`.""" + if children: + kids = ",".join([child.label for child in children]) + logger.debug("Adding children %s to %s", kids, self.label) + self.wrapped = _make_topods_compound_from_shapes( + [c.wrapped for c in self.children] + ) + # else: + # logger.debug("Adding no children to %s", self.label) - @property - def _dim(self) -> int: - return 3 + def _post_detach(self, parent: Compound): + """Method call after detaching from `parent`.""" + logger.debug("Removing parent of %s (%s)", self.label, parent.label) + if parent.children: + parent.wrapped = _make_topods_compound_from_shapes( + [c.wrapped for c in parent.children] + ) + else: + parent.wrapped = None + def _post_detach_children(self, children): + """Method call before detaching `children`.""" + if children: + kids = ",".join([child.label for child in children]) + logger.debug("Removing children %s from %s", kids, self.label) + self.wrapped = _make_topods_compound_from_shapes( + [c.wrapped for c in self.children] + ) + # else: + # logger.debug("Removing no children from %s", self.label) -class Sketch(Compound): - """A Compound containing 2D objects - aka Faces""" + def _pre_attach(self, parent: Compound): + """Method call before attaching to `parent`.""" + if not isinstance(parent, Compound): + raise ValueError("`parent` must be of type Compound") - @property - def _dim(self) -> int: - return 2 + def _pre_attach_children(self, children): + """Method call before attaching `children`.""" + if not all(isinstance(child, Shape) for child in children): + raise ValueError("Each child must be of type Shape") + + def _remove(self, shape: Shape) -> Compound: + """Return self with the specified shape removed. + + Args: + shape: Shape: + """ + comp_builder = TopoDS_Builder() + comp_builder.Remove(self.wrapped, shape.wrapped) + return self class Curve(Compound): """A Compound containing 1D objects - aka Edges""" + __add__ = Mixin1D.__add__ # type: ignore + # ---- Properties ---- + @property def _dim(self) -> int: return 1 - __add__ = Mixin1D.__add__ # type: ignore + # ---- Instance Methods ---- def __matmul__(self, position: float) -> Vector: """Position on curve operator @ - only works if continuous""" @@ -5063,4611 +767,21 @@ class Curve(Compound): return Wire.combine(self.edges()) -class Edge(Mixin1D, Shape[TopoDS_Edge]): - """An Edge in build123d is a fundamental element in the topological data structure - representing a one-dimensional geometric entity within a 3D model. It encapsulates - information about a curve, which could be a line, arc, or other parametrically - defined shape. Edge is crucial in for precise modeling and manipulation of curves, - facilitating operations like filleting, chamfering, and Boolean operations. It - serves as a building block for constructing complex structures, such as wires - and faces.""" +class Sketch(Compound): + """A Compound containing 2D objects - aka Faces""" - # pylint: disable=too-many-public-methods - - order = 1.0 - - def __init__( - self, - obj: Optional[TopoDS_Edge | Axis | None] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build an Edge from an OCCT TopoDS_Shape/TopoDS_Edge - - Args: - obj (TopoDS_Edge | Axis, optional): OCCT Edge or Axis. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Axis): - obj = BRepBuilderAPI_MakeEdge( - Geom_Line( - obj.position.to_pnt(), - obj.direction.to_dir(), - ) - ).Edge() - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_Curve: - """Return the Geom Curve from this Edge""" - return BRepAdaptor_Curve(self.wrapped) - - def close(self) -> Union[Edge, Wire]: - """Close an Edge""" - if not self.is_closed: - return_value = Wire([self]).close() - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Edge as Wire""" - return Wire([self]) - - @property - def arc_center(self) -> Vector: - """center of an underlying circle or ellipse geometry.""" - - geom_type = self.geom_type - geom_adaptor = self.geom_adaptor() - - if geom_type == GeomType.CIRCLE: - return_value = Vector(geom_adaptor.Circle().Position().Location()) - elif geom_type == GeomType.ELLIPSE: - return_value = Vector(geom_adaptor.Ellipse().Position().Location()) - else: - raise ValueError(f"{geom_type} has no arc center") - - return return_value - - def find_tangent( - self, - angle: float, - ) -> list[float]: - """find_tangent - - Find the parameter values of self where the tangent is equal to angle. - - Args: - angle (float): target angle in degrees - - Returns: - list[float]: u values between 0.0 and 1.0 - """ - angle = angle % 360 # angle needs to always be positive 0..360 - u_values: list[float] - - if self.geom_type == GeomType.LINE: - if self.tangent_angle_at(0) == angle: - u_values = [0] - else: - u_values = [] - else: - # Solve this problem geometrically by creating a tangent curve and finding intercepts - periodic = int(self.is_closed) # if closed don't include end point - tan_pnts: list[VectorLike] = [] - previous_tangent = None - - # When angles go from 360 to 0 a discontinuity is created so add 360 to these - # values and intercept another line - discontinuities = 0.0 - for i in range(101 - periodic): - tangent = self.tangent_angle_at(i / 100) + discontinuities * 360 - if ( - previous_tangent is not None - and abs(previous_tangent - tangent) > 300 - ): - discontinuities = copysign(1.0, previous_tangent - tangent) - tangent += 360 * discontinuities - previous_tangent = tangent - tan_pnts.append((i / 100, tangent)) - - # Generate a first differential curve from the tangent points - tan_curve = Edge.make_spline(tan_pnts) - - # Use the bounding box to find the min and max values - tan_curve_bbox = tan_curve.bounding_box() - min_range = 360 * (floor(tan_curve_bbox.min.Y / 360)) - max_range = 360 * (ceil(tan_curve_bbox.max.Y / 360)) - - # Create a horizontal line for each 360 cycle and intercept it - intercept_pnts: list[Vector] = [] - for i in range(min_range, max_range + 1, 360): - line = Edge.make_line((0, angle + i, 0), (100, angle + i, 0)) - intercept_pnts.extend(tan_curve.find_intersection_points(line)) - - u_values = [p.X for p in intercept_pnts] - - return u_values - - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - - def find_intersection_points( - self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE - ) -> ShapeList[Vector]: - """find_intersection_points - - Determine the points where a 2D edge crosses itself or another 2D edge - - Args: - other (Axis | Edge): curve to compare with - tolerance (float, optional): the precision of computing the intersection points. - Defaults to TOLERANCE. - - Returns: - ShapeList[Vector]: list of intersection points - """ - # Convert an Axis into an edge at least as large as self and Axis start point - if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) - other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, - ) - # To determine the 2D plane to work on - plane = self.common_plane(other) - if plane is None: - raise ValueError("All objects must be on the same plane") - # Convert the plane into a Geom_Surface - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - edge_surface = BRep_Tool.Surface_s(pln_shape) - - self_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - self.wrapped, - edge_surface, - TopLoc_Location(), - self.param_at(0), - self.param_at(1), - ) - if other is not None: - edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( - other.wrapped, - edge_surface, - TopLoc_Location(), - other.param_at(0), - other.param_at(1), - ) - intersector = Geom2dAPI_InterCurveCurve( - self_2d_curve, edge_2d_curve, tolerance - ) - else: - intersector = Geom2dAPI_InterCurveCurve(self_2d_curve, tolerance) - - crosses = [ - Vector(intersector.Point(i + 1).X(), intersector.Point(i + 1).Y()) - for i in range(intersector.NbPoints()) - ] - # Convert back to global coordinates - crosses = [plane.from_local_coords(p) for p in crosses] - - # crosses may contain points beyond the ends of the edge so - # .. filter those out - valid_crosses = [] - for pnt in crosses: - try: - if other is not None: - if ( - self.distance_to(pnt) <= TOLERANCE - and other.distance_to(pnt) <= TOLERANCE - ): - valid_crosses.append(pnt) - else: - if self.distance_to(pnt) <= TOLERANCE: - valid_crosses.append(pnt) - except ValueError: - pass # skip invalid points - - return ShapeList(valid_crosses) - - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Union[Edge, Axis]): other object - - Returns: - Union[Shape, None]: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None - - @classmethod - def extrude(cls, obj: Vertex, direction: VectorLike) -> Edge: - """extrude - - Extrude a Vertex into an Edge. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) - - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" - reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge - return reversed_edge - - def trim(self, start: float, end: float) -> Edge: - """trim - - Create a new edge by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Edge: trimmed edge - """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") - - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) - trimmed_curve = Geom_TrimmedCurve( - new_curve, - parm_start, - parm_end, - ) - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def trim_to_length(self, start: float, length: float) -> Edge: - """trim_to_length - - Create a new edge starting at the given normalized parameter of a - given length. - - Args: - start (float): 0.0 <= start < 1.0 - length (float): target length - - Returns: - Edge: trimmed edge - """ - new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) - ) - - # Create an adaptor for the curve - adaptor_curve = GeomAdaptor_Curve(new_curve) - - # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) - abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) - - # Get the parameter at the desired length - parm_end = abscissa_point.Parameter() - - # Trim the curve to the desired length - trimmed_curve = Geom_TrimmedCurve(new_curve, parm_start, parm_end) - - new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() - return Edge(new_edge) - - def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" - - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) - - point = Vector(point) - - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") - - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length - - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value - - @classmethod - def make_bezier( - cls, *cntl_pnts: VectorLike, weights: list[float] | None = None - ) -> Edge: - """make_bezier - - Create a rational (with weights) or non-rational bezier curve. The first and last - control points represent the start and end of the curve respectively. If weights - are provided, there must be one provided for each control point. - - Args: - cntl_pnts (sequence[VectorLike]): points defining the curve - weights (list[float], optional): control point weights list. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Edge: bezier curve - """ - if len(cntl_pnts) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(cntl_pnts) > 25: - raise ValueError("The maximum number of control points is 25") - if weights: - if len(cntl_pnts) != len(weights): - raise ValueError("A weight must be provided for each control point") - - cntl_gp_pnts = [Vector(cntl_pnt).to_pnt() for cntl_pnt in cntl_pnts] - - # The poles are stored in an OCCT Array object - poles = TColgp_Array1OfPnt(1, len(cntl_gp_pnts)) - for i, cntl_gp_pnt in enumerate(cntl_gp_pnts): - poles.SetValue(i + 1, cntl_gp_pnt) - - if weights: - pole_weights = TColStd_Array1OfReal(1, len(weights)) - for i, weight in enumerate(weights): - pole_weights.SetValue(i + 1, float(weight)) - bezier_curve = Geom_BezierCurve(poles, pole_weights) - else: - bezier_curve = Geom_BezierCurve(poles) - - return cls(BRepBuilderAPI_MakeEdge(bezier_curve).Edge()) - - @classmethod - def make_circle( - cls, - radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make circle - - Create a circle centered on the origin of plane - - Args: - radius (float): circle radius - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): start of arc angle. Defaults to 360.0. - end_angle (float, optional): end of arc angle. Defaults to 360. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial circle - """ - circle_gp = gp_Circ(plane.to_gp_ax2(), radius) - - if start_angle == end_angle: # full circle case - return_value = cls(BRepBuilderAPI_MakeEdge(circle_gp).Edge()) - else: # arc case - ccw = angular_direction == AngularDirection.COUNTER_CLOCKWISE - if ccw: - start = radians(start_angle) - end = radians(end_angle) - else: - start = radians(end_angle) - end = radians(start_angle) - circle_geom = GC_MakeArcOfCircle(circle_gp, start, end, ccw).Value() - return_value = cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - return return_value - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - ) -> Edge: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): Defaults to 360.0. - end_angle (float, optional): Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - - Returns: - Edge: full or partial ellipse - """ - ax1 = gp_Ax1(plane.origin.to_pnt(), plane.z_dir.to_dir()) - - if y_radius > x_radius: - # swap x and y radius and rotate by 90° afterwards to create an ellipse - # with x_radius < y_radius - correction_angle = 90.0 * DEG2RAD - ellipse_gp = gp_Elips(plane.to_gp_ax2(), y_radius, x_radius).Rotated( - ax1, correction_angle - ) - else: - correction_angle = 0.0 - ellipse_gp = gp_Elips(plane.to_gp_ax2(), x_radius, y_radius) - - if start_angle == end_angle: # full ellipse case - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_gp).Edge()) - else: # arc case - # take correction_angle into account - ellipse_geom = GC_MakeArcOfEllipse( - ellipse_gp, - start_angle * DEG2RAD - correction_angle, - end_angle * DEG2RAD - correction_angle, - angular_direction == AngularDirection.COUNTER_CLOCKWISE, - ).Value() - ellipse = cls(BRepBuilderAPI_MakeEdge(ellipse_geom).Edge()) - - return ellipse - - @classmethod - def make_mid_way(cls, first: Edge, second: Edge, middle: float = 0.5) -> Edge: - """make line between edges - - Create a new linear Edge between the two provided Edges. If the Edges are parallel - but in the opposite directions one Edge is flipped such that the mid way Edge isn't - truncated. - - Args: - first (Edge): first reference Edge - second (Edge): second reference Edge - middle (float, optional): factional distance between Edges. Defaults to 0.5. - - Returns: - Edge: linear Edge between two Edges - """ - flip = first.to_axis().is_opposite(second.to_axis()) - pnts = [ - Edge.make_line( - first.position_at(i), second.position_at(1 - i if flip else i) - ).position_at(middle) - for i in [0, 1] - ] - return Edge.make_line(*pnts) - - @classmethod - def make_spline( - cls, - points: list[VectorLike], - tangents: list[VectorLike] | None = None, - periodic: bool = False, - parameters: list[float] | None = None, - scale: bool = True, - tol: float = 1e-6, - ) -> Edge: - """Spline - - Interpolate a spline through the provided points. - - Args: - points (list[VectorLike]): the points defining the spline - tangents (list[VectorLike], optional): start and finish tangent. - Defaults to None. - periodic (bool, optional): creation of periodic curves. Defaults to False. - parameters (list[float], optional): the value of the parameter at each - interpolation point. (The interpolated curve is represented as a vector-valued - function of a scalar parameter.) If periodic == True, then len(parameters) - must be len(interpolation points) + 1, otherwise len(parameters) - must be equal to len(interpolation points). Defaults to None. - scale (bool, optional): whether to scale the specified tangent vectors before - interpolating. Each tangent is scaled, so it's length is equal to the derivative - of the Lagrange interpolated curve. I.e., set this to True, if you want to use - only the direction of the tangent vectors specified by `tangents` , but not - their magnitude. Defaults to True. - tol (float, optional): tolerance of the algorithm (consult OCC documentation). - Used to check that the specified points are not too close to each other, and - that tangent vectors are not too short. (In either case interpolation may fail.). - Defaults to 1e-6. - - Raises: - ValueError: Parameter for each interpolation point - ValueError: Tangent for each interpolation point - ValueError: B-spline interpolation failed - - Returns: - Edge: the spline - """ - # pylint: disable=too-many-locals - point_vectors = [Vector(point) for point in points] - if tangents: - tangent_vectors = tuple(Vector(v) for v in tangents) - pnts = TColgp_HArray1OfPnt(1, len(point_vectors)) - for i, point in enumerate(point_vectors): - pnts.SetValue(i + 1, point.to_pnt()) - - if parameters is None: - spline_builder = GeomAPI_Interpolate(pnts, periodic, tol) - else: - if len(parameters) != (len(point_vectors) + periodic): - raise ValueError( - "There must be one parameter for each interpolation point " - "(plus one if periodic), or none specified. Parameter count: " - f"{len(parameters)}, point count: {len(point_vectors)}" - ) - parameters_array = TColStd_HArray1OfReal(1, len(parameters)) - for p_index, p_value in enumerate(parameters): - parameters_array.SetValue(p_index + 1, p_value) - - spline_builder = GeomAPI_Interpolate(pnts, parameters_array, periodic, tol) - - if tangents: - if len(tangent_vectors) == 2 and len(point_vectors) != 2: - # Specify only initial and final tangent: - spline_builder.Load( - tangent_vectors[0].wrapped, tangent_vectors[1].wrapped, scale - ) - else: - if len(tangent_vectors) != len(point_vectors): - raise ValueError( - f"There must be one tangent for each interpolation point, " - f"or just two end point tangents. Tangent count: " - f"{len(tangent_vectors)}, point count: {len(point_vectors)}" - ) - - # Specify a tangent for each interpolation point: - tangents_array = TColgp_Array1OfVec(1, len(tangent_vectors)) - tangent_enabled_array = TColStd_HArray1OfBoolean( - 1, len(tangent_vectors) - ) - for t_index, t_value in enumerate(tangent_vectors): - tangent_enabled_array.SetValue(t_index + 1, t_value is not None) - tangent_vec = t_value if t_value is not None else Vector() - tangents_array.SetValue(t_index + 1, tangent_vec.wrapped) - - spline_builder.Load(tangents_array, tangent_enabled_array, scale) - - spline_builder.Perform() - if not spline_builder.IsDone(): - raise ValueError("B-spline interpolation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_spline_approx( - cls, - points: list[VectorLike], - tol: float = 1e-3, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 6, - ) -> Edge: - """make_spline_approx - - Approximate a spline through the provided points. - - Args: - points (list[Vector]): - tol (float, optional): tolerance of the algorithm. Defaults to 1e-3. - smoothing (Tuple[float, float, float], optional): optional tuple of 3 weights - use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when smoothing - is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 6. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Edge: spline - """ - pnts = TColgp_HArray1OfPnt(1, len(points)) - for i, point in enumerate(points): - pnts.SetValue(i + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSpline( - pnts, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSpline( - pnts, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Curve() - - return cls(BRepBuilderAPI_MakeEdge(spline_geom).Edge()) - - @classmethod - def make_three_point_arc( - cls, point1: VectorLike, point2: VectorLike, point3: VectorLike - ) -> Edge: - """Three Point Arc - - Makes a three point arc through the provided points - - Args: - point1 (VectorLike): start point - point2 (VectorLike): middle point - point3 (VectorLike): end point - - Returns: - Edge: a circular arc through the three points - """ - circle_geom = GC_MakeArcOfCircle( - Vector(point1).to_pnt(), Vector(point2).to_pnt(), Vector(point3).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_tangent_arc( - cls, start: VectorLike, tangent: VectorLike, end: VectorLike - ) -> Edge: - """Tangent Arc - - Makes a tangent arc from point start, in the direction of tangent and ends at end. - - Args: - start (VectorLike): start point - tangent (VectorLike): start tangent - end (VectorLike): end point - - Returns: - Edge: circular arc - """ - circle_geom = GC_MakeArcOfCircle( - Vector(start).to_pnt(), Vector(tangent).wrapped, Vector(end).to_pnt() - ).Value() - - return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - - @classmethod - def make_line(cls, point1: VectorLike, point2: VectorLike) -> Edge: - """Create a line between two points - - Args: - point1: VectorLike: that represents the first point - point2: VectorLike: that represents the second point - - Returns: - A linear edge between the two provided points - - """ - return cls( - BRepBuilderAPI_MakeEdge( - Vector(point1).to_pnt(), Vector(point2).to_pnt() - ).Edge() - ) - - @classmethod - def make_helix( - cls, - pitch: float, - height: float, - radius: float, - center: VectorLike = (0, 0, 0), - normal: VectorLike = (0, 0, 1), - angle: float = 0.0, - lefthand: bool = False, - ) -> Wire: - """make_helix - - Make a helix with a given pitch, height and radius. By default a cylindrical surface is - used to create the helix. If the :angle: is set (the apex given in degree) a conical - surface is used instead. - - Args: - pitch (float): distance per revolution along normal - height (float): total height - radius (float): - center (VectorLike, optional): Defaults to (0, 0, 0). - normal (VectorLike, optional): Defaults to (0, 0, 1). - angle (float, optional): conical angle. Defaults to 0.0. - lefthand (bool, optional): Defaults to False. - - Returns: - Wire: helix - """ - # pylint: disable=too-many-locals - # 1. build underlying cylindrical/conical surface - if angle == 0.0: - geom_surf: Geom_Surface = Geom_CylindricalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), radius - ) - else: - geom_surf = Geom_ConicalSurface( - gp_Ax3(Vector(center).to_pnt(), Vector(normal).to_dir()), - angle * DEG2RAD, - radius, - ) - - # 2. construct an segment in the u,v domain - - # Determine the length of the 2d line which will be wrapped around the surface - line_sign = -1 if lefthand else 1 - line_dir = Vector(line_sign * 2 * pi, pitch).normalized() - line_len = (height / line_dir.Y) / cos(radians(angle)) - - # Create an infinite 2d line in the direction of the helix - helix_line = Geom2d_Line(gp_Pnt2d(0, 0), gp_Dir2d(line_dir.X, line_dir.Y)) - # Trim the line to the desired length - helix_curve = Geom2d_TrimmedCurve( - helix_line, 0, line_len, theAdjustPeriodic=True - ) - - # 3. Wrap the line around the surface - edge_builder = BRepBuilderAPI_MakeEdge(helix_curve, geom_surf) - topods_edge = edge_builder.Edge() - - # 4. Convert the edge made with 2d geometry to 3d - BRepLib.BuildCurves3d_s(topods_edge, 1e-9, MaxSegment=2000) - - return cls(topods_edge) - - def distribute_locations( - self: Union[Wire, Edge], - count: int, - start: float = 0.0, - stop: float = 1.0, - positions_only: bool = False, - ) -> list[Location]: - """Distribute Locations - - Distribute locations along edge or wire. - - Args: - self: Union[Wire:Edge]: - count(int): Number of locations to generate - start(float): position along Edge|Wire to start. Defaults to 0.0. - stop(float): position along Edge|Wire to end. Defaults to 1.0. - positions_only(bool): only generate position not orientation. Defaults to False. - - Returns: - list[Location]: locations distributed along Edge|Wire - - Raises: - ValueError: count must be two or greater - - """ - if count < 2: - raise ValueError("count must be two or greater") - - t_values = [start + i * (stop - start) / (count - 1) for i in range(count)] - - locations = self.locations(t_values) - if positions_only: - for loc in locations: - loc.orientation = Vector(0, 0, 0) - - return locations - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Edge]: - """Project Edge - - Project an Edge onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected Edge(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - wire = Wire([self]) - projected_wires = wire.project_to_shape(target_object, direction, center) - projected_edges = [w.edges()[0] for w in projected_wires] - return projected_edges - - def to_axis(self) -> Axis: - """Translate a linear Edge to an Axis""" - if self.geom_type != GeomType.LINE: - raise ValueError( - f"to_axis is only valid for linear Edges not {self.geom_type}" - ) - return Axis(self.position_at(0), self.position_at(1) - self.position_at(0)) - - -class Face(Mixin2D, Shape[TopoDS_Face]): - """A Face in build123d represents a 3D bounded surface within the topological data - structure. It encapsulates geometric information, defining a face of a 3D shape. - These faces are integral components of complex structures, such as solids and - shells. Face enables precise modeling and manipulation of surfaces, supporting - operations like trimming, filleting, and Boolean operations.""" - - # pylint: disable=too-many-public-methods - - order = 2.0 - - @overload - def __init__( - self, - obj: TopoDS_Face, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face - - Args: - obj (TopoDS_Shape, optional): OCCT Face. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - outer_wire: Wire, - inner_wires: Iterable[Wire] | None = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a planar Face from a boundary Wire with optional hole Wires. - - Args: - outer_wire (Wire): closed perimeter wire - inner_wires (Iterable[Wire], optional): holes. Defaults to None. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args: Any, **kwargs: Any): - outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Shape): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - outer_wire, inner_wires, label, color, parent = args[:5] + (None,) * ( - 5 - l_a - ) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "outer_wire", - "inner_wires", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - outer_wire = kwargs.get("outer_wire", outer_wire) - inner_wires = kwargs.get("inner_wires", inner_wires) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - - if outer_wire is not None: - inner_topods_wires = ( - [w.wrapped for w in inner_wires] if inner_wires is not None else [] - ) - obj = _make_topods_face_from_wires(outer_wire.wrapped, inner_topods_wires) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - # Faces can optionally record the plane it was created on for later extrusion - self.created_on: Plane | None = None - - @property - def length(self) -> None | float: - """length of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.X) - result = face_vertices[-1].X - face_vertices[0].X - return result - - @property - def volume(self) -> float: - """volume - the volume of this Face, which is always zero""" - return 0.0 - - @property - def width(self) -> None | float: - """width of planar face""" - result = None - if self.is_planar: - # Reposition on Plane.XY - flat_face = Plane(self).to_local_coords(self) - face_vertices = flat_face.vertices().sort_by(Axis.Y) - result = face_vertices[-1].Y - face_vertices[0].Y - return result - - @property - def geometry(self) -> None | str: - """geometry of planar face""" - result = None - if self.is_planar: - flat_face: Face = Plane(self).to_local_coords(self) - flat_face_edges = flat_face.edges() - if all(e.geom_type == GeomType.LINE for e in flat_face_edges): - flat_face_vertices = flat_face.vertices() - result = "POLYGON" - if len(flat_face_edges) == 4: - edge_pairs: list[list[Edge]] = [] - for vertex in flat_face_vertices: - edge_pairs.append( - [e for e in flat_face_edges if vertex in e.vertices()] - ) - edge_pair_directions = [ - [edge.tangent_at(0) for edge in pair] for pair in edge_pairs - ] - if all( - edge_directions[0].get_angle(edge_directions[1]) == 90 - for edge_directions in edge_pair_directions - ): - result = "RECTANGLE" - if len(flat_face_edges.group_by(SortBy.LENGTH)) == 1: - result = "SQUARE" - - return result - - @property - def center_location(self) -> Location: - """Location at the center of face""" - origin = self.position_at(0.5, 0.5) - return Plane(origin, z_dir=self.normal_at(origin)).location - - @property - def is_planar(self) -> bool: - """Is the face planar even though its geom_type may not be PLANE""" - return self.is_planar_face - - def geom_adaptor(self) -> Geom_Surface: - """Return the Geom Surface for this Face""" - return BRep_Tool.Surface_s(self.wrapped) - - def _uv_bounds(self) -> Tuple[float, float, float, float]: - """Return the u min, u max, v min, v max values""" - return BRepTools.UVBounds_s(self.wrapped) - - @overload - def normal_at(self, surface_point: VectorLike | None = None) -> Vector: - """normal_at point on surface - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where - the normal. Defaults to the center (None). - - Returns: - Vector: surface normal direction - """ - - @overload - def normal_at(self, u: float, v: float) -> Vector: - """normal_at u, v values on Face - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - Defaults to the center (None/None) - - Raises: - ValueError: Either neither or both u v values must be provided - - Returns: - Vector: surface normal direction - """ - - def normal_at(self, *args, **kwargs) -> Vector: - """normal_at - - Computes the normal vector at the desired location on the face. - - Args: - surface_point (VectorLike, optional): a point that lies on the surface where the normal. - Defaults to None. - - Returns: - Vector: surface normal direction - """ - surface_point, u, v = None, -1.0, -1.0 - - if args: - if isinstance(args[0], Sequence): - surface_point = args[0] - elif isinstance(args[0], (int, float)): - u = args[0] - if len(args) == 2 and isinstance(args[1], (int, float)): - v = args[1] - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["surface_point", "u", "v"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - surface_point = kwargs.get("surface_point", surface_point) - u = kwargs.get("u", u) - v = kwargs.get("v", v) - if surface_point is None and u < 0 and v < 0: - u, v = 0.5, 0.5 - elif surface_point is None and sum(i == -1.0 for i in [u, v]) == 1: - raise ValueError("Both u & v values must be specified") - - # get the geometry - surface = self.geom_adaptor() - - if surface_point is None: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) - else: - # project point on surface - projector = GeomAPI_ProjectPointOnSurf( - Vector(surface_point).to_pnt(), surface - ) - - u_val, v_val = projector.LowerDistanceParameters() - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(normal).normalized() - - def position_at(self, u: float, v: float) -> Vector: - """position_at - - Computes a point on the Face given u, v coordinates. - - Args: - u (float): the horizontal coordinate in the parameter space of the Face, - between 0.0 and 1.0 - v (float): the vertical coordinate in the parameter space of the Face, - between 0.0 and 1.0 - - Returns: - Vector: point on Face - """ - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u_val0 + u * (u_val1 - u_val0) - v_val = v_val0 + v * (v_val1 - v_val0) - - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, gp_pnt, normal) - - return Vector(gp_pnt) - - def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) - else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) - return Location(pln) - - def center(self, center_of: CenterOf = CenterOf.GEOMETRY) -> Vector: - """Center of Face - - Return the center based on center_of - - Args: - center_of (CenterOf, optional): centering option. Defaults to CenterOf.GEOMETRY. - - Returns: - Vector: center - """ - if (center_of == CenterOf.MASS) or ( - center_of == CenterOf.GEOMETRY and self.is_planar - ): - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(self.wrapped, properties) - center_point = properties.CentreOfMass() - - elif center_of == CenterOf.BOUNDING_BOX: - center_point = self.bounding_box().center() - - elif center_of == CenterOf.GEOMETRY: - u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = 0.5 * (u_val0 + u_val1) - v_val = 0.5 * (v_val0 + v_val1) - - center_point = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val, v_val, center_point, normal) - - return Vector(center_point) - - def outer_wire(self) -> Wire: - """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) - - def inner_wires(self) -> ShapeList[Wire]: - """Extract the inner or hole wires from this Face""" - outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) - - def wire(self) -> Wire: - """Return the outerwire, generate a warning if inner_wires present""" - if self.inner_wires(): - warnings.warn( - "Found holes, returning outer_wire", - stacklevel=2, - ) - return self.outer_wire() - - @classmethod - def extrude(cls, obj: Edge, direction: VectorLike) -> Face: - """extrude - - Extrude an Edge into a Face. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Face: extruded shape - """ - return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: - """make_rect - - Make a Rectangle centered on center with the given normal - - Args: - width (float, optional): width (local x). - height (float, optional): height (local y). - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Face: The centered rectangle - """ - pln_shape = BRepBuilderAPI_MakeFace( - plane.wrapped, -width * 0.5, width * 0.5, -height * 0.5, height * 0.5 - ).Face() - - return cls(pln_shape) - - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - - @overload - @classmethod - def make_surface_from_curves( - cls, edge1: Edge, edge2: Edge - ) -> Face: # pragma: no cover - ... - - @overload - @classmethod - def make_surface_from_curves( - cls, wire1: Wire, wire2: Wire - ) -> Face: # pragma: no cover - ... - - @classmethod - def make_surface_from_curves(cls, *args, **kwargs) -> Face: - """make_surface_from_curves - - Create a ruled surface out of two edges or two wires. If wires are used then - these must have the same number of edges. - - Args: - curve1 (Union[Edge,Wire]): side of surface - curve2 (Union[Edge,Wire]): opposite side of surface - - Returns: - Face: potentially non planar surface - """ - curve1, curve2 = None, None - if args: - if len(args) != 2 or type(args[0]) is not type(args[1]): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - curve1, curve2 = args - - curve1 = kwargs.pop("edge1", curve1) - curve2 = kwargs.pop("edge2", curve2) - curve1 = kwargs.pop("wire1", curve1) - curve2 = kwargs.pop("wire2", curve2) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if not isinstance(curve1, (Edge, Wire)) or not isinstance(curve2, (Edge, Wire)): - raise TypeError( - "Both curves must be of the same type (both Edge or both Wire)." - ) - - if isinstance(curve1, Wire): - return_value = cls.cast(BRepFill.Shell_s(curve1.wrapped, curve2.wrapped)) - else: - return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) - return return_value - - @classmethod - def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: - """sew faces - - Group contiguous faces and return them in a list of ShapeList - - Args: - faces (Iterable[Face]): Faces to sew together - - Raises: - RuntimeError: OCCT SewedShape generated unexpected output - - Returns: - list[ShapeList[Face]]: grouped contiguous faces - """ - # Sew the faces - sewed_shape = _sew_topods_faces([f.wrapped for f in faces]) - top_level_shapes = get_top_level_topods_shapes(sewed_shape) - sewn_faces: list[ShapeList] = [] - - # For each of the top level shapes create a ShapeList of Face - for top_level_shape in top_level_shapes: - if isinstance(top_level_shape, TopoDS_Face): - sewn_faces.append(ShapeList([Face(top_level_shape)])) - elif isinstance(top_level_shape, TopoDS_Shell): - sewn_faces.append(Shell(top_level_shape).faces()) - elif isinstance(top_level_shape, TopoDS_Solid): - sewn_faces.append( - ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") - ) - ) - else: - raise RuntimeError( - f"SewedShape returned a {type(top_level_shape)} which was unexpected" - ) - - return sewn_faces - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Face: - """sweep - - Sweep a 1D profile along a 1D path. Both the profile and path must be composed - of only 1 Edge. - - Args: - profile (Union[Curve,Edge,Wire]): the object to sweep - path (Union[Curve,Edge,Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Raises: - ValueError: Only 1 Edge allowed in profile & path - - Returns: - Face: resulting face, may be non-planar - """ - # Note: BRepOffsetAPI_MakePipe is an option here - # pipe_sweep = BRepOffsetAPI_MakePipe(path.wrapped, profile.wrapped) - # pipe_sweep.Build() - # return Face(pipe_sweep.Shape()) - - if len(profile.edges()) != 1 or len(path.edges()) != 1: - raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Face(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_surface_from_array_of_points( - cls, - points: list[list[VectorLike]], - tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, - min_deg: int = 1, - max_deg: int = 3, - ) -> Face: - """make_surface_from_array_of_points - - Approximate a spline surface through the provided 2d array of points. - The first dimension correspond to points on the vertical direction in the parameter - space of the face. The second dimension correspond to points on the horizontal - direction in the parameter space of the face. The 2 dimensions are U,V dimensions - of the parameter space of the face. - - Args: - points (list[list[VectorLike]]): a 2D list of points, first dimension is V - parameters second is U parameters. - tol (float, optional): tolerance of the algorithm. Defaults to 1e-2. - smoothing (Tuple[float, float, float], optional): optional tuple of - 3 weights use for variational smoothing. Defaults to None. - min_deg (int, optional): minimum spline degree. Enforced only when - smoothing is None. Defaults to 1. - max_deg (int, optional): maximum spline degree. Defaults to 3. - - Raises: - ValueError: B-spline approximation failed - - Returns: - Face: a potentially non-planar face defined by points - """ - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - - for i, point_row in enumerate(points): - for j, point in enumerate(point_row): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if smoothing: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, *smoothing, DegMax=max_deg, Tol3D=tol - ) - else: - spline_builder = GeomAPI_PointsToBSplineSurface( - points_, DegMin=min_deg, DegMax=max_deg, Tol3D=tol - ) - - if not spline_builder.IsDone(): - raise ValueError("B-spline approximation failed") - - spline_geom = spline_builder.Surface() - - return cls(BRepBuilderAPI_MakeFace(spline_geom, Precision.Confusion_s()).Face()) - - @classmethod - def make_bezier_surface( - cls, - points: list[list[VectorLike]], - weights: list[list[float]] | None = None, - ) -> Face: - """make_bezier_surface - - Construct a Bézier surface from the provided 2d array of points. - - Args: - points (list[list[VectorLike]]): a 2D list of control points - weights (list[list[float]], optional): control point weights. Defaults to None. - - Raises: - ValueError: Too few control points - ValueError: Too many control points - ValueError: A weight is required for each control point - - Returns: - Face: a potentially non-planar face - """ - if len(points) < 2 or len(points[0]) < 2: - raise ValueError( - "At least two control points must be provided (start, end)" - ) - if len(points) > 25 or len(points[0]) > 25: - raise ValueError("The maximum number of control points is 25") - if weights and ( - len(points) != len(weights) or len(points[0]) != len(weights[0]) - ): - raise ValueError("A weight must be provided for each control point") - - points_ = TColgp_HArray2OfPnt(1, len(points), 1, len(points[0])) - for i, row_points in enumerate(points): - for j, point in enumerate(row_points): - points_.SetValue(i + 1, j + 1, Vector(point).to_pnt()) - - if weights: - weights_ = TColStd_HArray2OfReal(1, len(weights), 1, len(weights[0])) - for i, row_weights in enumerate(weights): - for j, weight in enumerate(row_weights): - weights_.SetValue(i + 1, j + 1, float(weight)) - bezier = Geom_BezierSurface(points_, weights_) - else: - bezier = Geom_BezierSurface(points_) - - return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) - - @classmethod - def make_surface( - cls, - exterior: Union[Wire, Iterable[Edge]], - surface_points: Iterable[VectorLike] | None = None, - interior_wires: Iterable[Wire] | None = None, - ) -> Face: - """Create Non-Planar Face - - Create a potentially non-planar face bounded by exterior (wire or edges), - optionally refined by surface_points with optional holes defined by - interior_wires. - - Args: - exterior (Union[Wire, list[Edge]]): Perimeter of face - surface_points (list[VectorLike], optional): Points on the surface that - refine the shape. Defaults to None. - interior_wires (list[Wire], optional): Hole(s) in the face. Defaults to None. - - Raises: - RuntimeError: Internal error building face - RuntimeError: Error building non-planar face with provided surface_points - RuntimeError: Error adding interior hole - RuntimeError: Generated face is invalid - - Returns: - Face: Potentially non-planar face - """ - exterior = list(exterior) if isinstance(exterior, Iterable) else exterior - # pylint: disable=too-many-branches - if surface_points: - surface_point_vectors = [Vector(p) for p in surface_points] - else: - surface_point_vectors = None - - # First, create the non-planar surface - surface = BRepOffsetAPI_MakeFilling( - # order of energy criterion to minimize for computing the deformation of the surface - Degree=3, - # average number of points for discretisation of the edges - NbPtsOnCur=15, - NbIter=2, - Anisotropie=False, - # the maximum distance allowed between the support surface and the constraints - Tol2d=0.00001, - # the maximum distance allowed between the support surface and the constraints - Tol3d=0.0001, - # the maximum angle allowed between the normal of the surface and the constraints - TolAng=0.01, - # the maximum difference of curvature allowed between the surface and the constraint - TolCurv=0.1, - # the highest degree which the polynomial defining the filling surface can have - MaxDeg=8, - # the greatest number of segments which the filling surface can have - MaxSegments=9, - ) - if isinstance(exterior, Wire): - outside_edges = exterior.edges() - elif isinstance(exterior, Iterable) and all( - isinstance(o, Edge) for o in exterior - ): - outside_edges = ShapeList(exterior) - else: - raise ValueError("exterior must be a Wire or list of Edges") - - for edge in outside_edges: - surface.Add(edge.wrapped, GeomAbs_C0) - - try: - surface.Build() - surface_face = Face(surface.Shape()) - except ( - Standard_Failure, - StdFail_NotDone, - Standard_NoSuchObject, - Standard_ConstructionError, - ) as err: - raise RuntimeError( - "Error building non-planar face with provided exterior" - ) from err - if surface_point_vectors: - for point in surface_point_vectors: - surface.Add(gp_Pnt(*point.to_tuple())) - try: - surface.Build() - surface_face = Face(surface.Shape()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error building non-planar face with provided surface_points" - ) from err - - # Next, add wires that define interior holes - note these wires must be entirely interior - if interior_wires: - makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) - for wire in interior_wires: - makeface_object.Add(wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - if not surface_face.is_valid(): - raise RuntimeError("non planar face is invalid") - - return surface_face - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Face: - """Apply 2D fillet to a face - - Args: - radius: float: - vertices: Iterable[Vertex]: - - Returns: - - """ - - fillet_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - - fillet_builder.Build() - - return self.__class__.cast(fillet_builder.Shape()) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Face: - """Apply 2D chamfer to a face - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Raises: - ValueError: Cannot chamfer at this location - ValueError: One or more vertices are not part of edge - - Returns: - Face: face with a chamfered corner(s) - - """ - reference_edge = edge - - chamfer_builder = BRepFilletAPI_MakeFillet2d(self.wrapped) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - return self.__class__.cast(chamfer_builder.Shape()).fix() - - def is_coplanar(self, plane: Plane) -> bool: - """Is this planar face coplanar with the provided plane""" - u_val0, _u_val1, v_val0, _v_val1 = self._uv_bounds() - gp_pnt = gp_Pnt() - normal = gp_Vec() - BRepGProp_Face(self.wrapped).Normal(u_val0, v_val0, gp_pnt, normal) - - return ( - plane.contains(Vector(gp_pnt)) - and 1 - abs(plane.z_dir.dot(Vector(normal))) < TOLERANCE - ) - - def project_to_shape( - self, target_object: Shape, direction: VectorLike - ) -> ShapeList[Face | Shell]: - """Project Face to target Object - - Project a Face onto a Shape generating new Face(s) on the surfaces of the object. - - A projection with no taper is illustrated below: - - .. image:: flatProjection.png - :alt: flatProjection - - Note that an array of faces is returned as the projection might result in faces - on the "front" and "back" of the object (or even more if there are intermediate - surfaces in the projection path). faces "behind" the projection are not - returned. - - Args: - target_object (Shape): Object to project onto - direction (VectorLike): projection direction - - Returns: - ShapeList[Face]: Face(s) projected on target object ordered by distance - """ - max_dimension = find_max_dimension([self, target_object]) - extruded_topods_self = _extrude_topods_shape( - self.wrapped, Vector(direction) * max_dimension - ) - - intersected_shapes: ShapeList[Face | Shell] = ShapeList() - if isinstance(target_object, Vertex): - raise TypeError("projection to a vertex is not supported") - if isinstance(target_object, Face): - topods_shape = _topods_bool_op( - (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() - ) - if not topods_shape.IsNull(): - intersected_shapes.append(Face(topods_shape)) - else: - for target_shell in target_object.shells(): - topods_shape = _topods_bool_op( - (extruded_topods_self,), - (target_shell.wrapped,), - BRepAlgoAPI_Common(), - ) - for topods_shell in get_top_level_topods_shapes(topods_shape): - intersected_shapes.append(Shell(topods_shell)) - - intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = ShapeList( - s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ) - return intersected_shapes - - def make_holes(self, interior_wires: list[Wire]) -> Face: - """Make Holes in Face - - Create holes in the Face 'self' from interior_wires which must be entirely interior. - Note that making holes in faces is more efficient than using boolean operations - with solid object. Also note that OCCT core may fail unless the orientation of the wire - is correct - use `Wire(forward_wire.wrapped.Reversed())` to reverse a wire. - - Example: - - For example, make a series of slots on the curved walls of a cylinder. - - .. image:: slotted_cylinder.png - - Args: - interior_wires: a list of hole outline wires - interior_wires: list[Wire]: - - Returns: - Face: 'self' with holes - - Raises: - RuntimeError: adding interior hole in non-planar face with provided interior_wires - RuntimeError: resulting face is not valid - - """ - # Add wires that define interior holes - note these wires must be entirely interior - makeface_object = BRepBuilderAPI_MakeFace(self.wrapped) - for interior_wire in interior_wires: - makeface_object.Add(interior_wire.wrapped) - try: - surface_face = Face(makeface_object.Face()) - except StdFail_NotDone as err: - raise RuntimeError( - "Error adding interior hole in non-planar face with provided interior_wires" - ) from err - - surface_face = surface_face.fix() - # if not surface_face.is_valid(): - # raise RuntimeError("non planar face is invalid") - - return surface_face - - def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: - """Point inside Face - - Returns whether or not the point is inside a Face within the specified tolerance. - Points on the edge of the Face are considered inside. - - Args: - point(VectorLike): tuple or Vector representing 3D point to be tested - tolerance(float): tolerance for inside determination. Defaults to 1.0e-6. - point: VectorLike: - tolerance: float: (Default value = 1.0e-6) - - Returns: - bool: indicating whether or not point is within Face - - """ - solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) - return solid_classifier.IsOnAFace() - - # surface = BRep_Tool.Surface_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) - # return projector.LowerDistance() <= TOLERANCE - - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs - - Approximate planar face with arcs and straight line segments. - - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - - -class Shell(Mixin2D, Shape[TopoDS_Shell]): - """A Shell is a fundamental component in build123d's topological data structure - representing a connected set of faces forming a closed surface in 3D space. As - part of a geometric model, it defines a watertight enclosure, commonly encountered - in solid modeling. Shells group faces in a coherent manner, playing a crucial role - in representing complex shapes with voids and surfaces. This hierarchical structure - allows for efficient handling of surfaces within a model, supporting various - operations and analyses.""" - - order = 2.5 - - def __init__( - self, - obj: Optional[TopoDS_Shell | Face | Iterable[Face]] = None, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a shell from an OCCT TopoDS_Shape/TopoDS_Shell - - Args: - obj (TopoDS_Shape | Face | Iterable[Face], optional): OCCT Shell, Face or Faces. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - obj = list(obj) if isinstance(obj, Iterable) else obj - if isinstance(obj, Iterable) and len(obj_list := list(obj)) == 1: - obj = obj_list[0] - - if isinstance(obj, Face): - builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(obj.wrapped).Surface().Surface() - ) - obj = builder.Shape() - elif isinstance(obj, Iterable): - obj = _sew_topods_faces([f.wrapped for f in obj]) - - super().__init__( - obj=obj, - label=label, - color=color, - parent=parent, - ) - - @property - def volume(self) -> float: - """volume - the volume of this Shell if manifold, otherwise zero""" - if self.is_manifold: - solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) - properties = GProp_GProps() - calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] - calc_function(solid_shell, properties) - return properties.Mass() - return 0.0 - - def center(self) -> Vector: - """Center of mass of the shell""" - properties = GProp_GProps() - BRepGProp.LinearProperties_s(self.wrapped, properties) - return Vector(properties.CentreOfMass()) - - @classmethod - def extrude(cls, obj: Wire, direction: VectorLike) -> Shell: - """extrude - - Extrude a Wire into a Shell. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def sweep( - cls, - profile: Union[Curve, Edge, Wire], - path: Union[Curve, Edge, Wire], - transition=Transition.TRANSFORMED, - ) -> Shell: - """sweep - - Sweep a 1D profile along a 1D path - - Args: - profile (Union[Curve, Edge, Wire]): the object to sweep - path (Union[Curve, Edge, Wire]): the path to follow when sweeping - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Shell: resulting Shell, may be non-planar - """ - profile = Wire(profile.edges()) - path = Wire(Wire(path.edges()).order_edges()) - builder = BRepOffsetAPI_MakePipeShell(path.wrapped) - builder.Add(profile.wrapped, False, False) - builder.SetTransitionMode(Shape._transModeDict[transition]) - builder.Build() - result = Shell(builder.Shape()) - if SkipClean.clean: - result = result.clean() - - return result - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Shell: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list nor - between wires. Wires may be closed or opened. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Shell: Lofted object - """ - return cls(_make_loft(objs, False, ruled)) - - -class Solid(Mixin3D, Shape[TopoDS_Solid]): - """A Solid in build123d represents a three-dimensional solid geometry - in a topological structure. A solid is a closed and bounded volume, enclosing - a region in 3D space. It comprises faces, edges, and vertices connected in a - well-defined manner. Solid modeling operations, such as Boolean - operations (union, intersection, and difference), are often performed on - Solid objects to create or modify complex geometries.""" - - order = 3.0 - - def __init__( - self, - obj: TopoDS_Solid | Shell | None = None, - label: str = "", - color: Color | None = None, - material: str = "", - joints: dict[str, Joint] | None = None, - parent: Compound | None = None, - ): - """Build a solid from an OCCT TopoDS_Shape/TopoDS_Solid - - Args: - obj (TopoDS_Shape | Shell, optional): OCCT Solid or Shell. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - material (str, optional): tag for external tools. Defaults to ''. - joints (dict[str, Joint], optional): names joints. Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - if isinstance(obj, Shell): - obj = Solid._make_solid(obj) - - super().__init__( - obj=obj, - # label="" if label is None else label, - label=label, - color=color, - parent=parent, - ) - self.material = "" if material is None else material - self.joints = {} if joints is None else joints - - @property - def volume(self) -> float: - """volume - the volume of this Solid""" - # when density == 1, mass == volume - return Shape.compute_mass(self) - - @classmethod - def _make_solid(cls, shell: Shell) -> TopoDS_Solid: - """Create a Solid object from the surface shell""" - return ShapeFix_Solid().SolidFromShell(shell.wrapped) - - @classmethod - def extrude(cls, obj: Face, direction: VectorLike) -> Solid: - """extrude - - Extrude a Face into a Solid. - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - Edge: extruded shape - """ - return Solid(TopoDS.Solid_s(_extrude_topods_shape(obj.wrapped, direction))) - - @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: - """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) - - @classmethod - def make_box( - cls, length: float, width: float, height: float, plane: Plane = Plane.XY - ) -> Solid: - """make box - - Make a box at the origin of plane extending in positive direction of each axis. - - Args: - length (float): - width (float): - height (float): - plane (Plane, optional): base plane. Defaults to Plane.XY. - - Returns: - Solid: Box - """ - return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() - ) - - @classmethod - def make_cone( - cls, - base_radius: float, - top_radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cone - - Make a cone with given radii and height - - Args: - base_radius (float): - top_radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cone - """ - return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_cylinder( - cls, - radius: float, - height: float, - plane: Plane = Plane.XY, - angle: float = 360, - ) -> Solid: - """make cylinder - - Make a cylinder with a given radius and height with the base center on plane origin. - - Args: - radius (float): - height (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle (float, optional): arc size. Defaults to 360. - - Returns: - Solid: Full or partial cylinder - """ - return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_torus( - cls, - major_radius: float, - minor_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 0, - end_angle: float = 360, - major_angle: float = 360, - ) -> Solid: - """make torus - - Make a torus with a given radii and angles - - Args: - major_radius (float): - minor_radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - start_angle (float, optional): start major arc. Defaults to 0. - end_angle (float, optional): end major arc. Defaults to 360. - - Returns: - Solid: Full or partial torus - """ - return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() - ) - - @classmethod - def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False - ) -> Solid: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - objs (list[Vertex, Wire]): wire perimeters or vertices - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - Solid: Lofted object - """ - return cls(_make_loft(objs, True, ruled)) - - @classmethod - def make_wedge( - cls, - delta_x: float, - delta_y: float, - delta_z: float, - min_x: float, - min_z: float, - max_x: float, - max_z: float, - plane: Plane = Plane.XY, - ) -> Solid: - """Make a wedge - - Args: - delta_x (float): - delta_y (float): - delta_z (float): - min_x (float): - min_z (float): - max_x (float): - max_z (float): - plane (Plane): base plane. Defaults to Plane.XY. - - Returns: - Solid: wedge - """ - return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() - ) - - @classmethod - def make_sphere( - cls, - radius: float, - plane: Plane = Plane.XY, - angle1: float = -90, - angle2: float = 90, - angle3: float = 360, - ) -> Solid: - """Sphere - - Make a full or partial sphere - with a given radius center on the origin or plane. - - Args: - radius (float): - plane (Plane): base plane. Defaults to Plane.XY. - angle1 (float, optional): Defaults to -90. - angle2 (float, optional): Defaults to 90. - angle3 (float, optional): Defaults to 360. - - Returns: - Solid: sphere - """ - return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() - ) - - @classmethod - def extrude_taper( - cls, profile: Face, direction: VectorLike, taper: float, flip_inner: bool = True - ) -> Solid: - """Extrude a cross section with a taper - - Extrude a cross section into a prismatic solid in the provided direction. - - Note that two difference algorithms are used. If direction aligns with - the profile normal (which must be positive), the taper is positive and the profile - contains no holes the OCP LocOpe_DPrism algorithm is used as it generates the most - accurate results. Otherwise, a loft is created between the profile and the profile - with a 2D offset set at the appropriate direction. - - Args: - section (Face]): cross section - normal (VectorLike): a vector along which to extrude the wires. The length - of the vector controls the length of the extrusion. - taper (float): taper angle in degrees. - flip_inner (bool, optional): outer and inner geometry have opposite tapers to - allow for part extraction when injection molding. - - Returns: - Solid: extruded cross section - """ - # pylint: disable=too-many-locals - direction = Vector(direction) - - if ( - direction.normalized() == profile.normal_at() - and Plane(profile).z_dir.Z > 0 - and taper > 0 - and not profile.inner_wires() - ): - prism_builder = LocOpe_DPrism( - profile.wrapped, - direction.length / cos(radians(taper)), - radians(taper), - ) - new_solid = Solid(prism_builder.Shape()) - else: - # Determine the offset to get the taper - offset_amt = -direction.length * tan(radians(taper)) - - outer = profile.outer_wire() - local_outer: Wire = Plane(profile).to_local_coords(outer) - local_taper_outer = local_outer.offset_2d( - offset_amt, kind=Kind.INTERSECTION - ) - taper_outer = Plane(profile).from_local_coords(local_taper_outer) - taper_outer.move(Location(direction)) - - profile_wires = [profile.outer_wire()] + profile.inner_wires() - - taper_wires = [] - for i, wire in enumerate(profile_wires): - flip = -1 if i > 0 and flip_inner else 1 - local: Wire = Plane(profile).to_local_coords(wire) - local_taper = local.offset_2d(flip * offset_amt, kind=Kind.INTERSECTION) - taper_wire: Wire = Plane(profile).from_local_coords(local_taper) - taper_wire.move(Location(direction)) - taper_wires.append(taper_wire) - - solids = [ - Solid.make_loft([p, t]) for p, t in zip(profile_wires, taper_wires) - ] - if len(solids) > 1: - complex_solid = solids[0].cut(*solids[1:]) - assert isinstance(complex_solid, Solid) # Can't be a list - new_solid = complex_solid - else: - new_solid = solids[0] - - return new_solid - - @classmethod - def extrude_linear_with_rotation( - cls, - section: Union[Face, Wire], - center: VectorLike, - normal: VectorLike, - angle: float, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Extrude with Rotation - - Creates a 'twisted prism' by extruding, while simultaneously rotating around the - extrusion vector. - - Args: - section (Union[Face,Wire]): cross section - vec_center (VectorLike): the center point about which to rotate - vec_normal (VectorLike): a vector along which to extrude the wires - angle (float): the angle to rotate through while extruding - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to None. - - Returns: - Solid: extruded object - """ - # Though the signature may appear to be similar enough to extrude to merit - # combining them, the construction methods used here are different enough that they - # should be separate. - - # At a high level, the steps followed are: - # (1) accept a set of wires - # (2) create another set of wires like this one, but which are transformed and rotated - # (3) create a ruledSurface between the sets of wires - # (4) create a shell and compute the resulting object - - inner_wires = inner_wires if inner_wires else [] - center = Vector(center) - normal = Vector(normal) - - def extrude_aux_spine( - wire: TopoDS_Wire, spine: TopoDS_Wire, aux_spine: TopoDS_Wire - ) -> TopoDS_Shape: - """Helper function""" - extrude_builder = BRepOffsetAPI_MakePipeShell(spine) - extrude_builder.SetMode(aux_spine, False) # auxiliary spine - extrude_builder.Add(wire) - extrude_builder.Build() - extrude_builder.MakeSolid() - return extrude_builder.Shape() - - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - - # make straight spine - straight_spine_e = Edge.make_line(center, center.add(normal)) - straight_spine_w = Wire.combine([straight_spine_e])[0].wrapped - - # make an auxiliary spine - pitch = 360.0 / angle * normal.length - aux_spine_w = Wire( - [Edge.make_helix(pitch, normal.length, 1, center=center, normal=normal)] - ).wrapped - - # extrude the outer wire - outer_solid = extrude_aux_spine( - outer_wire.wrapped, straight_spine_w, aux_spine_w - ) - - # extrude inner wires - inner_solids = [ - extrude_aux_spine(w.wrapped, straight_spine_w, aux_spine_w) - for w in inner_wires - ] - - # combine the inner solids into compound - inner_comp = _make_topods_compound_from_shapes(inner_solids) - - # subtract from the outer solid - return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) - - @classmethod - def extrude_until( - cls, - section: Face, - target_object: Union[Compound, Solid], - direction: VectorLike, - until: Until = Until.NEXT, - ) -> Union[Compound, Solid]: - """extrude_until - - Extrude section in provided direction until it encounters either the - NEXT or LAST surface of target_object. Note that the bounding surface - must be larger than the extruded face where they contact. - - Args: - section (Face): Face to extrude - target_object (Union[Compound, Solid]): object to limit extrusion - direction (VectorLike): extrusion direction - until (Until, optional): surface to limit extrusion. Defaults to Until.NEXT. - - Raises: - ValueError: provided face does not intersect target_object - - Returns: - Union[Compound, Solid]: extruded Face - """ - direction = Vector(direction) - if until in [Until.PREVIOUS, Until.FIRST]: - direction *= -1 - until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - - max_dimension = find_max_dimension([section, target_object]) - clipping_direction = ( - direction * max_dimension - if until == Until.NEXT - else -direction * max_dimension - ) - direction_axis = Axis(section.center(), clipping_direction) - # Create a linear extrusion to start - extrusion = Solid.extrude(section, direction * max_dimension) - - # Project section onto the shape to generate faces that will clip the extrusion - # and exclude the planar faces normal to the direction of extrusion and these - # will have no volume when extruded - faces = [] - for face in section.project_to_shape(target_object, direction): - if isinstance(face, Face): - faces.append(face) - else: - faces += face.faces() - - clip_faces = [ - f - for f in faces - if not (f.is_planar and f.normal_at().dot(direction) == 0.0) - ] - if not clip_faces: - raise ValueError("provided face does not intersect target_object") - - # Create the objects that will clip the linear extrusion - clipping_objects = [ - Solid.extrude(f, clipping_direction).fix() for f in clip_faces - ] - clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] - - if until == Until.NEXT: - trimmed_extrusion = extrusion.cut(target_object) - if isinstance(trimmed_extrusion, ShapeList): - closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] - else: - closest_extrusion = trimmed_extrusion - for clipping_object in clipping_objects: - # It's possible for clipping faces to self intersect when they are extruded - # thus they could be non manifold which results failed boolean operations - # - so skip these objects - try: - extrusion_shapes = closest_extrusion.cut(clipping_object) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - else: - base_part = extrusion.intersect(target_object) - if isinstance(base_part, ShapeList): - extrusion_parts = base_part - elif base_part is None: - extrusion_parts = ShapeList() - else: - extrusion_parts = ShapeList([base_part]) - for clipping_object in clipping_objects: - try: - clipped_extrusion = extrusion.intersect(clipping_object) - if clipped_extrusion is not None: - extrusion_parts.append( - clipped_extrusion.solids().sort_by(direction_axis)[0] - ) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - extrusion_shapes = Solid.fuse(*extrusion_parts) - - result = extrusion_shapes.solids().sort_by(direction_axis)[0] - - return result - - @classmethod - def revolve( - cls, - section: Union[Face, Wire], - angle: float, - axis: Axis, - inner_wires: list[Wire] | None = None, - ) -> Solid: - """Revolve - - Revolve a cross section about the given Axis by the given angle. - - Args: - section (Union[Face,Wire]): cross section - angle (float): the angle to revolve through - axis (Axis): rotation Axis - inner_wires (list[Wire], optional): holes - only used if section is of type Wire. - Defaults to []. - - Returns: - Solid: the revolved cross section - """ - inner_wires = inner_wires if inner_wires else [] - if isinstance(section, Wire): - section_face = Face(section, inner_wires) - else: - section_face = section - - revol_builder = BRepPrimAPI_MakeRevol( - section_face.wrapped, - axis.wrapped, - angle * DEG2RAD, - True, - ) - - return cls(revol_builder.Shape()) - - @classmethod - def _set_sweep_mode( - cls, - builder: BRepOffsetAPI_MakePipeShell, - path: Union[Wire, Edge], - binormal: Union[Vector, Wire, Edge], - ) -> bool: - rotate = False - - if isinstance(binormal, Vector): - coordinate_system = gp_Ax2() - coordinate_system.SetLocation(path.start_point().to_pnt()) - coordinate_system.SetDirection(binormal.to_dir()) - builder.SetMode(coordinate_system) - rotate = True - elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) - - return rotate - - @classmethod - def sweep( - cls, - section: Union[Face, Wire], - path: Union[Wire, Edge], - inner_wires: list[Wire] | None = None, - make_solid: bool = True, - is_frenet: bool = False, - mode: Union[Vector, Wire, Edge, None] = None, - transition: Transition = Transition.TRANSFORMED, - ) -> Solid: - """Sweep - - Sweep the given cross section into a prismatic solid along the provided path - - Args: - section (Union[Face, Wire]): cross section to sweep - path (Union[Wire, Edge]): sweep path - inner_wires (list[Wire]): holes - only used if section is a wire - make_solid (bool, optional): return Solid or Shell. Defaults to True. - is_frenet (bool, optional): Frenet mode. Defaults to False. - mode (Union[Vector, Wire, Edge, None], optional): additional sweep - mode parameters. Defaults to None. - transition (Transition, optional): handling of profile orientation at C1 path - discontinuities. Defaults to Transition.TRANSFORMED. - - Returns: - Solid: the swept cross section - """ - if isinstance(section, Face): - outer_wire = section.outer_wire() - inner_wires = section.inner_wires() - else: - outer_wire = section - inner_wires = inner_wires if inner_wires else [] - - shapes = [] - for wire in [outer_wire] + inner_wires: - builder = BRepOffsetAPI_MakePipeShell(path.to_wire().wrapped) - - rotate = False - - # handle sweep mode - if mode: - rotate = Solid._set_sweep_mode(builder, path, mode) - else: - builder.SetMode(is_frenet) - - builder.SetTransitionMode(Shape._transModeDict[transition]) - - builder.Add(wire.wrapped, False, rotate) - - builder.Build() - if make_solid: - builder.MakeSolid() - - shapes.append(Mixin3D.cast(builder.Shape())) - - outer_shape, inner_shapes = shapes[0], shapes[1:] - - if inner_shapes: - hollow_outer_shape = outer_shape.cut(*inner_shapes) - assert isinstance(hollow_outer_shape, Solid) - return hollow_outer_shape - - return outer_shape - - @classmethod - def sweep_multi( - cls, - profiles: Iterable[Union[Wire, Face]], - path: Union[Wire, Edge], - make_solid: bool = True, - is_frenet: bool = False, - binormal: Union[Vector, Wire, Edge, None] = None, - ) -> Solid: - """Multi section sweep - - Sweep through a sequence of profiles following a path. - - Args: - profiles (Iterable[Union[Wire, Face]]): list of profiles - path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over - make_solid (bool, optional): Solid or Shell. Defaults to True. - is_frenet (bool, optional): Select frenet mode. Defaults to False. - binormal (Union[Vector, Wire, Edge, None], optional): additional sweep mode parameters. - Defaults to None. - - Returns: - Solid: swept object - """ - path_as_wire = path.to_wire().wrapped - - builder = BRepOffsetAPI_MakePipeShell(path_as_wire) - - translate = False - rotate = False - - if binormal: - rotate = cls._set_sweep_mode(builder, path, binormal) - else: - builder.SetMode(is_frenet) - - for profile in profiles: - path_as_wire = ( - profile.wrapped - if isinstance(profile, Wire) - else profile.outer_wire().wrapped - ) - builder.Add(path_as_wire, translate, rotate) - - builder.Build() - - if make_solid: - builder.MakeSolid() - - return cls(builder.Shape()) - - @classmethod - def thicken( - cls, - surface: Face | Shell, - depth: float, - normal_override: Optional[VectorLike] = None, - ) -> Solid: - """Thicken Face or Shell - - Create a solid from a potentially non planar face or shell by thickening along - the normals. - - .. image:: thickenFace.png - - Non-planar faces are thickened both towards and away from the center of the sphere. - - Args: - depth (float): Amount to thicken face(s), can be positive or negative. - normal_override (Vector, optional): Face only. The normal_override vector can be - used to indicate which way is 'up', potentially flipping the face normal - direction such that many faces with different normals all go in the same - direction (direction need only be +/- 90 degrees from the face normal). - Defaults to None. - - Raises: - RuntimeError: Opencascade internal failures - - Returns: - Solid: The resulting Solid object - """ - # Check to see if the normal needs to be flipped - adjusted_depth = depth - if isinstance(surface, Face) and normal_override is not None: - surface_center = surface.center() - surface_normal = surface.normal_at(surface_center).normalized() - if surface_normal.dot(Vector(normal_override).normalized()) < 0: - adjusted_depth = -depth - - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - surface.wrapped, - Offset=adjusted_depth, - Tol=1.0e-5, - Mode=BRepOffset_Skin, - # BRepOffset_RectoVerso - which describes the offset of a given surface shell along both - # sides of the surface but doesn't seem to work - Intersection=True, - SelfInter=False, - Join=GeomAbs_Intersection, # Could be GeomAbs_Arc,GeomAbs_Tangent,GeomAbs_Intersection - Thickening=True, - RemoveIntEdges=True, - ) - offset_builder.MakeOffsetShape() - try: - result = Solid(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error applying thicken to given surface") from err - - return result - - -class Vertex(Shape[TopoDS_Vertex]): - """A Vertex in build123d represents a zero-dimensional point in the topological - data structure. It marks the endpoints of edges within a 3D model, defining precise - locations in space. Vertices play a crucial role in defining the geometry of objects - and the connectivity between edges, facilitating accurate representation and - manipulation of 3D shapes. They hold coordinate information and are essential - for constructing complex structures like wires, faces, and solids.""" - - order = 0.0 + # ---- Properties ---- @property def _dim(self) -> int: - return 0 + return 2 - @overload - def __init__(self): # pragma: no cover - """Default Vertext at the origin""" - @overload - def __init__(self, ocp_vx: TopoDS_Vertex): # pragma: no cover - """Vertex from OCCT TopoDS_Vertex object""" +class Part(Compound): + """A Compound containing 3D objects - aka Solids""" - @overload - def __init__(self, X: float, Y: float, Z: float): # pragma: no cover - """Vertex from three float values""" - - @overload - def __init__(self, v: Iterable[float]): - """Vertex from Vector or other iterators""" - - def __init__(self, *args, **kwargs): - self.vertex_index = 0 - - ocp_vx = kwargs.pop("ocp_vx", None) - v = kwargs.pop("v", None) - x = kwargs.pop("X", 0) - y = kwargs.pop("Y", 0) - z = kwargs.pop("Z", 0) - - # Handle unexpected kwargs - if kwargs: - raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - - if args: - if isinstance(args[0], TopoDS_Vertex): - ocp_vx = args[0] - elif isinstance(args[0], Iterable): - v = args[0] - else: - x, y, z = args[:3] + (0,) * (3 - len(args)) - - if v is not None: - x, y, z = itertools.islice(itertools.chain(v, [0, 0, 0]), 3) - - ocp_vx = ( - downcast(BRepBuilderAPI_MakeVertex(gp_Pnt(x, y, z)).Vertex()) - if ocp_vx is None - else ocp_vx - ) - - super().__init__(ocp_vx) - self.X, self.Y, self.Z = self.to_tuple() - - @classmethod - def cast(cls, obj: TopoDS_Shape) -> Self: - "Returns the right type of wrapper, given a OCCT object" - - # define the shape lookup table for casting - constructor_lut = { - ta.TopAbs_VERTEX: Vertex, - } - - shape_type = shapetype(obj) - # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) + # ---- Properties ---- @property - def volume(self) -> float: - """volume - the volume of this Vertex, which is always zero""" - return 0.0 - - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return ShapeList((self,)) # Vertex is an iterable - - def vertex(self) -> Vertex: - """Return the Vertex""" - return self - - def to_tuple(self) -> tuple[float, float, float]: - """Return vertex as three tuple of floats""" - geom_point = BRep_Tool.Pnt_s(self.wrapped) - return (geom_point.X(), geom_point.Y(), geom_point.Z()) - - def center(self) -> Vector: - """The center of a vertex is itself!""" - return Vector(self) - - def __add__( # type: ignore - self, other: Vertex | Vector | tuple[float, float, float] - ) -> Vertex: - """Add - - Add to a Vertex with a Vertex, Vector or Tuple - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" Vertex: # type: ignore - """Subtract - - Substract a Vertex with a Vertex, Vector or Tuple from self - - Args: - other: Value to add - - Raises: - TypeError: other not in [Tuple,Vector,Vertex] - - Returns: - Result - - Example: - part.faces(">z").vertices(" str: - """To String - - Convert Vertex to String for display - - Returns: - Vertex as String - """ - return f"Vertex({self.X}, {self.Y}, {self.Z})" - - def __iter__(self): - """Initialize to beginning""" - self.vertex_index = 0 - return self - - def __next__(self): - """return the next value""" - if self.vertex_index == 0: - self.vertex_index += 1 - value = self.X - elif self.vertex_index == 1: - self.vertex_index += 1 - value = self.Y - elif self.vertex_index == 2: - self.vertex_index += 1 - value = self.Z - else: - raise StopIteration - return value - - def transform_shape(self, t_matrix: Matrix) -> Vertex: - """Apply affine transform without changing type - - Transforms a copy of this Vertex by the provided 3D affine transformation matrix. - Note that not all transformation are supported - primarily designed for translation - and rotation. See :transform_geometry: for more comprehensive transformations. - - Args: - t_matrix (Matrix): affine transformation matrix - - Returns: - Vertex: copy of transformed shape with all objects keeping their type - """ - return Vertex(*t_matrix.multiply(Vector(self))) - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: - """extrude - invalid operation for Vertex""" - raise NotImplementedError("Vertices can't be created by extrusion") - - -class Wire(Mixin1D, Shape[TopoDS_Wire]): - """A Wire in build123d is a topological entity representing a connected sequence - of edges forming a continuous curve or path in 3D space. Wires are essential - components in modeling complex objects, defining boundaries for surfaces or - solids. They store information about the connectivity and order of edges, - allowing precise definition of paths within a 3D model.""" - - order = 1.5 - - @overload - def __init__( - self, - obj: TopoDS_Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from an OCCT TopoDS_Wire - - Args: - obj (TopoDS_Wire, optional): OCCT Wire. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edge: Edge, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Edge - - Args: - edge (Edge): Edge to convert to Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Wire, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Wire - used when the input could be an Edge or Wire. - - Args: - wire (Wire): Wire to convert to another Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - wire: Curve, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a Wire from an Curve. - - Args: - curve (Curve): Curve to convert to a Wire - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - @overload - def __init__( - self, - edges: Iterable[Edge], - sequenced: bool = False, - label: str = "", - color: Color | None = None, - parent: Compound | None = None, - ): - """Build a wire from Edges - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. - parent (Compound, optional): assembly parent. Defaults to None. - """ - - def __init__(self, *args, **kwargs): - curve, edge, edges, wire, sequenced, obj, label, color, parent = (None,) * 9 - - if args: - l_a = len(args) - if isinstance(args[0], TopoDS_Wire): - obj, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Edge): - edge, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Wire): - wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - # elif isinstance(args[0], Curve): - elif ( - hasattr(args[0], "wrapped") - and isinstance(args[0].wrapped, TopoDS_Compound) - and topods_dim(args[0].wrapped) == 1 - ): # Curve - curve, label, color, parent = args[:4] + (None,) * (4 - l_a) - elif isinstance(args[0], Iterable): - edges, sequenced, label, color, parent = args[:5] + (None,) * (5 - l_a) - - unknown_args = ", ".join( - set(kwargs.keys()).difference( - [ - "curve", - "wire", - "edge", - "edges", - "sequenced", - "obj", - "label", - "color", - "parent", - ] - ) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") - - obj = kwargs.get("obj", obj) - edge = kwargs.get("edge", edge) - edges = kwargs.get("edges", edges) - sequenced = kwargs.get("sequenced", sequenced) - label = kwargs.get("label", label) - color = kwargs.get("color", color) - parent = kwargs.get("parent", parent) - wire = kwargs.get("wire", wire) - curve = kwargs.get("curve", curve) - - if edge is not None: - edges = [edge] - elif curve is not None: - edges = curve.edges() - if wire is not None: - obj = wire.wrapped - elif edges: - obj = Wire._make_wire(edges, False if sequenced is None else sequenced) - - super().__init__( - obj=obj, - label="" if label is None else label, - color=color, - parent=parent, - ) - - def geom_adaptor(self) -> BRepAdaptor_CompCurve: - """Return the Geom Comp Curve for this Wire""" - return BRepAdaptor_CompCurve(self.wrapped) - - def close(self) -> Wire: - """Close a Wire""" - if not self.is_closed: - edge = Edge.make_line(self.end_point(), self.start_point()) - return_value = Wire.combine((self, edge))[0] - else: - return_value = self - - return return_value - - def to_wire(self) -> Wire: - """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" - return self - - @classmethod - def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 - ) -> ShapeList[Wire]: - """combine - - Combine a list of wires and edges into a list of Wires. - - Args: - wires (Iterable[Union[Wire, Edge]]): unsorted - tol (float, optional): tolerance. Defaults to 1e-9. - - Returns: - ShapeList[Wire]: Wires - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) - - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires = ShapeList() - for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) - - return wires - - @classmethod - def extrude(cls, obj: Shape, direction: VectorLike) -> Wire: - """extrude - invalid operation for Wire""" - raise NotImplementedError("Wires can't be created by extrusion") - - def fix_degenerate_edges(self, precision: float) -> Wire: - """fix_degenerate_edges - - Fix a Wire that contains degenerate (very small) edges - - Args: - precision (float): minimum value edge length - - Returns: - Wire: fixed wire - """ - sf_w = ShapeFix_Wireframe(self.wrapped) - sf_w.SetPrecision(precision) - sf_w.SetMaxTolerance(1e-6) - sf_w.FixSmallEdges() - sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) - - def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" - - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. - - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False - - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) - - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length - break - distance += edge.length - - if not found: - raise ValueError(f"{point} not on wire") - - return distance / wire_length - - def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. - - Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end - - Returns: - Wire: trimmed wire - """ - - # pylint: disable=too-many-branches - if start >= end: - raise ValueError("start must be less than end") - - edges = self.edges() - - # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) - - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) - - trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue - - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) - - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) - - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) - - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) - - return Wire(trimmed_edges) - - def order_edges(self) -> ShapeList[Edge]: - """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) - - @classmethod - def _make_wire(cls, edges: Iterable[Edge], sequenced: bool = False) -> TopoDS_Wire: - """_make_wire - - Build a Wire from the provided unsorted Edges. If sequenced is True the - Edges are placed in such that the end of the nth Edge is coincident with - the n+1th Edge forming an unbroken sequence. Note that sequencing a list - is relatively slow. - - Args: - edges (Iterable[Edge]): Edges to assemble - sequenced (bool, optional): arrange in order. Defaults to False. - - Raises: - ValueError: Edges are disconnected and can't be sequenced. - RuntimeError: Wire is empty - - Returns: - Wire: assembled edges - """ - - def closest_to_end(current: Wire, unplaced_edges: list[Edge]) -> Edge: - """Return the Edge closest to the end of last_edge""" - target_point = current.position_at(1) - - sorted_edges = sorted( - unplaced_edges, - key=lambda e: min( - (target_point - e.position_at(0)).length, - (target_point - e.position_at(1)).length, - ), - ) - return sorted_edges[0] - - edges = list(edges) - if sequenced: - placed_edges = [edges.pop(0)] - unplaced_edges = edges - - while unplaced_edges: - next_edge = closest_to_end(Wire(placed_edges), unplaced_edges) - next_edge_index = unplaced_edges.index(next_edge) - placed_edges.append(unplaced_edges.pop(next_edge_index)) - - edges = placed_edges - - wire_builder = BRepBuilderAPI_MakeWire() - combined_edges = TopTools_ListOfShape() - for edge in edges: - combined_edges.Append(edge.wrapped) - wire_builder.Add(combined_edges) - - wire_builder.Build() - if not wire_builder.IsDone(): - if wire_builder.Error() == BRepBuilderAPI_NonManifoldWire: - warnings.warn( - "Wire is non manifold (e.g. branching, self intersecting)", - stacklevel=2, - ) - elif wire_builder.Error() == BRepBuilderAPI_EmptyWire: - raise RuntimeError("Wire is empty") - elif wire_builder.Error() == BRepBuilderAPI_DisconnectedWire: - raise ValueError("Edges are disconnected") - - return wire_builder.Wire() - - @classmethod - def make_circle(cls, radius: float, plane: Plane = Plane.XY) -> Wire: - """make_circle - - Makes a circle centered at the origin of plane - - Args: - radius (float): circle radius - plane (Plane): base plane. Defaults to Plane.XY - - Returns: - Wire: a circle - """ - circle_edge = Edge.make_circle(radius, plane=plane) - return Wire([circle_edge]) - - @classmethod - def make_ellipse( - cls, - x_radius: float, - y_radius: float, - plane: Plane = Plane.XY, - start_angle: float = 360.0, - end_angle: float = 360.0, - angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, - closed: bool = True, - ) -> Wire: - """make ellipse - - Makes an ellipse centered at the origin of plane. - - Args: - x_radius (float): x radius of the ellipse (along the x-axis of plane) - y_radius (float): y radius of the ellipse (along the y-axis of plane) - plane (Plane, optional): base plane. Defaults to Plane.XY. - start_angle (float, optional): _description_. Defaults to 360.0. - end_angle (float, optional): _description_. Defaults to 360.0. - angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - closed (bool, optional): close the arc. Defaults to True. - - Returns: - Wire: an ellipse - """ - ellipse_edge = Edge.make_ellipse( - x_radius, y_radius, plane, start_angle, end_angle, angular_direction - ) - - if start_angle != end_angle and closed: - line = Edge.make_line(ellipse_edge.end_point(), ellipse_edge.start_point()) - wire = Wire([ellipse_edge, line]) - else: - wire = Wire([ellipse_edge]) - - return wire - - @classmethod - def make_polygon(cls, vertices: Iterable[VectorLike], close: bool = True) -> Wire: - """make_polygon - - Create an irregular polygon by defining vertices - - Args: - vertices (Iterable[VectorLike]): - close (bool, optional): close the polygon. Defaults to True. - - Returns: - Wire: an irregular polygon - """ - vectors = [Vector(v) for v in vertices] - if (vectors[0] - vectors[-1]).length > TOLERANCE and close: - vectors.append(vectors[0]) - - wire_builder = BRepBuilderAPI_MakePolygon() - for vertex in vectors: - wire_builder.Add(vertex.to_pnt()) - - return cls(wire_builder.Wire()) - - def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires - - Args: - other: Wire: - - Returns: - - """ - - wire_builder = BRepBuilderAPI_MakeWire() - wire_builder.Add(TopoDS.Wire_s(self.wrapped)) - wire_builder.Add(TopoDS.Wire_s(other.wrapped)) - wire_builder.Build() - - return self.__class__.cast(wire_builder.Wire()) - - def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: - """fillet_2d - - Apply 2D fillet to a wire - - Args: - radius (float): - vertices (Iterable[Vertex]): vertices to fillet - - Returns: - Wire: filleted wire - """ - # Create a face to fillet - unfilleted_face = _make_topods_face_from_wires(self.wrapped) - # Fillet the face - fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) - for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) - fillet_builder.Build() - filleted_face = downcast(fillet_builder.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(filleted_face)) - - def chamfer_2d( - self, - distance: float, - distance2: float, - vertices: Iterable[Vertex], - edge: Edge | None = None, - ) -> Wire: - """chamfer_2d - - Apply 2D chamfer to a wire - - Args: - distance (float): chamfer length - distance2 (float): chamfer length - vertices (Iterable[Vertex]): vertices to chamfer - edge (Edge): identifies the side where length is measured. The vertices must be - part of the edge - - Returns: - Wire: chamfered wire - """ - reference_edge = edge - - # Create a face to chamfer - unchamfered_face = _make_topods_face_from_wires(self.wrapped) - chamfer_builder = BRepFilletAPI_MakeFillet2d(unchamfered_face) - - vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() - TopExp.MapShapesAndAncestors_s( - unchamfered_face, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map - ) - - for v in vertices: - edge_list = vertex_edge_map.FindFromKey(v.wrapped) - - # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs - # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) - - edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) - - chamfer_builder.Build() - chamfered_face = chamfer_builder.Shape() - # Fix the shape - shape_fix = ShapeFix_Shape(chamfered_face) - shape_fix.Perform() - chamfered_face = downcast(shape_fix.Shape()) - # Return the outer wire - return Wire(BRepTools.OuterWire_s(chamfered_face)) - - @staticmethod - def order_chamfer_edges( - reference_edge: Optional[Edge], edges: tuple[Edge, Edge] - ) -> tuple[Edge, Edge]: - """Order the edges of a chamfer relative to a reference Edge""" - if reference_edge: - edge1, edge2 = edges - if edge1 == reference_edge: - return edge1, edge2 - if edge2 == reference_edge: - return edge2, edge1 - raise ValueError("reference edge not in edges") - return edges - - @classmethod - def make_rect( - cls, - width: float, - height: float, - plane: Plane = Plane.XY, - ) -> Wire: - """Make Rectangle - - Make a Rectangle centered on center with the given normal - - Args: - width (float): width (local x) - height (float): height (local y) - plane (Plane, optional): plane containing rectangle. Defaults to Plane.XY. - - Returns: - Wire: The centered rectangle - """ - corners_local = [ - (width / 2, height / 2), - (width / 2, height / -2), - (width / -2, height / -2), - (width / -2, height / 2), - ] - corners_world = [plane.from_local_coords(c) for c in corners_local] - return Wire.make_polygon(corners_world, close=True) - - @classmethod - def make_convex_hull(cls, edges: Iterable[Edge], tolerance: float = 1e-3) -> Wire: - """make_convex_hull - - Create a wire of minimum length enclosing all of the provided edges. - - Note that edges can't overlap each other. - - Args: - edges (Iterable[Edge]): edges defining the convex hull - tolerance (float): allowable error as a fraction of each edge length. - Defaults to 1e-3. - - Raises: - ValueError: edges overlap - - Returns: - Wire: convex hull perimeter - """ - # pylint: disable=too-many-branches, too-many-locals - # Algorithm: - # 1) create a cloud of points along all edges - # 2) create a convex hull which returns facets/simplices as pairs of point indices - # 3) find facets that are within an edge but not adjacent and store trim and - # new connecting edge data - # 4) find facets between edges and store trim and new connecting edge data - # 5) post process the trim data to remove duplicates and store in pairs - # 6) create connecting edges - # 7) create trim edges from the original edges and the trim data - # 8) return a wire version of all the edges - - # Possible enhancement: The accuracy of the result could be improved and the - # execution time reduced by adaptively placing more points around where the - # connecting edges contact the arc. - - # if any( - # [ - # edge_pair[0].overlaps(edge_pair[1]) - # for edge_pair in combinations(edges, 2) - # ] - # ): - # raise ValueError("edges overlap") - edges = list(edges) - fragments_per_edge = int(2 / tolerance) - points_lookup = {} # lookup from point index to edge/position on edge - points = [] # convex hull point cloud - - # Create points along each edge and the lookup structure - for edge_index, edge in enumerate(edges): - for i in range(fragments_per_edge): - param = i / (fragments_per_edge - 1) - points.append(edge.position_at(param).to_tuple()[:2]) - points_lookup[edge_index * fragments_per_edge + i] = (edge_index, param) - - convex_hull = ConvexHull(points) - - # Filter the fragments - connecting_edge_data = [] - trim_points: dict[int, list[int]] = {} - for simplice in convex_hull.simplices: - edge0 = points_lookup[simplice[0]][0] - edge1 = points_lookup[simplice[1]][0] - # Look for connecting edges between edges - if edge0 != edge1: - if edge0 not in trim_points: - trim_points[edge0] = [simplice[0]] - else: - trim_points[edge0].append(simplice[0]) - if edge1 not in trim_points: - trim_points[edge1] = [simplice[1]] - else: - trim_points[edge1].append(simplice[1]) - connecting_edge_data.append( - ( - (edge0, points_lookup[simplice[0]][1], simplice[0]), - (edge1, points_lookup[simplice[1]][1], simplice[1]), - ) - ) - # Look for connecting edges within an edge - elif abs(simplice[0] - simplice[1]) != 1: - start_pnt = min(simplice.tolist()) - end_pnt = max(simplice.tolist()) - if edge0 not in trim_points: - trim_points[edge0] = [start_pnt, end_pnt] - else: - trim_points[edge0].extend([start_pnt, end_pnt]) - connecting_edge_data.append( - ( - (edge0, points_lookup[start_pnt][1], start_pnt), - (edge0, points_lookup[end_pnt][1], end_pnt), - ) - ) - - trim_data = {} - for edge_index, start_end_pnts in trim_points.items(): - s_points = sorted(start_end_pnts) - f_points = [] - for i in range(0, len(s_points) - 1, 2): - if s_points[i] != s_points[i + 1]: - f_points.append(tuple(s_points[i : i + 2])) - trim_data[edge_index] = f_points - - connecting_edges = [ - Edge.make_line( - edges[line[0][0]] @ line[0][1], edges[line[1][0]] @ line[1][1] - ) - for line in connecting_edge_data - ] - trimmed_edges = [ - edges[edge_index].trim( - points_lookup[trim_pair[0]][1], points_lookup[trim_pair[1]][1] - ) - for edge_index, trim_pairs in trim_data.items() - for trim_pair in trim_pairs - ] - hull_wire = Wire(connecting_edges + trimmed_edges, sequenced=True) - return hull_wire - - def project_to_shape( - self, - target_object: Shape, - direction: VectorLike | None = None, - center: VectorLike | None = None, - ) -> list[Wire]: - """Project Wire - - Project a Wire onto a Shape generating new wires on the surfaces of the object - one and only one of `direction` or `center` must be provided. Note that one or - more wires may be generated depending on the topology of the target object and - location/direction of projection. - - To avoid flipping the normal of a face built with the projected wire the orientation - of the output wires are forced to be the same as self. - - Args: - target_object: Object to project onto - direction: Parallel projection direction. Defaults to None. - center: Conical center of projection. Defaults to None. - target_object: Shape: - direction: VectorLike: (Default value = None) - center: VectorLike: (Default value = None) - - Returns: - : Projected wire(s) - - Raises: - ValueError: Only one of direction or center must be provided - - """ - # pylint: disable=too-many-branches - if self.wrapped is None or target_object.wrapped is None: - raise ValueError("Can't project empty Wires or to empty Shapes") - - if not (direction is None) ^ (center is None): - raise ValueError("One of either direction or center must be provided") - if direction is not None: - direction_vector = Vector(direction).normalized() - center_point = Vector() # for typing, never used - else: - direction_vector = None - center_point = Vector(center) - - # Project the wire on the target object - if direction_vector is not None: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Dir(*direction_vector.to_tuple()), - ) - else: - projection_object = BRepProj_Projection( - self.wrapped, - target_object.wrapped, - gp_Pnt(*center_point.to_tuple()), - ) - - # Generate a list of the projected wires with aligned orientation - output_wires = [] - target_orientation = self.wrapped.Orientation() - while projection_object.More(): - projected_wire = projection_object.Current() - if target_orientation == projected_wire.Orientation(): - output_wires.append(Wire(projected_wire)) - else: - output_wires.append(Wire(projected_wire.Reversed())) - projection_object.Next() - - logger.debug("wire generated %d projected wires", len(output_wires)) - - # BRepProj_Projection is inconsistent in the order that it returns projected - # wires, sometimes front first and sometimes back - so sort this out by sorting - # by distance from the original planar wire - if len(output_wires) > 1: - output_wires_distances = [] - planar_wire_center = self.center() - for output_wire in output_wires: - output_wire_center = output_wire.center() - if direction_vector is not None: - output_wire_direction = ( - output_wire_center - planar_wire_center - ).normalized() - if output_wire_direction.dot(direction_vector) >= 0: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - planar_wire_center).length, - ) - ) - else: - output_wires_distances.append( - ( - output_wire, - (output_wire_center - center_point).length, - ) - ) - - output_wires_distances.sort(key=lambda x: x[1]) - logger.debug( - "projected, filtered and sorted wire list is of length %d", - len(output_wires_distances), - ) - output_wires = [w[0] for w in output_wires_distances] - - return output_wires - - -class Joint(ABC): - """Joint - - Abstract Base Joint class - used to join two components together - - Args: - parent (Union[Solid, Compound]): object that joint to bound to - - Attributes: - label (str): user assigned label - parent (Shape): object joint is bound to - connected_to (Joint): joint that is connect to this joint - - """ - - def __init__(self, label: str, parent: Union[Solid, Compound]): - self.label = label - self.parent = parent - self.connected_to: Joint | None = None - - def _connect_to(self, other: Joint, **kwargs): # pragma: no cover - """Connect Joint self by repositioning other""" - - if not isinstance(other, Joint): - raise TypeError(f"other must of type Joint not {type(other)}") - if self.parent.location is None: - raise ValueError("Parent location is not set") - relative_location = self.relative_to(other, **kwargs) - other.parent.locate(self.parent.location * relative_location) - self.connected_to = other - - @abstractmethod - def connect_to(self, other: Joint): - """All derived classes must provide a connect_to method""" - - @abstractmethod - def relative_to(self, other: Joint) -> Location: - """Return relative location to another joint""" - - @property - @abstractmethod - def location(self) -> Location: - """Location of joint""" - - @property - @abstractmethod - def symbol(self) -> Compound: - """A CAD object positioned in global space to illustrate the joint""" - - -def _make_loft( - objs: Iterable[Union[Vertex, Wire]], - filled: bool, - ruled: bool = False, -) -> TopoDS_Shape: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - wires (list[Wire]): section perimeters - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - TopoDS_Shape: Lofted object - """ - objs = list(objs) # To determine its length - if len(objs) < 2: - raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] - vertex_count = len(vertices) - - if vertex_count > 2: - raise ValueError("Only two vertices are allowed") - - if vertex_count == 1 and not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - or isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertex must be either at the beginning or end of the list" - ) - - if vertex_count == 2: - if len(objs) == 2: - raise ValueError( - "You can't have only 2 vertices to loft; try adding some wires" - ) - if not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - and isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertices must be at the beginning and end of the list" - ) - - loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) - - for obj in objs: - if isinstance(obj.wrapped, TopoDS_Vertex): - loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj.wrapped, TopoDS_Wire): - loft_builder.AddWire(obj.wrapped) - - loft_builder.Build() - - return loft_builder.Shape() - - -def downcast(obj: TopoDS_Shape) -> TopoDS_Shape: - """Downcasts a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - f_downcast: Any = Shape.downcast_LUT[shapetype(obj)] - return_value = f_downcast(obj) - - return return_value - - -def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: - """Convert edges to a list of wires. - - Args: - edges: Iterable[Edge]: - tol: float: (Default value = 1e-6) - - Returns: - - """ - - edges_in = TopTools_HSequenceOfShape() - wires_out = TopTools_HSequenceOfShape() - - for edge in edges: - if edge.wrapped is not None: - edges_in.Append(edge.wrapped) - ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) - - wires: ShapeList[Wire] = ShapeList() - for i in range(wires_out.Length()): - # wires.append(Wire(downcast(wires_out.Value(i + 1)))) - wires.append(Wire(TopoDS.Wire_s(wires_out.Value(i + 1)))) - - return wires - - -def fix(obj: TopoDS_Shape) -> TopoDS_Shape: - """Fix a TopoDS object to suitable specialized type - - Args: - obj: TopoDS_Shape: - - Returns: - - """ - - shape_fix = ShapeFix_Shape(obj) - shape_fix.Perform() - - return downcast(shape_fix.Shape()) - - -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def shapetype(obj: TopoDS_Shape | None) -> TopAbs_ShapeEnum: - """Return TopoDS_Shape's TopAbs_ShapeEnum""" - if obj is None or obj.IsNull(): - raise ValueError("Null TopoDS_Shape object") - - return obj.ShapeType() - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) - if len(shapetypes) == 1: - result = shapetypes.pop() - else: - result = shapetype(obj) - else: - result = shapetype(obj.wrapped) - return result - - -def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: - """Tries to determine how wires should be combined into faces. - - Assume: - The wires make up one or more faces, which could have 'holes' - Outer wires are listed ahead of inner wires - there are no wires inside wires inside wires - ( IE, islands -- we can deal with that later on ) - none of the wires are construction wires - - Compute: - one or more sets of wires, with the outer wire listed first, and inner - ones - - Returns, list of lists. - - Args: - wire_list: list[Wire]: - - Returns: - - """ - - # check if we have something to sort at all - if len(wire_list) < 2: - return [ - wire_list, - ] - - # make a Face, NB: this might return a compound of faces - faces = Face(wire_list[0], wire_list[1:]) - - return_value = [] - for face in faces.faces(): - return_value.append( - [ - face.outer_wire(), - ] - + face.inner_wires() - ) - - return return_value - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - -def topo_explore_connected_edges( - edge: Edge, parent: Shape | None = None -) -> ShapeList[Edge]: - """Given an edge extracted from a Shape, return the edges connected to it""" - - parent = parent if parent is not None else edge.topo_parent - if parent is None: - raise ValueError("edge has no valid parent") - given_topods_edge = edge.wrapped - if given_topods_edge is None: - raise ValueError("edge is empty") - connected_edges = set() - - # Find all the TopoDS_Edges for this Shape - topods_edges = [e.wrapped for e in parent.edges() if e.wrapped is not None] - - for topods_edge in topods_edges: - # # Don't match with the given edge - if given_topods_edge.IsSame(topods_edge): - continue - # If the edge shares a vertex with the given edge they are connected - if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: - connected_edges.add(topods_edge) - - return ShapeList(Edge(e) for e in connected_edges) - - -def topo_explore_common_vertex( - edge1: Edge | TopoDS_Edge, edge2: Edge | TopoDS_Edge -) -> Optional[Vertex]: - """Given two edges, find the common vertex""" - topods_edge1 = edge1 if isinstance(edge1, TopoDS_Edge) else edge1.wrapped - topods_edge2 = edge2 if isinstance(edge2, TopoDS_Edge) else edge2.wrapped - - if topods_edge1 is None or topods_edge2 is None: - raise ValueError("edge is empty") - - # Explore vertices of the first edge - vert_exp = TopExp_Explorer(topods_edge1, ta.TopAbs_VERTEX) - while vert_exp.More(): - vertex1 = vert_exp.Current() - - # Explore vertices of the second edge - explorer2 = TopExp_Explorer(topods_edge2, ta.TopAbs_VERTEX) - while explorer2.More(): - vertex2 = explorer2.Current() - - # Check if the vertices are the same - if vertex1.IsSame(vertex2): - return Vertex(TopoDS.Vertex_s(vertex1)) # Common vertex found - - explorer2.Next() - vert_exp.Next() - - return None # No common vertex found - - -def unwrap_topods_compound( - compound: TopoDS_Compound, fully: bool = True -) -> TopoDS_Compound | TopoDS_Shape: - """Strip unnecessary Compound wrappers - - Args: - compound (TopoDS_Compound): The TopoDS_Compound to unwrap. - fully (bool, optional): return base shape without any TopoDS_Compound - wrappers (otherwise one TopoDS_Compound is left). Defaults to True. - - Returns: - TopoDS_Compound | TopoDS_Shape: base shape - """ - if compound.NbChildren() == 1: - iterator = TopoDS_Iterator(compound) - single_element = downcast(iterator.Value()) - - # If the single element is another TopoDS_Compound, unwrap it recursively - if isinstance(single_element, TopoDS_Compound): - return unwrap_topods_compound(single_element, fully) - - return single_element if fully else compound - - # If there are no elements or more than one element, return TopoDS_Compound - return compound - - -def get_top_level_topods_shapes( - topods_shape: TopoDS_Shape | None, -) -> list[TopoDS_Shape]: - """ - Retrieve the first level of child shapes from the shape. - - This method collects all the non-compound shapes directly contained in the - current shape. If the wrapped shape is a `TopoDS_Compound`, it traverses - its immediate children and collects all shapes that are not further nested - compounds. Nested compounds are traversed to gather their non-compound elements - without returning the nested compound itself. - - Returns: - list[TopoDS_Shape]: A list of all first-level non-compound child shapes. - - Example: - If the current shape is a compound containing both simple shapes - (e.g., edges, vertices) and other compounds, the method returns a list - of only the simple shapes directly contained at the top level. - """ - if topods_shape is None: - return ShapeList() - - first_level_shapes = [] - stack = [topods_shape] - - while stack: - current_shape = stack.pop() - if isinstance(current_shape, TopoDS_Compound): - iterator = TopoDS_Iterator() - iterator.Initialize(current_shape) - while iterator.More(): - child_shape = downcast(iterator.Value()) - if isinstance(child_shape, TopoDS_Compound): - # Traverse further into the compound - stack.append(child_shape) - else: - # Add non-compound shape - first_level_shapes.append(child_shape) - iterator.Next() - else: - first_level_shapes.append(current_shape) - - return first_level_shapes - - -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - -def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Optional[Iterable[TopoDS_Wire]] = None -) -> TopoDS_Face: - """_make_topods_face_from_wires - - Makes a planar face from one or more wires - - Args: - outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. - - Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error - - Returns: - TopoDS_Face: planar face potentially with holes - """ - if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = list(inner_wires) if inner_wires else [] - - # check if wires are coplanar - verification_compound = _make_topods_compound_from_shapes( - [outer_wire] + inner_wires - ) - if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): - raise ValueError("Cannot build face(s): wires not planar") - - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) - - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) - - for inner_wire in inner_wires: - if not BRep_Tool.IsClosed_s(inner_wire): - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) - - face_builder.Build() - - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") - - face = face_builder.Face() - - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() - - return TopoDS.Face_s(sf_f.Result()) - - -def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: - """Sew faces into a shell if possible""" - shell_builder = BRepBuilderAPI_Sewing() - for face in faces: - shell_builder.Add(face) - shell_builder.Perform() - return downcast(shell_builder.SewedShape()) - - -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound - """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) - - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) - - return comp - - -def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: - """Return the maximum dimension of one or more shapes""" - shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) - bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) - return bbox.diagonal - - -def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: - """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" - out = {} # using dict to prevent duplicates - - explorer = TopExp_Explorer(shape, Shape.inverse_shape_LUT[topo_type]) - - while explorer.More(): - item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( - item # needed to avoid pseudo-duplicate entities - ) - explorer.Next() - - return list(out.values()) - - -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - TopoDS_Shape: extruded shape - """ - direction = Vector(direction) - - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") - - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion - - -class SkipClean: - """Skip clean context for use in operator driven code where clean=False wouldn't work""" - - clean = True - - def __enter__(self): - SkipClean.clean = False - - def __exit__(self, exception_type, exception_value, traceback): - SkipClean.clean = True + def _dim(self) -> int: + return 3 From 89763b9673af58bc50857326c4eb56a0f5e1c628 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 14:07:20 -0500 Subject: [PATCH 080/518] Adding missing __init__.py file --- src/build123d/topology/__init__.py | 92 ++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 src/build123d/topology/__init__.py diff --git a/src/build123d/topology/__init__.py b/src/build123d/topology/__init__.py new file mode 100644 index 0000000..223aa4e --- /dev/null +++ b/src/build123d/topology/__init__.py @@ -0,0 +1,92 @@ + +""" +build123d.topology package + +name: __init__.py +by: Gumyr +date: January 07, 2025 + +desc: + This package contains modules for representing and manipulating 3D geometric shapes, + including operations on vertices, edges, faces, solids, and composites. + The package provides foundational classes to work with 3D objects, and methods to + manipulate and analyze those objects. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +from .shape_core import ( + Shape, + Comparable, + ShapePredicate, + GroupBy, + ShapeList, + Joint, + SkipClean, + BoundBox, + downcast, + fix, + unwrap_topods_compound, +) +from .utils import ( + tuplify, + isclose_b, + polar, + delta, + new_edges, + find_max_dimension, +) +from .zero_d import Vertex, topo_explore_common_vertex +from .one_d import Edge, Wire, edges_to_wires, topo_explore_connected_edges +from .two_d import Face, Shell, sort_wires_by_build_order +from .three_d import Solid +from .composite import Compound, Curve, Sketch, Part + +__all__ = [ + "Shape", + "Comparable", + "ShapePredicate", + "GroupBy", + "ShapeList", + "Joint", + "SkipClean", + "BoundBox", + "downcast", + "fix", + "unwrap_topods_compound", + "tuplify", + "isclose_b", + "polar", + "delta", + "new_edges", + "find_max_dimension", + "Vertex", + "topo_explore_common_vertex", + "Edge", + "Wire", + "edges_to_wires", + "topo_explore_connected_edges", + "Face", + "Shell", + "sort_wires_by_build_order", + "Solid", + "Compound", + "Curve", + "Sketch", + "Part", +] From b2e6b3c0d4e316e371768f044b79287e25aa7bc6 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 14:26:56 -0500 Subject: [PATCH 081/518] Disable linting on imported modules --- .pylintrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pylintrc b/.pylintrc index f097be2..91a9fac 100644 --- a/.pylintrc +++ b/.pylintrc @@ -16,3 +16,5 @@ disable= ignore-paths= ./src/build123d/_version.py # Generated + +ignored-modules=OCP,vtkmodules,scipy.spatial,ezdxf,anytree,IPython,trianglesolver,scipy,numpy \ No newline at end of file From 7e189f4b2a222b5b46f59671cc3c03cdfc0240e8 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 13:55:30 -0600 Subject: [PATCH 082/518] action.yml -> add pytest-benchmark --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 3dba669..2bccaa6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -14,5 +14,5 @@ runs: - name: Install Requirements shell: bash run: | - pip install wheel mypy pytest pytest-cov pylint + pip install wheel mypy pytest pytest-benchmark pytest-cov pylint pip install . From a2c53eab1b23af4b9c12178a5bc19b07124b31f6 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 15:31:03 -0600 Subject: [PATCH 083/518] Update mypy.yml --- .github/workflows/mypy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index ebf3b61..a734b00 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -1,6 +1,6 @@ name: Run type checker -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: typecheck: strategy: From 1af7175a7573901e695c1a88d790395625cd1f2c Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 16:36:31 -0600 Subject: [PATCH 084/518] benchmark.yml -> add new workflow for pytest-benchmark --- .github/workflows/benchmark.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/benchmark.yml diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml new file mode 100644 index 0000000..d884408 --- /dev/null +++ b/.github/workflows/benchmark.yml @@ -0,0 +1,27 @@ +name: benchmarks + +on: [workflow_dispatch] +# on: [push, pull_request, workflow_dispatch] +jobs: + + tests: + strategy: + fail-fast: false + matrix: + python-version: [ + # "3.10", + # "3.11", + "3.12", + ] + os: [macos-13, macos-14, ubuntu-latest, windows-latest] + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - uses: ./.github/actions/setup/ + with: + python-version: ${{ matrix.python-version }} + - name: benchmark + run: | + pip install pytest-benchmark + python -m pytest --benchmark-only From bd62971cba22883b77e1461bad3028c8c5e9454b Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 16:42:30 -0600 Subject: [PATCH 085/518] test_benchmarks.py -> add 12 benchmarking tests from the build123d docs --- tests/test_benchmarks.py | 674 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 tests/test_benchmarks.py diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py new file mode 100644 index 0000000..409a653 --- /dev/null +++ b/tests/test_benchmarks.py @@ -0,0 +1,674 @@ +import pytest +from math import sqrt +from build123d import * + + +def test_ppp_0101(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-01 Bearing Bracket + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + with BuildPart() as p: + with BuildSketch() as s: + Rectangle(115, 50) + with Locations((5 / 2, 0)): + SlotOverall(90, 12, mode=Mode.SUBTRACT) + extrude(amount=15) + + with BuildSketch(Plane.XZ.offset(50 / 2)) as s3: + with Locations((-115 / 2 + 26, 15)): + SlotOverall(42 + 2 * 26 + 12, 2 * 26, rotation=90) + zz = extrude(amount=-12) + split(bisect_by=Plane.XY) + edgs = p.part.edges().filter_by(Axis.Y).group_by(Axis.X)[-2] + fillet(edgs, 9) + + with Locations(zz.faces().sort_by(Axis.Y)[0]): + with Locations((42 / 2 + 6, 0)): + CounterBoreHole(24 / 2, 34 / 2, 4) + mirror(about=Plane.XZ) + + with BuildSketch() as s4: + RectangleRounded(115, 50, 6) + extrude(amount=80, mode=Mode.INTERSECT) + # fillet does not work right, mode intersect is safer + + with BuildSketch(Plane.YZ) as s4: + with BuildLine() as bl: + l1 = Line((0, 0), (18 / 2, 0)) + l2 = PolarLine(l1 @ 1, 8, 60, length_mode=LengthMode.VERTICAL) + l3 = Line(l2 @ 1, (0, 8)) + mirror(about=Plane.YZ) + make_face() + extrude(amount=115 / 2, both=True, mode=Mode.SUBTRACT) + + print(f"\npart mass = {p.part.volume*densa:0.2f}") + assert p.part.volume * densa == pytest.approx(797.15, 0.01) + + benchmark(model) + + +def test_ppp_0102(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-02 Post Cap + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + # TTT Party Pack 01: PPP0102, mass(abs) = 43.09g + with BuildPart() as p: + with BuildSketch(Plane.XZ) as sk1: + Rectangle(49, 48 - 8, align=(Align.CENTER, Align.MIN)) + Rectangle(9, 48, align=(Align.CENTER, Align.MIN)) + with Locations((9 / 2, 40)): + Ellipse(20, 8) + split(bisect_by=Plane.YZ) + revolve(axis=Axis.Z) + + with BuildSketch(Plane.YZ.offset(-15)) as xc1: + with Locations((0, 40 / 2 - 17)): + Ellipse(10 / 2, 4 / 2) + with BuildLine(Plane.XZ) as l1: + CenterArc((-15, 40 / 2), 17, 90, 180) + sweep(path=l1) + + fillet( + p.edges().filter_by(GeomType.CIRCLE, reverse=True).group_by(Axis.X)[0], + 1, + ) + + with BuildLine(mode=Mode.PRIVATE) as lc1: + PolarLine( + (42 / 2, 0), 37, 94, length_mode=LengthMode.VERTICAL + ) # construction line + + pts = [ + (0, 0), + (42 / 2, 0), + ((lc1.line @ 1).X, (lc1.line @ 1).Y), + (0, (lc1.line @ 1).Y), + ] + with BuildSketch(Plane.XZ) as sk2: + Polygon(*pts, align=None) + fillet(sk2.vertices().group_by(Axis.X)[1], 3) + revolve(axis=Axis.Z, mode=Mode.SUBTRACT) + + # print(f"\npart mass = {p.part.volume*densa:0.2f}") + assert p.part.volume * densc == pytest.approx(43.09, 0.01) + + benchmark(model) + + +def test_ppp_0103(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-03 C Clamp Base + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + with BuildPart() as ppp0103: + with BuildSketch() as sk1: + RectangleRounded(34 * 2, 95, 18) + with Locations((0, -2)): + RectangleRounded((34 - 16) * 2, 95 - 18 - 14, 7, mode=Mode.SUBTRACT) + with Locations((-34 / 2, 0)): + Rectangle(34, 95, 0, mode=Mode.SUBTRACT) + extrude(amount=16) + with BuildSketch(Plane.XZ.offset(-95 / 2)) as cyl1: + with Locations((0, 16 / 2)): + Circle(16 / 2) + extrude(amount=18) + with BuildSketch(Plane.XZ.offset(95 / 2 - 14)) as cyl2: + with Locations((0, 16 / 2)): + Circle(16 / 2) + extrude(amount=23) + with Locations(Plane.XZ.offset(95 / 2 + 9)): + with Locations((0, 16 / 2)): + CounterSinkHole(5.5 / 2, 11.2 / 2, None, 90) + + assert ppp0103.part.volume * densb == pytest.approx(96.13, 0.01) + + benchmark(model) + + +def test_ppp_0104(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-04 Angle Bracket + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + d1, d2, d3 = 38, 26, 16 + h1, h2, h3, h4 = 20, 8, 7, 23 + w1, w2, w3 = 80, 10, 5 + f1, f2, f3 = 4, 10, 5 + sloth1, sloth2 = 18, 12 + slotw1, slotw2 = 17, 14 + + with BuildPart() as p: + with BuildSketch() as s: + Circle(d1 / 2) + extrude(amount=h1) + with BuildSketch(Plane.XY.offset(h1)) as s2: + Circle(d2 / 2) + extrude(amount=h2) + with BuildSketch(Plane.YZ) as s3: + Rectangle(d1 + 15, h3, align=(Align.CENTER, Align.MIN)) + extrude(amount=w1 - d1 / 2) + # fillet workaround \/ + ped = p.part.edges().group_by(Axis.Z)[2].filter_by(GeomType.CIRCLE) + fillet(ped, f1) + with BuildSketch(Plane.YZ) as s3a: + Rectangle(d1 + 15, 15, align=(Align.CENTER, Align.MIN)) + Rectangle(d1, 15, mode=Mode.SUBTRACT, align=(Align.CENTER, Align.MIN)) + extrude(amount=w1 - d1 / 2, mode=Mode.SUBTRACT) + # end fillet workaround /\ + with BuildSketch() as s4: + Circle(d3 / 2) + extrude(amount=h1 + h2, mode=Mode.SUBTRACT) + with BuildSketch() as s5: + with Locations((w1 - d1 / 2 - w2 / 2, 0)): + Rectangle(w2, d1) + extrude(amount=-h4) + fillet(p.part.edges().group_by(Axis.X)[-1].sort_by(Axis.Z)[-1], f2) + fillet(p.part.edges().group_by(Axis.X)[-4].sort_by(Axis.Z)[-2], f3) + pln = Plane.YZ.offset(w1 - d1 / 2) + with BuildSketch(pln) as s6: + with Locations((0, -h4)): + SlotOverall(slotw1 * 2, sloth1, 90) + extrude(amount=-w3, mode=Mode.SUBTRACT) + with BuildSketch(pln) as s6b: + with Locations((0, -h4)): + SlotOverall(slotw2 * 2, sloth2, 90) + extrude(amount=-w2, mode=Mode.SUBTRACT) + + # print(f"\npart mass = {p.part.volume*densa:0.2f}") + assert p.part.volume * densa == pytest.approx(310.00, 0.01) + + benchmark(model) + + +def test_ppp_0105(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-05 Paste Sleeve + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + with BuildPart() as p: + with BuildSketch() as s: + SlotOverall(45, 38) + offset(amount=3) + with BuildSketch(Plane.XY.offset(133 - 30)) as s2: + SlotOverall(60, 4) + offset(amount=3) + loft() + + with BuildSketch() as s3: + SlotOverall(45, 38) + with BuildSketch(Plane.XY.offset(133 - 30)) as s4: + SlotOverall(60, 4) + loft(mode=Mode.SUBTRACT) + + extrude(p.part.faces().sort_by(Axis.Z)[0], amount=30) + + # print(f"\npart mass = {p.part.volume*densc:0.2f}") + assert p.part.volume * densc == pytest.approx(57.08, 0.01) + + benchmark(model) + + +def test_ppp_0106(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-06 Bearing Jig + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + r1, r2, r3, r4, r5 = 30 / 2, 13 / 2, 12 / 2, 10, 6 # radii used + x1 = 44 # lengths used + y1, y2, y3, y4, y_tot = 36, 36 - 22 / 2, 22 / 2, 42, 69 # widths used + + with BuildSketch(Location((0, -r1, y3))) as sk_body: + with BuildLine() as l: + c1 = Line((r1, 0), (r1, y_tot), mode=Mode.PRIVATE) # construction line + m1 = Line((0, y_tot), (x1 / 2, y_tot)) + m2 = JernArc(m1 @ 1, m1 % 1, r4, -90 - 45) + m3 = IntersectingLine(m2 @ 1, m2 % 1, c1) + m4 = Line(m3 @ 1, (r1, r1)) + m5 = JernArc(m4 @ 1, m4 % 1, r1, -90) + m6 = Line(m5 @ 1, m1 @ 0) + mirror(make_face(l.line), Plane.YZ) + fillet(sk_body.vertices().group_by(Axis.Y)[1], 12) + with Locations((x1 / 2, y_tot - 10), (-x1 / 2, y_tot - 10)): + Circle(r2, mode=Mode.SUBTRACT) + # Keyway + with Locations((0, r1)): + Circle(r3, mode=Mode.SUBTRACT) + Rectangle(4, 3 + 6, align=(Align.CENTER, Align.MIN), mode=Mode.SUBTRACT) + + with BuildPart() as p: + Box(200, 200, 22) # Oversized plate + # Cylinder underneath + Cylinder(r1, y2, align=(Align.CENTER, Align.CENTER, Align.MAX)) + fillet(p.edges(Select.NEW), r5) # Weld together + extrude(sk_body.sketch, amount=-y1, mode=Mode.INTERSECT) # Cut to shape + # Remove slot + with Locations((0, y_tot - r1 - y4, 0)): + Box( + y_tot, + y_tot, + 10, + align=(Align.CENTER, Align.MIN, Align.CENTER), + mode=Mode.SUBTRACT, + ) + + # print(f"\npart mass = {p.part.volume*densa:0.2f}") + assert p.part.volume * densa == pytest.approx(328.02, 0.01) + + benchmark(model) + + +def test_ppp_0107(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-07 Flanged Hub + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + with BuildPart() as p: + with BuildSketch() as s: + Circle(130 / 2) + extrude(amount=8) + with BuildSketch(Plane.XY.offset(8)) as s2: + Circle(84 / 2) + extrude(amount=25 - 8) + with BuildSketch(Plane.XY.offset(25)) as s3: + Circle(35 / 2) + extrude(amount=52 - 25) + with BuildSketch() as s4: + Circle(73 / 2) + extrude(amount=18, mode=Mode.SUBTRACT) + pln2 = p.part.faces().sort_by(Axis.Z)[5] + with BuildSketch(Plane.XY.offset(52)) as s5: + Circle(20 / 2) + extrude(amount=-52, mode=Mode.SUBTRACT) + fillet( + p.part.edges() + .filter_by(GeomType.CIRCLE) + .sort_by(Axis.Z)[2:-2] + .sort_by(SortBy.RADIUS)[1:], + 3, + ) + pln = Plane(pln2) + pln.origin = pln.origin + Vector(20 / 2, 0, 0) + pln = pln.rotated((0, 45, 0)) + pln = pln.offset(-25 + 3 + 0.10) + with BuildSketch(pln) as s6: + Rectangle((73 - 35) / 2 * 1.414 + 5, 3) + zz = extrude(amount=15, taper=-20 / 2, mode=Mode.PRIVATE) + zz2 = split(zz, bisect_by=Plane.XY.offset(25), mode=Mode.PRIVATE) + zz3 = split(zz2, bisect_by=Plane.YZ.offset(35 / 2 - 1), mode=Mode.PRIVATE) + with PolarLocations(0, 3): + add(zz3) + with Locations(Plane.XY.offset(8)): + with PolarLocations(107.95 / 2, 6): + CounterBoreHole(6 / 2, 13 / 2, 4) + + # print(f"\npart mass = {p.part.volume*densb:0.2f}") + assert p.part.volume * densb == pytest.approx(372.99, 0.01) + + benchmark(model) + + +def test_ppp_0108(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-08 Tie Plate + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + with BuildPart() as p: + with BuildSketch() as s1: + Rectangle(188 / 2 - 33, 162, align=(Align.MIN, Align.CENTER)) + with Locations((188 / 2 - 33, 0)): + SlotOverall(190, 33 * 2, rotation=90) + mirror(about=Plane.YZ) + with GridLocations(188 - 2 * 33, 190 - 2 * 33, 2, 2): + Circle(29 / 2, mode=Mode.SUBTRACT) + Circle(84 / 2, mode=Mode.SUBTRACT) + extrude(amount=16) + + with BuildPart() as p2: + with BuildSketch(Plane.XZ) as s2: + with BuildLine() as l1: + l1 = Polyline( + (222 / 2 + 14 - 40 - 40, 0), + (222 / 2 + 14 - 40, -35 + 16), + (222 / 2 + 14, -35 + 16), + (222 / 2 + 14, -35 + 16 + 30), + (222 / 2 + 14 - 40 - 40, -35 + 16 + 30), + close=True, + ) + make_face() + with Locations((222 / 2, -35 + 16 + 14)): + Circle(11 / 2, mode=Mode.SUBTRACT) + extrude(amount=20 / 2, both=True) + with BuildSketch() as s3: + with Locations(l1 @ 0): + Rectangle(40 + 40, 8, align=(Align.MIN, Align.CENTER)) + with Locations((40, 0)): + Rectangle(40, 20, align=(Align.MIN, Align.CENTER)) + extrude(amount=30, both=True, mode=Mode.INTERSECT) + mirror(about=Plane.YZ) + + # print(f"\npart mass = {p.part.volume*densa:0.2f}") + assert p.part.volume * densa == pytest.approx(3387.06, 0.01) + + benchmark(model) + + +def test_ppp_0109(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-09 Corner Tie + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + with BuildPart() as ppp109: + with BuildSketch() as one: + Rectangle(69, 75, align=(Align.MAX, Align.CENTER)) + fillet(one.vertices().group_by(Axis.X)[0], 17) + extrude(amount=13) + centers = [ + arc.arc_center + for arc in ppp109.edges() + .filter_by(GeomType.CIRCLE) + .group_by(Axis.Z)[-1] + ] + with Locations(*centers): + CounterBoreHole( + radius=8 / 2, counter_bore_radius=15 / 2, counter_bore_depth=4 + ) + + with BuildSketch(Plane.YZ) as two: + with Locations((0, 45)): + Circle(15) + with BuildLine() as bl: + c = Line((75 / 2, 0), (75 / 2, 60), mode=Mode.PRIVATE) + u = two.edge().find_tangent(75 / 2 + 90)[ + 0 + ] # where is the slope 75/2? + l1 = IntersectingLine( + two.edge().position_at(u), -two.edge().tangent_at(u), other=c + ) + Line(l1 @ 0, (0, 45)) + Polyline((0, 0), c @ 0, l1 @ 1) + mirror(about=Plane.YZ) + make_face() + with Locations((0, 45)): + Circle(12 / 2, mode=Mode.SUBTRACT) + extrude(amount=-13) + + with BuildSketch( + Plane((0, 0, 0), x_dir=(1, 0, 0), z_dir=(1, 0, 1)) + ) as three: + Rectangle(45 * 2 / sqrt(2) - 37.5, 75, align=(Align.MIN, Align.CENTER)) + with Locations(three.edges().sort_by(Axis.X)[-1].center()): + Circle(37.5) + Circle(33 / 2, mode=Mode.SUBTRACT) + split(bisect_by=Plane.YZ) + extrude(amount=6) + f = ppp109.faces().filter_by(Axis((0, 0, 0), (-1, 0, 1)))[0] + # extrude(f, until=Until.NEXT) # throws a warning + extrude(f, amount=10) + fillet(ppp109.edge(Select.NEW), 16) + + # print(f"\npart mass = {ppp109.part.volume*densb:0.2f}") + assert ppp109.part.volume * densb == pytest.approx(307.23, 0.01) + + benchmark(model) + + +def test_ppp_0110(benchmark): + def model(): + """ + Too Tall Toby Party Pack 01-10 Light Cap + """ + + densa = 7800 / 1e6 # carbon steel density g/mm^3 + densb = 2700 / 1e6 # aluminum alloy + densc = 1020 / 1e6 # ABS + + with BuildPart() as p: + with BuildSketch() as s: + with BuildLine() as l: + n1 = JernArc((0, 46), (1, 0), 40, -95) + n2 = Line((0, 0), (42, 0)) + make_hull() + # hack to keep arc vertex off revolution axis + split(bisect_by=Plane.XZ.offset(-45.9999), keep=Keep.TOP) + + revolve(s.sketch, axis=Axis.Y, revolution_arc=90) + extrude(faces().sort_by(Axis.Z)[-1], amount=50) + mirror(about=Plane(faces().sort_by(Axis.Z)[-1])) + mirror(about=Plane.YZ) + + with BuildPart() as p2: + add(p.part) + offset(amount=-8) + + with BuildPart() as pzzz: + add(p2.part) + split(bisect_by=Plane.XZ.offset(-46 + 16), keep=Keep.TOP) + fillet(faces().sort_by(Axis.Y)[-1].edges(), 12) + + with BuildPart() as p3: + with BuildSketch(Plane.XZ) as s2: + add(p.part.faces().sort_by(Axis.Y)[0]) + offset(amount=-8) + loft([pzzz.part.faces().sort_by(Axis.Y)[0], s2.sketch.face()]) + + with BuildPart() as ppp0110: + add(p.part) + add(pzzz.part, mode=Mode.SUBTRACT) + add(p3.part, mode=Mode.SUBTRACT) + + # print(f"\npart mass = {ppp0110.part.volume*densc:0.2f}") # 211.30 g is correct + assert ppp0110.part.volume * densc == pytest.approx(211, 1.00) + + benchmark(model) + + +def test_ttt_23_02_02(benchmark): + def model(): + """ + Creation of a complex sheet metal part + + name: ttt_sm_hanger.py + by: Gumyr + date: July 17, 2023 + + desc: + This example implements the sheet metal part described in Too Tall Toby's + sm_hanger CAD challenge. + + Notably, a BuildLine/Curve object is filleted by providing all the vertices + and allowing the fillet operation filter out the end vertices. The + make_brake_formed operation is used both in Algebra and Builder mode to + create a sheet metal part from just an outline and some dimensions. + license: + + Copyright 2023 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + """ + densa = 7800 / 1e6 # carbon steel density g/mm^3 + sheet_thickness = 4 * MM + + # Create the main body from a side profile + with BuildPart() as side: + d = Vector(1, 0, 0).rotate(Axis.Y, 60) + with BuildLine(Plane.XZ) as side_line: + l1 = Line((0, 65), (170 / 2, 65)) + l2 = PolarLine( + l1 @ 1, length=65, direction=d, length_mode=LengthMode.VERTICAL + ) + l3 = Line(l2 @ 1, (170 / 2, 0)) + fillet(side_line.vertices(), 7) + make_brake_formed( + thickness=sheet_thickness, + station_widths=[40, 40, 40, 112.52 / 2, 112.52 / 2, 112.52 / 2], + side=Side.RIGHT, + ) + fe = side.edges().filter_by(Axis.Z).group_by(Axis.Z)[0].sort_by(Axis.Y)[-1] + fillet(fe, radius=7) + + # Create the "wings" at the top + with BuildPart() as wing: + with BuildLine(Plane.YZ) as wing_line: + l1 = Line((0, 65), (80 / 2 + 1.526 * sheet_thickness, 65)) + PolarLine( + l1 @ 1, 20.371288916, direction=Vector(0, 1, 0).rotate(Axis.X, -75) + ) + fillet(wing_line.vertices(), 7) + make_brake_formed( + thickness=sheet_thickness, + station_widths=110 / 2, + side=Side.RIGHT, + ) + bottom_edge = wing.edges().group_by(Axis.X)[-1].sort_by(Axis.Z)[0] + fillet(bottom_edge, radius=7) + + # Create the tab at the top in Algebra mode + tab_line = Plane.XZ * Polyline( + (20, 65 - sheet_thickness), (56 / 2, 65 - sheet_thickness), (56 / 2, 88) + ) + tab_line = fillet(tab_line.vertices(), 7) + tab = make_brake_formed(sheet_thickness, 8, tab_line, Side.RIGHT) + tab = fillet( + tab.edges().filter_by(Axis.X).group_by(Axis.Z)[-1].sort_by(Axis.Y)[-1], 5 + ) + tab -= Pos((0, 0, 80)) * Rot(0, 90, 0) * Hole(5, 100) + + # Combine the parts together + with BuildPart() as sm_hanger: + add([side.part, wing.part]) + mirror(about=Plane.XZ) + with BuildSketch(Plane.XY.offset(65)) as h1: + with Locations((20, 0)): + Rectangle(30, 30, align=(Align.MIN, Align.CENTER)) + fillet(h1.vertices().group_by(Axis.X)[-1], 7) + SlotCenterPoint((154, 0), (154 / 2, 0), 20) + extrude(amount=-40, mode=Mode.SUBTRACT) + with BuildSketch() as h2: + SlotCenterPoint((206, 0), (206 / 2, 0), 20) + extrude(amount=40, mode=Mode.SUBTRACT) + add(tab) + mirror(about=Plane.YZ) + mirror(about=Plane.XZ) + + # print(f"Mass: {sm_hanger.part.volume*7800*1e-6:0.1f} g") + assert sm_hanger.part.volume * densa == pytest.approx(1028, 10) + + benchmark(model) + +# def test_ttt_23_T_24(benchmark): +# excluding because it requires sympy + +def test_ttt_24_SPO_06(benchmark): + def model(): + densa = 7800 / 1e6 # carbon steel density g/mm^3 + + with BuildPart() as p: + with BuildSketch() as xy: + with BuildLine(): + l1 = ThreePointArc((5 / 2, -1.25), (5.5 / 2, 0), (5 / 2, 1.25)) + Polyline(l1 @ 0, (0, -1.25), (0, 1.25), l1 @ 1) + make_face() + extrude(amount=4) + + with BuildSketch(Plane.YZ) as yz: + Trapezoid(2.5, 4, 90 - 6, align=(Align.CENTER, Align.MIN)) + _, arc_center, arc_radius = full_round( + yz.edges().sort_by(SortBy.LENGTH)[0] + ) + extrude(amount=10, mode=Mode.INTERSECT) + + # To avoid OCCT problems, don't attempt to extend the top arc, remove instead + with BuildPart(mode=Mode.SUBTRACT) as internals: + y = p.edges().filter_by(Axis.X).sort_by(Axis.Z)[-1].center().Z + + with BuildSketch(Plane.YZ.offset(4.25 / 2)) as yz: + Trapezoid(2.5, y, 90 - 6, align=(Align.CENTER, Align.MIN)) + with Locations(arc_center): + Circle(arc_radius, mode=Mode.SUBTRACT) + extrude(amount=-(4.25 - 3.5) / 2) + + with BuildSketch(Plane.YZ.offset(3.5 / 2)) as yz: + Trapezoid(2.5, 4, 90 - 6, align=(Align.CENTER, Align.MIN)) + extrude(amount=-3.5 / 2) + + with BuildSketch(Plane.XZ.offset(-2)) as xz: + with Locations((0, 4)): + RectangleRounded(4.25, 7.5, 0.5) + extrude(amount=4, mode=Mode.INTERSECT) + + with Locations( + p.faces(Select.LAST).filter_by(GeomType.PLANE).sort_by(Axis.Z)[-1] + ): + CounterBoreHole(0.625 / 2, 1.25 / 2, 0.5) + + with BuildSketch(Plane.YZ) as rib: + with Locations((0, 0.25)): + Trapezoid(0.5, 1, 90 - 8, align=(Align.CENTER, Align.MIN)) + full_round(rib.edges().sort_by(SortBy.LENGTH)[0]) + extrude(amount=4.25 / 2) + + mirror(about=Plane.YZ) + + # part = scale(p.part, IN) + # print(f"\npart weight = {part.volume*7800e-6/LB:0.2f} lbs") + assert p.part.scale(IN).volume * densa / LB == pytest.approx(3.92, 0.03) + + benchmark(model) From 357abf36dbc4e282eb2a5431ffa3a1ddad8c6415 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 16:49:17 -0600 Subject: [PATCH 086/518] action.yml -> rem pytest-benchmark from main setup --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 2bccaa6..fdb5eba 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -14,5 +14,5 @@ runs: - name: Install Requirements shell: bash run: | - pip install wheel mypy pytest pytest-benchmark pytest-cov pylint + pip install wheel mypy pytest pytest-cov pylint pip install . From 027517ffd6284e2e0b966033f78fd90b3c60e9e1 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 16:54:05 -0600 Subject: [PATCH 087/518] benchmark.yml -> enable for all workflows --- .github/workflows/benchmark.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index d884408..7332a56 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -1,7 +1,6 @@ name: benchmarks -on: [workflow_dispatch] -# on: [push, pull_request, workflow_dispatch] +on: [push, pull_request, workflow_dispatch] jobs: tests: From f8456b28b9c292a0f4e9621607f49b7e3dbf6f9c Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 19:25:27 -0500 Subject: [PATCH 088/518] Update mypy global options to ignore imports --- mypy.ini | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/mypy.ini b/mypy.ini index 2180a44..530ce58 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,24 +1,31 @@ # Global options: +ignore_missing_imports = True [mypy] -[mypy-OCP.*] -ignore_missing_imports = True - [mypy-anytree.*] ignore_missing_imports = True -[mypy-svgpathtools.*] -ignore_missing_imports = True - -[mypy-vtkmodules.*] -ignore_missing_imports = True - [mypy-build123d.topology.jupyter_tools.*] ignore_missing_imports = True [mypy-IPython.lib.pretty.*] ignore_missing_imports = True +[mypy-numpy.*] +ignore_missing_imports = True + +[mypy-OCP.*] +ignore_missing_imports = True + +[mypy-scipy.*] +ignore_missing_imports = True + [mypy-svgpathtools.*] ignore_missing_imports = True + +[mypy-svgpathtools.*] +ignore_missing_imports = True + +[mypy-vtkmodules.*] +ignore_missing_imports = True From 563083f37e47d186d99df08f5c7ee22eb7a26f2c Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 7 Jan 2025 19:32:03 -0500 Subject: [PATCH 089/518] Fix mypy.ini --- mypy.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mypy.ini b/mypy.ini index 530ce58..971aa30 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,6 +1,5 @@ # Global options: -ignore_missing_imports = True [mypy] [mypy-anytree.*] @@ -24,8 +23,5 @@ ignore_missing_imports = True [mypy-svgpathtools.*] ignore_missing_imports = True -[mypy-svgpathtools.*] -ignore_missing_imports = True - [mypy-vtkmodules.*] ignore_missing_imports = True From 344760e54179e5952475f7815c743d5b15ff14a0 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 21:40:24 -0600 Subject: [PATCH 090/518] Update mypy.yml --- .github/workflows/mypy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 6a3e7f7..9008650 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -1,6 +1,6 @@ name: Run type checker -on: [push, pull_request, workflow_dispatch] +on: [push, pull_request] jobs: typecheck: strategy: From 65ac2504b5f2ab9bda1c907df28059ddf1dccbbc Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 21:44:25 -0600 Subject: [PATCH 091/518] upgrade to python 310 syntax --- src/build123d/build_common.py | 58 ++++++++-------- src/build123d/build_enums.py | 2 +- src/build123d/build_line.py | 4 +- src/build123d/build_part.py | 4 +- src/build123d/build_sketch.py | 4 +- src/build123d/drafting.py | 22 +++--- src/build123d/exporters.py | 52 +++++++------- src/build123d/exporters3d.py | 8 +-- src/build123d/geometry.py | 100 +++++++++++++-------------- src/build123d/importers.py | 14 ++-- src/build123d/joints.py | 14 ++-- src/build123d/jupyter_tools.py | 2 +- src/build123d/mesher.py | 12 ++-- src/build123d/objects_curve.py | 24 ++++--- src/build123d/objects_part.py | 16 ++--- src/build123d/objects_sketch.py | 32 +++++---- src/build123d/operations_generic.py | 56 +++++++-------- src/build123d/operations_part.py | 24 ++++--- src/build123d/operations_sketch.py | 10 +-- src/build123d/pack.py | 8 ++- src/build123d/topology/__init__.py | 1 - src/build123d/topology/composite.py | 20 +++--- src/build123d/topology/one_d.py | 12 ++-- src/build123d/topology/shape_core.py | 19 ++--- src/build123d/topology/three_d.py | 12 ++-- src/build123d/topology/two_d.py | 10 +-- src/build123d/topology/utils.py | 12 ++-- src/build123d/topology/zero_d.py | 4 +- 28 files changed, 296 insertions(+), 260 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index f2f42c5..d77c734 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -50,8 +50,12 @@ import functools from abc import ABC, abstractmethod from itertools import product from math import sqrt, cos, pi -from typing import Any, Callable, Iterable, Optional, Union, TypeVar -from typing_extensions import Self, ParamSpec, Concatenate +from typing import Any, Optional, Union, TypeVar + +from collections.abc import Callable, Iterable +from typing_extensions import Self, ParamSpec + +from typing import Concatenate from build123d.build_enums import Align, Mode, Select, Unit from build123d.geometry import ( @@ -191,7 +195,7 @@ class Builder(ABC): # pylint: disable=too-many-instance-attributes # Context variable used to by Objects and Operations to link to current builder instance - _current: contextvars.ContextVar["Builder"] = contextvars.ContextVar( + _current: contextvars.ContextVar[Builder] = contextvars.ContextVar( "Builder._current" ) @@ -220,7 +224,7 @@ class Builder(ABC): def __init__( self, - *workplanes: Union[Face, Plane, Location], + *workplanes: Face | Plane | Location, mode: Mode = Mode.ADD, ): self.mode = mode @@ -237,7 +241,7 @@ class Builder(ABC): self.lasts: dict = {Vertex: [], Edge: [], Face: [], Solid: []} self.workplanes_context = None self.exit_workplanes = None - self.obj_before: Optional[Shape] = None + self.obj_before: Shape | None = None self.to_combine: list[Shape] = [] def __enter__(self): @@ -305,12 +309,12 @@ class Builder(ABC): logger.info("Exiting %s", type(self).__name__) @abstractmethod - def _add_to_pending(self, *objects: Union[Edge, Face], face_plane: Plane = None): + def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane = None): """Integrate a sequence of objects into existing builder object""" return NotImplementedError # pragma: no cover @classmethod - def _get_context(cls, caller: Union[Builder, str] = None, log: bool = True) -> Self: + def _get_context(cls, caller: Builder | str = None, log: bool = True) -> Self: """Return the instance of the current builder""" result = cls._current.get(None) context_name = "None" if result is None else type(result).__name__ @@ -328,7 +332,7 @@ class Builder(ABC): def _add_to_context( self, - *objects: Union[Edge, Wire, Face, Solid, Compound], + *objects: Edge | Wire | Face | Solid | Compound, faces_to_pending: bool = True, clean: bool = True, mode: Mode = Mode.ADD, @@ -370,7 +374,7 @@ class Builder(ABC): num_stored = sum(len(t) for t in typed.values()) # Generate an exception if not processing exceptions if len(objects) != num_stored and not sys.exc_info()[1]: - unsupported = set(objects) - set(v for l in typed.values() for v in l) + unsupported = set(objects) - {v for l in typed.values() for v in l} if unsupported != {None}: raise ValueError(f"{self._tag} doesn't accept {unsupported}") @@ -713,7 +717,7 @@ class Builder(ABC): ) return all_solids[0] - def _shapes(self, obj_type: Union[Vertex, Edge, Face, Solid] = None) -> ShapeList: + def _shapes(self, obj_type: Vertex | Edge | Face | Solid = None) -> ShapeList: """Extract Shapes""" obj_type = self._shape if obj_type is None else obj_type if obj_type == Vertex: @@ -729,7 +733,7 @@ class Builder(ABC): return result def validate_inputs( - self, validating_class, objects: Union[Shape, Iterable[Shape]] = None + self, validating_class, objects: Shape | Iterable[Shape] = None ): """Validate that objects/operations and parameters apply""" @@ -821,7 +825,7 @@ class LocationList: """ # Context variable used to link to LocationList instance - _current: contextvars.ContextVar["LocationList"] = contextvars.ContextVar( + _current: contextvars.ContextVar[LocationList] = contextvars.ContextVar( "ContextList._current" ) @@ -931,7 +935,7 @@ class HexLocations(LocationList): x_count: int, y_count: int, major_radius: bool = False, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), ): # pylint: disable=too-many-locals @@ -1065,15 +1069,15 @@ class Locations(LocationList): def __init__( self, - *pts: Union[ - VectorLike, - Vertex, - Location, - Face, - Plane, - Axis, - Iterable[VectorLike, Vertex, Location, Face, Plane, Axis], - ], + *pts: ( + VectorLike | + Vertex | + Location | + Face | + Plane | + Axis | + Iterable[VectorLike, Vertex, Location, Face, Plane, Axis] + ), ): local_locations = [] for point in flatten_sequence(*pts): @@ -1155,7 +1159,7 @@ class GridLocations(LocationList): y_spacing: float, x_count: int, y_count: int, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), ): if x_count < 1 or y_count < 1: raise ValueError( @@ -1209,18 +1213,18 @@ class WorkplaneList: """ # Context variable used to link to WorkplaneList instance - _current: contextvars.ContextVar["WorkplaneList"] = contextvars.ContextVar( + _current: contextvars.ContextVar[WorkplaneList] = contextvars.ContextVar( "WorkplaneList._current" ) - def __init__(self, *workplanes: Union[Face, Plane, Location]): + def __init__(self, *workplanes: Face | Plane | Location): self._reset_tok = None self.workplanes = WorkplaneList._convert_to_planes(workplanes) self.locations_context = None self.plane_index = 0 @staticmethod - def _convert_to_planes(objs: Iterable[Union[Face, Plane, Location]]) -> list[Plane]: + def _convert_to_planes(objs: Iterable[Face | Plane | Location]) -> list[Plane]: """Translate objects to planes""" objs = flatten_sequence(*objs) planes = [] @@ -1272,7 +1276,7 @@ class WorkplaneList: return cls._current.get(None) @classmethod - def localize(cls, *points: VectorLike) -> Union[list[Vector], Vector]: + def localize(cls, *points: VectorLike) -> list[Vector] | Vector: """Localize a sequence of points to the active workplane (only used by BuildLine where there is only one active workplane) diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index ab98131..9d890fe 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -31,7 +31,7 @@ from __future__ import annotations from enum import Enum, auto from typing import Union -from typing_extensions import TypeAlias +from typing import TypeAlias class Align(Enum): diff --git a/src/build123d/build_line.py b/src/build123d/build_line.py index 2822c3d..6657cbe 100644 --- a/src/build123d/build_line.py +++ b/src/build123d/build_line.py @@ -79,7 +79,7 @@ class BuildLine(Builder): def __init__( self, - workplane: Union[Face, Plane, Location] = Plane.XY, + workplane: Face | Plane | Location = Plane.XY, mode: Mode = Mode.ADD, ): self.line: Curve = None @@ -126,6 +126,6 @@ class BuildLine(Builder): """solid() not implemented""" raise NotImplementedError("solid() doesn't apply to BuildLine") - def _add_to_pending(self, *objects: Union[Edge, Face], face_plane: Plane = None): + def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane = None): """_add_to_pending not implemented""" raise NotImplementedError("_add_to_pending doesn't apply to BuildLine") diff --git a/src/build123d/build_part.py b/src/build123d/build_part.py index 11911c6..f8354f8 100644 --- a/src/build123d/build_part.py +++ b/src/build123d/build_part.py @@ -79,7 +79,7 @@ class BuildPart(Builder): def __init__( self, - *workplanes: Union[Face, Plane, Location], + *workplanes: Face | Plane | Location, mode: Mode = Mode.ADD, ): self.joints: dict[str, Joint] = {} @@ -90,7 +90,7 @@ class BuildPart(Builder): self.pending_edges: list[Edge] = [] super().__init__(*workplanes, mode=mode) - def _add_to_pending(self, *objects: Union[Edge, Face], face_plane: Plane = None): + def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane = None): """Add objects to BuildPart pending lists Args: diff --git a/src/build123d/build_sketch.py b/src/build123d/build_sketch.py index 8b4e053..26423bd 100644 --- a/src/build123d/build_sketch.py +++ b/src/build123d/build_sketch.py @@ -87,7 +87,7 @@ class BuildSketch(Builder): def __init__( self, - *workplanes: Union[Face, Plane, Location], + *workplanes: Face | Plane | Location, mode: Mode = Mode.ADD, ): self.mode = mode @@ -103,7 +103,7 @@ class BuildSketch(Builder): """solid() not implemented""" raise NotImplementedError("solid() doesn't apply to BuildSketch") - def consolidate_edges(self) -> Union[Wire, list[Wire]]: + def consolidate_edges(self) -> Wire | list[Wire]: """Unify pending edges into one or more Wires""" wires = Wire.combine(self.pending_edges) return wires if len(wires) > 1 else wires[0] diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index 171e669..e2929e1 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -29,7 +29,9 @@ license: from dataclasses import dataclass from datetime import date from math import copysign, floor, gcd, log2, pi -from typing import ClassVar, Iterable, Optional, Union +from typing import ClassVar, Optional, Union + +from collections.abc import Iterable from build123d.build_common import IN, MM from build123d.build_enums import ( @@ -112,7 +114,7 @@ class Arrow(BaseSketchObject): def __init__( self, arrow_size: float, - shaft_path: Union[Edge, Wire], + shaft_path: Edge | Wire, shaft_width: float, head_at_start: bool = True, head_type: HeadType = HeadType.CURVED, @@ -221,8 +223,8 @@ class Draft: def _number_with_units( self, number: float, - tolerance: Union[float, tuple[float, float]] = None, - display_units: Optional[bool] = None, + tolerance: float | tuple[float, float] = None, + display_units: bool | None = None, ) -> str: """Convert a raw number to a unit of measurement string based on the class settings""" @@ -272,7 +274,7 @@ class Draft: return return_value @staticmethod - def _process_path(path: PathDescriptor) -> Union[Edge, Wire]: + def _process_path(path: PathDescriptor) -> Edge | Wire: """Convert a PathDescriptor into a Edge/Wire""" if isinstance(path, (Edge, Wire)): processed_path = path @@ -296,7 +298,7 @@ class Draft: label: str, line_wire: Wire, label_angle: bool, - tolerance: Optional[Union[float, tuple[float, float]]], + tolerance: float | tuple[float, float] | None, ) -> str: """Create the str to use as the label text""" line_length = line_wire.length @@ -317,7 +319,7 @@ class Draft: @staticmethod def _sketch_location( - path: Union[Edge, Wire], u_value: float, flip: bool = False + path: Edge | Wire, u_value: float, flip: bool = False ) -> Location: """Given a path on Plane.XY, determine the Location for object placement""" angle = path.tangent_angle_at(u_value) + int(flip) * 180 @@ -370,7 +372,7 @@ class DimensionLine(BaseSketchObject): sketch: Sketch = None, label: str = None, arrows: tuple[bool, bool] = (True, True), - tolerance: Union[float, tuple[float, float]] = None, + tolerance: float | tuple[float, float] = None, label_angle: bool = False, mode: Mode = Mode.ADD, ) -> Sketch: @@ -508,7 +510,7 @@ class ExtensionLine(BaseSketchObject): sketch: Sketch = None, label: str = None, arrows: tuple[bool, bool] = (True, True), - tolerance: Union[float, tuple[float, float]] = None, + tolerance: float | tuple[float, float] = None, label_angle: bool = False, project_line: VectorLike = None, mode: Mode = Mode.ADD, @@ -622,7 +624,7 @@ class TechnicalDrawing(BaseSketchObject): def __init__( self, designed_by: str = "build123d", - design_date: Optional[date] = None, + design_date: date | None = None, page_size: PageSize = PageSize.A4, title: str = "Title", sub_title: str = "Sub Title", diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index b869ac5..9d0ba2e 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -36,7 +36,9 @@ from copy import copy from enum import Enum, auto from os import PathLike, fsdecode, fspath from pathlib import Path -from typing import Callable, Iterable, List, Optional, Tuple, Union +from typing import List, Optional, Tuple, Union + +from collections.abc import Callable, Iterable import ezdxf import svgpathtools as PT @@ -84,7 +86,7 @@ class Drawing: look_from: VectorLike = (1, -1, 1), look_up: VectorLike = (0, 0, 1), with_hidden: bool = True, - focus: Union[float, None] = None, + focus: float | None = None, ): # pylint: disable=too-many-locals hlr = HLRBRep_Algo() @@ -506,9 +508,9 @@ class ExportDXF(Export2D): self, version: str = ezdxf.DXF2013, unit: Unit = Unit.MM, - color: Optional[ColorIndex] = None, - line_weight: Optional[float] = None, - line_type: Optional[LineType] = None, + color: ColorIndex | None = None, + line_weight: float | None = None, + line_type: LineType | None = None, ): self._non_planar_point_count = 0 if unit not in self._UNITS_LOOKUP: @@ -538,9 +540,9 @@ class ExportDXF(Export2D): self, name: str, *, - color: Optional[ColorIndex] = None, - line_weight: Optional[float] = None, - line_type: Optional[LineType] = None, + color: ColorIndex | None = None, + line_weight: float | None = None, + line_type: LineType | None = None, ) -> Self: """add_layer @@ -597,7 +599,7 @@ class ExportDXF(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def add_shape(self, shape: Union[Shape, Iterable[Shape]], layer: str = "") -> Self: + def add_shape(self, shape: Shape | Iterable[Shape], layer: str = "") -> Self: """add_shape Adds a shape to the specified layer. @@ -633,7 +635,7 @@ class ExportDXF(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def write(self, file_name: Union[PathLike, str, bytes]): + def write(self, file_name: PathLike | str | bytes): """write Writes the DXF data to the specified file name. @@ -651,7 +653,7 @@ class ExportDXF(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def _convert_point(self, pt: Union[gp_XYZ, gp_Pnt, gp_Vec, Vector]) -> Vec2: + def _convert_point(self, pt: gp_XYZ | gp_Pnt | gp_Vec | Vector) -> Vec2: """Create a Vec2 from a gp_Pnt or Vector. This method also checks for points z != 0.""" if isinstance(pt, (gp_XYZ, gp_Pnt, gp_Vec)): @@ -870,14 +872,14 @@ class ExportSVG(Export2D): def __init__( self, name: str, - fill_color: Union[ColorIndex, RGB, Color, None], - line_color: Union[ColorIndex, RGB, Color, None], + fill_color: ColorIndex | RGB | Color | None, + line_color: ColorIndex | RGB | Color | None, line_weight: float, line_type: LineType, ): def convert_color( - c: Union[ColorIndex, RGB, Color, None], - ) -> Union[Color, None]: + c: ColorIndex | RGB | Color | None, + ) -> Color | None: if isinstance(c, ColorIndex): # The easydxf color indices BLACK and WHITE have the same # value (7), and are both mapped to (255,255,255) by the @@ -908,11 +910,11 @@ class ExportSVG(Export2D): margin: float = 0, fit_to_stroke: bool = True, precision: int = 6, - fill_color: Union[ColorIndex, RGB, Color, None] = None, - line_color: Union[ColorIndex, RGB, Color, None] = Export2D.DEFAULT_COLOR_INDEX, + fill_color: ColorIndex | RGB | Color | None = None, + line_color: ColorIndex | RGB | Color | None = Export2D.DEFAULT_COLOR_INDEX, line_weight: float = Export2D.DEFAULT_LINE_WEIGHT, # in millimeters line_type: LineType = Export2D.DEFAULT_LINE_TYPE, - dot_length: Union[DotLength, float] = DotLength.INKSCAPE_COMPAT, + dot_length: DotLength | float = DotLength.INKSCAPE_COMPAT, ): if unit not in ExportSVG._UNIT_STRING: raise ValueError( @@ -944,8 +946,8 @@ class ExportSVG(Export2D): self, name: str, *, - fill_color: Union[ColorIndex, RGB, Color, None] = None, - line_color: Union[ColorIndex, RGB, Color, None] = Export2D.DEFAULT_COLOR_INDEX, + fill_color: ColorIndex | RGB | Color | None = None, + line_color: ColorIndex | RGB | Color | None = Export2D.DEFAULT_COLOR_INDEX, line_weight: float = Export2D.DEFAULT_LINE_WEIGHT, # in millimeters line_type: LineType = Export2D.DEFAULT_LINE_TYPE, ) -> Self: @@ -991,7 +993,7 @@ class ExportSVG(Export2D): def add_shape( self, - shape: Union[Shape, Iterable[Shape]], + shape: Shape | Iterable[Shape], layer: str = "", reverse_wires: bool = False, ): @@ -1097,7 +1099,7 @@ class ExportSVG(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @staticmethod - def _wire_edges(wire: Wire, reverse: bool) -> List[Edge]: + def _wire_edges(wire: Wire, reverse: bool) -> list[Edge]: # edges = [] # explorer = BRepTools_WireExplorer(wire.wrapped) # while explorer.More(): @@ -1136,7 +1138,7 @@ class ExportSVG(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def _path_point(self, pt: Union[gp_Pnt, Vector]) -> complex: + def _path_point(self, pt: gp_Pnt | Vector) -> complex: """Create a complex point from a gp_Pnt or Vector. We are using complex because that is what svgpathtools wants. This method also checks for points z != 0.""" @@ -1390,7 +1392,7 @@ class ExportSVG(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def _group_for_layer(self, layer: _Layer, attribs: dict = None) -> ET.Element: - def _color_attribs(c: Color) -> Tuple[str, str]: + def _color_attribs(c: Color) -> tuple[str, str]: if c: (r, g, b, a) = tuple(c) (r, g, b, a) = (int(r * 255), int(g * 255), int(b * 255), round(a, 3)) @@ -1427,7 +1429,7 @@ class ExportSVG(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def write(self, path: Union[PathLike, str, bytes]): + def write(self, path: PathLike | str | bytes): """write Writes the SVG data to the specified file path. diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index f4e640e..b1c4dde 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -156,7 +156,7 @@ def _create_xde(to_export: Shape, unit: Unit = Unit.MM) -> TDocStd_Document: def export_brep( to_export: Shape, - file_path: Union[PathLike, str, bytes, BytesIO], + file_path: PathLike | str | bytes | BytesIO, ) -> bool: """Export this shape to a BREP file @@ -177,7 +177,7 @@ def export_brep( def export_gltf( to_export: Shape, - file_path: Union[PathLike, str, bytes], + file_path: PathLike | str | bytes, unit: Unit = Unit.MM, binary: bool = False, linear_deflection: float = 0.001, @@ -255,7 +255,7 @@ def export_gltf( def export_step( to_export: Shape, - file_path: Union[PathLike, str, bytes], + file_path: PathLike | str | bytes, unit: Unit = Unit.MM, write_pcurves: bool = True, precision_mode: PrecisionMode = PrecisionMode.AVERAGE, @@ -323,7 +323,7 @@ def export_step( def export_stl( to_export: Shape, - file_path: Union[PathLike, str, bytes], + file_path: PathLike | str | bytes, tolerance: float = 1e-3, angular_tolerance: float = 0.1, ascii_format: bool = False, diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 209ff8f..f2cdc8b 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -42,16 +42,16 @@ import numpy as np from math import degrees, pi, radians from typing import ( Any, - Iterable, List, Optional, - Sequence, Tuple, Union, overload, TypeVar, ) +from collections.abc import Iterable, Sequence + from OCP.Bnd import Bnd_Box, Bnd_OBB from OCP.BRep import BRep_Tool from OCP.BRepBndLib import BRepBndLib @@ -165,7 +165,7 @@ class Vector: ... @overload - def __init__(self, v: Union[gp_Vec, gp_Pnt, gp_Dir, gp_XYZ]): # pragma: no cover + def __init__(self, v: gp_Vec | gp_Pnt | gp_Dir | gp_XYZ): # pragma: no cover ... @overload @@ -429,7 +429,7 @@ class Vector: """Vector length operator abs()""" return self.length - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self: Plane, other: Axis | Location | Plane | VectorLike | Shape): """intersect vector with other &""" return self.intersect(other) @@ -506,19 +506,19 @@ class Vector: return Vector(self.wrapped.Rotated(axis.wrapped, pi * angle / 180)) @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and vector""" @overload - def intersect(self, location: Location) -> Union[Vector, None]: + def intersect(self, location: Location) -> Vector | None: """Find intersection of location and vector""" @overload - def intersect(self, axis: Axis) -> Union[Vector, None]: + def intersect(self, axis: Axis) -> Vector | None: """Find intersection of axis and vector""" @overload - def intersect(self, plane: Plane) -> Union[Vector, None]: + def intersect(self, plane: Plane) -> Vector | None: """Find intersection of plane and vector""" def intersect(self, *args, **kwargs): @@ -597,7 +597,7 @@ class Axis(metaclass=AxisMeta): """Axis: point and direction""" @overload - def __init__(self, edge: "Edge"): # pragma: no cover + def __init__(self, edge: Edge): # pragma: no cover """Axis: start of Edge""" def __init__(self, *args, **kwargs): @@ -774,24 +774,24 @@ class Axis(metaclass=AxisMeta): """Flip direction operator -""" return self.reverse() - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self: Plane, other: Axis | Location | Plane | VectorLike | Shape): """intersect vector with other &""" return self.intersect(other) @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and axis""" @overload - def intersect(self, location: Location) -> Union[Location, None]: + def intersect(self, location: Location) -> Location | None: """Find intersection of location and axis""" @overload - def intersect(self, axis: Axis) -> Union[Axis, None]: + def intersect(self, axis: Axis) -> Axis | None: """Find intersection of axis and axis""" @overload - def intersect(self, plane: Plane) -> Union[Axis, None]: + def intersect(self, plane: Plane) -> Axis | None: """Find intersection of plane and axis""" def intersect(self, *args, **kwargs): @@ -891,7 +891,7 @@ class BoundBox: def add( self, - obj: Union[tuple[float, float, float], Vector, BoundBox], + obj: tuple[float, float, float] | Vector | BoundBox, tol: float = None, ) -> BoundBox: """Returns a modified (expanded) bounding box @@ -933,7 +933,7 @@ class BoundBox: return BoundBox(tmp) @staticmethod - def find_outside_box_2d(bb1: BoundBox, bb2: BoundBox) -> Optional[BoundBox]: + def find_outside_box_2d(bb1: BoundBox, bb2: BoundBox) -> BoundBox | None: """Compares bounding boxes Compares bounding boxes. Returns none if neither is inside the other. @@ -1026,7 +1026,7 @@ class BoundBox: and second_box.max.Z < self.max.Z ) - def to_align_offset(self, align: Union[Align2DType, Align3DType]) -> Vector: + def to_align_offset(self, align: Align2DType | Align3DType) -> Vector: """Amount to move object to achieve the desired alignment""" return to_align_offset(self.min.to_tuple(), self.max.to_tuple(), align) @@ -1329,7 +1329,7 @@ class Location: self, translation: VectorLike, rotation: RotationLike, - ordering: Union[Extrinsic, Intrinsic], + ordering: Extrinsic | Intrinsic, ): # pragma: no cover """Location with translation with respect to the original location. If rotation is not None then the location includes the rotation (see also Rotation class) @@ -1502,7 +1502,7 @@ class Location: """Flip the orientation without changing the position operator -""" return Location(-Plane(self)) - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self: Plane, other: Axis | Location | Plane | VectorLike | Shape): """intersect axis with other &""" return self.intersect(other) @@ -1532,8 +1532,8 @@ class Location: Returns: Location as String """ - position_str = ", ".join((f"{v:.2f}" for v in self.to_tuple()[0])) - orientation_str = ", ".join((f"{v:.2f}" for v in self.to_tuple()[1])) + position_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[0]) + orientation_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[1]) return f"(p=({position_str}), o=({orientation_str}))" def __str__(self): @@ -1544,24 +1544,24 @@ class Location: Returns: Location as String """ - position_str = ", ".join((f"{v:.2f}" for v in self.to_tuple()[0])) - orientation_str = ", ".join((f"{v:.2f}" for v in self.to_tuple()[1])) + position_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[0]) + orientation_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[1]) return f"Location: (position=({position_str}), orientation=({orientation_str}))" @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and location""" @overload - def intersect(self, location: Location) -> Union[Location, None]: + def intersect(self, location: Location) -> Location | None: """Find intersection of location and location""" @overload - def intersect(self, axis: Axis) -> Union[Location, None]: + def intersect(self, axis: Axis) -> Location | None: """Find intersection of axis and location""" @overload - def intersect(self, plane: Plane) -> Union[Location, None]: + def intersect(self, plane: Plane) -> Location | None: """Find intersection of plane and location""" def intersect(self, *args, **kwargs): @@ -1641,7 +1641,7 @@ class Rotation(Location): def __init__( self, rotation: RotationLike, - ordering: Union[Extrinsic, Intrinsic] == Intrinsic.XYZ, + ordering: Extrinsic | Intrinsic == Intrinsic.XYZ, ): """Subclass of Location used only for object rotation ordering is for order of rotations in Intrinsic or Extrinsic enums""" @@ -1652,7 +1652,7 @@ class Rotation(Location): X: float = 0, Y: float = 0, Z: float = 0, - ordering: Union[Extrinsic, Intrinsic] = Intrinsic.XYZ, + ordering: Extrinsic | Intrinsic = Intrinsic.XYZ, ): """Subclass of Location used only for object rotation ordering is for order of rotations in Intrinsic or Extrinsic enums""" @@ -1760,7 +1760,7 @@ class Matrix: ... @overload - def __init__(self, matrix: Union[gp_GTrsf, gp_Trsf]) -> None: # pragma: no cover + def __init__(self, matrix: gp_GTrsf | gp_Trsf) -> None: # pragma: no cover ... @overload @@ -2016,7 +2016,7 @@ class Plane(metaclass=PlaneMeta): @overload def __init__( - self, face: "Face", x_dir: Optional[VectorLike] = None + self, face: Face, x_dir: VectorLike | None = None ): # pragma: no cover """Return a plane extending the face. Note: for non planar face this will return the underlying work plane""" @@ -2181,8 +2181,8 @@ class Plane(metaclass=PlaneMeta): return Plane(self.origin, self.x_dir, -self.z_dir) def __mul__( - self, other: Union[Location, "Shape"] - ) -> Union[Plane, List[Plane], "Shape"]: + self, other: Location | Shape + ) -> Plane | list[Plane] | Shape: if isinstance(other, Location): result = Plane(self.location * other) elif ( # LocationList @@ -2201,7 +2201,7 @@ class Plane(metaclass=PlaneMeta): ) return result - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self: Plane, other: Axis | Location | Plane | VectorLike | Shape): """intersect plane with other &""" return self.intersect(other) @@ -2213,9 +2213,9 @@ class Plane(metaclass=PlaneMeta): Returns: Plane as String """ - origin_str = ", ".join((f"{v:.2f}" for v in self._origin.to_tuple())) - x_dir_str = ", ".join((f"{v:.2f}" for v in self.x_dir.to_tuple())) - z_dir_str = ", ".join((f"{v:.2f}" for v in self.z_dir.to_tuple())) + origin_str = ", ".join(f"{v:.2f}" for v in self._origin.to_tuple()) + x_dir_str = ", ".join(f"{v:.2f}" for v in self.x_dir.to_tuple()) + z_dir_str = ", ".join(f"{v:.2f}" for v in self.z_dir.to_tuple()) return f"Plane(o=({origin_str}), x=({x_dir_str}), z=({z_dir_str}))" def reverse(self) -> Plane: @@ -2236,7 +2236,7 @@ class Plane(metaclass=PlaneMeta): gp_Ax3(self._origin.to_pnt(), self.z_dir.to_dir(), self.x_dir.to_dir()) ) - def shift_origin(self, locator: Union[Axis, VectorLike, "Vertex"]) -> Plane: + def shift_origin(self, locator: Axis | VectorLike | Vertex) -> Plane: """shift plane origin Creates a new plane with the origin moved within the plane to the point of intersection @@ -2274,7 +2274,7 @@ class Plane(metaclass=PlaneMeta): def rotated( self, rotation: VectorLike = (0, 0, 0), - ordering: Union[Extrinsic, Intrinsic] = None, + ordering: Extrinsic | Intrinsic = None, ) -> Plane: """Returns a copy of this plane, rotated about the specified axes @@ -2366,7 +2366,7 @@ class Plane(metaclass=PlaneMeta): return axis def _to_from_local_coords( - self, obj: Union[VectorLike, Any, BoundBox], to_from: bool = True + self, obj: VectorLike | Any | BoundBox, to_from: bool = True ): """_to_from_local_coords @@ -2406,7 +2406,7 @@ class Plane(metaclass=PlaneMeta): ) return return_value - def to_local_coords(self, obj: Union[VectorLike, Any, BoundBox]): + def to_local_coords(self, obj: VectorLike | Any | BoundBox): """Reposition the object relative to this plane Args: @@ -2419,7 +2419,7 @@ class Plane(metaclass=PlaneMeta): """ return self._to_from_local_coords(obj, True) - def from_local_coords(self, obj: Union[tuple, Vector, Any, BoundBox]): + def from_local_coords(self, obj: tuple | Vector | Any | BoundBox): """Reposition the object relative from this plane Args: @@ -2442,7 +2442,7 @@ class Plane(metaclass=PlaneMeta): return Location(transformation) def contains( - self, obj: Union[VectorLike, Axis], tolerance: float = TOLERANCE + self, obj: VectorLike | Axis, tolerance: float = TOLERANCE ) -> bool: """contains @@ -2467,23 +2467,23 @@ class Plane(metaclass=PlaneMeta): return return_value @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and plane""" @overload - def intersect(self, location: Location) -> Union[Location, None]: + def intersect(self, location: Location) -> Location | None: """Find intersection of location and plane""" @overload - def intersect(self, axis: Axis) -> Union[Axis, Vector, None]: + def intersect(self, axis: Axis) -> Axis | Vector | None: """Find intersection of axis and plane""" @overload - def intersect(self, plane: Plane) -> Union[Axis, None]: + def intersect(self, plane: Plane) -> Axis | None: """Find intersection of plane and plane""" @overload - def intersect(self, shape: "Shape") -> Union["Shape", None]: + def intersect(self, shape: Shape) -> Shape | None: """Find intersection of plane and shape""" def intersect(self, *args, **kwargs): @@ -2536,8 +2536,8 @@ class Plane(metaclass=PlaneMeta): def to_align_offset( min_point: VectorLike, max_point: VectorLike, - align: Union[Align2DType, Align3DType], - center: Optional[VectorLike] = None, + align: Align2DType | Align3DType, + center: VectorLike | None = None, ) -> Vector: """Amount to move object to achieve the desired alignment""" align_offset = [] diff --git a/src/build123d/importers.py b/src/build123d/importers.py index baf4dc0..fa81eca 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -93,7 +93,7 @@ topods_lut = { } -def import_brep(file_name: Union[PathLike, str, bytes]) -> Shape: +def import_brep(file_name: PathLike | str | bytes) -> Shape: """Import shape from a BREP file Args: @@ -116,7 +116,7 @@ def import_brep(file_name: Union[PathLike, str, bytes]) -> Shape: return Compound.cast(shape) -def import_step(filename: Union[PathLike, str, bytes]) -> Compound: +def import_step(filename: PathLike | str | bytes) -> Compound: """import_step Extract shapes from a STEP file and return them as a Compound object. @@ -173,7 +173,7 @@ def import_step(filename: Union[PathLike, str, bytes]) -> Compound: return shape_color - def build_assembly(parent_tdf_label: Optional[TDF_Label] = None) -> list[Shape]: + def build_assembly(parent_tdf_label: TDF_Label | None = None) -> list[Shape]: """Recursively extract object into an assembly""" sub_tdf_labels = TDF_LabelSequence() if parent_tdf_label is None: @@ -228,7 +228,7 @@ def import_step(filename: Union[PathLike, str, bytes]) -> Compound: return root -def import_stl(file_name: Union[PathLike, str, bytes]) -> Face: +def import_stl(file_name: PathLike | str | bytes) -> Face: """import_stl Extract shape from an STL file and return it as a Face reference object. @@ -255,7 +255,7 @@ def import_stl(file_name: Union[PathLike, str, bytes]) -> Face: def import_svg_as_buildline_code( - file_name: Union[PathLike, str, bytes], + file_name: PathLike | str | bytes, ) -> tuple[str, str]: """translate_to_buildline_code @@ -332,13 +332,13 @@ def import_svg_as_buildline_code( def import_svg( - svg_file: Union[str, Path, TextIO], + svg_file: str | Path | TextIO, *, flip_y: bool = True, ignore_visibility: bool = False, label_by: str = "id", is_inkscape_label: bool = False, -) -> ShapeList[Union[Wire, Face]]: +) -> ShapeList[Wire | Face]: """import_svg Args: diff --git a/src/build123d/joints.py b/src/build123d/joints.py index bb9af78..9919f09 100644 --- a/src/build123d/joints.py +++ b/src/build123d/joints.py @@ -75,8 +75,8 @@ class RigidJoint(Joint): def __init__( self, label: str, - to_part: Optional[Union[Solid, Compound]] = None, - joint_location: Union[Location, None] = None, + to_part: Solid | Compound | None = None, + joint_location: Location | None = None, ): context: BuildPart = BuildPart._get_context(self) validate_inputs(context, self) @@ -244,7 +244,7 @@ class RevoluteJoint(Joint): def __init__( self, label: str, - to_part: Union[Solid, Compound] = None, + to_part: Solid | Compound = None, axis: Axis = Axis.Z, angle_reference: VectorLike = None, angular_range: tuple[float, float] = (0, 360), @@ -353,7 +353,7 @@ class LinearJoint(Joint): def __init__( self, label: str, - to_part: Union[Solid, Compound] = None, + to_part: Solid | Compound = None, axis: Axis = Axis.Z, linear_range: tuple[float, float] = (0, inf), ): @@ -530,7 +530,7 @@ class CylindricalJoint(Joint): def __init__( self, label: str, - to_part: Union[Solid, Compound] = None, + to_part: Solid | Compound = None, axis: Axis = Axis.Z, angle_reference: VectorLike = None, linear_range: tuple[float, float] = (0, inf), @@ -680,8 +680,8 @@ class BallJoint(Joint): def __init__( self, label: str, - to_part: Optional[Union[Solid, Compound]] = None, - joint_location: Optional[Location] = None, + to_part: Solid | Compound | None = None, + joint_location: Location | None = None, angular_range: tuple[ tuple[float, float], tuple[float, float], tuple[float, float] ] = ((0, 360), (0, 360), (0, 360)), diff --git a/src/build123d/jupyter_tools.py b/src/build123d/jupyter_tools.py index 326a1c0..0fd9f64 100644 --- a/src/build123d/jupyter_tools.py +++ b/src/build123d/jupyter_tools.py @@ -216,7 +216,7 @@ def display(shape: Any) -> Javascript: Returns: Javascript: code """ - payload: List[Dict[str, Any]] = [] + payload: list[dict[str, Any]] = [] if not hasattr(shape, "wrapped"): # Is a "Shape" raise ValueError(f"Type {type(shape)} is not supported") diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index 4380bd9..aa28fa4 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -89,7 +89,9 @@ import sys import uuid import warnings from os import PathLike, fsdecode -from typing import Iterable, Union +from typing import Union + +from collections.abc import Iterable import OCP.TopAbs as ta from OCP.BRep import BRep_Tool @@ -214,7 +216,7 @@ class Mesher: name space `build123d`, name equal to the base file name and the type as `python`""" caller_file = sys._getframe().f_back.f_code.co_filename - with open(caller_file, mode="r", encoding="utf-8") as code_file: + with open(caller_file, encoding="utf-8") as code_file: source_code = code_file.read() # read whole file to a string self.add_meta_data( @@ -354,7 +356,7 @@ class Mesher: def add_shape( self, - shape: Union[Shape, Iterable[Shape]], + shape: Shape | Iterable[Shape], linear_deflection: float = 0.001, angular_deflection: float = 0.1, mesh_type: MeshType = MeshType.MODEL, @@ -483,7 +485,7 @@ class Mesher: return shape_obj - def read(self, file_name: Union[PathLike, str, bytes]) -> list[Shape]: + def read(self, file_name: PathLike | str | bytes) -> list[Shape]: """read Args: @@ -527,7 +529,7 @@ class Mesher: return shapes - def write(self, file_name: Union[PathLike, str, bytes]): + def write(self, file_name: PathLike | str | bytes): """write Args: diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 0247ba9..05b71f8 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -31,7 +31,9 @@ from __future__ import annotations import copy from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize -from typing import Iterable, Union +from typing import Union + +from collections.abc import Iterable from build123d.build_common import WorkplaneList, flatten_sequence, validate_inputs from build123d.build_enums import AngularDirection, GeomType, Keep, LengthMode, Mode @@ -197,7 +199,7 @@ class DoubleTangentArc(BaseEdgeObject): self, pnt: VectorLike, tangent: VectorLike, - other: Union[Curve, Edge, Wire], + other: Curve | Edge | Wire, keep: Keep = Keep.TOP, mode: Mode = Mode.ADD, ): @@ -489,7 +491,7 @@ class FilletPolyline(BaseLineObject): def __init__( self, - *pts: Union[VectorLike, Iterable[VectorLike]], + *pts: VectorLike | Iterable[VectorLike], radius: float, close: bool = False, mode: Mode = Mode.ADD, @@ -537,9 +539,9 @@ class FilletPolyline(BaseLineObject): for vertex, edges in vertex_to_edges.items(): if len(edges) != 2: continue - other_vertices = set( + other_vertices = { ve for e in edges for ve in e.vertices() if ve != vertex - ) + } third_edge = Edge.make_line(*[v.to_tuple() for v in other_vertices]) fillet_face = Face(Wire(edges + [third_edge])).fillet_2d(radius, [vertex]) fillets.append(fillet_face.edges().filter_by(GeomType.CIRCLE)[0]) @@ -641,7 +643,7 @@ class Line(BaseEdgeObject): _applies_to = [BuildLine._tag] def __init__( - self, *pts: Union[VectorLike, Iterable[VectorLike]], mode: Mode = Mode.ADD + self, *pts: VectorLike | Iterable[VectorLike], mode: Mode = Mode.ADD ): pts = flatten_sequence(*pts) if len(pts) != 2: @@ -677,7 +679,7 @@ class IntersectingLine(BaseEdgeObject): self, start: VectorLike, direction: VectorLike, - other: Union[Curve, Edge, Wire], + other: Curve | Edge | Wire, mode: Mode = Mode.ADD, ): context: BuildLine = BuildLine._get_context(self) @@ -777,7 +779,7 @@ class Polyline(BaseLineObject): def __init__( self, - *pts: Union[VectorLike, Iterable[VectorLike]], + *pts: VectorLike | Iterable[VectorLike], close: bool = False, mode: Mode = Mode.ADD, ): @@ -912,7 +914,7 @@ class Spline(BaseEdgeObject): def __init__( self, - *pts: Union[VectorLike, Iterable[VectorLike]], + *pts: VectorLike | Iterable[VectorLike], tangents: Iterable[VectorLike] = None, tangent_scalars: Iterable[float] = None, periodic: bool = False, @@ -972,7 +974,7 @@ class TangentArc(BaseEdgeObject): def __init__( self, - *pts: Union[VectorLike, Iterable[VectorLike]], + *pts: VectorLike | Iterable[VectorLike], tangent: VectorLike, tangent_from_first: bool = True, mode: Mode = Mode.ADD, @@ -1010,7 +1012,7 @@ class ThreePointArc(BaseEdgeObject): _applies_to = [BuildLine._tag] def __init__( - self, *pts: Union[VectorLike, Iterable[VectorLike]], mode: Mode = Mode.ADD + self, *pts: VectorLike | Iterable[VectorLike], mode: Mode = Mode.ADD ): context: BuildLine = BuildLine._get_context(self) validate_inputs(context, self) diff --git a/src/build123d/objects_part.py b/src/build123d/objects_part.py index 42b4e21..cce0175 100644 --- a/src/build123d/objects_part.py +++ b/src/build123d/objects_part.py @@ -55,9 +55,9 @@ class BasePartObject(Part): def __init__( self, - part: Union[Part, Solid], + part: Part | Solid, rotation: RotationLike = (0, 0, 0), - align: Union[Align, tuple[Align, Align, Align]] = None, + align: Align | tuple[Align, Align, Align] = None, mode: Mode = Mode.ADD, ): if align is not None: @@ -124,7 +124,7 @@ class Box(BasePartObject): width: float, height: float, rotation: RotationLike = (0, 0, 0), - align: Union[Align, tuple[Align, Align, Align]] = ( + align: Align | tuple[Align, Align, Align] = ( Align.CENTER, Align.CENTER, Align.CENTER, @@ -170,7 +170,7 @@ class Cone(BasePartObject): height: float, arc_size: float = 360, rotation: RotationLike = (0, 0, 0), - align: Union[Align, tuple[Align, Align, Align]] = ( + align: Align | tuple[Align, Align, Align] = ( Align.CENTER, Align.CENTER, Align.CENTER, @@ -322,7 +322,7 @@ class Cylinder(BasePartObject): height: float, arc_size: float = 360, rotation: RotationLike = (0, 0, 0), - align: Union[Align, tuple[Align, Align, Align]] = ( + align: Align | tuple[Align, Align, Align] = ( Align.CENTER, Align.CENTER, Align.CENTER, @@ -419,7 +419,7 @@ class Sphere(BasePartObject): arc_size2: float = 90, arc_size3: float = 360, rotation: RotationLike = (0, 0, 0), - align: Union[Align, tuple[Align, Align, Align]] = ( + align: Align | tuple[Align, Align, Align] = ( Align.CENTER, Align.CENTER, Align.CENTER, @@ -473,7 +473,7 @@ class Torus(BasePartObject): minor_end_angle: float = 360, major_angle: float = 360, rotation: RotationLike = (0, 0, 0), - align: Union[Align, tuple[Align, Align, Align]] = ( + align: Align | tuple[Align, Align, Align] = ( Align.CENTER, Align.CENTER, Align.CENTER, @@ -533,7 +533,7 @@ class Wedge(BasePartObject): xmax: float, zmax: float, rotation: RotationLike = (0, 0, 0), - align: Union[Align, tuple[Align, Align, Align]] = ( + align: Align | tuple[Align, Align, Align] = ( Align.CENTER, Align.CENTER, Align.CENTER, diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index c91d87c..0d718bb 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -31,7 +31,9 @@ from __future__ import annotations import trianglesolver from math import cos, degrees, pi, radians, sin, tan -from typing import Iterable, Union +from typing import Union + +from collections.abc import Iterable from build123d.build_common import LocationList, flatten_sequence, validate_inputs from build123d.build_enums import Align, FontStyle, Mode @@ -74,9 +76,9 @@ class BaseSketchObject(Sketch): def __init__( self, - obj: Union[Compound, Face], + obj: Compound | Face, rotation: float = 0, - align: Union[Align, tuple[Align, Align]] = None, + align: Align | tuple[Align, Align] = None, mode: Mode = Mode.ADD, ): if align is not None: @@ -121,7 +123,7 @@ class Circle(BaseSketchObject): def __init__( self, radius: float, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -155,7 +157,7 @@ class Ellipse(BaseSketchObject): x_radius: float, y_radius: float, rotation: float = 0, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -192,9 +194,9 @@ class Polygon(BaseSketchObject): def __init__( self, - *pts: Union[VectorLike, Iterable[VectorLike]], + *pts: VectorLike | Iterable[VectorLike], rotation: float = 0, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -230,7 +232,7 @@ class Rectangle(BaseSketchObject): width: float, height: float, rotation: float = 0, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -267,7 +269,7 @@ class RectangleRounded(BaseSketchObject): height: float, radius: float, rotation: float = 0, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -374,7 +376,7 @@ class SlotArc(BaseSketchObject): def __init__( self, - arc: Union[Edge, Wire], + arc: Edge | Wire, height: float, rotation: float = 0, mode: Mode = Mode.ADD, @@ -508,7 +510,7 @@ class SlotOverall(BaseSketchObject): width: float, height: float, rotation: float = 0, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): if width <= height: @@ -566,8 +568,8 @@ class Text(BaseSketchObject): font: str = "Arial", font_path: str = None, font_style: FontStyle = FontStyle.REGULAR, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), - path: Union[Edge, Wire] = None, + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + path: Edge | Wire = None, position_on_path: float = 0.0, rotation: float = 0, mode: Mode = Mode.ADD, @@ -628,7 +630,7 @@ class Trapezoid(BaseSketchObject): left_side_angle: float, right_side_angle: float = None, rotation: float = 0, - align: Union[Align, tuple[Align, Align]] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -714,7 +716,7 @@ class Triangle(BaseSketchObject): A: float = None, B: float = None, C: float = None, - align: Union[None, Align, tuple[Align, Align]] = None, + align: None | Align | tuple[Align, Align] = None, rotation: float = 0, mode: Mode = Mode.ADD, ): diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 9909cbf..67370c5 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -30,7 +30,9 @@ license: import copy import logging from math import radians, tan -from typing import Union, Iterable +from typing import Union + +from collections.abc import Iterable from build123d.build_common import ( Builder, @@ -81,8 +83,8 @@ AddType = Union[Edge, Wire, Face, Solid, Compound, Builder] def add( - objects: Union[AddType, Iterable[AddType]], - rotation: Union[float, RotationLike] = None, + objects: AddType | Iterable[AddType], + rotation: float | RotationLike = None, clean: bool = True, mode: Mode = Mode.ADD, ) -> Compound: @@ -199,9 +201,9 @@ def add( def bounding_box( - objects: Union[Shape, Iterable[Shape]] = None, + objects: Shape | Iterable[Shape] = None, mode: Mode = Mode.PRIVATE, -) -> Union[Sketch, Part]: +) -> Sketch | Part: """Generic Operation: Add Bounding Box Applies to: BuildSketch and BuildPart @@ -264,12 +266,12 @@ ChamferFilletType = Union[Edge, Vertex] def chamfer( - objects: Union[ChamferFilletType, Iterable[ChamferFilletType]], + objects: ChamferFilletType | Iterable[ChamferFilletType], length: float, length2: float = None, angle: float = None, - reference: Union[Edge, Face] = None, -) -> Union[Sketch, Part]: + reference: Edge | Face = None, +) -> Sketch | Part: """Generic Operation: chamfer Applies to 2 and 3 dimensional objects. @@ -385,9 +387,9 @@ def chamfer( def fillet( - objects: Union[ChamferFilletType, Iterable[ChamferFilletType]], + objects: ChamferFilletType | Iterable[ChamferFilletType], radius: float, -) -> Union[Sketch, Part, Curve]: +) -> Sketch | Part | Curve: """Generic Operation: fillet Applies to 2 and 3 dimensional objects. @@ -488,10 +490,10 @@ MirrorType = Union[Edge, Wire, Face, Compound, Curve, Sketch, Part] def mirror( - objects: Union[MirrorType, Iterable[MirrorType]] = None, + objects: MirrorType | Iterable[MirrorType] = None, about: Plane = Plane.XZ, mode: Mode = Mode.ADD, -) -> Union[Curve, Sketch, Part, Compound]: +) -> Curve | Sketch | Part | Compound: """Generic Operation: mirror Applies to 1, 2, and 3 dimensional objects. @@ -538,15 +540,15 @@ OffsetType = Union[Edge, Face, Solid, Compound] def offset( - objects: Union[OffsetType, Iterable[OffsetType]] = None, + objects: OffsetType | Iterable[OffsetType] = None, amount: float = 0, - openings: Union[Face, list[Face]] = None, + openings: Face | list[Face] = None, kind: Kind = Kind.ARC, side: Side = Side.BOTH, closed: bool = True, min_edge_length: float = None, mode: Mode = Mode.REPLACE, -) -> Union[Curve, Sketch, Part, Compound]: +) -> Curve | Sketch | Part | Compound: """Generic Operation: offset Applies to 1, 2, and 3 dimensional objects. @@ -682,11 +684,11 @@ ProjectType = Union[Edge, Face, Wire, Vector, Vertex] def project( - objects: Union[ProjectType, Iterable[ProjectType]] = None, + objects: ProjectType | Iterable[ProjectType] = None, workplane: Plane = None, - target: Union[Solid, Compound, Part] = None, + target: Solid | Compound | Part = None, mode: Mode = Mode.ADD, -) -> Union[Curve, Sketch, Compound, ShapeList[Vector]]: +) -> Curve | Sketch | Compound | ShapeList[Vector]: """Generic Operation: project Applies to 0, 1, and 2 dimensional objects. @@ -823,10 +825,10 @@ def project( def scale( - objects: Union[Shape, Iterable[Shape]] = None, - by: Union[float, tuple[float, float, float]] = 1, + objects: Shape | Iterable[Shape] = None, + by: float | tuple[float, float, float] = 1, mode: Mode = Mode.REPLACE, -) -> Union[Curve, Sketch, Part, Compound]: +) -> Curve | Sketch | Part | Compound: """Generic Operation: scale Applies to 1, 2, and 3 dimensional objects. @@ -903,8 +905,8 @@ SplitType = Union[Edge, Wire, Face, Solid] def split( - objects: Union[SplitType, Iterable[SplitType]] = None, - bisect_by: Union[Plane, Face, Shell] = Plane.XZ, + objects: SplitType | Iterable[SplitType] = None, + bisect_by: Plane | Face | Shell = Plane.XZ, keep: Keep = Keep.TOP, mode: Mode = Mode.REPLACE, ): @@ -966,16 +968,16 @@ SweepType = Union[Compound, Edge, Wire, Face, Solid] def sweep( - sections: Union[SweepType, Iterable[SweepType]] = None, - path: Union[Curve, Edge, Wire, Iterable[Edge]] = None, + sections: SweepType | Iterable[SweepType] = None, + path: Curve | Edge | Wire | Iterable[Edge] = None, multisection: bool = False, is_frenet: bool = False, transition: Transition = Transition.TRANSFORMED, normal: VectorLike = None, - binormal: Union[Edge, Wire] = None, + binormal: Edge | Wire = None, clean: bool = True, mode: Mode = Mode.ADD, -) -> Union[Part, Sketch]: +) -> Part | Sketch: """Generic Operation: sweep Sweep pending 1D or 2D objects along path. diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 464da38..c7f4bab 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -27,7 +27,9 @@ license: """ from __future__ import annotations -from typing import Union, Iterable +from typing import Union + +from collections.abc import Iterable from build123d.build_enums import Mode, Until, Kind, Side from build123d.build_part import BuildPart from build123d.geometry import Axis, Plane, Vector, VectorLike @@ -54,11 +56,11 @@ from build123d.build_common import ( def extrude( - to_extrude: Union[Face, Sketch] = None, + to_extrude: Face | Sketch = None, amount: float = None, dir: VectorLike = None, # pylint: disable=redefined-builtin until: Until = None, - target: Union[Compound, Solid] = None, + target: Compound | Solid = None, both: bool = False, taper: float = 0.0, clean: bool = True, @@ -184,7 +186,7 @@ def extrude( def loft( - sections: Union[Face, Sketch, Iterable[Union[Vertex, Face, Sketch]]] = None, + sections: Face | Sketch | Iterable[Vertex | Face | Sketch] = None, ruled: bool = False, clean: bool = True, mode: Mode = Mode.ADD, @@ -259,8 +261,8 @@ def loft( def make_brake_formed( thickness: float, - station_widths: Union[float, Iterable[float]], - line: Union[Edge, Wire, Curve] = None, + station_widths: float | Iterable[float], + line: Edge | Wire | Curve = None, side: Side = Side.LEFT, kind: Kind = Kind.ARC, clean: bool = True, @@ -364,8 +366,8 @@ def make_brake_formed( def project_workplane( - origin: Union[VectorLike, Vertex], - x_dir: Union[VectorLike, Vertex], + origin: VectorLike | Vertex, + x_dir: VectorLike | Vertex, projection_dir: VectorLike, distance: float, ) -> Plane: @@ -420,7 +422,7 @@ def project_workplane( def revolve( - profiles: Union[Face, Iterable[Face]] = None, + profiles: Face | Iterable[Face] = None, axis: Axis = Axis.Z, revolution_arc: float = 360.0, clean: bool = True, @@ -478,7 +480,7 @@ def revolve( def section( obj: Part = None, - section_by: Union[Plane, Iterable[Plane]] = Plane.XZ, + section_by: Plane | Iterable[Plane] = Plane.XZ, height: float = 0.0, clean: bool = True, mode: Mode = Mode.PRIVATE, @@ -540,7 +542,7 @@ def section( def thicken( - to_thicken: Union[Face, Sketch] = None, + to_thicken: Face | Sketch = None, amount: float = None, normal_override: VectorLike = None, both: bool = False, diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index 78e8936..d305b51 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -28,7 +28,9 @@ license: """ from __future__ import annotations -from typing import Iterable, Union +from typing import Union + +from collections.abc import Iterable from build123d.build_enums import Mode, SortBy from build123d.topology import ( Compound, @@ -193,7 +195,7 @@ def full_round( def make_face( - edges: Union[Edge, Iterable[Edge]] = None, mode: Mode = Mode.ADD + edges: Edge | Iterable[Edge] = None, mode: Mode = Mode.ADD ) -> Sketch: """Sketch Operation: make_face @@ -228,7 +230,7 @@ def make_face( def make_hull( - edges: Union[Edge, Iterable[Edge]] = None, mode: Mode = Mode.ADD + edges: Edge | Iterable[Edge] = None, mode: Mode = Mode.ADD ) -> Sketch: """Sketch Operation: make_hull @@ -266,7 +268,7 @@ def make_hull( def trace( - lines: Union[Curve, Edge, Wire, Iterable[Union[Curve, Edge, Wire]]] = None, + lines: Curve | Edge | Wire | Iterable[Curve | Edge | Wire] = None, line_width: float = 1, mode: Mode = Mode.ADD, ) -> Sketch: diff --git a/src/build123d/pack.py b/src/build123d/pack.py index 88ca580..28d5491 100644 --- a/src/build123d/pack.py +++ b/src/build123d/pack.py @@ -12,7 +12,9 @@ desc: from __future__ import annotations from dataclasses import dataclass -from typing import Callable, Collection, Optional, cast +from typing import Optional, cast + +from collections.abc import Callable, Collection from build123d import Location, Shape, Pos @@ -37,8 +39,8 @@ def _pack2d( y: float = 0 w: float = 0 h: float = 0 - down: Optional["_Node"] = None - right: Optional["_Node"] = None + down: _Node | None = None + right: _Node | None = None def find_node(start, w, h): if start.used: diff --git a/src/build123d/topology/__init__.py b/src/build123d/topology/__init__.py index 223aa4e..6b810b5 100644 --- a/src/build123d/topology/__init__.py +++ b/src/build123d/topology/__init__.py @@ -1,4 +1,3 @@ - """ build123d.topology package diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 6014dda..8be2776 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -59,7 +59,9 @@ import os import sys import warnings from itertools import combinations -from typing import Iterable, Iterator, Sequence, Type, Union +from typing import Type, Union + +from collections.abc import Iterable, Iterator, Sequence import OCP.TopAbs as ta from OCP.BRepAlgoAPI import BRepAlgoAPI_Fuse @@ -238,7 +240,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), position_on_path: float = 0.0, text_path: Edge | Wire | None = None, - ) -> "Compound": + ) -> Compound: """2D Text that optionally follows a path. The text that is created can be combined as with other sketch features by specifying @@ -609,14 +611,14 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): def get_type( self, obj_type: ( - Type[Vertex] - | Type[Edge] - | Type[Face] - | Type[Shell] - | Type[Solid] - | Type[Wire] + type[Vertex] + | type[Edge] + | type[Face] + | type[Shell] + | type[Solid] + | type[Wire] ), - ) -> list[Union[Vertex, Edge, Face, Shell, Solid, Wire]]: + ) -> list[Vertex | Edge | Face | Shell | Solid | Wire]: """get_type Extract the objects of the given type from a Compound. Note that this diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index e3346a1..92d75ba 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -56,7 +56,9 @@ import itertools import warnings from itertools import combinations from math import radians, inf, pi, cos, copysign, ceil, floor -from typing import Iterable, Tuple, Union, overload, TYPE_CHECKING +from typing import Tuple, Union, overload, TYPE_CHECKING + +from collections.abc import Iterable import OCP.TopAbs as ta from OCP.BRep import BRep_Tool @@ -164,7 +166,9 @@ from build123d.geometry import ( from numpy import ndarray from scipy.optimize import minimize from scipy.spatial import ConvexHull -from typing_extensions import Self, Literal +from typing_extensions import Self + +from typing import Literal from .shape_core import ( Shape, @@ -1536,7 +1540,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): cls, points: list[VectorLike], tol: float = 1e-3, - smoothing: Tuple[float, float, float] | None = None, + smoothing: tuple[float, float, float] | None = None, min_deg: int = 1, max_deg: int = 6, ) -> Edge: @@ -2302,7 +2306,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): @classmethod def combine( - cls, wires: Iterable[Union[Wire, Edge]], tol: float = 1e-9 + cls, wires: Iterable[Wire | Edge], tol: float = 1e-9 ) -> ShapeList[Wire]: """combine diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 44b5d5d..01111ff 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -53,11 +53,8 @@ from abc import ABC, abstractmethod from typing import ( cast as tcast, Any, - Callable, Dict, Generic, - Iterable, - Iterator, Optional, Protocol, SupportsIndex, @@ -69,6 +66,8 @@ from typing import ( TYPE_CHECKING, ) +from collections.abc import Callable, Iterable, Iterator + import OCP.GeomAbs as ga import OCP.TopAbs as ta from IPython.lib.pretty import pretty, PrettyPrinter @@ -153,7 +152,9 @@ from build123d.geometry import ( VectorLike, logger, ) -from typing_extensions import Self, Literal +from typing_extensions import Self + +from typing import Literal from vtkmodules.vtkCommonDataModel import vtkPolyData from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter @@ -226,7 +227,7 @@ class Shape(NodeMixin, Generic[TOPODS]): ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s, } - geom_LUT_EDGE: Dict[ga.GeomAbs_CurveType, GeomType] = { + geom_LUT_EDGE: dict[ga.GeomAbs_CurveType, GeomType] = { ga.GeomAbs_Line: GeomType.LINE, ga.GeomAbs_Circle: GeomType.CIRCLE, ga.GeomAbs_Ellipse: GeomType.ELLIPSE, @@ -237,7 +238,7 @@ class Shape(NodeMixin, Generic[TOPODS]): ga.GeomAbs_OffsetCurve: GeomType.OFFSET, ga.GeomAbs_OtherCurve: GeomType.OTHER, } - geom_LUT_FACE: Dict[ga.GeomAbs_SurfaceType, GeomType] = { + geom_LUT_FACE: dict[ga.GeomAbs_SurfaceType, GeomType] = { ga.GeomAbs_Plane: GeomType.PLANE, ga.GeomAbs_Cylinder: GeomType.CYLINDER, ga.GeomAbs_Cone: GeomType.CONE, @@ -484,7 +485,7 @@ class Shape(NodeMixin, Generic[TOPODS]): @classmethod @abstractmethod - def cast(cls: Type[Self], obj: TopoDS_Shape) -> Self: + def cast(cls: type[Self], obj: TopoDS_Shape) -> Self: """Returns the right type of wrapper, given a OCCT object""" @classmethod @@ -1742,7 +1743,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def tessellate( self, tolerance: float, angular_tolerance: float = 0.1 - ) -> Tuple[list[Vector], list[Tuple[int, int, int]]]: + ) -> tuple[list[Vector], list[tuple[int, int, int]]]: """General triangulated approximation""" if self.wrapped is None: raise ValueError("Cannot tessellate an empty shape") @@ -1750,7 +1751,7 @@ class Shape(NodeMixin, Generic[TOPODS]): self.mesh(tolerance, angular_tolerance) vertices: list[Vector] = [] - triangles: list[Tuple[int, int, int]] = [] + triangles: list[tuple[int, int, int]] = [] offset = 0 for face in self.faces(): diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 7a01caf..a62bb40 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -57,7 +57,9 @@ from __future__ import annotations import platform import warnings from math import radians, cos, tan -from typing import Iterable, Union, TYPE_CHECKING +from typing import Union, TYPE_CHECKING + +from collections.abc import Iterable import OCP.TopAbs as ta from OCP.BRepAlgoAPI import BRepAlgoAPI_Cut @@ -219,7 +221,7 @@ class Mixin3D(Shape): """ edge_list = list(edge_list) if face: - if any((edge for edge in edge_list if edge not in face.edges())): + if any(edge for edge in edge_list if edge not in face.edges()): raise ValueError("Some edges are not part of the face") native_edges = [e.wrapped for e in edge_list] @@ -264,7 +266,7 @@ class Mixin3D(Shape): def dprism( self, basis: Face | None, - bounds: list[Union[Face, Wire]], + bounds: list[Face | Wire], depth: float | None = None, taper: float = 0, up_to_face: Face | None = None, @@ -1042,7 +1044,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): @classmethod def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False + cls, objs: Iterable[Vertex | Wire], ruled: bool = False ) -> Solid: """make loft @@ -1277,7 +1279,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): @classmethod def sweep_multi( cls, - profiles: Iterable[Union[Wire, Face]], + profiles: Iterable[Wire | Face], path: Wire | Edge, make_solid: bool = True, is_frenet: bool = False, diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index df01732..620c8ee 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -57,7 +57,9 @@ from __future__ import annotations import copy import warnings -from typing import Any, Iterable, Sequence, Tuple, Union, overload, TYPE_CHECKING +from typing import Any, Tuple, Union, overload, TYPE_CHECKING + +from collections.abc import Iterable, Sequence import OCP.TopAbs as ta from OCP.BRep import BRep_Tool @@ -631,7 +633,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): cls, points: list[list[VectorLike]], tol: float = 1e-2, - smoothing: Tuple[float, float, float] | None = None, + smoothing: tuple[float, float, float] | None = None, min_deg: int = 1, max_deg: int = 3, ) -> Face: @@ -1219,7 +1221,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) return self.outer_wire() - def _uv_bounds(self) -> Tuple[float, float, float, float]: + def _uv_bounds(self) -> tuple[float, float, float, float]: """Return the u min, u max, v min, v max values""" return BRepTools.UVBounds_s(self.wrapped) @@ -1305,7 +1307,7 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): @classmethod def make_loft( - cls, objs: Iterable[Union[Vertex, Wire]], ruled: bool = False + cls, objs: Iterable[Vertex | Wire], ruled: bool = False ) -> Shell: """make loft diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index 2cc51a8..176b869 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -54,7 +54,9 @@ license: from __future__ import annotations from math import radians, sin, cos, isclose -from typing import Any, Iterable, Union, TYPE_CHECKING +from typing import Any, Union, TYPE_CHECKING + +from collections.abc import Iterable from OCP.BRep import BRep_Tool from OCP.BRepAlgoAPI import ( @@ -136,7 +138,7 @@ def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Sh def _make_loft( - objs: Iterable[Union[Vertex, Wire]], + objs: Iterable[Vertex | Wire], filled: bool, ruled: bool = False, ) -> TopoDS_Shape: @@ -323,8 +325,8 @@ def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shap """Compare the OCCT objects of each list and return the differences""" shapes_one = list(shapes_one) shapes_two = list(shapes_two) - occt_one = set(shape.wrapped for shape in shapes_one) - occt_two = set(shape.wrapped for shape in shapes_two) + occt_one = {shape.wrapped for shape in shapes_one} + occt_two = {shape.wrapped for shape in shapes_two} occt_delta = list(occt_one - occt_two) all_shapes = [] @@ -421,7 +423,7 @@ def tuplify(obj: Any, dim: int) -> tuple | None: def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: """Return Shape's TopAbs_ShapeEnum""" if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = set(shapetype(o.wrapped) for o in obj) + shapetypes = {shapetype(o.wrapped) for o in obj} if len(shapetypes) == 1: result = shapetypes.pop() else: diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index 9e8e47d..59518c7 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -54,7 +54,9 @@ license: from __future__ import annotations import itertools -from typing import Iterable, overload, TYPE_CHECKING +from typing import overload, TYPE_CHECKING + +from collections.abc import Iterable import OCP.TopAbs as ta from OCP.BRep import BRep_Tool From 9928ba5bfd43b056b6aa77476405e70884bfafcf Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 22:16:50 -0600 Subject: [PATCH 092/518] test_benchmarks.py -> skip if pytest-benchmark package not found --- tests/test_benchmarks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py index 409a653..03eb667 100644 --- a/tests/test_benchmarks.py +++ b/tests/test_benchmarks.py @@ -1,7 +1,10 @@ import pytest +import importlib from math import sqrt from build123d import * +pytestmark = pytest.mark.skipif(importlib.util.find_spec("pytest_benchmark") is not None) + def test_ppp_0101(benchmark): def model(): From 25181f4ba78b7899e39b6a4c9466a8f1ee9f1a20 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 7 Jan 2025 22:22:08 -0600 Subject: [PATCH 093/518] test_benchmarks.py -> try again skip if pytest_benchmark is missing --- tests/test_benchmarks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py index 03eb667..7f9484f 100644 --- a/tests/test_benchmarks.py +++ b/tests/test_benchmarks.py @@ -3,8 +3,8 @@ import importlib from math import sqrt from build123d import * -pytestmark = pytest.mark.skipif(importlib.util.find_spec("pytest_benchmark") is not None) +pytest_benchmark = pytest.importorskip("pytest_benchmark") def test_ppp_0101(benchmark): def model(): From 98ef21b9eb0acebcef40d6bcb544b2ad274bdc6e Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 8 Jan 2025 11:49:48 -0500 Subject: [PATCH 094/518] Fixing typing issues --- src/build123d/geometry.py | 181 ++++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 87 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 209ff8f..6193472 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -44,12 +44,12 @@ from typing import ( Any, Iterable, List, - Optional, Sequence, Tuple, Union, overload, TypeVar, + TYPE_CHECKING, ) from OCP.Bnd import Bnd_Box, Bnd_OBB @@ -80,10 +80,14 @@ from OCP.gp import ( from OCP.GProp import GProp_GProps from OCP.Quantity import Quantity_Color, Quantity_ColorRGBA from OCP.TopLoc import TopLoc_Location -from OCP.TopoDS import TopoDS_Face, TopoDS_Shape, TopoDS_Vertex +from OCP.TopoDS import TopoDS_Edge, TopoDS_Face, TopoDS_Shape, TopoDS_Vertex from build123d.build_enums import Align, Align2DType, Align3DType, Intrinsic, Extrinsic +if TYPE_CHECKING: # pragma: no cover + from .topology import Shape + from .topology import Edge + # Create a build123d logger to distinguish these logs from application logs. # If the user doesn't configure logging, all build123d logs will be discarded. logging.getLogger("build123d").addHandler(logging.NullHandler()) @@ -134,7 +138,7 @@ class Vector: x (float): x component y (float): y component z (float): z component - vec (Union[Vector, Sequence(float), gp_Vec, gp_Pnt, gp_Dir, gp_XYZ]): vector representations + vec (Vector | Sequence(float) | gp_Vec | gp_Pnt | gp_Dir | gp_XYZ): vector representations Note that if no z value is provided it's assumed to be zero. If no values are provided the returned Vector has the value of 0, 0, 0. @@ -165,7 +169,7 @@ class Vector: ... @overload - def __init__(self, v: Union[gp_Vec, gp_Pnt, gp_Dir, gp_XYZ]): # pragma: no cover + def __init__(self, v: gp_Vec | gp_Pnt | gp_Dir | gp_XYZ): # pragma: no cover ... @overload @@ -362,7 +366,7 @@ class Vector: """Unsigned angle between vectors""" return self.wrapped.Angle(vec.wrapped) * RAD2DEG - def get_signed_angle(self, vec: Vector, normal: Vector = None) -> float: + def get_signed_angle(self, vec: Vector, normal: Vector | None = None) -> float: """Signed Angle Between Vectors Return the signed angle in degrees between two vectors with the given normal @@ -429,7 +433,7 @@ class Vector: """Vector length operator abs()""" return self.length - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self, other: Axis | Location | Plane | VectorLike | Shape): """intersect vector with other &""" return self.intersect(other) @@ -506,19 +510,19 @@ class Vector: return Vector(self.wrapped.Rotated(axis.wrapped, pi * angle / 180)) @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and vector""" @overload - def intersect(self, location: Location) -> Union[Vector, None]: + def intersect(self, location: Location) -> Vector | None: """Find intersection of location and vector""" @overload - def intersect(self, axis: Axis) -> Union[Vector, None]: + def intersect(self, axis: Axis) -> Vector | None: """Find intersection of axis and vector""" @overload - def intersect(self, plane: Plane) -> Union[Vector, None]: + def intersect(self, plane: Plane) -> Vector | None: """Find intersection of plane and vector""" def intersect(self, *args, **kwargs): @@ -597,48 +601,59 @@ class Axis(metaclass=AxisMeta): """Axis: point and direction""" @overload - def __init__(self, edge: "Edge"): # pragma: no cover + def __init__(self, edge: Edge): # pragma: no cover """Axis: start of Edge""" def __init__(self, *args, **kwargs): - gp_ax1, origin, direction = (None,) * 3 + + gp_ax1 = kwargs.pop("gp_ax1", None) + origin = kwargs.pop("origin", None) + direction = kwargs.pop("direction", None) + edge = kwargs.pop("edge", None) + + # Handle unexpected kwargs + if kwargs: + raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + if len(args) == 1: - if type(args[0]).__name__ == "Edge": - origin = args[0].position_at(0) - direction = args[0].tangent_at(0) - elif isinstance(args[0], gp_Ax1): + if isinstance(args[0], gp_Ax1): gp_ax1 = args[0] + elif ( + hasattr(args[0], "wrapped") + and args[0].wrapped is not None + and isinstance(args[0].wrapped, TopoDS_Edge) + ): + edge = args[0] else: origin = args[0] - if len(args) == 2: - origin = args[0] - direction = args[1] + elif len(args) == 2: + origin, direction = args - origin = kwargs.get("origin", origin) - direction = kwargs.get("direction", direction) - gp_ax1 = kwargs.get("gp_ax1", gp_ax1) - if "edge" in kwargs and type(kwargs["edge"]).__name__ == "Edge": - origin = kwargs["edge"].position_at(0) - direction = kwargs["edge"].tangent_at(0) - - unknown_args = ", ".join( - set(kwargs.keys()).difference(["gp_ax1", "origin", "direction", "edge"]) - ) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") + if edge is not None: + if ( + hasattr(edge, "wrapped") + and edge.wrapped is not None + and isinstance(edge.wrapped, TopoDS_Edge) + ): + origin: Vector = edge.position_at(0) + direction: Vector = edge.tangent_at(0) + else: + raise ValueError(f"Invalid argument {edge}") if gp_ax1 is not None: - self.wrapped = gp_ax1 + if not isinstance(gp_ax1, gp_Ax1): + raise ValueError(f"Invalid Axis parameter {gp_ax1}") + self.wrapped: gp_Ax1 = gp_ax1 else: try: - origin = Vector(origin) - direction = Vector(direction) + origin_vector = Vector(origin) + direction_vector = Vector(direction) except TypeError as exc: raise ValueError("Invalid Axis parameters") from exc self.wrapped = gp_Ax1( - Vector(origin).to_pnt(), - gp_Dir(*Vector(direction).normalized().to_tuple()), + origin_vector.to_pnt(), + gp_Dir(*tuple(direction_vector.normalized())), ) self.position = Vector( @@ -774,24 +789,24 @@ class Axis(metaclass=AxisMeta): """Flip direction operator -""" return self.reverse() - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self: Plane, other: Axis | Location | Plane | VectorLike | Shape): """intersect vector with other &""" return self.intersect(other) @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and axis""" @overload - def intersect(self, location: Location) -> Union[Location, None]: + def intersect(self, location: Location) -> Location | None: """Find intersection of location and axis""" @overload - def intersect(self, axis: Axis) -> Union[Axis, None]: + def intersect(self, axis: Axis) -> Axis | None: """Find intersection of axis and axis""" @overload - def intersect(self, plane: Plane) -> Union[Axis, None]: + def intersect(self, plane: Plane) -> Axis | None: """Find intersection of plane and axis""" def intersect(self, *args, **kwargs): @@ -891,7 +906,7 @@ class BoundBox: def add( self, - obj: Union[tuple[float, float, float], Vector, BoundBox], + obj: tuple[float, float, float] | Vector | BoundBox, tol: float = None, ) -> BoundBox: """Returns a modified (expanded) bounding box @@ -905,11 +920,7 @@ class BoundBox: This bounding box is not changed. Args: - obj: Union[tuple[float: - float: - float]: - Vector: - BoundBox]: + obj: tuple[float, float, float] | Vector | BoundBox]: tol: float: (Default value = None) Returns: @@ -933,7 +944,7 @@ class BoundBox: return BoundBox(tmp) @staticmethod - def find_outside_box_2d(bb1: BoundBox, bb2: BoundBox) -> Optional[BoundBox]: + def find_outside_box_2d(bb1: BoundBox, bb2: BoundBox) -> BoundBox | None: """Compares bounding boxes Compares bounding boxes. Returns none if neither is inside the other. @@ -1026,7 +1037,7 @@ class BoundBox: and second_box.max.Z < self.max.Z ) - def to_align_offset(self, align: Union[Align2DType, Align3DType]) -> Vector: + def to_align_offset(self, align: Align2DType | Align3DType) -> Vector: """Amount to move object to achieve the desired alignment""" return to_align_offset(self.min.to_tuple(), self.max.to_tuple(), align) @@ -1329,7 +1340,7 @@ class Location: self, translation: VectorLike, rotation: RotationLike, - ordering: Union[Extrinsic, Intrinsic], + ordering: Extrinsic | Intrinsic, ): # pragma: no cover """Location with translation with respect to the original location. If rotation is not None then the location includes the rotation (see also Rotation class) @@ -1502,7 +1513,7 @@ class Location: """Flip the orientation without changing the position operator -""" return Location(-Plane(self)) - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self: Plane, other: Axis | Location | Plane | VectorLike | Shape): """intersect axis with other &""" return self.intersect(other) @@ -1549,19 +1560,19 @@ class Location: return f"Location: (position=({position_str}), orientation=({orientation_str}))" @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and location""" @overload - def intersect(self, location: Location) -> Union[Location, None]: + def intersect(self, location: Location) -> Location | None: """Find intersection of location and location""" @overload - def intersect(self, axis: Axis) -> Union[Location, None]: + def intersect(self, axis: Axis) -> Location | None: """Find intersection of axis and location""" @overload - def intersect(self, plane: Plane) -> Union[Location, None]: + def intersect(self, plane: Plane) -> Location | None: """Find intersection of plane and location""" def intersect(self, *args, **kwargs): @@ -1641,7 +1652,7 @@ class Rotation(Location): def __init__( self, rotation: RotationLike, - ordering: Union[Extrinsic, Intrinsic] == Intrinsic.XYZ, + ordering: Extrinsic | Intrinsic == Intrinsic.XYZ, ): """Subclass of Location used only for object rotation ordering is for order of rotations in Intrinsic or Extrinsic enums""" @@ -1652,7 +1663,7 @@ class Rotation(Location): X: float = 0, Y: float = 0, Z: float = 0, - ordering: Union[Extrinsic, Intrinsic] = Intrinsic.XYZ, + ordering: Extrinsic | Intrinsic = Intrinsic.XYZ, ): """Subclass of Location used only for object rotation ordering is for order of rotations in Intrinsic or Extrinsic enums""" @@ -1760,7 +1771,7 @@ class Matrix: ... @overload - def __init__(self, matrix: Union[gp_GTrsf, gp_Trsf]) -> None: # pragma: no cover + def __init__(self, matrix: gp_GTrsf | gp_Trsf) -> None: # pragma: no cover ... @overload @@ -1973,10 +1984,10 @@ class Plane(metaclass=PlaneMeta): Args: gp_pln (gp_Pln): an OCCT plane object - origin (Union[tuple[float, float, float], Vector]): the origin in global coordinates - x_dir (Union[tuple[float, float, float], Vector], optional): an optional vector + origin (tuple[float, float, float] | Vector): the origin in global coordinates + x_dir (tuple[float, float, float] | Vector | None): an optional vector representing the X Direction. Defaults to None. - z_dir (Union[tuple[float, float, float], Vector], optional): the normal direction + z_dir (tuple[float, float, float] | Vector | None): the normal direction for the plane. Defaults to (0, 0, 1). Attributes: @@ -2016,7 +2027,7 @@ class Plane(metaclass=PlaneMeta): @overload def __init__( - self, face: "Face", x_dir: Optional[VectorLike] = None + self, face: "Face", x_dir: VectorLike | None = None ): # pragma: no cover """Return a plane extending the face. Note: for non planar face this will return the underlying work plane""" @@ -2180,9 +2191,7 @@ class Plane(metaclass=PlaneMeta): """Reverse z direction of plane operator -""" return Plane(self.origin, self.x_dir, -self.z_dir) - def __mul__( - self, other: Union[Location, "Shape"] - ) -> Union[Plane, List[Plane], "Shape"]: + def __mul__(self, other: Location | Shape) -> Plane | list[Plane] | Shape: if isinstance(other, Location): result = Plane(self.location * other) elif ( # LocationList @@ -2201,7 +2210,7 @@ class Plane(metaclass=PlaneMeta): ) return result - def __and__(self: Plane, other: Union[Axis, Location, Plane, VectorLike, "Shape"]): + def __and__(self: Plane, other: Axis | Location | Plane | VectorLike | Shape): """intersect plane with other &""" return self.intersect(other) @@ -2236,14 +2245,14 @@ class Plane(metaclass=PlaneMeta): gp_Ax3(self._origin.to_pnt(), self.z_dir.to_dir(), self.x_dir.to_dir()) ) - def shift_origin(self, locator: Union[Axis, VectorLike, "Vertex"]) -> Plane: + def shift_origin(self, locator: Axis | VectorLike | "Vertex") -> Plane: """shift plane origin Creates a new plane with the origin moved within the plane to the point of intersection of the axis or at the given Vertex. The plane's x_dir and z_dir are unchanged. Args: - locator (Union[Axis, VectorLike, Vertex]): Either Axis that intersects the new + locator (Axis | VectorLike | Vertex): Either Axis that intersects the new plane origin or Vertex within Plane. Raises: @@ -2274,7 +2283,7 @@ class Plane(metaclass=PlaneMeta): def rotated( self, rotation: VectorLike = (0, 0, 0), - ordering: Union[Extrinsic, Intrinsic] = None, + ordering: Extrinsic | Intrinsic = None, ) -> Plane: """Returns a copy of this plane, rotated about the specified axes @@ -2288,7 +2297,7 @@ class Plane(metaclass=PlaneMeta): Args: rotation (VectorLike, optional): (xDegrees, yDegrees, zDegrees). Defaults to (0, 0, 0). - ordering (Union[Intrinsic, Extrinsic], optional): order of rotations in Intrinsic or Extrinsic rotation mode, defaults to Intrinsic.XYZ + ordering (Intrinsic | Extrinsic, optional): order of rotations in Intrinsic or Extrinsic rotation mode, defaults to Intrinsic.XYZ Returns: Plane: a copy of this plane rotated as requested. @@ -2366,14 +2375,14 @@ class Plane(metaclass=PlaneMeta): return axis def _to_from_local_coords( - self, obj: Union[VectorLike, Any, BoundBox], to_from: bool = True + self, obj: VectorLike | Any | BoundBox, to_from: bool = True ): """_to_from_local_coords Reposition the object relative to this plane Args: - obj (Union[VectorLike, Shape, BoundBox]): an object to reposition. Note that + obj (VectorLike | Shape | BoundBox): an object to reposition. Note that type Any refers to all topological classes. to_from (bool, optional): direction of transformation. Defaults to True (to). @@ -2406,11 +2415,11 @@ class Plane(metaclass=PlaneMeta): ) return return_value - def to_local_coords(self, obj: Union[VectorLike, Any, BoundBox]): + def to_local_coords(self, obj: VectorLike | Any | BoundBox): """Reposition the object relative to this plane Args: - obj: Union[VectorLike, Shape, BoundBox] an object to reposition. Note that + obj: VectorLike | Shape | BoundBox an object to reposition. Note that type Any refers to all topological classes. Returns: @@ -2419,11 +2428,11 @@ class Plane(metaclass=PlaneMeta): """ return self._to_from_local_coords(obj, True) - def from_local_coords(self, obj: Union[tuple, Vector, Any, BoundBox]): + def from_local_coords(self, obj: tuple | Vector | Any | BoundBox): """Reposition the object relative from this plane Args: - obj: Union[VectorLike, Shape, BoundBox] an object to reposition. Note that + obj: VectorLike | Shape | BoundBox an object to reposition. Note that type Any refers to all topological classes. Returns: @@ -2441,15 +2450,13 @@ class Plane(metaclass=PlaneMeta): ) return Location(transformation) - def contains( - self, obj: Union[VectorLike, Axis], tolerance: float = TOLERANCE - ) -> bool: + def contains(self, obj: VectorLike | Axis, tolerance: float = TOLERANCE) -> bool: """contains Is this point or Axis fully contained in this plane? Args: - obj (Union[VectorLike,Axis]): point or Axis to evaluate + obj (VectorLike | Axis): point or Axis to evaluate tolerance (float, optional): comparison tolerance. Defaults to TOLERANCE. Returns: @@ -2467,23 +2474,23 @@ class Plane(metaclass=PlaneMeta): return return_value @overload - def intersect(self, vector: VectorLike) -> Union[Vector, None]: + def intersect(self, vector: VectorLike) -> Vector | None: """Find intersection of vector and plane""" @overload - def intersect(self, location: Location) -> Union[Location, None]: + def intersect(self, location: Location) -> Location | None: """Find intersection of location and plane""" @overload - def intersect(self, axis: Axis) -> Union[Axis, Vector, None]: + def intersect(self, axis: Axis) -> Axis | Vector | None: """Find intersection of axis and plane""" @overload - def intersect(self, plane: Plane) -> Union[Axis, None]: + def intersect(self, plane: Plane) -> Axis | None: """Find intersection of plane and plane""" @overload - def intersect(self, shape: "Shape") -> Union["Shape", None]: + def intersect(self, shape: Shape) -> Shape | None: """Find intersection of plane and shape""" def intersect(self, *args, **kwargs): @@ -2536,8 +2543,8 @@ class Plane(metaclass=PlaneMeta): def to_align_offset( min_point: VectorLike, max_point: VectorLike, - align: Union[Align2DType, Align3DType], - center: Optional[VectorLike] = None, + align: Align2DType | Align3DType, + center: VectorLike | None = None, ) -> Vector: """Amount to move object to achieve the desired alignment""" align_offset = [] From 16c685f6898f67e18a31959da3b1589e998ce44c Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 8 Jan 2025 14:11:24 -0600 Subject: [PATCH 095/518] sketch_objects.py -> typing improvements --- mypy-baseline.txt | 725 ++++++++++++++++++++++++++++++++ src/build123d/objects_sketch.py | 52 +-- 2 files changed, 751 insertions(+), 26 deletions(-) create mode 100644 mypy-baseline.txt diff --git a/mypy-baseline.txt b/mypy-baseline.txt new file mode 100644 index 0000000..7f90784 --- /dev/null +++ b/mypy-baseline.txt @@ -0,0 +1,725 @@ +src/build123d/_dev/scm_version.py:0: error: Cannot find implementation or library stub for module named "setuptools_scm" [import-not-found] +src/build123d/_dev/scm_version.py:0: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports +src/build123d/version.py:0: error: Cannot find implementation or library stub for module named "build123d._version" [import-not-found] +src/build123d/version.py:0: error: Name "version" already defined (possibly by an import) [no-redef] +src/build123d/jupyter_tools.py:0: error: Cannot find implementation or library stub for module named "IPython.display" [import-not-found] +src/build123d/geometry.py:0: error: Incompatible default for argument "normal" (default has type "None", argument has type "Vector") [assignment] +src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/geometry.py:0: error: Self argument missing for a non-static method (or an invalid type for self) [misc] +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/geometry.py:0: error: Name "Edge" is not defined [name-defined] +src/build123d/geometry.py:0: error: Cannot determine type of "wrapped" [has-type] +src/build123d/geometry.py:0: error: Self argument missing for a non-static method (or an invalid type for self) [misc] +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/geometry.py:0: error: Attribute "wrapped" already defined on line 0 [no-redef] +src/build123d/geometry.py:0: error: Incompatible default for argument "tol" (default has type "None", argument has type "float") [assignment] +src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/geometry.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float") [assignment] +src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/geometry.py:0: error: Cannot determine type of "wrapped" [has-type] +src/build123d/geometry.py:0: error: Incompatible default for argument "rotation" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] +src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/geometry.py:0: error: Item "Location" of the upper bound "Location | Any" of type variable "T" has no attribute "moved" [union-attr] +src/build123d/geometry.py:0: error: Self argument missing for a non-static method (or an invalid type for self) [misc] +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/geometry.py:0: error: Incompatible return value type (got "tuple[tuple[Any, Any, Any], tuple[float, ...]]", expected "tuple[tuple[float, float, float], tuple[float, float, float]]") [return-value] +src/build123d/geometry.py:0: error: Invalid type comment or annotation [valid-type] +src/build123d/geometry.py:0: error: Overloaded function signature 3 will never be matched: signature 2's parameter type(s) are the same or broader [overload-cannot-match] +src/build123d/geometry.py:0: error: Name "Face" is not defined [name-defined] +src/build123d/geometry.py:0: error: Incompatible default for argument "x_dir" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "Plane") [assignment] +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/geometry.py:0: error: Name "Vertex" is not defined [name-defined] +src/build123d/geometry.py:0: error: Argument 1 to "tuple" has incompatible type "Axis | Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Any"; expected "Iterable[Any]" [arg-type] +src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "Vector", variable has type "tuple[Any, ...]") [assignment] +src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "Axis | Vector | None", variable has type "tuple[Any, ...]") [assignment] +src/build123d/geometry.py:0: error: Incompatible default for argument "ordering" (default has type "None", argument has type "Extrinsic | Intrinsic") [assignment] +src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "BoundBox", variable has type "Vector") [assignment] +src/build123d/geometry.py:0: error: Item "Sequence[float]" of "Any | Sequence[float]" has no attribute "transform_shape" [union-attr] +src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] +src/build123d/topology/shape_core.py:0: error: Incompatible return value type (got "Any | None", expected "Shape[Any]") [return-value] +src/build123d/persistence.py:0: error: Incompatible return value type (got "None", expected "bytes") [return-value] +src/build123d/persistence.py:0: error: Incompatible return value type (got "None", expected "bytes") [return-value] +src/build123d/mesher.py:0: error: Cannot find implementation or library stub for module named "py_lib3mf" [import-not-found] +src/build123d/mesher.py:0: error: Item "None" of "Any | None" has no attribute "Orientation" [union-attr] +src/build123d/mesher.py:0: error: "list" expects 1 type argument, but 3 given [type-arg] +src/build123d/mesher.py:0: error: Incompatible types in assignment (expression has type "Array[c_uint]", variable has type "Array[c_float]") [assignment] +src/build123d/mesher.py:0: error: Incompatible default for argument "part_number" (default has type "None", argument has type "str") [assignment] +src/build123d/mesher.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/mesher.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/mesher.py:0: error: Module "uuid" is not valid as a type [valid-type] +src/build123d/mesher.py:0: note: Perhaps you meant to use a protocol matching the module structure? +src/build123d/mesher.py:0: error: Attribute "meshes" already defined on line 0 [no-redef] +src/build123d/importers.py:0: error: Cannot find implementation or library stub for module named "ocpsvg" [import-not-found] +src/build123d/importers.py:0: error: If x = b'abc' then f"{x}" or "{}".format(x) produces "b'abc'", not "abc". If this is desired behavior, use f"{x!r}" or "{!r}".format(x). Otherwise, decode the bytes [str-bytes-safe] +src/build123d/importers.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "bool") [assignment] +src/build123d/build_common.py:0: error: Item "None" of "FrameType | None" has no attribute "f_code" [union-attr] +src/build123d/build_common.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] +src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/build_common.py:0: error: Incompatible default for argument "caller" (default has type "None", argument has type "Builder | str") [assignment] +src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/build_common.py:0: error: Incompatible return value type (got "Builder | None", expected "Self") [return-value] +src/build123d/build_common.py:0: error: Argument 1 to "_shapes" of "Builder" has incompatible type "type"; expected "Vertex | Edge | Face | Solid" [arg-type] +src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] +src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] +src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] +src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] +src/build123d/build_common.py:0: error: Incompatible types in assignment (expression has type "Shape[Any] | ShapeList[Shape[Any]] | None", variable has type "Shape[Any] | ShapeList[Shape[Any]]") [assignment] +src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] +src/build123d/build_common.py:0: error: "None" not callable [misc] +src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] +src/build123d/build_common.py:0: error: "None" not callable [misc] +src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] +src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] +src/build123d/build_common.py:0: error: Argument 1 to "_shapes" of "Builder" has incompatible type "type"; expected "Vertex | Edge | Face | Solid" [arg-type] +src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] +src/build123d/build_common.py:0: error: "None" not callable [misc] +src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] +src/build123d/build_common.py:0: error: "None" not callable [misc] +src/build123d/build_common.py:0: error: Incompatible default for argument "obj_type" (default has type "None", argument has type "Vertex | Edge | Face | Solid") [assignment] +src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/build_common.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Shape[Any] | Iterable[Shape[Any]]") [assignment] +src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/build_common.py:0: error: Missing return statement [return] +src/build123d/build_common.py:0: error: Missing return statement [return] +src/build123d/build_common.py:0: error: Missing return statement [return] +src/build123d/build_common.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Iterable[Shape[Any]]") [assignment] +src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/build_common.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "int") [assignment] +src/build123d/build_common.py:0: error: "Iterable" expects 1 type argument, but 6 given [type-arg] +src/build123d/build_common.py:0: error: Argument 1 to "append" of "list" has incompatible type "Any | Vector | Sequence[float]"; expected "Vector" [arg-type] +src/build123d/build_common.py:0: error: Argument 1 to "extend" of "list" has incompatible type "list[Any | Vector | Sequence[float]]"; expected "Iterable[Vector]" [arg-type] +src/build123d/build_common.py:0: error: Incompatible types in assignment (expression has type "list[Vector]", variable has type "Vector") [assignment] +src/build123d/build_common.py:0: error: Too few arguments [call-arg] +src/build123d/build_common.py:0: error: Argument 2 has incompatible type "Select"; expected "P.args" [arg-type] +src/build123d/build_common.py:0: error: Incompatible return value type (got "_Wrapped[[Builder, **P], T2, [Select], Any]", expected "Callable[P, T2]") [return-value] +src/build123d/build_common.py:0: note: "_Wrapped[[Builder, **P], T2, [Select], Any].__call__" has type "Callable[[DefaultArg(Select, 'select')], Any]" +src/build123d/exporters3d.py:0: error: Unsupported left operand type for * ("None") [operator] +src/build123d/exporters3d.py:0: note: Left operand is of type "Location | None" +src/build123d/exporters.py:0: error: Cannot find implementation or library stub for module named "ezdxf" [import-not-found] +src/build123d/exporters.py:0: error: Cannot find implementation or library stub for module named "ezdxf.colors" [import-not-found] +src/build123d/exporters.py:0: error: Cannot find implementation or library stub for module named "ezdxf.math" [import-not-found] +src/build123d/exporters.py:0: error: Incompatible default for argument "look_at" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/exporters.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/exporters.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "int", target has type "str") [assignment] +src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "int", target has type "str") [assignment] +src/build123d/exporters.py:0: error: "None" object is not iterable [misc] +src/build123d/exporters.py:0: error: Item "None" of "Location | None" has no attribute "wrapped" [union-attr] +src/build123d/exporters.py:0: error: No overload variant of "Color" matches argument types "Any", "int" [call-overload] +src/build123d/exporters.py:0: note: Possible overload variants: +src/build123d/exporters.py:0: note: def __init__(self, q_color: Any) -> Color +src/build123d/exporters.py:0: note: def __init__(self, name: str, alpha: float = ...) -> Color +src/build123d/exporters.py:0: note: def __init__(self, red: float, green: float, blue: float, alpha: float = ...) -> Color +src/build123d/exporters.py:0: note: def __init__(self, color_tuple: tuple[float]) -> Color +src/build123d/exporters.py:0: note: def __init__(self, color_code: int, alpha: int = ...) -> Color +src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "BoundBox") [assignment] +src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "_Layer", variable has type "str") [assignment] +src/build123d/exporters.py:0: error: Argument 2 to "_add_single_shape" of "ExportSVG" has incompatible type "str"; expected "_Layer" [arg-type] +src/build123d/exporters.py:0: error: Argument 2 to "_add_single_shape" of "ExportSVG" has incompatible type "str"; expected "_Layer" [arg-type] +src/build123d/exporters.py:0: error: Item "None" of "Location | None" has no attribute "wrapped" [union-attr] +src/build123d/exporters.py:0: error: Item "None" of "Any | None" has no attribute "Orientation" [union-attr] +src/build123d/exporters.py:0: error: Incompatible default for argument "attribs" (default has type "None", argument has type "dict[Any, Any]") [assignment] +src/build123d/exporters.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/exporters.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/exporters.py:0: error: Incompatible return value type (got "tuple[str, str | None]", expected "tuple[str, str]") [return-value] +src/build123d/exporters.py:0: error: Incompatible return value type (got "tuple[str, None]", expected "tuple[str, str]") [return-value] +src/build123d/exporters.py:0: error: Argument 1 to "_color_attribs" has incompatible type "Color | None"; expected "Color" [arg-type] +src/build123d/exporters.py:0: error: Argument 1 to "_color_attribs" has incompatible type "Color | None"; expected "Color" [arg-type] +src/build123d/exporters.py:0: error: Argument "default_namespace" to "write" of "ElementTree" has incompatible type "bool"; expected "str | None" [arg-type] +src/build123d/build_sketch.py:0: error: Incompatible types in assignment (expression has type "type[Face]", base class "Builder" defined the type as "None") [assignment] +src/build123d/build_sketch.py:0: error: Incompatible types in assignment (expression has type "type[Compound]", base class "Builder" defined the type as "None") [assignment] +src/build123d/build_sketch.py:0: error: Attribute "sketch_local" already defined on line 0 [no-redef] +src/build123d/build_sketch.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "Sketch") [assignment] +src/build123d/build_sketch.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] +src/build123d/build_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/build_part.py:0: error: Incompatible types in assignment (expression has type "type[Solid]", base class "Builder" defined the type as "None") [assignment] +src/build123d/build_part.py:0: error: Incompatible types in assignment (expression has type "type[Compound]", base class "Builder" defined the type as "None") [assignment] +src/build123d/build_part.py:0: error: Incompatible return value type (got "Location | None", expected "Location") [return-value] +src/build123d/build_part.py:0: error: Attribute "part" already defined on line 0 [no-redef] +src/build123d/build_part.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "Part") [assignment] +src/build123d/build_part.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] +src/build123d/build_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/build_line.py:0: error: Incompatible types in assignment (expression has type "type[Edge]", base class "Builder" defined the type as "None") [assignment] +src/build123d/build_line.py:0: error: Incompatible types in assignment (expression has type "type[Compound]", base class "Builder" defined the type as "None") [assignment] +src/build123d/build_line.py:0: error: Attribute "line" already defined on line 0 [no-redef] +src/build123d/build_line.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "Curve") [assignment] +src/build123d/build_line.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] +src/build123d/build_line.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/build_line.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_sketch.py:0: error: Incompatible types in assignment (expression has type "tuple[float, int]", target has type "tuple[float, None]") [assignment] +src/build123d/operations_sketch.py:0: error: No overload variant of "__getitem__" of "list" matches argument type "None" [call-overload] +src/build123d/operations_sketch.py:0: note: Possible overload variants: +src/build123d/operations_sketch.py:0: note: def __getitem__(self, SupportsIndex, /) -> Vector +src/build123d/operations_sketch.py:0: note: def __getitem__(self, slice[Any, Any, Any], /) -> list[Vector] +src/build123d/operations_sketch.py:0: error: Argument 1 to "distance_to_with_closest_points" of "Shape" has incompatible type "float"; expected "Shape[Any] | Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/operations_sketch.py:0: error: Argument 1 to "distance_to_with_closest_points" of "Shape" has incompatible type "float"; expected "Shape[Any] | Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/operations_sketch.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "Vector") [assignment] +src/build123d/operations_sketch.py:0: error: Unsupported operand types for - ("float" and "Vector") [operator] +src/build123d/operations_sketch.py:0: error: Item "None" of "Shape[Any] | None" has no attribute "edges" [union-attr] +src/build123d/operations_sketch.py:0: error: Unsupported operand types for - ("ShapeList[Edge]" and "list[Edge]") [operator] +src/build123d/operations_sketch.py:0: note: Left operand is of type "ShapeList[Edge] | Any" +src/build123d/operations_sketch.py:0: error: Incompatible default for argument "edges" (default has type "None", argument has type "Edge | Iterable[Edge]") [assignment] +src/build123d/operations_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_sketch.py:0: error: Incompatible default for argument "edges" (default has type "None", argument has type "Edge | Iterable[Edge]") [assignment] +src/build123d/operations_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_sketch.py:0: error: Incompatible default for argument "lines" (default has type "None", argument has type "Curve | Edge | Wire | Iterable[Curve | Edge | Wire]") [assignment] +src/build123d/operations_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_sketch.py:0: error: Need type annotation for "new_faces" (hint: "new_faces: list[] = ...") [var-annotated] +src/build123d/operations_part.py:0: error: Incompatible default for argument "to_extrude" (default has type "None", argument has type "Face | Sketch") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "amount" (default has type "None", argument has type "float") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "dir" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "until" (default has type "None", argument has type "Until") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "target" (default has type "None", argument has type "Compound | Solid") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "sections" (default has type "None", argument has type "Face | Sketch | Iterable[Vertex | Face | Sketch]") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Item "None" of "Face | None" has no attribute "outer_wire" [union-attr] +src/build123d/operations_part.py:0: error: Unsupported operand types for + ("ShapeList[Face]" and "list[Any]") [operator] +src/build123d/operations_part.py:0: error: Incompatible default for argument "line" (default has type "None", argument has type "Edge | Wire | Curve") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Need type annotation for "station_edges" [var-annotated] +src/build123d/operations_part.py:0: error: Argument 1 to "len" has incompatible type "list[float | int] | Iterable[float]"; expected "Sized" [arg-type] +src/build123d/operations_part.py:0: error: Argument 1 to "_add_to_context" of "Builder" has incompatible type "Solid | ShapeList[Solid]"; expected "Edge | Wire | Face | Solid | Compound" [arg-type] +src/build123d/operations_part.py:0: error: Incompatible default for argument "profiles" (default has type "None", argument has type "Face | Iterable[Face]") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "obj" (default has type "None", argument has type "Part") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Argument 3 to "validate_inputs" has incompatible type "None"; expected "Iterable[Shape[Any]]" [arg-type] +src/build123d/operations_part.py:0: error: Argument 1 to "_add_to_context" of "Builder" has incompatible type "*list[Part | ShapeList[Part] | None]"; expected "Edge | Wire | Face | Solid | Compound" [arg-type] +src/build123d/operations_part.py:0: error: Incompatible default for argument "to_thicken" (default has type "None", argument has type "Face | Sketch") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "amount" (default has type "None", argument has type "float") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Incompatible default for argument "normal_override" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_part.py:0: error: Unsupported operand types for * ("Sequence[float]" and "int") [operator] +src/build123d/operations_part.py:0: note: Left operand is of type "Vector | Sequence[float]" +src/build123d/operations_part.py:0: error: Argument "normal_override" to "thicken" of "Solid" has incompatible type "Vector | int"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | None" [arg-type] +src/build123d/objects_sketch.py:0: error: Cannot find implementation or library stub for module named "trianglesolver" [import-not-found] +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "align" (default has type "None", argument has type "Align | tuple[Align, Align]") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "tuple[Any, ...] | None", variable has type "Align | tuple[Align, Align]") [assignment] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "list[Vector]", variable has type "ShapeList[Vector]") [assignment] +src/build123d/objects_sketch.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "Face | None", variable has type "Face") [assignment] +src/build123d/objects_sketch.py:0: error: The return type of "__init__" must be None [misc] +src/build123d/objects_sketch.py:0: error: Missing return statement [return] +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "font_path" (default has type "None", argument has type "str") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "path" (default has type "None", argument has type "Edge | Wire") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Argument "align" to "make_text" of "Compound" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "right_side_angle" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "a" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "b" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "c" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "A" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "B" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Incompatible default for argument "C" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Generator has incompatible item type "Vector"; expected "bool" [misc] +src/build123d/objects_sketch.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/objects_part.py:0: error: Incompatible default for argument "align" (default has type "None", argument has type "Align | tuple[Align, Align, Align]") [assignment] +src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_part.py:0: error: Incompatible types in assignment (expression has type "tuple[Any, ...] | None", variable has type "Align | tuple[Align, Align, Align]") [assignment] +src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] +src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] +src/build123d/objects_part.py:0: error: Incompatible default for argument "depth" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_part.py:0: error: Argument "part" to "__init__" of "BasePartObject" has incompatible type "Solid | ShapeList[Solid]"; expected "Part | Solid" [arg-type] +src/build123d/objects_part.py:0: error: Incompatible default for argument "depth" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_part.py:0: error: Argument "part" to "__init__" of "BasePartObject" has incompatible type "Solid | ShapeList[Solid]"; expected "Part | Solid" [arg-type] +src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] +src/build123d/objects_part.py:0: error: Incompatible default for argument "depth" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] +src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] +src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] +src/build123d/objects_curve.py:0: error: Incompatible default for argument "weights" (default has type "None", argument has type "list[float]") [assignment] +src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] +src/build123d/objects_curve.py:0: error: Argument 1 to "make_line" of "Edge" has incompatible type "list[Vector] | Vector"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "list" matches argument type "Vector" [operator] +src/build123d/objects_curve.py:0: note: Possible overload variants: +src/build123d/objects_curve.py:0: note: def __add__(self, list[Vector], /) -> list[Vector] +src/build123d/objects_curve.py:0: note: def [_S] __add__(self, list[_S], /) -> list[_S | Vector] +src/build123d/objects_curve.py:0: note: Both left and right operands are unions +src/build123d/objects_curve.py:0: error: Argument 1 to "add" of "BoundBox" has incompatible type "list[Vector] | Vector"; expected "tuple[float, float, float] | Vector | BoundBox" [arg-type] +src/build123d/objects_curve.py:0: error: The return type of "__init__" must be None [misc] +src/build123d/objects_curve.py:0: error: Argument 1 to "Axis" has incompatible type "list[Vector] | Vector"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Argument 4 to "make_helix" of "Edge" has incompatible type "list[Vector] | Vector"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Value of type "list[Vector] | Vector" is not indexable [index] +src/build123d/objects_curve.py:0: error: Argument 1 to "len" has incompatible type "list[Vector] | Vector"; expected "Sized" [arg-type] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "Vector" [operator] +src/build123d/objects_curve.py:0: note: Possible overload variants: +src/build123d/objects_curve.py:0: note: def __add__(self, tuple[float, ...], /) -> tuple[float, ...] +src/build123d/objects_curve.py:0: note: def [_T] __add__(self, tuple[_T, ...], /) -> tuple[float | _T, ...] +src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "Vector") [operator] +src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float]") [operator] +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float, float]") [operator] +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("Sequence[float]") [operator] +src/build123d/objects_curve.py:0: note: Both left and right operands are unions +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float]") [operator] +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float, float]") [operator] +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("Sequence[float]") [operator] +src/build123d/objects_curve.py:0: note: Both left and right operands are unions +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float]") [operator] +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float, float]") [operator] +src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("Sequence[float]") [operator] +src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" +src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "Vector" [operator] +src/build123d/objects_curve.py:0: note: Possible overload variants: +src/build123d/objects_curve.py:0: note: def __add__(self, tuple[float, ...], /) -> tuple[float, ...] +src/build123d/objects_curve.py:0: note: def [_T] __add__(self, tuple[_T, ...], /) -> tuple[float | _T, ...] +src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "Vector") [operator] +src/build123d/objects_curve.py:0: note: Both left and right operands are unions +src/build123d/objects_curve.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_curve.py:0: error: Incompatible default for argument "direction" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/objects_curve.py:0: error: Argument 1 to "get_angle" of "Vector" has incompatible type "Vector | Sequence[float]"; expected "Vector" [arg-type] +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("Sequence[float]" and "float") [operator] +src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float]" and "float") [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float, float]" and "float") [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("Sequence[float]" and "float") [operator] +src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float]" and "float") [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float, float]" and "float") [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("Sequence[float]" and "float") [operator] +src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float]" and "float") [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float, float]" and "float") [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Vector" and "float") [operator] +src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "Vector" [operator] +src/build123d/objects_curve.py:0: note: Possible overload variants: +src/build123d/objects_curve.py:0: note: def __add__(self, tuple[float, ...], /) -> tuple[float, ...] +src/build123d/objects_curve.py:0: note: def [_T] __add__(self, tuple[_T, ...], /) -> tuple[float | _T, ...] +src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "float" [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "Vector") [operator] +src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "float") [operator] +src/build123d/objects_curve.py:0: note: Both left and right operands are unions +src/build123d/objects_curve.py:0: error: Argument 2 to "make_line" of "Edge" has incompatible type "Vector | Any | float"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Value of type "list[Vector] | Vector" is not indexable [index] +src/build123d/objects_curve.py:0: error: Argument 1 to "len" has incompatible type "list[Vector] | Vector"; expected "Sized" [arg-type] +src/build123d/objects_curve.py:0: error: Incompatible default for argument "tangents" (default has type "None", argument has type "Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]") [assignment] +src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_curve.py:0: error: Incompatible default for argument "tangent_scalars" (default has type "None", argument has type "Iterable[float]") [assignment] +src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] +src/build123d/objects_curve.py:0: error: Argument 1 to "len" has incompatible type "Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]"; expected "Sized" [arg-type] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "Iterable[float]", variable has type "list[float]") [assignment] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] +src/build123d/objects_curve.py:0: error: Value of type "list[Vector] | Vector" is not indexable [index] +src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] +src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] +src/build123d/joints.py:0: error: Unsupported left operand type for * ("None") [operator] +src/build123d/joints.py:0: note: Both left and right operands are unions +src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "RigidJoint"; expected "Builder | str" [arg-type] +src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "BuildPart", variable has type "Solid | Compound | None") [assignment] +src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "location" [union-attr] +src/build123d/joints.py:0: error: Item "None" of "Location | Any | None" has no attribute "inverse" [union-attr] +src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "joints" [union-attr] +src/build123d/joints.py:0: error: Argument 2 to "__init__" of "Joint" has incompatible type "Solid | Compound | None"; expected "Solid | Compound" [arg-type] +src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def connect_to(self, other: BallJoint, *, angles: tuple[float, float, float] | Rotation = ..., **kwargs: Any) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def connect_to(self, other: CylindricalJoint, *, position: float = ..., angle: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def connect_to(self, other: LinearJoint, *, position: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def connect_to(self, other: RevoluteJoint, *, angle: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def relative_to(self, other: BallJoint, *, angles: tuple[float, float, float] | Rotation = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def relative_to(self, other: CylindricalJoint, *, position: float = ..., angle: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def relative_to(self, other: LinearJoint, *, position: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def relative_to(self, other: RevoluteJoint, *, angle: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Argument "angle" to "relative_to" of "RevoluteJoint" has incompatible type "Any | None"; expected "float" [arg-type] +src/build123d/joints.py:0: error: Argument "position" to "relative_to" of "LinearJoint" has incompatible type "Any | None"; expected "float" [arg-type] +src/build123d/joints.py:0: error: Argument "position" to "relative_to" of "CylindricalJoint" has incompatible type "Any | None"; expected "float" [arg-type] +src/build123d/joints.py:0: error: Argument "angle" to "relative_to" of "CylindricalJoint" has incompatible type "Any | None"; expected "float" [arg-type] +src/build123d/joints.py:0: error: Argument "angles" to "relative_to" of "BallJoint" has incompatible type "Any | None"; expected "tuple[float, float, float] | Rotation" [arg-type] +src/build123d/joints.py:0: error: Incompatible default for argument "to_part" (default has type "None", argument has type "Solid | Compound") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle_reference" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "RevoluteJoint"; expected "Builder | str" [arg-type] +src/build123d/joints.py:0: error: Item "None" of "Location | None" has no attribute "inverse" [union-attr] +src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, angle: float = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, angle: float = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "None") [assignment] +src/build123d/joints.py:0: error: Incompatible default for argument "to_part" (default has type "None", argument has type "Solid | Compound") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "LinearJoint"; expected "Builder | str" [arg-type] +src/build123d/joints.py:0: error: Item "None" of "Location | None" has no attribute "inverse" [union-attr] +src/build123d/joints.py:0: error: Unexpected type declaration [misc] +src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def connect_to(self, other: RevoluteJoint, *, position: float = ..., angle: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, position: float = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, position: float = ...) -> Any +src/build123d/joints.py:0: note: @overload +src/build123d/joints.py:0: note: def relative_to(self, other: RevoluteJoint, *, position: float = ..., angle: float = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] +src/build123d/joints.py:0: error: Incompatible default for argument "to_part" (default has type "None", argument has type "Solid | Compound") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle_reference" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "CylindricalJoint"; expected "Builder | str" [arg-type] +src/build123d/joints.py:0: error: Item "None" of "Location | None" has no attribute "inverse" [union-attr] +src/build123d/joints.py:0: error: Unexpected type declaration [misc] +src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, position: float = ..., angle: float = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, position: float = ..., angle: float = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "None") [assignment] +src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "None") [assignment] +src/build123d/joints.py:0: error: Unsupported left operand type for * ("None") [operator] +src/build123d/joints.py:0: note: Both left and right operands are unions +src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "BallJoint"; expected "Builder | str" [arg-type] +src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "BuildPart", variable has type "Solid | Compound | None") [assignment] +src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "location" [union-attr] +src/build123d/joints.py:0: error: Item "None" of "Location | Any | None" has no attribute "inverse" [union-attr] +src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "joints" [union-attr] +src/build123d/joints.py:0: error: Argument 2 to "__init__" of "Joint" has incompatible type "Solid | Compound | None"; expected "Solid | Compound" [arg-type] +src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, angles: tuple[float, float, float] | Rotation = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] +src/build123d/joints.py:0: note: Superclass: +src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location +src/build123d/joints.py:0: note: Subclass: +src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, angles: tuple[float, float, float] | Rotation = ...) -> Any +src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] +src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/joints.py:0: error: No overload variant of "Rotation" matches argument type "list[float]" [call-overload] +src/build123d/joints.py:0: note: Possible overload variants: +src/build123d/joints.py:0: note: def __init__(self, rotation: tuple[float, float, float] | Rotation, ordering: Any) -> Rotation +src/build123d/joints.py:0: note: def __init__(self, X: float = ..., Y: float = ..., Z: float = ..., ordering: Extrinsic | Intrinsic = ...) -> Rotation +src/build123d/joints.py:0: error: Expected iterable as variadic argument [misc] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "rotation" (default has type "None", argument has type "float | tuple[float, float, float] | Rotation") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "None"; expected "Builder | str" [arg-type] +src/build123d/operations_generic.py:0: error: Item "Builder" of "Edge | Wire | Face | Solid | Compound | Builder | Iterable[Edge | Wire | Face | Solid | Compound | Builder]" has no attribute "__iter__" (not iterable) [union-attr] +src/build123d/operations_generic.py:0: error: Argument 3 to "validate_inputs" has incompatible type "Edge | Wire | Face | Solid | Compound | list[Edge | Wire | Face | Solid | Compound | Builder]"; expected "Iterable[Shape[Any]]" [arg-type] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Shape[Any] | Iterable[Shape[Any]]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Missing return statement [return] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "length2" (default has type "None", argument has type "float") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "reference" (default has type "None", argument has type "Edge | Face") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "filter[Any]", variable has type "list[Any]") [assignment] +src/build123d/operations_generic.py:0: error: Missing return statement [return] +src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "filter[Any]", variable has type "list[Any]") [assignment] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Wire | Face | Compound | Curve | Sketch | Part | Iterable[Edge | Wire | Face | Compound | Curve | Sketch | Part]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Face | Solid | Compound | Iterable[Edge | Face | Solid | Compound]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "openings" (default has type "None", argument has type "Face | list[Face]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "min_edge_length" (default has type "None", argument has type "float") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "Face | ShapeList[Face]", variable has type "Face") [assignment] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Face | Wire | Vector | Vertex | Iterable[Edge | Face | Wire | Vector | Vertex]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "workplane" (default has type "None", argument has type "Plane") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "target" (default has type "None", argument has type "Solid | Compound | Part") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Value of type "None" is not indexable [index] +src/build123d/operations_generic.py:0: error: List comprehension has incompatible type List[Vector]; expected List[Edge | Vertex] [misc] +src/build123d/operations_generic.py:0: error: Value of type variable "T" of "ShapeList" cannot be "ShapeList[Face | Shell]" [type-var] +src/build123d/operations_generic.py:0: error: Incompatible return value type (got "ShapeList[ShapeList[Face | Shell]]", expected "Curve | Sketch | Compound | ShapeList[Vector]") [return-value] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Shape[Any] | Iterable[Shape[Any]]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "Vector", variable has type "float") [assignment] +src/build123d/operations_generic.py:0: error: "float" has no attribute "X" [attr-defined] +src/build123d/operations_generic.py:0: error: "float" has no attribute "Y" [attr-defined] +src/build123d/operations_generic.py:0: error: "float" has no attribute "Z" [attr-defined] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Wire | Face | Solid | Iterable[Edge | Wire | Face | Solid]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Need type annotation for "new_objects" (hint: "new_objects: list[] = ...") [var-annotated] +src/build123d/operations_generic.py:0: error: Incompatible default for argument "sections" (default has type "None", argument has type "Compound | Edge | Wire | Face | Solid | Iterable[Compound | Edge | Wire | Face | Solid]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "path" (default has type "None", argument has type "Curve | Edge | Wire | Iterable[Edge]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "normal" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Incompatible default for argument "binormal" (default has type "None", argument has type "Edge | Wire") [assignment] +src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/operations_generic.py:0: error: Need type annotation for "edge_list" (hint: "edge_list: list[] = ...") [var-annotated] +src/build123d/operations_generic.py:0: error: Need type annotation for "new_faces" (hint: "new_faces: list[] = ...") [var-annotated] +src/build123d/drafting.py:0: error: Argument "align" to "Polygon" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/drafting.py:0: error: Item "ShapeList[ArrowHead]" of "ArrowHead | ShapeList[ArrowHead]" has no attribute "clean" [union-attr] +src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/drafting.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float | tuple[float, float]") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: The return type of "__init__" must be None [misc] +src/build123d/drafting.py:0: error: Missing return statement [return] +src/build123d/drafting.py:0: error: Incompatible default for argument "draft" (default has type "None", argument has type "Draft") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible default for argument "sketch" (default has type "None", argument has type "Sketch") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible default for argument "label" (default has type "None", argument has type "str") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float | tuple[float, float]") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Item "None" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] +src/build123d/drafting.py:0: error: Item "ShapeList[Compound]" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] +src/build123d/drafting.py:0: error: Item "None" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] +src/build123d/drafting.py:0: error: Item "ShapeList[Compound]" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] +src/build123d/drafting.py:0: error: Incompatible types in assignment (expression has type "list[tuple[Compound, float]]", variable has type "dict[Compound, float]") [assignment] +src/build123d/drafting.py:0: error: Value of type "float" is not indexable [index] +src/build123d/drafting.py:0: error: Invalid index type "int" for "dict[Compound, float]"; expected type "Compound" [index] +src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/drafting.py:0: error: Incompatible default for argument "sketch" (default has type "None", argument has type "Sketch") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible default for argument "label" (default has type "None", argument has type "str") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float | tuple[float, float]") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible default for argument "project_line" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible default for argument "sheet_number" (default has type "None", argument has type "int") [assignment] +src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True +src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/drafting.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment] +src/build123d/drafting.py:0: error: Argument 1 to "make_text" of "Compound" has incompatible type "int"; expected "str" [arg-type] +src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] +src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] +src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] +src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] +src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 0d718bb..95f6008 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -78,7 +78,7 @@ class BaseSketchObject(Sketch): self, obj: Compound | Face, rotation: float = 0, - align: Align | tuple[Align, Align] = None, + align: Align | tuple[Align, Align] | None = None, mode: Mode = Mode.ADD, ): if align is not None: @@ -123,7 +123,7 @@ class Circle(BaseSketchObject): def __init__( self, radius: float, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -157,7 +157,7 @@ class Ellipse(BaseSketchObject): x_radius: float, y_radius: float, rotation: float = 0, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -196,7 +196,7 @@ class Polygon(BaseSketchObject): self, *pts: VectorLike | Iterable[VectorLike], rotation: float = 0, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -232,7 +232,7 @@ class Rectangle(BaseSketchObject): width: float, height: float, rotation: float = 0, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -269,7 +269,7 @@ class RectangleRounded(BaseSketchObject): height: float, radius: float, rotation: float = 0, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -510,7 +510,7 @@ class SlotOverall(BaseSketchObject): width: float, height: float, rotation: float = 0, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): if width <= height: @@ -566,14 +566,14 @@ class Text(BaseSketchObject): txt: str, font_size: float, font: str = "Arial", - font_path: str = None, + font_path: str | None = None, font_style: FontStyle = FontStyle.REGULAR, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), path: Edge | Wire = None, position_on_path: float = 0.0, rotation: float = 0, mode: Mode = Mode.ADD, - ) -> Compound: + ): context = BuildSketch._get_context(self) validate_inputs(context, self) @@ -628,9 +628,9 @@ class Trapezoid(BaseSketchObject): width: float, height: float, left_side_angle: float, - right_side_angle: float = None, + right_side_angle: float | None = None, rotation: float = 0, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -710,13 +710,13 @@ class Triangle(BaseSketchObject): def __init__( self, *, - a: float = None, - b: float = None, - c: float = None, - A: float = None, - B: float = None, - C: float = None, - align: None | Align | tuple[Align, Align] = None, + a: float | None = None, + b: float | None = None, + c: float | None = None, + A: float | None = None, + B: float | None = None, + C: float | None = None, + align: Align | tuple[Align, Align] | None = None, rotation: float = 0, mode: Mode = Mode.ADD, ): @@ -729,13 +729,13 @@ class Triangle(BaseSketchObject): raise ValueError("One length and two other values must be provided") A, B, C = (radians(angle) if angle is not None else None for angle in [A, B, C]) - a, b, c, A, B, C = trianglesolver.solve(a, b, c, A, B, C) - self.a = a #: length of side 'a' - self.b = b #: length of side 'b' - self.c = c #: length of side 'c' - self.A = degrees(A) #: interior angle 'A' in degrees - self.B = degrees(B) #: interior angle 'B' in degrees - self.C = degrees(C) #: interior angle 'C' in degrees + a2, b2, c2, A2, B2, C2 = trianglesolver.solve(a, b, c, A, B, C) + self.a = a2 #: length of side 'a' + self.b = b2 #: length of side 'b' + self.c = c2 #: length of side 'c' + self.A = degrees(A2) #: interior angle 'A' in degrees + self.B = degrees(B2) #: interior angle 'B' in degrees + self.C = degrees(C2) #: interior angle 'C' in degrees triangle = Face( Wire.make_polygon( [Vector(0, 0), Vector(a, 0), Vector(c, 0).rotate(Axis.Z, self.B)] From d05b98aff75d752703929801ef5510fa16369812 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 8 Jan 2025 14:23:57 -0600 Subject: [PATCH 096/518] add trianglesolver to mypy.ini and don't redefine input variables, create new ones to keep mypy happy --- mypy.ini | 3 +++ src/build123d/objects_sketch.py | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/mypy.ini b/mypy.ini index 971aa30..947693e 100644 --- a/mypy.ini +++ b/mypy.ini @@ -23,5 +23,8 @@ ignore_missing_imports = True [mypy-svgpathtools.*] ignore_missing_imports = True +[mypy-trianglesolver.*] +ignore_missing_imports = True + [mypy-vtkmodules.*] ignore_missing_imports = True diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 95f6008..e8013c9 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -729,27 +729,27 @@ class Triangle(BaseSketchObject): raise ValueError("One length and two other values must be provided") A, B, C = (radians(angle) if angle is not None else None for angle in [A, B, C]) - a2, b2, c2, A2, B2, C2 = trianglesolver.solve(a, b, c, A, B, C) - self.a = a2 #: length of side 'a' - self.b = b2 #: length of side 'b' - self.c = c2 #: length of side 'c' - self.A = degrees(A2) #: interior angle 'A' in degrees - self.B = degrees(B2) #: interior angle 'B' in degrees - self.C = degrees(C2) #: interior angle 'C' in degrees + ar, br, cr, Ar, Br, Cr = trianglesolver.solve(a, b, c, A, B, C) + self.a = ar #: length of side 'a' + self.b = br #: length of side 'b' + self.c = cr #: length of side 'c' + self.A = degrees(Ar) #: interior angle 'A' in degrees + self.B = degrees(Br) #: interior angle 'B' in degrees + self.C = degrees(Cr) #: interior angle 'C' in degrees triangle = Face( Wire.make_polygon( - [Vector(0, 0), Vector(a, 0), Vector(c, 0).rotate(Axis.Z, self.B)] + [Vector(0, 0), Vector(ar, 0), Vector(cr, 0).rotate(Axis.Z, self.B)] ) ) center_of_geometry = sum(Vector(v) for v in triangle.vertices()) / 3 triangle.move(Location(-center_of_geometry)) alignment = None if align is None else tuplify(align, 2) super().__init__(obj=triangle, rotation=rotation, align=alignment, mode=mode) - self.edge_a = self.edges().filter_by(lambda e: abs(e.length - a) < TOLERANCE)[ + self.edge_a = self.edges().filter_by(lambda e: abs(e.length - ar) < TOLERANCE)[ 0 ] #: edge 'a' self.edge_b = self.edges().filter_by( - lambda e: abs(e.length - b) < TOLERANCE and e not in [self.edge_a] + lambda e: abs(e.length - br) < TOLERANCE and e not in [self.edge_a] )[ 0 ] #: edge 'b' From 7e65b8e930cc36a1985efe7e23ff1c764b016f97 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 8 Jan 2025 17:14:12 -0600 Subject: [PATCH 097/518] additional typing fixes for objects_sketch.py --- mypy-baseline.txt | 80 +++++---------------------------- src/build123d/objects_sketch.py | 22 ++++----- 2 files changed, 23 insertions(+), 79 deletions(-) diff --git a/mypy-baseline.txt b/mypy-baseline.txt index 7f90784..72f95ac 100644 --- a/mypy-baseline.txt +++ b/mypy-baseline.txt @@ -1,8 +1,5 @@ src/build123d/_dev/scm_version.py:0: error: Cannot find implementation or library stub for module named "setuptools_scm" [import-not-found] src/build123d/_dev/scm_version.py:0: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports -src/build123d/version.py:0: error: Cannot find implementation or library stub for module named "build123d._version" [import-not-found] -src/build123d/version.py:0: error: Name "version" already defined (possibly by an import) [no-redef] -src/build123d/jupyter_tools.py:0: error: Cannot find implementation or library stub for module named "IPython.display" [import-not-found] src/build123d/geometry.py:0: error: Incompatible default for argument "normal" (default has type "None", argument has type "Vector") [assignment] src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase @@ -56,9 +53,10 @@ src/build123d/geometry.py:0: error: Incompatible types in assignment (expression src/build123d/geometry.py:0: error: Item "Sequence[float]" of "Any | Sequence[float]" has no attribute "transform_shape" [union-attr] src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] src/build123d/topology/shape_core.py:0: error: Incompatible return value type (got "Any | None", expected "Shape[Any]") [return-value] +src/build123d/topology/shape_core.py:0: error: "PrettyPrinter" has no attribute "pretty" [attr-defined] src/build123d/persistence.py:0: error: Incompatible return value type (got "None", expected "bytes") [return-value] src/build123d/persistence.py:0: error: Incompatible return value type (got "None", expected "bytes") [return-value] -src/build123d/mesher.py:0: error: Cannot find implementation or library stub for module named "py_lib3mf" [import-not-found] +src/build123d/mesher.py:0: error: Skipping analyzing "py_lib3mf": module is installed, but missing library stubs or py.typed marker [import-untyped] src/build123d/mesher.py:0: error: Item "None" of "Any | None" has no attribute "Orientation" [union-attr] src/build123d/mesher.py:0: error: "list" expects 1 type argument, but 3 given [type-arg] src/build123d/mesher.py:0: error: Incompatible types in assignment (expression has type "Array[c_uint]", variable has type "Array[c_float]") [assignment] @@ -68,7 +66,7 @@ src/build123d/mesher.py:0: note: Use https://github.com/hauntsaninja/no_implicit src/build123d/mesher.py:0: error: Module "uuid" is not valid as a type [valid-type] src/build123d/mesher.py:0: note: Perhaps you meant to use a protocol matching the module structure? src/build123d/mesher.py:0: error: Attribute "meshes" already defined on line 0 [no-redef] -src/build123d/importers.py:0: error: Cannot find implementation or library stub for module named "ocpsvg" [import-not-found] +src/build123d/importers.py:0: error: Skipping analyzing "ocpsvg": module is installed, but missing library stubs or py.typed marker [import-untyped] src/build123d/importers.py:0: error: If x = b'abc' then f"{x}" or "{}".format(x) produces "b'abc'", not "abc". If this is desired behavior, use f"{x!r}" or "{!r}".format(x). Otherwise, decode the bytes [str-bytes-safe] src/build123d/importers.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "bool") [assignment] src/build123d/build_common.py:0: error: Item "None" of "FrameType | None" has no attribute "f_code" [union-attr] @@ -119,23 +117,17 @@ src/build123d/build_common.py:0: error: Incompatible return value type (got "_Wr src/build123d/build_common.py:0: note: "_Wrapped[[Builder, **P], T2, [Select], Any].__call__" has type "Callable[[DefaultArg(Select, 'select')], Any]" src/build123d/exporters3d.py:0: error: Unsupported left operand type for * ("None") [operator] src/build123d/exporters3d.py:0: note: Left operand is of type "Location | None" -src/build123d/exporters.py:0: error: Cannot find implementation or library stub for module named "ezdxf" [import-not-found] -src/build123d/exporters.py:0: error: Cannot find implementation or library stub for module named "ezdxf.colors" [import-not-found] -src/build123d/exporters.py:0: error: Cannot find implementation or library stub for module named "ezdxf.math" [import-not-found] src/build123d/exporters.py:0: error: Incompatible default for argument "look_at" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] src/build123d/exporters.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True src/build123d/exporters.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "int", target has type "str") [assignment] src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "int", target has type "str") [assignment] +src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "int" [arg-type] +src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "int | None" [arg-type] +src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "bool" [arg-type] +src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "float | None" [arg-type] src/build123d/exporters.py:0: error: "None" object is not iterable [misc] src/build123d/exporters.py:0: error: Item "None" of "Location | None" has no attribute "wrapped" [union-attr] -src/build123d/exporters.py:0: error: No overload variant of "Color" matches argument types "Any", "int" [call-overload] -src/build123d/exporters.py:0: note: Possible overload variants: -src/build123d/exporters.py:0: note: def __init__(self, q_color: Any) -> Color -src/build123d/exporters.py:0: note: def __init__(self, name: str, alpha: float = ...) -> Color -src/build123d/exporters.py:0: note: def __init__(self, red: float, green: float, blue: float, alpha: float = ...) -> Color -src/build123d/exporters.py:0: note: def __init__(self, color_tuple: tuple[float]) -> Color -src/build123d/exporters.py:0: note: def __init__(self, color_code: int, alpha: int = ...) -> Color src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "BoundBox") [assignment] src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "_Layer", variable has type "str") [assignment] src/build123d/exporters.py:0: error: Argument 2 to "_add_single_shape" of "ExportSVG" has incompatible type "str"; expected "_Layer" [arg-type] @@ -240,56 +232,11 @@ src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no src/build123d/operations_part.py:0: error: Unsupported operand types for * ("Sequence[float]" and "int") [operator] src/build123d/operations_part.py:0: note: Left operand is of type "Vector | Sequence[float]" src/build123d/operations_part.py:0: error: Argument "normal_override" to "thicken" of "Solid" has incompatible type "Vector | int"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | None" [arg-type] -src/build123d/objects_sketch.py:0: error: Cannot find implementation or library stub for module named "trianglesolver" [import-not-found] -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "align" (default has type "None", argument has type "Align | tuple[Align, Align]") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "tuple[Any, ...] | None", variable has type "Align | tuple[Align, Align]") [assignment] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "list[Vector]", variable has type "ShapeList[Vector]") [assignment] -src/build123d/objects_sketch.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Incompatible types in assignment (expression has type "Face | None", variable has type "Face") [assignment] -src/build123d/objects_sketch.py:0: error: The return type of "__init__" must be None [misc] -src/build123d/objects_sketch.py:0: error: Missing return statement [return] -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "font_path" (default has type "None", argument has type "str") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "path" (default has type "None", argument has type "Edge | Wire") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Argument "align" to "make_text" of "Compound" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "right_side_angle" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Argument 3 to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "a" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "b" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "c" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "A" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "B" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_sketch.py:0: error: Incompatible default for argument "C" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase +src/build123d/objects_sketch.py:0: error: Item "None" of "Compound | Face | None" has no attribute "move" [union-attr] +src/build123d/objects_sketch.py:0: error: Item "None" of "Compound | Face | None" has no attribute "bounding_box" [union-attr] +src/build123d/objects_sketch.py:0: error: Item "None" of "Compound | Face | None" has no attribute "moved" [union-attr] +src/build123d/objects_sketch.py:0: error: Argument "align" to "make_text" of "Compound" has incompatible type "Align | tuple[Align, Align] | None"; expected "Align | tuple[Align, Align]" [arg-type] src/build123d/objects_sketch.py:0: error: Generator has incompatible item type "Vector"; expected "bool" [misc] -src/build123d/objects_sketch.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align]" [arg-type] src/build123d/objects_part.py:0: error: Incompatible default for argument "align" (default has type "None", argument has type "Align | tuple[Align, Align, Align]") [assignment] src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase @@ -672,10 +619,7 @@ src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase src/build123d/operations_generic.py:0: error: Need type annotation for "edge_list" (hint: "edge_list: list[] = ...") [var-annotated] src/build123d/operations_generic.py:0: error: Need type annotation for "new_faces" (hint: "new_faces: list[] = ...") [var-annotated] -src/build123d/drafting.py:0: error: Argument "align" to "Polygon" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] src/build123d/drafting.py:0: error: Item "ShapeList[ArrowHead]" of "ArrowHead | ShapeList[ArrowHead]" has no attribute "clean" [union-attr] -src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] src/build123d/drafting.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float | tuple[float, float]") [assignment] src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase @@ -700,7 +644,6 @@ src/build123d/drafting.py:0: error: Item "ShapeList[Compound]" of "Compound | Sh src/build123d/drafting.py:0: error: Incompatible types in assignment (expression has type "list[tuple[Compound, float]]", variable has type "dict[Compound, float]") [assignment] src/build123d/drafting.py:0: error: Value of type "float" is not indexable [index] src/build123d/drafting.py:0: error: Invalid index type "int" for "dict[Compound, float]"; expected type "Compound" [index] -src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] src/build123d/drafting.py:0: error: Incompatible default for argument "sketch" (default has type "None", argument has type "Sketch") [assignment] src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase @@ -718,7 +661,6 @@ src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordin src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase src/build123d/drafting.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment] src/build123d/drafting.py:0: error: Argument 1 to "make_text" of "Compound" has incompatible type "int"; expected "str" [arg-type] -src/build123d/drafting.py:0: error: Argument "align" to "__init__" of "BaseSketchObject" has incompatible type "None"; expected "Align | tuple[Align, Align]" [arg-type] src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index e8013c9..c8d1501 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -76,7 +76,7 @@ class BaseSketchObject(Sketch): def __init__( self, - obj: Compound | Face, + obj: Compound | Face | None, rotation: float = 0, align: Align | tuple[Align, Align] | None = None, mode: Mode = Mode.ADD, @@ -202,8 +202,8 @@ class Polygon(BaseSketchObject): context = BuildSketch._get_context(self) validate_inputs(context, self) - pts = flatten_sequence(*pts) - self.pts = pts + flattened_pts = flatten_sequence(*pts) + self.pts = flattened_pts self.align = tuplify(align, 2) poly_pts = [Vector(p) for p in pts] @@ -354,9 +354,9 @@ class RegularPolygon(BaseSketchObject): maxs = [pts_sorted[0][-1].X, pts_sorted[1][-1].Y] align_offset = to_align_offset(mins, maxs, align, center=(0, 0)) - pts = [point + align_offset for point in pts] + pts_ao = [point + align_offset for point in pts] - face = Face(Wire.make_polygon(pts)) + face = Face(Wire.make_polygon(pts_ao)) super().__init__(face, rotation=0, align=None, mode=mode) @@ -525,7 +525,7 @@ class SlotOverall(BaseSketchObject): self.slot_height = height if width != height: - face = Face( + face: Face | None = Face( Wire( [ Edge.make_line(Vector(-width / 2 + height / 2, 0, 0), Vector()), @@ -569,9 +569,9 @@ class Text(BaseSketchObject): font_path: str | None = None, font_style: FontStyle = FontStyle.REGULAR, align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), - path: Edge | Wire = None, + path: Edge | Wire | None = None, position_on_path: float = 0.0, - rotation: float = 0, + rotation: float = 0.0, mode: Mode = Mode.ADD, ): context = BuildSketch._get_context(self) @@ -594,7 +594,7 @@ class Text(BaseSketchObject): font=font, font_path=font_path, font_style=font_style, - align=tuplify(align, 2), + align=align, position_on_path=position_on_path, text_path=path, ) @@ -741,7 +741,9 @@ class Triangle(BaseSketchObject): [Vector(0, 0), Vector(ar, 0), Vector(cr, 0).rotate(Axis.Z, self.B)] ) ) - center_of_geometry = sum(Vector(v) for v in triangle.vertices()) / 3 + center_of_geometry = ( + sum((Vector(v) for v in triangle.vertices()), Vector(0, 0, 0)) / 3 + ) triangle.move(Location(-center_of_geometry)) alignment = None if align is None else tuplify(align, 2) super().__init__(obj=triangle, rotation=rotation, align=alignment, mode=mode) From b81948043516058e4164b3c08cdc1455079b370f Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 8 Jan 2025 17:15:32 -0600 Subject: [PATCH 098/518] additional typing fixes for objects_sketch.py --- mypy-baseline.txt | 667 ---------------------------------------------- 1 file changed, 667 deletions(-) delete mode 100644 mypy-baseline.txt diff --git a/mypy-baseline.txt b/mypy-baseline.txt deleted file mode 100644 index 72f95ac..0000000 --- a/mypy-baseline.txt +++ /dev/null @@ -1,667 +0,0 @@ -src/build123d/_dev/scm_version.py:0: error: Cannot find implementation or library stub for module named "setuptools_scm" [import-not-found] -src/build123d/_dev/scm_version.py:0: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports -src/build123d/geometry.py:0: error: Incompatible default for argument "normal" (default has type "None", argument has type "Vector") [assignment] -src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/geometry.py:0: error: Self argument missing for a non-static method (or an invalid type for self) [misc] -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/geometry.py:0: error: Name "Edge" is not defined [name-defined] -src/build123d/geometry.py:0: error: Cannot determine type of "wrapped" [has-type] -src/build123d/geometry.py:0: error: Self argument missing for a non-static method (or an invalid type for self) [misc] -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/geometry.py:0: error: Attribute "wrapped" already defined on line 0 [no-redef] -src/build123d/geometry.py:0: error: Incompatible default for argument "tol" (default has type "None", argument has type "float") [assignment] -src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/geometry.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float") [assignment] -src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/geometry.py:0: error: Cannot determine type of "wrapped" [has-type] -src/build123d/geometry.py:0: error: Incompatible default for argument "rotation" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] -src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/geometry.py:0: error: Item "Location" of the upper bound "Location | Any" of type variable "T" has no attribute "moved" [union-attr] -src/build123d/geometry.py:0: error: Self argument missing for a non-static method (or an invalid type for self) [misc] -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/geometry.py:0: error: Incompatible return value type (got "tuple[tuple[Any, Any, Any], tuple[float, ...]]", expected "tuple[tuple[float, float, float], tuple[float, float, float]]") [return-value] -src/build123d/geometry.py:0: error: Invalid type comment or annotation [valid-type] -src/build123d/geometry.py:0: error: Overloaded function signature 3 will never be matched: signature 2's parameter type(s) are the same or broader [overload-cannot-match] -src/build123d/geometry.py:0: error: Name "Face" is not defined [name-defined] -src/build123d/geometry.py:0: error: Incompatible default for argument "x_dir" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "Plane") [assignment] -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/geometry.py:0: error: Name "Vertex" is not defined [name-defined] -src/build123d/geometry.py:0: error: Argument 1 to "tuple" has incompatible type "Axis | Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Any"; expected "Iterable[Any]" [arg-type] -src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "Vector", variable has type "tuple[Any, ...]") [assignment] -src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "Axis | Vector | None", variable has type "tuple[Any, ...]") [assignment] -src/build123d/geometry.py:0: error: Incompatible default for argument "ordering" (default has type "None", argument has type "Extrinsic | Intrinsic") [assignment] -src/build123d/geometry.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/geometry.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/geometry.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/geometry.py:0: error: Incompatible types in assignment (expression has type "BoundBox", variable has type "Vector") [assignment] -src/build123d/geometry.py:0: error: Item "Sequence[float]" of "Any | Sequence[float]" has no attribute "transform_shape" [union-attr] -src/build123d/geometry.py:0: error: Name "Shape" is not defined [name-defined] -src/build123d/topology/shape_core.py:0: error: Incompatible return value type (got "Any | None", expected "Shape[Any]") [return-value] -src/build123d/topology/shape_core.py:0: error: "PrettyPrinter" has no attribute "pretty" [attr-defined] -src/build123d/persistence.py:0: error: Incompatible return value type (got "None", expected "bytes") [return-value] -src/build123d/persistence.py:0: error: Incompatible return value type (got "None", expected "bytes") [return-value] -src/build123d/mesher.py:0: error: Skipping analyzing "py_lib3mf": module is installed, but missing library stubs or py.typed marker [import-untyped] -src/build123d/mesher.py:0: error: Item "None" of "Any | None" has no attribute "Orientation" [union-attr] -src/build123d/mesher.py:0: error: "list" expects 1 type argument, but 3 given [type-arg] -src/build123d/mesher.py:0: error: Incompatible types in assignment (expression has type "Array[c_uint]", variable has type "Array[c_float]") [assignment] -src/build123d/mesher.py:0: error: Incompatible default for argument "part_number" (default has type "None", argument has type "str") [assignment] -src/build123d/mesher.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/mesher.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/mesher.py:0: error: Module "uuid" is not valid as a type [valid-type] -src/build123d/mesher.py:0: note: Perhaps you meant to use a protocol matching the module structure? -src/build123d/mesher.py:0: error: Attribute "meshes" already defined on line 0 [no-redef] -src/build123d/importers.py:0: error: Skipping analyzing "ocpsvg": module is installed, but missing library stubs or py.typed marker [import-untyped] -src/build123d/importers.py:0: error: If x = b'abc' then f"{x}" or "{}".format(x) produces "b'abc'", not "abc". If this is desired behavior, use f"{x!r}" or "{!r}".format(x). Otherwise, decode the bytes [str-bytes-safe] -src/build123d/importers.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "bool") [assignment] -src/build123d/build_common.py:0: error: Item "None" of "FrameType | None" has no attribute "f_code" [union-attr] -src/build123d/build_common.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] -src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/build_common.py:0: error: Incompatible default for argument "caller" (default has type "None", argument has type "Builder | str") [assignment] -src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/build_common.py:0: error: Incompatible return value type (got "Builder | None", expected "Self") [return-value] -src/build123d/build_common.py:0: error: Argument 1 to "_shapes" of "Builder" has incompatible type "type"; expected "Vertex | Edge | Face | Solid" [arg-type] -src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] -src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] -src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] -src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] -src/build123d/build_common.py:0: error: Incompatible types in assignment (expression has type "Shape[Any] | ShapeList[Shape[Any]] | None", variable has type "Shape[Any] | ShapeList[Shape[Any]]") [assignment] -src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] -src/build123d/build_common.py:0: error: "None" not callable [misc] -src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] -src/build123d/build_common.py:0: error: "None" not callable [misc] -src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] -src/build123d/build_common.py:0: error: Invalid index type "None" for "dict[type, list[Edge | Wire | Face | Solid | Compound]]"; expected type "type" [index] -src/build123d/build_common.py:0: error: Argument 1 to "_shapes" of "Builder" has incompatible type "type"; expected "Vertex | Edge | Face | Solid" [arg-type] -src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] -src/build123d/build_common.py:0: error: "None" not callable [misc] -src/build123d/build_common.py:0: error: Property "_obj" defined in "Builder" is read-only [misc] -src/build123d/build_common.py:0: error: "None" not callable [misc] -src/build123d/build_common.py:0: error: Incompatible default for argument "obj_type" (default has type "None", argument has type "Vertex | Edge | Face | Solid") [assignment] -src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/build_common.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Shape[Any] | Iterable[Shape[Any]]") [assignment] -src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/build_common.py:0: error: Missing return statement [return] -src/build123d/build_common.py:0: error: Missing return statement [return] -src/build123d/build_common.py:0: error: Missing return statement [return] -src/build123d/build_common.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Iterable[Shape[Any]]") [assignment] -src/build123d/build_common.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_common.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/build_common.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "int") [assignment] -src/build123d/build_common.py:0: error: "Iterable" expects 1 type argument, but 6 given [type-arg] -src/build123d/build_common.py:0: error: Argument 1 to "append" of "list" has incompatible type "Any | Vector | Sequence[float]"; expected "Vector" [arg-type] -src/build123d/build_common.py:0: error: Argument 1 to "extend" of "list" has incompatible type "list[Any | Vector | Sequence[float]]"; expected "Iterable[Vector]" [arg-type] -src/build123d/build_common.py:0: error: Incompatible types in assignment (expression has type "list[Vector]", variable has type "Vector") [assignment] -src/build123d/build_common.py:0: error: Too few arguments [call-arg] -src/build123d/build_common.py:0: error: Argument 2 has incompatible type "Select"; expected "P.args" [arg-type] -src/build123d/build_common.py:0: error: Incompatible return value type (got "_Wrapped[[Builder, **P], T2, [Select], Any]", expected "Callable[P, T2]") [return-value] -src/build123d/build_common.py:0: note: "_Wrapped[[Builder, **P], T2, [Select], Any].__call__" has type "Callable[[DefaultArg(Select, 'select')], Any]" -src/build123d/exporters3d.py:0: error: Unsupported left operand type for * ("None") [operator] -src/build123d/exporters3d.py:0: note: Left operand is of type "Location | None" -src/build123d/exporters.py:0: error: Incompatible default for argument "look_at" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/exporters.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/exporters.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "int", target has type "str") [assignment] -src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "int", target has type "str") [assignment] -src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "int" [arg-type] -src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "int | None" [arg-type] -src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "bool" [arg-type] -src/build123d/exporters.py:0: error: Argument 2 to "add" of "LayerTable" has incompatible type "**dict[str, str]"; expected "float | None" [arg-type] -src/build123d/exporters.py:0: error: "None" object is not iterable [misc] -src/build123d/exporters.py:0: error: Item "None" of "Location | None" has no attribute "wrapped" [union-attr] -src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "BoundBox") [assignment] -src/build123d/exporters.py:0: error: Incompatible types in assignment (expression has type "_Layer", variable has type "str") [assignment] -src/build123d/exporters.py:0: error: Argument 2 to "_add_single_shape" of "ExportSVG" has incompatible type "str"; expected "_Layer" [arg-type] -src/build123d/exporters.py:0: error: Argument 2 to "_add_single_shape" of "ExportSVG" has incompatible type "str"; expected "_Layer" [arg-type] -src/build123d/exporters.py:0: error: Item "None" of "Location | None" has no attribute "wrapped" [union-attr] -src/build123d/exporters.py:0: error: Item "None" of "Any | None" has no attribute "Orientation" [union-attr] -src/build123d/exporters.py:0: error: Incompatible default for argument "attribs" (default has type "None", argument has type "dict[Any, Any]") [assignment] -src/build123d/exporters.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/exporters.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/exporters.py:0: error: Incompatible return value type (got "tuple[str, str | None]", expected "tuple[str, str]") [return-value] -src/build123d/exporters.py:0: error: Incompatible return value type (got "tuple[str, None]", expected "tuple[str, str]") [return-value] -src/build123d/exporters.py:0: error: Argument 1 to "_color_attribs" has incompatible type "Color | None"; expected "Color" [arg-type] -src/build123d/exporters.py:0: error: Argument 1 to "_color_attribs" has incompatible type "Color | None"; expected "Color" [arg-type] -src/build123d/exporters.py:0: error: Argument "default_namespace" to "write" of "ElementTree" has incompatible type "bool"; expected "str | None" [arg-type] -src/build123d/build_sketch.py:0: error: Incompatible types in assignment (expression has type "type[Face]", base class "Builder" defined the type as "None") [assignment] -src/build123d/build_sketch.py:0: error: Incompatible types in assignment (expression has type "type[Compound]", base class "Builder" defined the type as "None") [assignment] -src/build123d/build_sketch.py:0: error: Attribute "sketch_local" already defined on line 0 [no-redef] -src/build123d/build_sketch.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "Sketch") [assignment] -src/build123d/build_sketch.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] -src/build123d/build_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/build_part.py:0: error: Incompatible types in assignment (expression has type "type[Solid]", base class "Builder" defined the type as "None") [assignment] -src/build123d/build_part.py:0: error: Incompatible types in assignment (expression has type "type[Compound]", base class "Builder" defined the type as "None") [assignment] -src/build123d/build_part.py:0: error: Incompatible return value type (got "Location | None", expected "Location") [return-value] -src/build123d/build_part.py:0: error: Attribute "part" already defined on line 0 [no-redef] -src/build123d/build_part.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "Part") [assignment] -src/build123d/build_part.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] -src/build123d/build_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/build_line.py:0: error: Incompatible types in assignment (expression has type "type[Edge]", base class "Builder" defined the type as "None") [assignment] -src/build123d/build_line.py:0: error: Incompatible types in assignment (expression has type "type[Compound]", base class "Builder" defined the type as "None") [assignment] -src/build123d/build_line.py:0: error: Attribute "line" already defined on line 0 [no-redef] -src/build123d/build_line.py:0: error: Incompatible types in assignment (expression has type "None", variable has type "Curve") [assignment] -src/build123d/build_line.py:0: error: Incompatible default for argument "face_plane" (default has type "None", argument has type "Plane") [assignment] -src/build123d/build_line.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/build_line.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_sketch.py:0: error: Incompatible types in assignment (expression has type "tuple[float, int]", target has type "tuple[float, None]") [assignment] -src/build123d/operations_sketch.py:0: error: No overload variant of "__getitem__" of "list" matches argument type "None" [call-overload] -src/build123d/operations_sketch.py:0: note: Possible overload variants: -src/build123d/operations_sketch.py:0: note: def __getitem__(self, SupportsIndex, /) -> Vector -src/build123d/operations_sketch.py:0: note: def __getitem__(self, slice[Any, Any, Any], /) -> list[Vector] -src/build123d/operations_sketch.py:0: error: Argument 1 to "distance_to_with_closest_points" of "Shape" has incompatible type "float"; expected "Shape[Any] | Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/operations_sketch.py:0: error: Argument 1 to "distance_to_with_closest_points" of "Shape" has incompatible type "float"; expected "Shape[Any] | Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/operations_sketch.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "Vector") [assignment] -src/build123d/operations_sketch.py:0: error: Unsupported operand types for - ("float" and "Vector") [operator] -src/build123d/operations_sketch.py:0: error: Item "None" of "Shape[Any] | None" has no attribute "edges" [union-attr] -src/build123d/operations_sketch.py:0: error: Unsupported operand types for - ("ShapeList[Edge]" and "list[Edge]") [operator] -src/build123d/operations_sketch.py:0: note: Left operand is of type "ShapeList[Edge] | Any" -src/build123d/operations_sketch.py:0: error: Incompatible default for argument "edges" (default has type "None", argument has type "Edge | Iterable[Edge]") [assignment] -src/build123d/operations_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_sketch.py:0: error: Incompatible default for argument "edges" (default has type "None", argument has type "Edge | Iterable[Edge]") [assignment] -src/build123d/operations_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_sketch.py:0: error: Incompatible default for argument "lines" (default has type "None", argument has type "Curve | Edge | Wire | Iterable[Curve | Edge | Wire]") [assignment] -src/build123d/operations_sketch.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_sketch.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_sketch.py:0: error: Need type annotation for "new_faces" (hint: "new_faces: list[] = ...") [var-annotated] -src/build123d/operations_part.py:0: error: Incompatible default for argument "to_extrude" (default has type "None", argument has type "Face | Sketch") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "amount" (default has type "None", argument has type "float") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "dir" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "until" (default has type "None", argument has type "Until") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "target" (default has type "None", argument has type "Compound | Solid") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "sections" (default has type "None", argument has type "Face | Sketch | Iterable[Vertex | Face | Sketch]") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Item "None" of "Face | None" has no attribute "outer_wire" [union-attr] -src/build123d/operations_part.py:0: error: Unsupported operand types for + ("ShapeList[Face]" and "list[Any]") [operator] -src/build123d/operations_part.py:0: error: Incompatible default for argument "line" (default has type "None", argument has type "Edge | Wire | Curve") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Need type annotation for "station_edges" [var-annotated] -src/build123d/operations_part.py:0: error: Argument 1 to "len" has incompatible type "list[float | int] | Iterable[float]"; expected "Sized" [arg-type] -src/build123d/operations_part.py:0: error: Argument 1 to "_add_to_context" of "Builder" has incompatible type "Solid | ShapeList[Solid]"; expected "Edge | Wire | Face | Solid | Compound" [arg-type] -src/build123d/operations_part.py:0: error: Incompatible default for argument "profiles" (default has type "None", argument has type "Face | Iterable[Face]") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "obj" (default has type "None", argument has type "Part") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Argument 3 to "validate_inputs" has incompatible type "None"; expected "Iterable[Shape[Any]]" [arg-type] -src/build123d/operations_part.py:0: error: Argument 1 to "_add_to_context" of "Builder" has incompatible type "*list[Part | ShapeList[Part] | None]"; expected "Edge | Wire | Face | Solid | Compound" [arg-type] -src/build123d/operations_part.py:0: error: Incompatible default for argument "to_thicken" (default has type "None", argument has type "Face | Sketch") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "amount" (default has type "None", argument has type "float") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Incompatible default for argument "normal_override" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/operations_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_part.py:0: error: Unsupported operand types for * ("Sequence[float]" and "int") [operator] -src/build123d/operations_part.py:0: note: Left operand is of type "Vector | Sequence[float]" -src/build123d/operations_part.py:0: error: Argument "normal_override" to "thicken" of "Solid" has incompatible type "Vector | int"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | None" [arg-type] -src/build123d/objects_sketch.py:0: error: Item "None" of "Compound | Face | None" has no attribute "move" [union-attr] -src/build123d/objects_sketch.py:0: error: Item "None" of "Compound | Face | None" has no attribute "bounding_box" [union-attr] -src/build123d/objects_sketch.py:0: error: Item "None" of "Compound | Face | None" has no attribute "moved" [union-attr] -src/build123d/objects_sketch.py:0: error: Argument "align" to "make_text" of "Compound" has incompatible type "Align | tuple[Align, Align] | None"; expected "Align | tuple[Align, Align]" [arg-type] -src/build123d/objects_sketch.py:0: error: Generator has incompatible item type "Vector"; expected "bool" [misc] -src/build123d/objects_part.py:0: error: Incompatible default for argument "align" (default has type "None", argument has type "Align | tuple[Align, Align, Align]") [assignment] -src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_part.py:0: error: Incompatible types in assignment (expression has type "tuple[Any, ...] | None", variable has type "Align | tuple[Align, Align, Align]") [assignment] -src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] -src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] -src/build123d/objects_part.py:0: error: Incompatible default for argument "depth" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_part.py:0: error: Argument "part" to "__init__" of "BasePartObject" has incompatible type "Solid | ShapeList[Solid]"; expected "Part | Solid" [arg-type] -src/build123d/objects_part.py:0: error: Incompatible default for argument "depth" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_part.py:0: error: Argument "part" to "__init__" of "BasePartObject" has incompatible type "Solid | ShapeList[Solid]"; expected "Part | Solid" [arg-type] -src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] -src/build123d/objects_part.py:0: error: Incompatible default for argument "depth" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_part.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_part.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] -src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] -src/build123d/objects_part.py:0: error: Argument "align" to "__init__" of "BasePartObject" has incompatible type "tuple[Any, ...] | None"; expected "Align | tuple[Align, Align, Align]" [arg-type] -src/build123d/objects_curve.py:0: error: Incompatible default for argument "weights" (default has type "None", argument has type "list[float]") [assignment] -src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] -src/build123d/objects_curve.py:0: error: Argument 1 to "make_line" of "Edge" has incompatible type "list[Vector] | Vector"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "list" matches argument type "Vector" [operator] -src/build123d/objects_curve.py:0: note: Possible overload variants: -src/build123d/objects_curve.py:0: note: def __add__(self, list[Vector], /) -> list[Vector] -src/build123d/objects_curve.py:0: note: def [_S] __add__(self, list[_S], /) -> list[_S | Vector] -src/build123d/objects_curve.py:0: note: Both left and right operands are unions -src/build123d/objects_curve.py:0: error: Argument 1 to "add" of "BoundBox" has incompatible type "list[Vector] | Vector"; expected "tuple[float, float, float] | Vector | BoundBox" [arg-type] -src/build123d/objects_curve.py:0: error: The return type of "__init__" must be None [misc] -src/build123d/objects_curve.py:0: error: Argument 1 to "Axis" has incompatible type "list[Vector] | Vector"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Argument 4 to "make_helix" of "Edge" has incompatible type "list[Vector] | Vector"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Value of type "list[Vector] | Vector" is not indexable [index] -src/build123d/objects_curve.py:0: error: Argument 1 to "len" has incompatible type "list[Vector] | Vector"; expected "Sized" [arg-type] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "Vector" [operator] -src/build123d/objects_curve.py:0: note: Possible overload variants: -src/build123d/objects_curve.py:0: note: def __add__(self, tuple[float, ...], /) -> tuple[float, ...] -src/build123d/objects_curve.py:0: note: def [_T] __add__(self, tuple[_T, ...], /) -> tuple[float | _T, ...] -src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "Vector") [operator] -src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float]") [operator] -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float, float]") [operator] -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("Sequence[float]") [operator] -src/build123d/objects_curve.py:0: note: Both left and right operands are unions -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float]") [operator] -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float, float]") [operator] -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("Sequence[float]") [operator] -src/build123d/objects_curve.py:0: note: Both left and right operands are unions -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float]") [operator] -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("tuple[float, float, float]") [operator] -src/build123d/objects_curve.py:0: error: Unsupported left operand type for - ("Sequence[float]") [operator] -src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" -src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "Vector" [operator] -src/build123d/objects_curve.py:0: note: Possible overload variants: -src/build123d/objects_curve.py:0: note: def __add__(self, tuple[float, ...], /) -> tuple[float, ...] -src/build123d/objects_curve.py:0: note: def [_T] __add__(self, tuple[_T, ...], /) -> tuple[float | _T, ...] -src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "Vector") [operator] -src/build123d/objects_curve.py:0: note: Both left and right operands are unions -src/build123d/objects_curve.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_curve.py:0: error: Incompatible default for argument "direction" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Vector] | Vector", variable has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/objects_curve.py:0: error: Argument 1 to "get_angle" of "Vector" has incompatible type "Vector | Sequence[float]"; expected "Vector" [arg-type] -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("Sequence[float]" and "float") [operator] -src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float]" and "float") [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float, float]" and "float") [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("Sequence[float]" and "float") [operator] -src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float]" and "float") [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float, float]" and "float") [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("Sequence[float]" and "float") [operator] -src/build123d/objects_curve.py:0: note: Left operand is of type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float]" and "float") [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for * ("tuple[float, float, float]" and "float") [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Vector" and "float") [operator] -src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "Vector" [operator] -src/build123d/objects_curve.py:0: note: Possible overload variants: -src/build123d/objects_curve.py:0: note: def __add__(self, tuple[float, ...], /) -> tuple[float, ...] -src/build123d/objects_curve.py:0: note: def [_T] __add__(self, tuple[_T, ...], /) -> tuple[float | _T, ...] -src/build123d/objects_curve.py:0: error: No overload variant of "__add__" of "tuple" matches argument type "float" [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "Vector") [operator] -src/build123d/objects_curve.py:0: error: Unsupported operand types for + ("Sequence[float]" and "float") [operator] -src/build123d/objects_curve.py:0: note: Both left and right operands are unions -src/build123d/objects_curve.py:0: error: Argument 2 to "make_line" of "Edge" has incompatible type "Vector | Any | float"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Value of type "list[Vector] | Vector" is not indexable [index] -src/build123d/objects_curve.py:0: error: Argument 1 to "len" has incompatible type "list[Vector] | Vector"; expected "Sized" [arg-type] -src/build123d/objects_curve.py:0: error: Incompatible default for argument "tangents" (default has type "None", argument has type "Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]") [assignment] -src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_curve.py:0: error: Incompatible default for argument "tangent_scalars" (default has type "None", argument has type "Iterable[float]") [assignment] -src/build123d/objects_curve.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/objects_curve.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] -src/build123d/objects_curve.py:0: error: Argument 1 to "len" has incompatible type "Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]"; expected "Sized" [arg-type] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "Iterable[float]", variable has type "list[float]") [assignment] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/objects_curve.py:0: error: Item "list[Vector]" of "list[Vector] | Vector" has no attribute "normalized" [union-attr] -src/build123d/objects_curve.py:0: error: Value of type "list[Vector] | Vector" is not indexable [index] -src/build123d/objects_curve.py:0: error: Incompatible types in assignment (expression has type "list[Any]", variable has type "tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], ...]") [assignment] -src/build123d/objects_curve.py:0: error: Argument 1 to "localize" of "WorkplaneList" has incompatible type "*tuple[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]], Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] | Iterable[Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]]]"; expected "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]" [arg-type] -src/build123d/joints.py:0: error: Unsupported left operand type for * ("None") [operator] -src/build123d/joints.py:0: note: Both left and right operands are unions -src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "RigidJoint"; expected "Builder | str" [arg-type] -src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "BuildPart", variable has type "Solid | Compound | None") [assignment] -src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "location" [union-attr] -src/build123d/joints.py:0: error: Item "None" of "Location | Any | None" has no attribute "inverse" [union-attr] -src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "joints" [union-attr] -src/build123d/joints.py:0: error: Argument 2 to "__init__" of "Joint" has incompatible type "Solid | Compound | None"; expected "Solid | Compound" [arg-type] -src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def connect_to(self, other: BallJoint, *, angles: tuple[float, float, float] | Rotation = ..., **kwargs: Any) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def connect_to(self, other: CylindricalJoint, *, position: float = ..., angle: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def connect_to(self, other: LinearJoint, *, position: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def connect_to(self, other: RevoluteJoint, *, angle: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def relative_to(self, other: BallJoint, *, angles: tuple[float, float, float] | Rotation = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def relative_to(self, other: CylindricalJoint, *, position: float = ..., angle: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def relative_to(self, other: LinearJoint, *, position: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def relative_to(self, other: RevoluteJoint, *, angle: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Argument "angle" to "relative_to" of "RevoluteJoint" has incompatible type "Any | None"; expected "float" [arg-type] -src/build123d/joints.py:0: error: Argument "position" to "relative_to" of "LinearJoint" has incompatible type "Any | None"; expected "float" [arg-type] -src/build123d/joints.py:0: error: Argument "position" to "relative_to" of "CylindricalJoint" has incompatible type "Any | None"; expected "float" [arg-type] -src/build123d/joints.py:0: error: Argument "angle" to "relative_to" of "CylindricalJoint" has incompatible type "Any | None"; expected "float" [arg-type] -src/build123d/joints.py:0: error: Argument "angles" to "relative_to" of "BallJoint" has incompatible type "Any | None"; expected "tuple[float, float, float] | Rotation" [arg-type] -src/build123d/joints.py:0: error: Incompatible default for argument "to_part" (default has type "None", argument has type "Solid | Compound") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle_reference" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "RevoluteJoint"; expected "Builder | str" [arg-type] -src/build123d/joints.py:0: error: Item "None" of "Location | None" has no attribute "inverse" [union-attr] -src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, angle: float = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, angle: float = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "None") [assignment] -src/build123d/joints.py:0: error: Incompatible default for argument "to_part" (default has type "None", argument has type "Solid | Compound") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "LinearJoint"; expected "Builder | str" [arg-type] -src/build123d/joints.py:0: error: Item "None" of "Location | None" has no attribute "inverse" [union-attr] -src/build123d/joints.py:0: error: Unexpected type declaration [misc] -src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def connect_to(self, other: RevoluteJoint, *, position: float = ..., angle: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, position: float = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, position: float = ...) -> Any -src/build123d/joints.py:0: note: @overload -src/build123d/joints.py:0: note: def relative_to(self, other: RevoluteJoint, *, position: float = ..., angle: float = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: By default the bodies of untyped functions are not checked, consider using --check-untyped-defs [annotation-unchecked] -src/build123d/joints.py:0: error: Incompatible default for argument "to_part" (default has type "None", argument has type "Solid | Compound") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle_reference" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "CylindricalJoint"; expected "Builder | str" [arg-type] -src/build123d/joints.py:0: error: Item "None" of "Location | None" has no attribute "inverse" [union-attr] -src/build123d/joints.py:0: error: Unexpected type declaration [misc] -src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, position: float = ..., angle: float = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, position: float = ..., angle: float = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "position" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "None") [assignment] -src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "float", variable has type "None") [assignment] -src/build123d/joints.py:0: error: Unsupported left operand type for * ("None") [operator] -src/build123d/joints.py:0: note: Both left and right operands are unions -src/build123d/joints.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "BallJoint"; expected "Builder | str" [arg-type] -src/build123d/joints.py:0: error: Incompatible types in assignment (expression has type "BuildPart", variable has type "Solid | Compound | None") [assignment] -src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "location" [union-attr] -src/build123d/joints.py:0: error: Item "None" of "Location | Any | None" has no attribute "inverse" [union-attr] -src/build123d/joints.py:0: error: Item "None" of "Solid | Compound | None" has no attribute "joints" [union-attr] -src/build123d/joints.py:0: error: Argument 2 to "__init__" of "Joint" has incompatible type "Solid | Compound | None"; expected "Solid | Compound" [arg-type] -src/build123d/joints.py:0: error: Signature of "connect_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def connect_to(self, other: Joint) -> Any -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: def connect_to(self, other: RigidJoint, *, angles: tuple[float, float, float] | Rotation = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: Signature of "relative_to" incompatible with supertype "Joint" [override] -src/build123d/joints.py:0: note: Superclass: -src/build123d/joints.py:0: note: def relative_to(self, other: Joint) -> Location -src/build123d/joints.py:0: note: Subclass: -src/build123d/joints.py:0: note: def relative_to(self, other: RigidJoint, *, angles: tuple[float, float, float] | Rotation = ...) -> Any -src/build123d/joints.py:0: error: Incompatible default for argument "angles" (default has type "None", argument has type "tuple[float, float, float] | Rotation") [assignment] -src/build123d/joints.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/joints.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/joints.py:0: error: No overload variant of "Rotation" matches argument type "list[float]" [call-overload] -src/build123d/joints.py:0: note: Possible overload variants: -src/build123d/joints.py:0: note: def __init__(self, rotation: tuple[float, float, float] | Rotation, ordering: Any) -> Rotation -src/build123d/joints.py:0: note: def __init__(self, X: float = ..., Y: float = ..., Z: float = ..., ordering: Extrinsic | Intrinsic = ...) -> Rotation -src/build123d/joints.py:0: error: Expected iterable as variadic argument [misc] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "rotation" (default has type "None", argument has type "float | tuple[float, float, float] | Rotation") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Argument 1 to "_get_context" of "Builder" has incompatible type "None"; expected "Builder | str" [arg-type] -src/build123d/operations_generic.py:0: error: Item "Builder" of "Edge | Wire | Face | Solid | Compound | Builder | Iterable[Edge | Wire | Face | Solid | Compound | Builder]" has no attribute "__iter__" (not iterable) [union-attr] -src/build123d/operations_generic.py:0: error: Argument 3 to "validate_inputs" has incompatible type "Edge | Wire | Face | Solid | Compound | list[Edge | Wire | Face | Solid | Compound | Builder]"; expected "Iterable[Shape[Any]]" [arg-type] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Shape[Any] | Iterable[Shape[Any]]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Missing return statement [return] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "length2" (default has type "None", argument has type "float") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "angle" (default has type "None", argument has type "float") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "reference" (default has type "None", argument has type "Edge | Face") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "filter[Any]", variable has type "list[Any]") [assignment] -src/build123d/operations_generic.py:0: error: Missing return statement [return] -src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "filter[Any]", variable has type "list[Any]") [assignment] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Wire | Face | Compound | Curve | Sketch | Part | Iterable[Edge | Wire | Face | Compound | Curve | Sketch | Part]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Face | Solid | Compound | Iterable[Edge | Face | Solid | Compound]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "openings" (default has type "None", argument has type "Face | list[Face]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "min_edge_length" (default has type "None", argument has type "float") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "Face | ShapeList[Face]", variable has type "Face") [assignment] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Face | Wire | Vector | Vertex | Iterable[Edge | Face | Wire | Vector | Vertex]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "workplane" (default has type "None", argument has type "Plane") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "target" (default has type "None", argument has type "Solid | Compound | Part") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Value of type "None" is not indexable [index] -src/build123d/operations_generic.py:0: error: List comprehension has incompatible type List[Vector]; expected List[Edge | Vertex] [misc] -src/build123d/operations_generic.py:0: error: Value of type variable "T" of "ShapeList" cannot be "ShapeList[Face | Shell]" [type-var] -src/build123d/operations_generic.py:0: error: Incompatible return value type (got "ShapeList[ShapeList[Face | Shell]]", expected "Curve | Sketch | Compound | ShapeList[Vector]") [return-value] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Shape[Any] | Iterable[Shape[Any]]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible types in assignment (expression has type "Vector", variable has type "float") [assignment] -src/build123d/operations_generic.py:0: error: "float" has no attribute "X" [attr-defined] -src/build123d/operations_generic.py:0: error: "float" has no attribute "Y" [attr-defined] -src/build123d/operations_generic.py:0: error: "float" has no attribute "Z" [attr-defined] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "objects" (default has type "None", argument has type "Edge | Wire | Face | Solid | Iterable[Edge | Wire | Face | Solid]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Need type annotation for "new_objects" (hint: "new_objects: list[] = ...") [var-annotated] -src/build123d/operations_generic.py:0: error: Incompatible default for argument "sections" (default has type "None", argument has type "Compound | Edge | Wire | Face | Solid | Iterable[Compound | Edge | Wire | Face | Solid]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "path" (default has type "None", argument has type "Curve | Edge | Wire | Iterable[Edge]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "normal" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Incompatible default for argument "binormal" (default has type "None", argument has type "Edge | Wire") [assignment] -src/build123d/operations_generic.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/operations_generic.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/operations_generic.py:0: error: Need type annotation for "edge_list" (hint: "edge_list: list[] = ...") [var-annotated] -src/build123d/operations_generic.py:0: error: Need type annotation for "new_faces" (hint: "new_faces: list[] = ...") [var-annotated] -src/build123d/drafting.py:0: error: Item "ShapeList[ArrowHead]" of "ArrowHead | ShapeList[ArrowHead]" has no attribute "clean" [union-attr] -src/build123d/drafting.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float | tuple[float, float]") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: The return type of "__init__" must be None [misc] -src/build123d/drafting.py:0: error: Missing return statement [return] -src/build123d/drafting.py:0: error: Incompatible default for argument "draft" (default has type "None", argument has type "Draft") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible default for argument "sketch" (default has type "None", argument has type "Sketch") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible default for argument "label" (default has type "None", argument has type "str") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float | tuple[float, float]") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Item "None" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] -src/build123d/drafting.py:0: error: Item "ShapeList[Compound]" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] -src/build123d/drafting.py:0: error: Item "None" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] -src/build123d/drafting.py:0: error: Item "ShapeList[Compound]" of "Compound | ShapeList[Compound] | None" has no attribute "area" [union-attr] -src/build123d/drafting.py:0: error: Incompatible types in assignment (expression has type "list[tuple[Compound, float]]", variable has type "dict[Compound, float]") [assignment] -src/build123d/drafting.py:0: error: Value of type "float" is not indexable [index] -src/build123d/drafting.py:0: error: Invalid index type "int" for "dict[Compound, float]"; expected type "Compound" [index] -src/build123d/drafting.py:0: error: Incompatible default for argument "sketch" (default has type "None", argument has type "Sketch") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible default for argument "label" (default has type "None", argument has type "str") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible default for argument "tolerance" (default has type "None", argument has type "float | tuple[float, float]") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible default for argument "project_line" (default has type "None", argument has type "Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float]") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible default for argument "sheet_number" (default has type "None", argument has type "int") [assignment] -src/build123d/drafting.py:0: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True -src/build123d/drafting.py:0: note: Use https://github.com/hauntsaninja/no_implicit_optional to automatically upgrade your codebase -src/build123d/drafting.py:0: error: Incompatible types in assignment (expression has type "str", variable has type "int") [assignment] -src/build123d/drafting.py:0: error: Argument 1 to "make_text" of "Compound" has incompatible type "int"; expected "str" [arg-type] -src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] -src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] -src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] -src/build123d/__init__.py:0: error: Incompatible import of "copy" (imported name has type Module, local name has type "Callable[[_T], _T]") [assignment] From 46690576a4554b7063ed9def6e8c7fb5959ebcd3 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 9 Jan 2025 08:55:26 -0600 Subject: [PATCH 099/518] objects_sketch.py -> revert `| None` in `BaseSketchObject` --- src/build123d/objects_sketch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index c8d1501..a6689da 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -76,7 +76,7 @@ class BaseSketchObject(Sketch): def __init__( self, - obj: Compound | Face | None, + obj: Compound | Face, rotation: float = 0, align: Align | tuple[Align, Align] | None = None, mode: Mode = Mode.ADD, From c909652bc823b715f4bb73ee580991d2075bc265 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 10 Jan 2025 13:44:51 -0500 Subject: [PATCH 100/518] Eliminated joints related typing issues --- src/build123d/build_common.py | 19 +-- src/build123d/geometry.py | 9 ++ src/build123d/joints.py | 205 +++++++++++++++++---------- src/build123d/topology/shape_core.py | 12 +- 4 files changed, 156 insertions(+), 89 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index d77c734..f836b05 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -71,6 +71,7 @@ from build123d.topology import ( Curve, Edge, Face, + Joint, Part, Shape, ShapeList, @@ -314,7 +315,9 @@ class Builder(ABC): return NotImplementedError # pragma: no cover @classmethod - def _get_context(cls, caller: Builder | str = None, log: bool = True) -> Self: + def _get_context( + cls, caller: Builder | Shape | Joint | str | None = None, log: bool = True + ) -> Self: """Return the instance of the current builder""" result = cls._current.get(None) context_name = "None" if result is None else type(result).__name__ @@ -1070,13 +1073,13 @@ class Locations(LocationList): def __init__( self, *pts: ( - VectorLike | - Vertex | - Location | - Face | - Plane | - Axis | - Iterable[VectorLike, Vertex, Location, Face, Plane, Axis] + VectorLike + | Vertex + | Location + | Face + | Plane + | Axis + | Iterable[VectorLike, Vertex, Location, Face, Plane, Axis] ), ): local_locations = [] diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index afd48d4..2f63c8c 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1490,6 +1490,15 @@ class Location: """Lib/copy.py deep copy""" return Location(self.wrapped.Transformation()) + @overload + def __mul__(self, other: Shape) -> Shape: ... + + @overload + def __mul__(self, other: Location) -> Location: ... + + @overload + def __mul__(self, other: Iterable[Location]) -> list[Location]: ... + def __mul__( self, other: Shape | Location | Iterable[Location] ) -> Shape | Location | list[Location]: diff --git a/src/build123d/joints.py b/src/build123d/joints.py index 9919f09..b0bbd8a 100644 --- a/src/build123d/joints.py +++ b/src/build123d/joints.py @@ -29,7 +29,7 @@ license: from __future__ import annotations from math import inf -from typing import Optional, Union, overload +from typing import overload from build123d.build_common import validate_inputs from build123d.build_enums import Align @@ -45,6 +45,10 @@ from build123d.geometry import ( ) from build123d.topology import Compound, Edge, Joint, Solid +# pylint can't cope with the combination of explicit and implicit kwargs on +# connect_to and relative_to methods +# pylint: disable=arguments-differ + class RigidJoint(Joint): """RigidJoint @@ -64,6 +68,8 @@ class RigidJoint(Joint): @property def location(self) -> Location: """Location of joint""" + if self.parent.location is None or self.relative_location is None: + raise RuntimeError("Joints are invalid") return self.parent.location * self.relative_location @property @@ -82,33 +88,41 @@ class RigidJoint(Joint): validate_inputs(context, self) if to_part is None: if context is not None: - to_part = context + part_or_builder = context else: raise ValueError("Either specify to_part or place in BuildPart scope") + else: + part_or_builder = to_part if joint_location is None: joint_location = Location() - self.relative_location = to_part.location.inverse() * joint_location - to_part.joints[label] = self - super().__init__(label, to_part) + self.relative_location = part_or_builder.location.inverse() * joint_location + part_or_builder.joints[label] = self + super().__init__(label, part_or_builder) @overload - def connect_to(self, other: BallJoint, *, angles: RotationLike = None, **kwargs): + def connect_to( + self, other: BallJoint, *, angles: RotationLike | None = None, **kwargs + ): """Connect RigidJoint and BallJoint""" @overload def connect_to( - self, other: CylindricalJoint, *, position: float = None, angle: float = None + self, + other: CylindricalJoint, + *, + position: float | None = None, + angle: float | None = None, ): """Connect RigidJoint and CylindricalJoint""" @overload - def connect_to(self, other: LinearJoint, *, position: float = None): + def connect_to(self, other: LinearJoint, *, position: float | None = None): """Connect RigidJoint and LinearJoint""" @overload - def connect_to(self, other: RevoluteJoint, *, angle: float = None): + def connect_to(self, other: RevoluteJoint, *, angle: float | None = None): """Connect RigidJoint and RevoluteJoint""" @overload @@ -129,21 +143,25 @@ class RigidJoint(Joint): return super()._connect_to(other, **kwargs) @overload - def relative_to(self, other: BallJoint, *, angles: RotationLike = None): + def relative_to(self, other: BallJoint, *, angles: RotationLike | None = None): """RigidJoint relative to BallJoint""" @overload def relative_to( - self, other: CylindricalJoint, *, position: float = None, angle: float = None + self, + other: CylindricalJoint, + *, + position: float | None = None, + angle: float | None = None, ): """RigidJoint relative to CylindricalJoint""" @overload - def relative_to(self, other: LinearJoint, *, position: float = None): + def relative_to(self, other: LinearJoint, *, position: float | None = None): """RigidJoint relative to LinearJoint""" @overload - def relative_to(self, other: RevoluteJoint, *, angle: float = None): + def relative_to(self, other: RevoluteJoint, *, angle: float | None = None): """RigidJoint relative to RevoluteJoint""" @overload @@ -226,6 +244,8 @@ class RevoluteJoint(Joint): @property def location(self) -> Location: """Location of joint""" + if self.parent.location is None or self.relative_axis.location is None: + raise RuntimeError("Joints are invalid") return self.parent.location * self.relative_axis.location @property @@ -244,18 +264,20 @@ class RevoluteJoint(Joint): def __init__( self, label: str, - to_part: Solid | Compound = None, + to_part: Solid | Compound | None = None, axis: Axis = Axis.Z, - angle_reference: VectorLike = None, + angle_reference: VectorLike | None = None, angular_range: tuple[float, float] = (0, 360), ): context: BuildPart = BuildPart._get_context(self) validate_inputs(context, self) if to_part is None: if context is not None: - to_part = context + part_or_builder = context else: raise ValueError("Either specify to_part or place in BuildPart scope") + else: + part_or_builder = to_part self.angular_range = angular_range if angle_reference: @@ -264,12 +286,12 @@ class RevoluteJoint(Joint): self.angle_reference = Vector(angle_reference) else: self.angle_reference = Plane(origin=(0, 0, 0), z_dir=axis.direction).x_dir - self._angle = None - self.relative_axis = axis.located(to_part.location.inverse()) - to_part.joints[label] = self - super().__init__(label, to_part) + self._angle: float | None = None + self.relative_axis = axis.located(part_or_builder.location.inverse()) + part_or_builder.joints[label] = self + super().__init__(label, part_or_builder) - def connect_to(self, other: RigidJoint, *, angle: float = None): + def connect_to(self, other: RigidJoint, *, angle: float | None = None): """Connect RevoluteJoint and RigidJoint Args: @@ -282,9 +304,7 @@ class RevoluteJoint(Joint): """ return super()._connect_to(other, angle=angle) - def relative_to( - self, other: RigidJoint, *, angle: float = None - ): # pylint: disable=arguments-differ + def relative_to(self, other: RigidJoint, *, angle: float | None = None): """Relative location of RevoluteJoint to RigidJoint Args: @@ -298,15 +318,20 @@ class RevoluteJoint(Joint): if not isinstance(other, RigidJoint): raise TypeError(f"other must of type RigidJoint not {type(other)}") - angle = self.angular_range[0] if angle is None else angle - if angle < self.angular_range[0] or angle > self.angular_range[1]: - raise ValueError(f"angle ({angle}) must in range of {self.angular_range}") - self._angle = angle + angle_degrees = self.angular_range[0] if angle is None else angle + if ( + angle_degrees < self.angular_range[0] + or angle_degrees > self.angular_range[1] + ): + raise ValueError( + f"angle ({angle_degrees}) must in range of {self.angular_range}" + ) + self._angle = angle_degrees # Avoid strange rotations when angle is zero by using 360 instead - angle = 360.0 if angle == 0.0 else angle + angle_degrees = 360.0 if angle_degrees == 0.0 else angle_degrees return ( self.relative_axis.location - * Rotation(0, 0, angle) + * Rotation(0, 0, angle_degrees) * other.relative_location.inverse() ) @@ -335,6 +360,8 @@ class LinearJoint(Joint): @property def location(self) -> Location: """Location of joint""" + if self.parent.location is None or self.relative_axis.location is None: + raise RuntimeError("Joints are invalid") return self.parent.location * self.relative_axis.location @property @@ -353,7 +380,7 @@ class LinearJoint(Joint): def __init__( self, label: str, - to_part: Solid | Compound = None, + to_part: Solid | Compound | None = None, axis: Axis = Axis.Z, linear_range: tuple[float, float] = (0, inf), ): @@ -361,26 +388,31 @@ class LinearJoint(Joint): validate_inputs(context, self) if to_part is None: if context is not None: - to_part = context + part_or_builder = context else: raise ValueError("Either specify to_part or place in BuildPart scope") - + else: + part_or_builder = to_part self.axis = axis self.linear_range = linear_range self.position = None - self.relative_axis = axis.located(to_part.location.inverse()) + self.relative_axis = axis.located(part_or_builder.location.inverse()) self.angle = None - to_part.joints[label]: dict[str, Joint] = self - super().__init__(label, to_part) + part_or_builder.joints[label] = self + super().__init__(label, part_or_builder) @overload def connect_to( - self, other: RevoluteJoint, *, position: float = None, angle: float = None + self, + other: RevoluteJoint, + *, + position: float | None = None, + angle: float | None = None, ): """Connect LinearJoint and RevoluteJoint""" @overload - def connect_to(self, other: RigidJoint, *, position: float = None): + def connect_to(self, other: RigidJoint, *, position: float | None = None): """Connect LinearJoint and RigidJoint""" def connect_to(self, other: Joint, **kwargs): @@ -399,18 +431,20 @@ class LinearJoint(Joint): return super()._connect_to(other, **kwargs) @overload - def relative_to( - self, other: RigidJoint, *, position: float = None - ): # pylint: disable=arguments-differ + def relative_to(self, other: RigidJoint, *, position: float | None = None): """Relative location of LinearJoint to RigidJoint""" @overload def relative_to( - self, other: RevoluteJoint, *, position: float = None, angle: float = None - ): # pylint: disable=arguments-differ + self, + other: RevoluteJoint, + *, + position: float | None = None, + angle: float | None = None, + ): """Relative location of LinearJoint to RevoluteJoint""" - def relative_to(self, other, **kwargs): # pylint: disable=arguments-differ + def relative_to(self, other, **kwargs): """Relative location of LinearJoint to RevoluteJoint or RigidJoint Args: @@ -443,7 +477,6 @@ class LinearJoint(Joint): self.position = position if isinstance(other, RevoluteJoint): - other: RevoluteJoint angle = other.angular_range[0] if angle is None else angle if not other.angular_range[0] <= angle <= other.angular_range[1]: raise ValueError( @@ -511,6 +544,8 @@ class CylindricalJoint(Joint): @property def location(self) -> Location: """Location of joint""" + if self.parent.location is None or self.relative_axis.location is None: + raise RuntimeError("Joints are invalid") return self.parent.location * self.relative_axis.location @property @@ -530,9 +565,9 @@ class CylindricalJoint(Joint): def __init__( self, label: str, - to_part: Solid | Compound = None, + to_part: Solid | Compound | None = None, axis: Axis = Axis.Z, - angle_reference: VectorLike = None, + angle_reference: VectorLike | None = None, linear_range: tuple[float, float] = (0, inf), angular_range: tuple[float, float] = (0, 360), ): @@ -540,10 +575,11 @@ class CylindricalJoint(Joint): validate_inputs(context, self) if to_part is None: if context is not None: - to_part = context + part_or_builder = context else: raise ValueError("Either specify to_part or place in BuildPart scope") - + else: + part_or_builder = to_part self.axis = axis self.linear_position = None self.rotational_position = None @@ -555,14 +591,18 @@ class CylindricalJoint(Joint): self.angle_reference = Plane(origin=(0, 0, 0), z_dir=axis.direction).x_dir self.angular_range = angular_range self.linear_range = linear_range - self.relative_axis = axis.located(to_part.location.inverse()) - self.position = None - self.angle = None - to_part.joints[label]: dict[str, Joint] = self - super().__init__(label, to_part) + self.relative_axis = axis.located(part_or_builder.location.inverse()) + self.position: float | None = None + self.angle: float | None = None + part_or_builder.joints[label] = self + super().__init__(label, part_or_builder) def connect_to( - self, other: RigidJoint, *, position: float = None, angle: float = None + self, + other: RigidJoint, + *, + position: float | None = None, + angle: float | None = None, ): """Connect CylindricalJoint and RigidJoint" @@ -579,8 +619,12 @@ class CylindricalJoint(Joint): return super()._connect_to(other, position=position, angle=angle) def relative_to( - self, other: RigidJoint, *, position: float = None, angle: float = None - ): # pylint: disable=arguments-differ + self, + other: RigidJoint, + *, + position: float | None = None, + angle: float | None = None, + ): """Relative location of CylindricalJoint to RigidJoint Args: @@ -596,19 +640,19 @@ class CylindricalJoint(Joint): if not isinstance(other, RigidJoint): raise TypeError(f"other must of type RigidJoint not {type(other)}") - position = sum(self.linear_range) / 2 if position is None else position - if not self.linear_range[0] <= position <= self.linear_range[1]: + position_value = sum(self.linear_range) / 2 if position is None else position + if not self.linear_range[0] <= position_value <= self.linear_range[1]: raise ValueError( - f"position ({position}) must in range of {self.linear_range}" + f"position ({position_value}) must in range of {self.linear_range}" ) - self.position = position + self.position = position_value angle = sum(self.angular_range) / 2 if angle is None else angle if not self.angular_range[0] <= angle <= self.angular_range[1]: raise ValueError(f"angle ({angle}) must in range of {self.angular_range}") self.angle = angle joint_relative_position = Location( - self.relative_axis.position + self.relative_axis.direction * position + self.relative_axis.position + self.relative_axis.direction * position_value ) joint_rotation = Location( Plane( @@ -650,6 +694,8 @@ class BallJoint(Joint): @property def location(self) -> Location: """Location of joint""" + if self.parent.location is None or self.relative_location is None: + raise RuntimeError("Joints are invalid") return self.parent.location * self.relative_location @property @@ -691,20 +737,21 @@ class BallJoint(Joint): validate_inputs(context, self) if to_part is None: if context is not None: - to_part = context + part_or_builder = context else: raise ValueError("Either specify to_part or place in BuildPart scope") - + else: + part_or_builder = to_part if joint_location is None: joint_location = Location() - self.relative_location = to_part.location.inverse() * joint_location - to_part.joints[label] = self + self.relative_location = part_or_builder.location.inverse() * joint_location + part_or_builder.joints[label] = self self.angular_range = angular_range self.angle_reference = angle_reference - super().__init__(label, to_part) + super().__init__(label, part_or_builder) - def connect_to(self, other: RigidJoint, *, angles: RotationLike = None): + def connect_to(self, other: RigidJoint, *, angles: RotationLike | None = None): """Connect BallJoint and RigidJoint Args: @@ -718,9 +765,7 @@ class BallJoint(Joint): """ return super()._connect_to(other, angles=angles) - def relative_to( - self, other: RigidJoint, *, angles: RotationLike = None - ): # pylint: disable=arguments-differ + def relative_to(self, other: RigidJoint, *, angles: RotationLike | None = None): """relative_to - BallJoint Return the relative location from this joint to the RigidJoint of another object @@ -738,12 +783,20 @@ class BallJoint(Joint): if not isinstance(other, RigidJoint): raise TypeError(f"other must of type RigidJoint not {type(other)}") - rotation = ( - Rotation(*[self.angular_range[i][0] for i in [0, 1, 2]]) - if angles is None - else Rotation(*angles) - ) * self.angle_reference.location + if isinstance(angles, Rotation): + angle_rotation = angles + elif isinstance(angles, tuple): + angle_rotation = Rotation(*angles) + elif angles is None: + angle_rotation = Rotation( + self.angular_range[0][0], + self.angular_range[1][0], + self.angular_range[2][0], + ) + else: + raise TypeError(f"angles is of an unknown type {type(angles)}") + rotation = angle_rotation * self.angle_reference.location for i, rotations in zip( [0, 1, 2], [rotation.orientation.X, rotation.orientation.Y, rotation.orientation.Z], diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index d30c6df..63703d7 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -164,7 +164,9 @@ if TYPE_CHECKING: # pragma: no cover from .one_d import Edge, Wire # pylint: disable=R0801 from .two_d import Face, Shell # pylint: disable=R0801 from .three_d import Solid # pylint: disable=R0801 - from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 + from .composite import Compound # pylint: disable=R0801 + from build123d.build_part import BuildPart # pylint: disable=R0801 + HASH_CODE_MAX = 2147483647 Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] TrimmingTool = Union[Plane, "Shell", "Face"] @@ -679,7 +681,7 @@ class Shape(NodeMixin, Generic[TOPODS]): entity_type: Literal[ "Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound" ], - ) -> Shape: + ) -> Shape | None: """Helper to extract a single entity of a specific type from a shape, with a warning if count != 1.""" shape_list = Shape.get_shape_list(shape, entity_type) @@ -2781,7 +2783,7 @@ class Joint(ABC): # ---- Constructor ---- - def __init__(self, label: str, parent: Solid | Compound): + def __init__(self, label: str, parent: BuildPart | Solid | Compound): self.label = label self.parent = parent self.connected_to: Joint | None = None @@ -2801,11 +2803,11 @@ class Joint(ABC): # ---- Instance Methods ---- @abstractmethod - def connect_to(self, other: Joint): + def connect_to(self, *args, **kwargs): """All derived classes must provide a connect_to method""" @abstractmethod - def relative_to(self, other: Joint) -> Location: + def relative_to(self, *args, **kwargs) -> Location: """Return relative location to another joint""" def _connect_to(self, other: Joint, **kwargs): # pragma: no cover From 9f0a67ac1155c26ff459b3f0c0cc8be07a9b3568 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 10 Jan 2025 19:39:51 -0500 Subject: [PATCH 101/518] Fixed typing errors --- src/build123d/build_common.py | 98 ++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 31 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index f836b05..88151b2 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -50,12 +50,10 @@ import functools from abc import ABC, abstractmethod from itertools import product from math import sqrt, cos, pi -from typing import Any, Optional, Union, TypeVar +from typing import Any, Type, TypeVar from collections.abc import Callable, Iterable -from typing_extensions import Self, ParamSpec - -from typing import Concatenate +from typing_extensions import Self from build123d.build_enums import Align, Mode, Select, Unit from build123d.geometry import ( @@ -203,8 +201,8 @@ class Builder(ABC): # Abstract class variables _tag = "Builder" _obj_name = "None" - _shape = None - _sub_class = None + _shape: Shape # The type of the shape the builder creates + _sub_class: Curve | Sketch | Part # The class of the shape the builder creates @property @abstractmethod @@ -212,6 +210,11 @@ class Builder(ABC): """Object to pass to parent""" raise NotImplementedError # pragma: no cover + @_obj.setter + @abstractmethod + def _obj(self, value: Part) -> None: + raise NotImplementedError # pragma: no cover + @property def max_dimension(self) -> float: """Maximum size of object in all directions""" @@ -236,7 +239,6 @@ class Builder(ABC): assert current_frame is not None assert current_frame.f_back is not None self._python_frame = current_frame.f_back.f_back - self._python_frame_code = self._python_frame.f_code self.parent_frame = None self.builder_parent = None self.lasts: dict = {Vertex: [], Edge: [], Face: [], Solid: []} @@ -310,14 +312,14 @@ class Builder(ABC): logger.info("Exiting %s", type(self).__name__) @abstractmethod - def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane = None): + def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane | None = None): """Integrate a sequence of objects into existing builder object""" return NotImplementedError # pragma: no cover @classmethod def _get_context( cls, caller: Builder | Shape | Joint | str | None = None, log: bool = True - ) -> Self: + ) -> Builder | None: """Return the instance of the current builder""" result = cls._current.get(None) context_name = "None" if result is None else type(result).__name__ @@ -432,7 +434,7 @@ class Builder(ABC): len(typed[self._shape]), mode, ) - + combined: Shape | list[Shape] | None if mode == Mode.ADD: if self._obj is None: if len(typed[self._shape]) == 1: @@ -454,12 +456,20 @@ class Builder(ABC): elif mode == Mode.REPLACE: combined = self._sub_class(list(typed[self._shape])) + if combined is None: # empty intersection result + self._obj = self._sub_class() + elif isinstance( + combined, list + ): # If the boolean operation created a list, convert back + self._obj = self._sub_class(combined) + else: + self._obj = combined # If the boolean operation created a list, convert back - self._obj = ( - self._sub_class(combined) - if isinstance(combined, list) - else combined - ) + # self._obj = ( + # self._sub_class(combined) + # if isinstance(combined, list) + # else combined + # ) if self._obj is not None and clean: self._obj = self._obj.clean() @@ -720,7 +730,10 @@ class Builder(ABC): ) return all_solids[0] - def _shapes(self, obj_type: Vertex | Edge | Face | Solid = None) -> ShapeList: + def _shapes( + self, + obj_type: Type[Vertex] | Type[Edge] | Type[Face] | Type[Solid] | None = None, + ) -> ShapeList: """Extract Shapes""" obj_type = self._shape if obj_type is None else obj_type if obj_type == Vertex: @@ -736,7 +749,7 @@ class Builder(ABC): return result def validate_inputs( - self, validating_class, objects: Shape | Iterable[Shape] = None + self, validating_class, objects: Shape | Iterable[Shape] | None = None ): """Validate that objects/operations and parameters apply""" @@ -786,15 +799,15 @@ class Builder(ABC): def __add__(self, _other) -> Self: """Invalid add""" - self._invalid_combine() + return self._invalid_combine() def __sub__(self, _other) -> Self: """Invalid sub""" - self._invalid_combine() + return self._invalid_combine() def __and__(self, _other) -> Self: """Invalid and""" - self._invalid_combine() + return self._invalid_combine() def __getattr__(self, name): """The user is likely trying to reference the builder's object""" @@ -805,7 +818,7 @@ class Builder(ABC): def validate_inputs( - context: Builder, validating_class, objects: Iterable[Shape] = None + context: Builder, validating_class, objects: Iterable[Shape] | None = None ): """A function to wrap the method when used outside of a Builder context""" if context is None: @@ -1034,7 +1047,7 @@ class PolarLocations(LocationList): if count < 1: raise ValueError(f"At least 1 elements required, requested {count}") if count == 1: - angle_step = 0 + angle_step = 0.0 else: angle_step = angular_range / (count - int(endpoint)) @@ -1079,7 +1092,7 @@ class Locations(LocationList): | Face | Plane | Axis - | Iterable[VectorLike, Vertex, Location, Face, Plane, Axis] + | Iterable[VectorLike | Vertex | Location | Face | Plane | Axis] ), ): local_locations = [] @@ -1302,31 +1315,54 @@ class WorkplaneList: points_per_workplane.extend(localized_pts) if len(points_per_workplane) == 1: - result = points_per_workplane[0] - else: - result = points_per_workplane - return result + return points_per_workplane[0] + return points_per_workplane -P = ParamSpec("P") +# Type variable representing the return type of the wrapped function T2 = TypeVar("T2") def __gen_context_component_getter( - func: Callable[Concatenate[Builder, P], T2], -) -> Callable[P, T2]: + func: Callable[[Builder, Select], T2] +) -> Callable[[Select], T2]: + """ + Wraps a Builder method to automatically provide the Builder context. + + This function creates a wrapper around the provided Builder method (`func`) that + automatically retrieves the current Builder context and passes it as the first + argument to the method. This allows the method to be called without explicitly + providing the Builder context. + + Args: + func (Callable[[Builder, Select], T2]): The Builder method to be wrapped. + - The method must take a `Builder` instance as its first argument and + a `Select` instance as its second argument. + + Returns: + Callable[[Select], T2]: A callable that takes only a `Select` argument and + internally retrieves the Builder context to call the original method. + + Raises: + RuntimeError: If no Builder context is available when the returned function + is called. + """ + @functools.wraps(func) - def getter(select: Select = Select.ALL): + def getter(select: Select = Select.ALL) -> T2: + # Retrieve the current Builder context based on the method name context = Builder._get_context(func.__name__) if not context: raise RuntimeError( f"{func.__name__}() requires a Builder context to be in scope" ) + # Call the original method with the retrieved context and provided select return func(context, select) return getter +# The following functions are used to get the shapes from the builder in context vertices = __gen_context_component_getter(Builder.vertices) edges = __gen_context_component_getter(Builder.edges) wires = __gen_context_component_getter(Builder.wires) From 8a94a9f8278248c79f574a3fe96e09e41e56dd76 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 11 Jan 2025 10:40:45 -0500 Subject: [PATCH 102/518] Changed VectorLike and RotationLike to TypeAlias --- src/build123d/geometry.py | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 2f63c8c..a8525ce 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -40,17 +40,7 @@ import logging import numpy as np from math import degrees, pi, radians -from typing import ( - cast as tcast, - Any, - List, - Optional, - Tuple, - Union, - overload, - TypeVar, - TYPE_CHECKING, -) +from typing import Any, overload, TypeAlias, TYPE_CHECKING from collections.abc import Iterable, Sequence @@ -62,9 +52,7 @@ from OCP.BRepBndLib import BRepBndLib from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeFace, BRepBuilderAPI_Transform from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation from OCP.BRepTools import BRepTools -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import Geom_BoundedSurface, Geom_Curve, Geom_Line, Geom_Plane -from OCP.GeomAdaptor import GeomAdaptor_Curve +from OCP.Geom import Geom_BoundedSurface, Geom_Line, Geom_Plane from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf, GeomAPI_IntCS, GeomAPI_IntSS from OCP.gp import ( gp_Ax1, @@ -549,10 +537,17 @@ class Vector: return shape.intersect(self) -#:TypeVar("VectorLike"): Tuple of float or Vector defining a position in space -VectorLike = Union[ - Vector, tuple[float, float], tuple[float, float, float], Sequence[float] -] +VectorLike: TypeAlias = ( + Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] +) +""" +VectorLike: Represents a position in space. + +- `Vector`: A vector object from `build123d`. +- `tuple[float, float]`: A 2D coordinate (x, y). +- `tuple[float, float, float]`: A 3D coordinate (x, y, z). +- `Sequence[float]`: A general sequence of floats (e.g., for higher dimensions). +""" class AxisMeta(type): @@ -1761,8 +1756,13 @@ class Rotation(Location): Rot = Rotation # Short form for Algebra users who like compact notation -#:TypeVar("RotationLike"): Three tuple of angles about x, y, z or Rotation -RotationLike = Union[tuple[float, float, float], Rotation] +RotationLike: TypeAlias = Rotation | tuple[float, float, float] +""" +RotationLike: Represents a rotation. + +- `Rotation`: A specialized `Location` with the orientation set. +- `tuple[float, float, float]`: Euler rotations about the X, Y, and Z axes. +""" class Pos(Location): From 152aedf9780cd14c35f3ddcf97948f8dd49f4234 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 11 Jan 2025 12:04:49 -0500 Subject: [PATCH 103/518] Fixed typing in operations_part.py --- src/build123d/build_common.py | 14 ++-- src/build123d/operations_part.py | 120 ++++++++++++++++++------------- 2 files changed, 79 insertions(+), 55 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 88151b2..afad117 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -136,10 +136,10 @@ def _is_point(obj): T = TypeVar("T", Any, list[Any]) -def flatten_sequence(*obj: T) -> list[Any]: +def flatten_sequence(*obj: T) -> ShapeList[Any]: """Convert a sequence of object potentially containing iterables into a flat list""" - flat_list = [] + flat_list = ShapeList() for item in obj: # Note: an Iterable can't be used here as it will match with Vector & Vertex # and break them into a list of floats. @@ -316,10 +316,14 @@ class Builder(ABC): """Integrate a sequence of objects into existing builder object""" return NotImplementedError # pragma: no cover + T = TypeVar("T", bound="Builder") + @classmethod def _get_context( - cls, caller: Builder | Shape | Joint | str | None = None, log: bool = True - ) -> Builder | None: + cls: Type[T], + caller: Builder | Shape | Joint | str | None = None, + log: bool = True, + ) -> T | None: """Return the instance of the current builder""" result = cls._current.get(None) context_name = "None" if result is None else type(result).__name__ @@ -818,7 +822,7 @@ class Builder(ABC): def validate_inputs( - context: Builder, validating_class, objects: Iterable[Shape] | None = None + context: Builder | None, validating_class, objects: Iterable[Shape] | None = None ): """A function to wrap the method when used outside of a Builder context""" if context is None: diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index c7f4bab..3781977 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -27,7 +27,7 @@ license: """ from __future__ import annotations -from typing import Union +from typing import cast from collections.abc import Iterable from build123d.build_enums import Mode, Until, Kind, Side @@ -56,11 +56,11 @@ from build123d.build_common import ( def extrude( - to_extrude: Face | Sketch = None, - amount: float = None, - dir: VectorLike = None, # pylint: disable=redefined-builtin - until: Until = None, - target: Compound | Solid = None, + to_extrude: Face | Sketch | None = None, + amount: float | None = None, + dir: VectorLike | None = None, # pylint: disable=redefined-builtin + until: Until | None = None, + target: Compound | Solid | None = None, both: bool = False, taper: float = 0.0, clean: bool = True, @@ -89,7 +89,7 @@ def extrude( Part: extruded object """ # pylint: disable=too-many-locals, too-many-branches - context: BuildPart = BuildPart._get_context("extrude") + context: BuildPart | None = BuildPart._get_context("extrude") validate_inputs(context, "extrude", to_extrude) to_extrude_faces: list[Face] @@ -130,12 +130,6 @@ def extrude( if len(face_planes) != len(to_extrude_faces): raise ValueError("dir must be provided when extruding non-planar faces") - if until is not None: - if target is None and context is None: - raise ValueError("A target object must be provided") - if target is None: - target = context.part - logger.info( "%d face(s) to extrude on %d face plane(s)", len(to_extrude_faces), @@ -144,7 +138,7 @@ def extrude( for face, plane in zip(to_extrude_faces, face_planes): for direction in [1, -1] if both else [1]: - if amount: + if amount is not None: if taper == 0: new_solids.append( Solid.extrude( @@ -162,10 +156,19 @@ def extrude( ) else: + if until is None: + raise ValueError("Either amount or until must be provided") + if target is None: + if context is None: + raise ValueError("A target object must be provided") + target_object = context.part + else: + target_object = target + new_solids.append( Solid.extrude_until( section=face, - target_object=target, + target_object=target_object, direction=plane.z_dir * direction, until=until, ) @@ -186,7 +189,7 @@ def extrude( def loft( - sections: Face | Sketch | Iterable[Vertex | Face | Sketch] = None, + sections: Face | Sketch | Iterable[Vertex | Face | Sketch] | None = None, ruled: bool = False, clean: bool = True, mode: Mode = Mode.ADD, @@ -203,7 +206,7 @@ def loft( clean (bool, optional): Remove extraneous internal structure. Defaults to True. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ - context: BuildPart = BuildPart._get_context("loft") + context: BuildPart | None = BuildPart._get_context("loft") section_list = flatten_sequence(sections) validate_inputs(context, "loft", section_list) @@ -235,10 +238,11 @@ def loft( elif isinstance(s, Face): loft_wires.append(s.outer_wire()) elif isinstance(s, Sketch): - loft_wires.append(s.face().outer_wire()) + loft_wires.extend([f.outer_wire() for f in s.faces()]) elif all(isinstance(s, Vertex) for s in section_list): raise ValueError( - "At least one face/sketch is required if vertices are the first, last, or first and last elements" + "At least one face/sketch is required if vertices are the first, last, " + "or first and last elements" ) new_solid = Solid.make_loft(loft_wires, ruled) @@ -262,7 +266,7 @@ def loft( def make_brake_formed( thickness: float, station_widths: float | Iterable[float], - line: Edge | Wire | Curve = None, + line: Edge | Wire | Curve | None = None, side: Side = Side.LEFT, kind: Kind = Kind.ARC, clean: bool = True, @@ -298,7 +302,7 @@ def make_brake_formed( Part: sheet metal part """ # pylint: disable=too-many-locals, too-many-branches - context: BuildPart = BuildPart._get_context("make_brake_formed") + context: BuildPart | None = BuildPart._get_context("make_brake_formed") validate_inputs(context, "make_brake_formed") if line is not None: @@ -321,8 +325,16 @@ def make_brake_formed( raise ValueError("line not suitable - probably straight") from exc # Make edge pairs - station_edges = ShapeList() + station_edges: ShapeList[Edge] = ShapeList() line_vertices = line.vertices() + + if isinstance(station_widths, (float, int)): + station_widths_list = [station_widths] * len(line_vertices) + elif isinstance(station_widths, Iterable): + station_widths_list = list(station_widths) + else: + raise TypeError("station_widths must be either a single number or an iterable") + for vertex in line_vertices: others = offset_vertices.sort_by_distance(Vector(vertex.X, vertex.Y, vertex.Z)) for other in others[1:]: @@ -333,19 +345,17 @@ def make_brake_formed( break station_edges = station_edges.sort_by(line) - if isinstance(station_widths, (float, int)): - station_widths = [station_widths] * len(line_vertices) - if len(station_widths) != len(line_vertices): + if len(station_widths_list) != len(line_vertices): raise ValueError( f"widths must either be a single number or an iterable with " f"a length of the # vertices in line ({len(line_vertices)})" ) station_faces = [ Face.extrude(obj=e, direction=plane.z_dir * w) - for e, w in zip(station_edges, station_widths) + for e, w in zip(station_edges, station_widths_list) ] sweep_paths = line.edges().sort_by(line) - sections = [] + sections: list[Solid] = [] for i in range(len(station_faces) - 1): sections.append( Solid.sweep_multi( @@ -353,7 +363,7 @@ def make_brake_formed( ) ) if len(sections) > 1: - new_solid = sections.pop().fuse(*sections) + new_solid = cast(Part, Part.fuse(*sections)) else: new_solid = sections[0] @@ -391,7 +401,7 @@ def project_workplane( Returns: Plane: workplane aligned for projection """ - context: BuildPart = BuildPart._get_context("project_workplane") + context: BuildPart | None = BuildPart._get_context("project_workplane") if context is not None and not isinstance(context, BuildPart): raise RuntimeError( @@ -422,7 +432,7 @@ def project_workplane( def revolve( - profiles: Face | Iterable[Face] = None, + profiles: Face | Iterable[Face] | None = None, axis: Axis = Axis.Z, revolution_arc: float = 360.0, clean: bool = True, @@ -444,7 +454,7 @@ def revolve( Raises: ValueError: Invalid axis of revolution """ - context: BuildPart = BuildPart._get_context("revolve") + context: BuildPart | None = BuildPart._get_context("revolve") profile_list = flatten_sequence(profiles) @@ -458,16 +468,13 @@ def revolve( if all([s is None for s in profile_list]): if context is None or (context is not None and not context.pending_faces): raise ValueError("No profiles provided") - profile_list = context.pending_faces + profile_faces = context.pending_faces context.pending_faces = [] context.pending_face_planes = [] else: - p_list = [] - for profile in profile_list: - p_list.extend(profile.faces()) - profile_list = p_list + profile_faces = profile_list.faces() - new_solids = [Solid.revolve(profile, angle, axis) for profile in profile_list] + new_solids = [Solid.revolve(profile, angle, axis) for profile in profile_faces] new_solid = Compound(new_solids) if context is not None: @@ -479,7 +486,7 @@ def revolve( def section( - obj: Part = None, + obj: Part | None = None, section_by: Plane | Iterable[Plane] = Plane.XZ, height: float = 0.0, clean: bool = True, @@ -497,13 +504,17 @@ def section( clean (bool, optional): Remove extraneous internal structure. Defaults to True. mode (Mode, optional): combination mode. Defaults to Mode.INTERSECT. """ - context: BuildPart = BuildPart._get_context("section") + context: BuildPart | None = BuildPart._get_context("section") validate_inputs(context, "section", None) - if context is not None and obj is None: - max_size = context.part.bounding_box(optimal=False).diagonal + if obj is not None: + to_section = obj + elif context is not None: + to_section = context.part else: - max_size = obj.bounding_box(optimal=False).diagonal + raise ValueError("No object to section") + + max_size = to_section.bounding_box(optimal=False).diagonal if section_by is not None: section_planes = ( @@ -528,7 +539,13 @@ def section( else: raise ValueError("obj must be provided") - new_objects = [obj.intersect(plane) for plane in planes] + new_objects: list[Face | Shell] = [] + for plane in planes: + intersection = to_section.intersect(plane) + if isinstance(intersection, ShapeList): + new_objects.extend(intersection) + elif intersection is not None: + new_objects.append(intersection) if context is not None: context._add_to_context( @@ -542,9 +559,9 @@ def section( def thicken( - to_thicken: Face | Sketch = None, - amount: float = None, - normal_override: VectorLike = None, + to_thicken: Face | Sketch | None = None, + amount: float | None = None, + normal_override: VectorLike | None = None, both: bool = False, clean: bool = True, mode: Mode = Mode.ADD, @@ -555,7 +572,7 @@ def thicken( Args: to_thicken (Union[Face, Sketch], optional): object to thicken. Defaults to None. - amount (float, optional): distance to extrude, sign controls direction. Defaults to None. + amount (float): distance to extrude, sign controls direction. normal_override (Vector, optional): The normal_override vector can be used to indicate which way is 'up', potentially flipping the face normal direction such that many faces with different normals all go in the same direction @@ -571,11 +588,14 @@ def thicken( Returns: Part: extruded object """ - context: BuildPart = BuildPart._get_context("thicken") + context: BuildPart | None = BuildPart._get_context("thicken") validate_inputs(context, "thicken", to_thicken) to_thicken_faces: list[Face] + if amount is None: + raise ValueError("An amount must be provided") + if to_thicken is None: if context is not None and context.pending_faces: # Get pending faces and face planes @@ -603,7 +623,7 @@ def thicken( for direction in [1, -1] if both else [1]: new_solids.append( Solid.thicken( - face, depth=amount, normal_override=face_normal * direction + face, depth=amount, normal_override=Vector(face_normal) * direction ) ) @@ -611,7 +631,7 @@ def thicken( context._add_to_context(*new_solids, clean=clean, mode=mode) else: if len(new_solids) > 1: - new_solids = [new_solids.pop().fuse(*new_solids)] + new_solids = [cast(Part, Part.fuse(*new_solids))] if clean: new_solids = [solid.clean() for solid in new_solids] From 61ddeed0296797a5aa64e0ab8df0d3cf4e22ab41 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 11 Jan 2025 13:57:22 -0500 Subject: [PATCH 104/518] Fixed objects_curve.py typing problems --- src/build123d/build_common.py | 12 +++- src/build123d/objects_curve.py | 124 ++++++++++++++++----------------- 2 files changed, 69 insertions(+), 67 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index afad117..f5fef9b 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -50,7 +50,7 @@ import functools from abc import ABC, abstractmethod from itertools import product from math import sqrt, cos, pi -from typing import Any, Type, TypeVar +from typing import Any, overload, Type, TypeVar from collections.abc import Callable, Iterable from typing_extensions import Self @@ -1295,8 +1295,16 @@ class WorkplaneList: """Return the instance of the current ContextList""" return cls._current.get(None) + @overload @classmethod - def localize(cls, *points: VectorLike) -> list[Vector] | Vector: + def localize(cls, points: VectorLike) -> Vector: ... + + @overload + @classmethod + def localize(cls, *points: VectorLike) -> list[Vector]: ... + + @classmethod + def localize(cls, *points: VectorLike): """Localize a sequence of points to the active workplane (only used by BuildLine where there is only one active workplane) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 05b71f8..b6604d0 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -49,7 +49,7 @@ def _add_curve_to_context(curve, mode: Mode): curve (Union[Wire, Edge]): curve to add to the context (either a Wire or an Edge). mode (Mode): combination mode. """ - context: BuildLine = BuildLine._get_context(log=False) + context: BuildLine | None = BuildLine._get_context(log=False) if context is not None and isinstance(context, BuildLine): if isinstance(curve, Wire): @@ -108,14 +108,14 @@ class Bezier(BaseEdgeObject): def __init__( self, *cntl_pnts: VectorLike, - weights: list[float] = None, + weights: list[float] | None = None, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - cntl_pnts = flatten_sequence(*cntl_pnts) - polls = WorkplaneList.localize(*cntl_pnts) + cntl_pnt_list = flatten_sequence(*cntl_pnts) + polls = WorkplaneList.localize(*cntl_pnt_list) curve = Edge.make_bezier(*polls, weights=weights) super().__init__(curve, mode=mode) @@ -144,7 +144,7 @@ class CenterArc(BaseEdgeObject): arc_size: float, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) center_point = WorkplaneList.localize(center) @@ -203,7 +203,7 @@ class DoubleTangentArc(BaseEdgeObject): keep: Keep = Keep.TOP, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) arc_pt = WorkplaneList.localize(pnt) @@ -304,11 +304,11 @@ class EllipticalStartArc(BaseEdgeObject): sweep_flag: bool = True, plane: Plane = Plane.XY, mode: Mode = Mode.ADD, - ) -> Edge: + ): # Debugging incomplete raise RuntimeError("Implementation incomplete") - # context: BuildLine = BuildLine._get_context(self) + # context: BuildLine | None = BuildLine._get_context(self) # context.validate_inputs(self) # # Calculate the ellipse parameters based on the SVG implementation here: @@ -374,7 +374,7 @@ class EllipticalStartArc(BaseEdgeObject): # context._add_to_context(curve, mode=mode) # super().__init__(curve.wrapped) - # context: BuildLine = BuildLine._get_context(self) + # context: BuildLine | None = BuildLine._get_context(self) class EllipticalCenterArc(BaseEdgeObject): @@ -408,7 +408,7 @@ class EllipticalCenterArc(BaseEdgeObject): angular_direction: AngularDirection = AngularDirection.COUNTER_CLOCKWISE, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) center_pnt = WorkplaneList.localize(center) @@ -460,7 +460,7 @@ class Helix(BaseEdgeObject): lefthand: bool = False, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) center_pnt = WorkplaneList.localize(center) @@ -496,17 +496,17 @@ class FilletPolyline(BaseLineObject): close: bool = False, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - pts = flatten_sequence(*pts) + points = flatten_sequence(*pts) - if len(pts) < 2: + if len(points) < 2: raise ValueError("FilletPolyline requires two or more pts") if radius <= 0: raise ValueError("radius must be positive") - lines_pts = WorkplaneList.localize(*pts) + lines_pts = WorkplaneList.localize(*points) # Create the polyline new_edges = [ @@ -539,9 +539,7 @@ class FilletPolyline(BaseLineObject): for vertex, edges in vertex_to_edges.items(): if len(edges) != 2: continue - other_vertices = { - ve for e in edges for ve in e.vertices() if ve != vertex - } + other_vertices = {ve for e in edges for ve in e.vertices() if ve != vertex} third_edge = Edge.make_line(*[v.to_tuple() for v in other_vertices]) fillet_face = Face(Wire(edges + [third_edge])).fillet_2d(radius, [vertex]) fillets.append(fillet_face.edges().filter_by(GeomType.CIRCLE)[0]) @@ -595,7 +593,7 @@ class JernArc(BaseEdgeObject): arc_size: float, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) start = WorkplaneList.localize(start) @@ -642,19 +640,17 @@ class Line(BaseEdgeObject): _applies_to = [BuildLine._tag] - def __init__( - self, *pts: VectorLike | Iterable[VectorLike], mode: Mode = Mode.ADD - ): - pts = flatten_sequence(*pts) - if len(pts) != 2: + def __init__(self, *pts: VectorLike | Iterable[VectorLike], mode: Mode = Mode.ADD): + points = flatten_sequence(*pts) + if len(points) != 2: raise ValueError("Line requires two pts") - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - pts = WorkplaneList.localize(*pts) + points_localized = WorkplaneList.localize(*points) - lines_pts = [Vector(p) for p in pts] + lines_pts = [Vector(p) for p in points_localized] new_edge = Edge.make_line(lines_pts[0], lines_pts[1]) super().__init__(new_edge, mode=mode) @@ -682,7 +678,7 @@ class IntersectingLine(BaseEdgeObject): other: Curve | Edge | Wire, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) start = WorkplaneList.localize(start) @@ -724,12 +720,12 @@ class PolarLine(BaseEdgeObject): self, start: VectorLike, length: float, - angle: float = None, - direction: VectorLike = None, + angle: float | None = None, + direction: VectorLike | None = None, length_mode: LengthMode = LengthMode.DIAGONAL, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) start = WorkplaneList.localize(start) @@ -738,11 +734,11 @@ class PolarLine(BaseEdgeObject): else: polar_workplane = copy.copy(WorkplaneList._get_context().workplanes[0]) - if direction: - direction = WorkplaneList.localize(direction) - angle = Vector(1, 0, 0).get_angle(direction) + if direction is not None: + direction_localized = WorkplaneList.localize(direction) + angle = Vector(1, 0, 0).get_angle(direction_localized) elif angle is not None: - direction = polar_workplane.x_dir.rotate( + direction_localized = polar_workplane.x_dir.rotate( Axis((0, 0, 0), polar_workplane.z_dir), angle, ) @@ -750,11 +746,11 @@ class PolarLine(BaseEdgeObject): raise ValueError("Either angle or direction must be provided") if length_mode == LengthMode.DIAGONAL: - length_vector = direction * length + length_vector = direction_localized * length elif length_mode == LengthMode.HORIZONTAL: - length_vector = direction * (length / cos(radians(angle))) + length_vector = direction_localized * (length / cos(radians(angle))) elif length_mode == LengthMode.VERTICAL: - length_vector = direction * (length / sin(radians(angle))) + length_vector = direction_localized * (length / sin(radians(angle))) new_edge = Edge.make_line(start, start + length_vector) @@ -783,14 +779,14 @@ class Polyline(BaseLineObject): close: bool = False, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - pts = flatten_sequence(*pts) - if len(pts) < 2: + points = flatten_sequence(*pts) + if len(points) < 2: raise ValueError("Polyline requires two or more pts") - lines_pts = WorkplaneList.localize(*pts) + lines_pts = WorkplaneList.localize(*points) new_edges = [ Edge.make_line(lines_pts[i], lines_pts[i + 1]) @@ -829,7 +825,7 @@ class RadiusArc(BaseEdgeObject): short_sagitta: bool = True, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) start, end = WorkplaneList.localize(start_point, end_point) @@ -875,7 +871,7 @@ class SagittaArc(BaseEdgeObject): sagitta: float, mode: Mode = Mode.ADD, ): - context: BuildLine = BuildLine._get_context(self) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) start, end = WorkplaneList.localize(start_point, end_point) @@ -915,16 +911,16 @@ class Spline(BaseEdgeObject): def __init__( self, *pts: VectorLike | Iterable[VectorLike], - tangents: Iterable[VectorLike] = None, - tangent_scalars: Iterable[float] = None, + tangents: Iterable[VectorLike] | None = None, + tangent_scalars: Iterable[float] | None = None, periodic: bool = False, mode: Mode = Mode.ADD, ): - pts = flatten_sequence(*pts) - context: BuildLine = BuildLine._get_context(self) + points = flatten_sequence(*pts) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - spline_pts = WorkplaneList.localize(*pts) + spline_pts = WorkplaneList.localize(*points) if tangents: spline_tangents = [ @@ -933,10 +929,10 @@ class Spline(BaseEdgeObject): else: spline_tangents = None - if tangents and not tangent_scalars: - scalars = [1.0] * len(tangents) + if tangents is not None and tangent_scalars is None: + scalars = [1.0] * len(list(tangents)) else: - scalars = tangent_scalars + scalars = list(tangent_scalars) if tangent_scalars is not None else [] spline = Edge.make_spline( [p if isinstance(p, Vector) else Vector(*p) for p in spline_pts], @@ -979,13 +975,13 @@ class TangentArc(BaseEdgeObject): tangent_from_first: bool = True, mode: Mode = Mode.ADD, ): - pts = flatten_sequence(*pts) - context: BuildLine = BuildLine._get_context(self) + points = flatten_sequence(*pts) + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - if len(pts) != 2: + if len(points) != 2: raise ValueError("tangent_arc requires two points") - arc_pts = WorkplaneList.localize(*pts) + arc_pts = WorkplaneList.localize(*points) arc_tangent = WorkplaneList.localize(tangent).normalized() point_indices = (0, -1) if tangent_from_first else (-1, 0) @@ -1011,16 +1007,14 @@ class ThreePointArc(BaseEdgeObject): _applies_to = [BuildLine._tag] - def __init__( - self, *pts: VectorLike | Iterable[VectorLike], mode: Mode = Mode.ADD - ): - context: BuildLine = BuildLine._get_context(self) + def __init__(self, *pts: VectorLike | Iterable[VectorLike], mode: Mode = Mode.ADD): + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - pts = flatten_sequence(*pts) - if len(pts) != 3: + points = flatten_sequence(*pts) + if len(points) != 3: raise ValueError("ThreePointArc requires three points") - points = WorkplaneList.localize(*pts) - arc = Edge.make_three_point_arc(*points) + points_localized = WorkplaneList.localize(*points) + arc = Edge.make_three_point_arc(*points_localized) super().__init__(arc, mode=mode) From ae80b27c9bad72e76baac9b9f7319c1f9b4c210a Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Sat, 11 Jan 2025 13:37:09 -0600 Subject: [PATCH 105/518] pyproject.toml -> change cadquery-ocp dep to >= 7.8.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6ef699d..b89afad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ classifiers = [ ] dependencies = [ - "cadquery-ocp >= 7.7.0", + "cadquery-ocp >= 7.8.1", "typing_extensions >= 4.6.0, <5", "numpy >= 2, <3", "svgpathtools >= 1.5.1, <2", From b93538c3119c911c40a0a546c3c4e1a2637cdcd7 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Sat, 11 Jan 2025 13:42:57 -0600 Subject: [PATCH 106/518] shape_core.py -> move to OCP>7.8 hash method --- src/build123d/topology/shape_core.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 63703d7..6933c55 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -167,7 +167,6 @@ if TYPE_CHECKING: # pragma: no cover from .composite import Compound # pylint: disable=R0801 from build123d.build_part import BuildPart # pylint: disable=R0801 -HASH_CODE_MAX = 2147483647 Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] TrimmingTool = Union[Plane, "Shell", "Face"] TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) @@ -805,8 +804,10 @@ class Shape(NodeMixin, Generic[TOPODS]): return NotImplemented def __hash__(self) -> int: - """Return has code""" - return self.hash_code() + """Return hash code""" + if self.wrapped is None: + return 0 + return hash(self.wrapped) def __rmul__(self, other): """right multiply for positioning operator *""" @@ -1181,19 +1182,6 @@ class Shape(NodeMixin, Generic[TOPODS]): self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) ) - def hash_code(self) -> int: - """Returns a hashed value denoting this shape. It is computed from the - TShape and the Location. The Orientation is not used. - - Args: - - Returns: - - """ - if self.wrapped is None: - return 0 - return self.wrapped.HashCode(HASH_CODE_MAX) - def intersect( self, *to_intersect: Shape | Axis | Plane ) -> None | Self | ShapeList[Self]: @@ -2852,7 +2840,7 @@ def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shap while explorer.More(): item = explorer.Current() - out[item.HashCode(HASH_CODE_MAX)] = ( + out[hash(item)] = ( item # needed to avoid pseudo-duplicate entities ) explorer.Next() From 42261cad6542f27dc39f4bc98ca6cd83c02fcf84 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Sat, 11 Jan 2025 14:31:50 -0600 Subject: [PATCH 107/518] @ocp781 test_direct_api.py-> test hash(empty) returns zero (modified) --- tests/test_direct_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index bc17a35..f26c958 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -3559,7 +3559,7 @@ class TestShape(DirectApiTestCase): with self.assertRaises(ValueError): empty.geom_type self.assertIs(empty, empty.fix()) - self.assertEqual(empty.hash_code(), 0) + self.assertEqual(hash(empty), 0) self.assertFalse(empty.is_same(Solid())) self.assertFalse(empty.is_equal(Solid())) self.assertTrue(empty.is_valid()) From 8c314d4a8e7ba4c96dc3b4a0d12b3820fe7cd8fd Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 11 Jan 2025 19:04:17 -0500 Subject: [PATCH 108/518] Fixed objects_sketch.py typing problems --- src/build123d/objects_sketch.py | 38 ++++++++++++++--------------- src/build123d/topology/composite.py | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index a6689da..65771d2 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -31,7 +31,7 @@ from __future__ import annotations import trianglesolver from math import cos, degrees, pi, radians, sin, tan -from typing import Union +from typing import cast from collections.abc import Iterable @@ -85,7 +85,7 @@ class BaseSketchObject(Sketch): align = tuplify(align, 2) obj.move(Location(obj.bounding_box().to_align_offset(align))) - context: BuildSketch = BuildSketch._get_context(self, log=False) + context: BuildSketch | None = BuildSketch._get_context(self, log=False) if context is None: new_faces = obj.moved(Rotation(0, 0, rotation)).faces() @@ -95,11 +95,11 @@ class BaseSketchObject(Sketch): obj = obj.moved(Rotation(0, 0, rotation)) - new_faces = [ + new_faces = ShapeList( face.moved(location) for face in obj.faces() for location in LocationList._get_context().local_locations - ] + ) if isinstance(context, BuildSketch): context._add_to_context(*new_faces, mode=mode) @@ -126,7 +126,7 @@ class Circle(BaseSketchObject): align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) self.radius = radius @@ -160,7 +160,7 @@ class Ellipse(BaseSketchObject): align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) self.x_radius = x_radius @@ -199,7 +199,7 @@ class Polygon(BaseSketchObject): align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) flattened_pts = flatten_sequence(*pts) @@ -235,7 +235,7 @@ class Rectangle(BaseSketchObject): align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) self.width = width @@ -272,7 +272,7 @@ class RectangleRounded(BaseSketchObject): align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) if width <= 2 * radius or height <= 2 * radius: @@ -317,7 +317,7 @@ class RegularPolygon(BaseSketchObject): mode: Mode = Mode.ADD, ): # pylint: disable=too-many-locals - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) if side_count < 3: @@ -381,7 +381,7 @@ class SlotArc(BaseSketchObject): rotation: float = 0, mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) self.arc = arc @@ -417,7 +417,7 @@ class SlotCenterPoint(BaseSketchObject): rotation: float = 0, mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) center_v = Vector(center) @@ -472,7 +472,7 @@ class SlotCenterToCenter(BaseSketchObject): f"Requires center_separation > 0. Got: {center_separation=}" ) - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) self.center_separation = center_separation @@ -518,14 +518,14 @@ class SlotOverall(BaseSketchObject): f"Slot requires that width > height. Got: {width=}, {height=}" ) - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) self.width = width self.slot_height = height if width != height: - face: Face | None = Face( + face = Face( Wire( [ Edge.make_line(Vector(-width / 2 + height / 2, 0, 0), Vector()), @@ -534,7 +534,7 @@ class SlotOverall(BaseSketchObject): ).offset_2d(height / 2) ) else: - face = Circle(width / 2, mode=mode).face() + face = cast(Face, Circle(width / 2, mode=mode).face()) super().__init__(face, rotation, align, mode) @@ -574,7 +574,7 @@ class Text(BaseSketchObject): rotation: float = 0.0, mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) self.txt = txt @@ -633,7 +633,7 @@ class Trapezoid(BaseSketchObject): align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) right_side_angle = left_side_angle if not right_side_angle else right_side_angle @@ -720,7 +720,7 @@ class Triangle(BaseSketchObject): rotation: float = 0, mode: Mode = Mode.ADD, ): - context = BuildSketch._get_context(self) + context: BuildSketch | None = BuildSketch._get_context(self) validate_inputs(context, self) if [v is None for v in [a, b, c]].count(True) == 3 or [ diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 8be2776..5be6a8f 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -237,7 +237,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): font: str = "Arial", font_path: str | None = None, font_style: FontStyle = FontStyle.REGULAR, - align: Align | tuple[Align, Align] = (Align.CENTER, Align.CENTER), + align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), position_on_path: float = 0.0, text_path: Edge | Wire | None = None, ) -> Compound: From 18957ef1587e9b2c0eafa72127f58b3cc923eb8b Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 12 Jan 2025 13:18:30 -0500 Subject: [PATCH 109/518] Fixing operations_generic.py typing problems --- src/build123d/build_common.py | 2 +- src/build123d/operations_generic.py | 272 ++++++++++++++++------------ 2 files changed, 153 insertions(+), 121 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index f5fef9b..92a785e 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -243,7 +243,7 @@ class Builder(ABC): self.builder_parent = None self.lasts: dict = {Vertex: [], Edge: [], Face: [], Solid: []} self.workplanes_context = None - self.exit_workplanes = None + self.exit_workplanes: list[Plane] = [] self.obj_before: Shape | None = None self.to_combine: list[Shape] = [] diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 67370c5..2deeeaa 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -30,7 +30,7 @@ license: import copy import logging from math import radians, tan -from typing import Union +from typing import cast, TypeAlias from collections.abc import Iterable @@ -78,13 +78,13 @@ from build123d.topology import ( logging.getLogger("build123d").addHandler(logging.NullHandler()) logger = logging.getLogger("build123d") -#:TypeVar("AddType"): Type of objects which can be added to a builder -AddType = Union[Edge, Wire, Face, Solid, Compound, Builder] +AddType: TypeAlias = Edge | Wire | Face | Solid | Compound | Builder +"""Type of objects which can be added to a builder""" def add( objects: AddType | Iterable[AddType], - rotation: float | RotationLike = None, + rotation: float | RotationLike | None = None, clean: bool = True, mode: Mode = Mode.ADD, ) -> Compound: @@ -101,22 +101,28 @@ def add( Edges and Wires are added to line. Args: - objects (Union[Edge, Wire, Face, Solid, Compound] or Iterable of): objects to add - rotation (Union[float, RotationLike], optional): rotation angle for sketch, + objects (Edge | Wire | Face | Solid | Compound or Iterable of): objects to add + rotation (float | RotationLike, optional): rotation angle for sketch, rotation about each axis for part. Defaults to None. clean (bool, optional): Remove extraneous internal structure. Defaults to True. mode (Mode, optional): combine mode. Defaults to Mode.ADD. """ - context: Builder = Builder._get_context(None) + context: Builder | None = Builder._get_context(None) if context is None: raise RuntimeError("Add must have an active builder context") - object_iter = objects if isinstance(objects, Iterable) else [objects] + if isinstance(objects, Iterable) and not isinstance(objects, Compound): + object_list = list(objects) + else: + object_list = [objects] object_iter = [ - obj.unwrap(fully=False) if isinstance(obj, Compound) else obj - for obj in object_iter + ( + obj.unwrap(fully=False) + if isinstance(obj, Compound) + else obj._obj if isinstance(obj, Builder) else obj + ) + for obj in object_list ] - object_iter = [obj._obj if isinstance(obj, Builder) else obj for obj in object_iter] validate_inputs(context, "add", object_iter) @@ -201,7 +207,7 @@ def add( def bounding_box( - objects: Shape | Iterable[Shape] = None, + objects: Shape | Iterable[Shape] | None = None, mode: Mode = Mode.PRIVATE, ) -> Sketch | Part: """Generic Operation: Add Bounding Box @@ -214,7 +220,7 @@ def bounding_box( objects (Shape or Iterable of): objects to create bbox for mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ - context: Builder = Builder._get_context("bounding_box") + context: Builder | None = Builder._get_context("bounding_box") if objects is None: if context is None or context is not None and context._obj is None: @@ -261,16 +267,16 @@ def bounding_box( return Part(Compound(new_objects).wrapped) -#:TypeVar("ChamferFilletType"): Type of objects which can be chamfered or filleted -ChamferFilletType = Union[Edge, Vertex] +ChamferFilletType: TypeAlias = Edge | Vertex +"""Type of objects which can be chamfered or filleted""" def chamfer( objects: ChamferFilletType | Iterable[ChamferFilletType], length: float, - length2: float = None, - angle: float = None, - reference: Edge | Face = None, + length2: float | None = None, + angle: float | None = None, + reference: Edge | Face | None = None, ) -> Sketch | Part: """Generic Operation: chamfer @@ -279,11 +285,11 @@ def chamfer( Chamfer the given sequence of edges or vertices. Args: - objects (Union[Edge,Vertex] or Iterable of): edges or vertices to chamfer + objects (Edge | Vertex or Iterable of): edges or vertices to chamfer length (float): chamfer size length2 (float, optional): asymmetric chamfer size. Defaults to None. angle (float, optional): chamfer angle in degrees. Defaults to None. - reference (Union[Edge,Face]): identifies the side where length is measured. Edge(s) must + reference (Edge | Face): identifies the side where length is measured. Edge(s) must be part of the face. Vertex/Vertices must be part of edge Raises: @@ -293,7 +299,7 @@ def chamfer( ValueError: Only one of length2 or angle should be provided ValueError: reference can only be used in conjunction with length2 or angle """ - context: Builder = Builder._get_context("chamfer") + context: Builder | None = Builder._get_context("chamfer") if length2 and angle: raise ValueError("Only one of length2 or angle should be provided") @@ -367,24 +373,28 @@ def chamfer( raise ValueError("1D fillet operation takes only Vertices") # Remove any end vertices as these can't be filleted if not target.is_closed: - object_list = filter( - lambda v: not ( - isclose_b( - (Vector(*v.to_tuple()) - target.position_at(0)).length, - 0.0, - ) - or isclose_b( - (Vector(*v.to_tuple()) - target.position_at(1)).length, - 0.0, - ) - ), - object_list, + object_list = ShapeList( + filter( + lambda v: not ( + isclose_b( + (Vector(*v.to_tuple()) - target.position_at(0)).length, + 0.0, + ) + or isclose_b( + (Vector(*v.to_tuple()) - target.position_at(1)).length, + 0.0, + ) + ), + object_list, + ) ) new_wire = target.chamfer_2d(length, length2, object_list, reference) if context is not None: context._add_to_context(new_wire, mode=Mode.REPLACE) return new_wire + raise ValueError("Invalid object dimension") + def fillet( objects: ChamferFilletType | Iterable[ChamferFilletType], @@ -398,7 +408,7 @@ def fillet( either end of an open line will be automatically skipped. Args: - objects (Union[Edge,Vertex] or Iterable of): edges or vertices to fillet + objects (Edge | Vertex or Iterable of): edges or vertices to fillet radius (float): fillet size - must be less than 1/2 local width Raises: @@ -407,7 +417,7 @@ def fillet( ValueError: objects must be Vertices ValueError: nothing to fillet """ - context: Builder = Builder._get_context("fillet") + context: Builder | None = Builder._get_context("fillet") if (objects is None and context is None) or ( objects is None and context is not None and context._obj is None ): @@ -466,31 +476,35 @@ def fillet( raise ValueError("1D fillet operation takes only Vertices") # Remove any end vertices as these can't be filleted if not target.is_closed: - object_list = filter( - lambda v: not ( - isclose_b( - (Vector(*v.to_tuple()) - target.position_at(0)).length, - 0.0, - ) - or isclose_b( - (Vector(*v.to_tuple()) - target.position_at(1)).length, - 0.0, - ) - ), - object_list, + object_list = ShapeList( + filter( + lambda v: not ( + isclose_b( + (Vector(*v.to_tuple()) - target.position_at(0)).length, + 0.0, + ) + or isclose_b( + (Vector(*v.to_tuple()) - target.position_at(1)).length, + 0.0, + ) + ), + object_list, + ) ) new_wire = target.fillet_2d(radius, object_list) if context is not None: context._add_to_context(new_wire, mode=Mode.REPLACE) return new_wire + raise ValueError("Invalid object dimension") -#:TypeVar("MirrorType"): Type of objects which can be mirrored -MirrorType = Union[Edge, Wire, Face, Compound, Curve, Sketch, Part] + +MirrorType: TypeAlias = Edge | Wire | Face | Compound | Curve | Sketch | Part +"""Type of objects which can be mirrored""" def mirror( - objects: MirrorType | Iterable[MirrorType] = None, + objects: MirrorType | Iterable[MirrorType] | None = None, about: Plane = Plane.XZ, mode: Mode = Mode.ADD, ) -> Curve | Sketch | Part | Compound: @@ -501,15 +515,18 @@ def mirror( Mirror a sequence of objects over the given plane. Args: - objects (Union[Edge, Face,Compound] or Iterable of): objects to mirror + objects (Edge | Face | Compound or Iterable of): objects to mirror about (Plane, optional): reference plane. Defaults to "XZ". mode (Mode, optional): combination mode. Defaults to Mode.ADD. Raises: ValueError: missing objects """ - context: Builder = Builder._get_context("mirror") - object_list = objects if isinstance(objects, Iterable) else [objects] + context: Builder | None = Builder._get_context("mirror") + if isinstance(objects, Iterable) and not isinstance(objects, Compound): + object_list = list(objects) + else: + object_list = [objects] if objects is None: if context is None or context is not None and context._obj is None: @@ -535,18 +552,18 @@ def mirror( return mirrored_compound -#:TypeVar("OffsetType"): Type of objects which can be offset -OffsetType = Union[Edge, Face, Solid, Compound] +OffsetType: TypeAlias = Edge | Face | Solid | Compound +"""Type of objects which can be offset""" def offset( - objects: OffsetType | Iterable[OffsetType] = None, + objects: OffsetType | Iterable[OffsetType] | None = None, amount: float = 0, - openings: Face | list[Face] = None, + openings: Face | list[Face] | None = None, kind: Kind = Kind.ARC, side: Side = Side.BOTH, closed: bool = True, - min_edge_length: float = None, + min_edge_length: float | None = None, mode: Mode = Mode.REPLACE, ) -> Curve | Sketch | Part | Compound: """Generic Operation: offset @@ -559,7 +576,7 @@ def offset( a hollow box with no lid. Args: - objects (Union[Edge, Face, Solid, Compound] or Iterable of): objects to offset + objects (Edge | Face | Solid | Compound or Iterable of): objects to offset amount (float): positive values external, negative internal openings (list[Face], optional), sequence of faces to open in part. Defaults to None. @@ -575,7 +592,7 @@ def offset( ValueError: missing objects ValueError: Invalid object type """ - context: Builder = Builder._get_context("offset") + context: Builder | None = Builder._get_context("offset") if objects is None: if context is None or context is not None and context._obj is None: @@ -624,15 +641,19 @@ def offset( pass # inner wires may go beyond the outer wire so subtract faces new_face = Face(outer_wire) - if inner_wires: - inner_faces = [Face(w) for w in inner_wires] - new_face = new_face.cut(*inner_faces) - if isinstance(new_face, Compound): - new_face = new_face.unwrap(fully=True) - if (new_face.normal_at() - face.normal_at()).length > 0.001: new_face = -new_face - new_faces.append(new_face) + if inner_wires: + inner_faces = [Face(w) for w in inner_wires] + subtraction = new_face.cut(*inner_faces) + if isinstance(subtraction, Compound): + new_faces.append(new_face.unwrap(fully=True)) + elif isinstance(subtraction, ShapeList): + new_faces.extend(subtraction) + else: + new_faces.append(subtraction) + else: + new_faces.append(new_face) if edges: if len(edges) == 1 and edges[0].geom_type == GeomType.LINE: new_wires = [ @@ -679,14 +700,14 @@ def offset( return offset_compound -#:TypeVar("ProjectType"): Type of objects which can be projected -ProjectType = Union[Edge, Face, Wire, Vector, Vertex] +ProjectType: TypeAlias = Edge | Face | Wire | Vector | Vertex +"""Type of objects which can be projected""" def project( - objects: ProjectType | Iterable[ProjectType] = None, - workplane: Plane = None, - target: Solid | Compound | Part = None, + objects: ProjectType | Iterable[ProjectType] | None = None, + workplane: Plane | None = None, + target: Solid | Compound | Part | None = None, mode: Mode = Mode.ADD, ) -> Curve | Sketch | Compound | ShapeList[Vector]: """Generic Operation: project @@ -704,7 +725,7 @@ def project( BuildSketch and Edge/Wires into BuildLine. Args: - objects (Union[Edge, Face, Wire, VectorLike, Vertex] or Iterable of): + objects (Edge | Face | Wire | VectorLike | Vertex or Iterable of): objects or points to project workplane (Plane, optional): screen workplane mode (Mode, optional): combination mode. Defaults to Mode.ADD. @@ -716,7 +737,7 @@ def project( ValueError: Edges, wires and points can only be projected in PRIVATE mode RuntimeError: BuildPart doesn't have a project operation """ - context: Builder = Builder._get_context("project") + context: Builder | None = Builder._get_context("project") if isinstance(objects, GroupBy): raise ValueError("project doesn't accept group_by, did you miss [n]?") @@ -742,8 +763,8 @@ def project( ] object_size = Compound(children=shape_list).bounding_box(optimal=False).diagonal - point_list = [o for o in object_list if isinstance(o, (Vector, Vertex))] - point_list = [Vector(pnt) for pnt in point_list] + vct_vrt_list = [o for o in object_list if isinstance(o, (Vector, Vertex))] + point_list = [Vector(pnt) for pnt in vct_vrt_list] face_list = [o for o in object_list if isinstance(o, Face)] line_list = [o for o in object_list if isinstance(o, (Edge, Wire))] @@ -764,6 +785,7 @@ def project( raise ValueError( "Edges, wires and points can only be projected in PRIVATE mode" ) + working_plane = cast(Plane, workplane) # BuildLine and BuildSketch are from target to workplane while BuildPart is # from workplane to target so the projection direction needs to be flipped @@ -775,7 +797,7 @@ def project( target = context._obj projection_flip = -1 else: - target = Face.make_rect(3 * object_size, 3 * object_size, plane=workplane) + target = Face.make_rect(3 * object_size, 3 * object_size, plane=working_plane) validate_inputs(context, "project") @@ -783,37 +805,39 @@ def project( obj: Shape for obj in face_list + line_list: obj_to_screen = (target.center() - obj.center()).normalized() - if workplane.from_local_coords(obj_to_screen).Z < 0: - projection_direction = -workplane.z_dir * projection_flip + if working_plane.from_local_coords(obj_to_screen).Z < 0: + projection_direction = -working_plane.z_dir * projection_flip else: - projection_direction = workplane.z_dir * projection_flip + projection_direction = working_plane.z_dir * projection_flip projection = obj.project_to_shape(target, projection_direction) if projection: if isinstance(context, BuildSketch): projected_shapes.extend( - [workplane.to_local_coords(p) for p in projection] + [working_plane.to_local_coords(p) for p in projection] ) elif isinstance(context, BuildLine): projected_shapes.extend(projection) else: # BuildPart projected_shapes.append(projection[0]) - projected_points = [] + projected_points: ShapeList[Vector] = ShapeList() for pnt in point_list: - pnt_to_target = (workplane.origin - pnt).normalized() - if workplane.from_local_coords(pnt_to_target).Z < 0: - projection_axis = -Axis(pnt, workplane.z_dir * projection_flip) + pnt_to_target = (working_plane.origin - pnt).normalized() + if working_plane.from_local_coords(pnt_to_target).Z < 0: + projection_axis = -Axis(pnt, working_plane.z_dir * projection_flip) else: - projection_axis = Axis(pnt, workplane.z_dir * projection_flip) - projection = workplane.to_local_coords(workplane.intersect(projection_axis)) - if projection is not None: - projected_points.append(projection) + projection_axis = Axis(pnt, working_plane.z_dir * projection_flip) + intersection = working_plane.intersect(projection_axis) + if isinstance(intersection, Axis): + raise RuntimeError("working_plane and projection_axis are parallel") + if intersection is not None: + projected_points.append(working_plane.to_local_coords(intersection)) if context is not None: context._add_to_context(*projected_shapes, mode=mode) if projected_points: - result = ShapeList(projected_points) + result = projected_points else: result = Compound(projected_shapes) if all([obj._dim == 2 for obj in object_list]): @@ -825,7 +849,7 @@ def project( def scale( - objects: Shape | Iterable[Shape] = None, + objects: Shape | Iterable[Shape] | None = None, by: float | tuple[float, float, float] = 1, mode: Mode = Mode.REPLACE, ) -> Curve | Sketch | Part | Compound: @@ -838,14 +862,14 @@ def scale( line, circle, etc. Args: - objects (Union[Edge, Face, Compound, Solid] or Iterable of): objects to scale - by (Union[float, tuple[float, float, float]]): scale factor + objects (Edge | Face | Compound | Solid or Iterable of): objects to scale + by (float | tuple[float, float, float]): scale factor mode (Mode, optional): combination mode. Defaults to Mode.REPLACE. Raises: ValueError: missing objects """ - context: Builder = Builder._get_context("scale") + context: Builder | None = Builder._get_context("scale") if objects is None: if context is None or context is not None and context._obj is None: @@ -863,12 +887,12 @@ def scale( and len(by) == 3 and all(isinstance(s, (int, float)) for s in by) ): - factor = Vector(by) + by_vector = Vector(by) scale_matrix = Matrix( [ - [factor.X, 0.0, 0.0, 0.0], - [0.0, factor.Y, 0.0, 0.0], - [0.0, 0.0, factor.Z, 0.0], + [by_vector.X, 0.0, 0.0, 0.0], + [0.0, by_vector.Y, 0.0, 0.0], + [0.0, 0.0, by_vector.Z, 0.0], [0.0, 0.0, 0.0, 1.0], ] ) @@ -877,9 +901,12 @@ def scale( new_objects = [] for obj in object_list: + if obj is None: + continue current_location = obj.location + assert current_location is not None obj_at_origin = obj.located(Location(Vector())) - if isinstance(factor, float): + if isinstance(by, (int, float)): new_object = obj_at_origin.scale(factor).locate(current_location) else: new_object = obj_at_origin.transform_geometry(scale_matrix).locate( @@ -900,12 +927,12 @@ def scale( return scale_compound.unwrap(fully=False) -#:TypeVar("SplitType"): Type of objects which can be offset -SplitType = Union[Edge, Wire, Face, Solid] +SplitType: TypeAlias = Edge | Wire | Face | Solid +"""Type of objects which can be split""" def split( - objects: SplitType | Iterable[SplitType] = None, + objects: SplitType | Iterable[SplitType] | None = None, bisect_by: Plane | Face | Shell = Plane.XZ, keep: Keep = Keep.TOP, mode: Mode = Mode.REPLACE, @@ -917,8 +944,8 @@ def split( Bisect object with plane and keep either top, bottom or both. Args: - objects (Union[Edge, Wire, Face, Solid] or Iterable of), objects to split - bisect_by (Union[Plane, Face], optional): plane to segment part. + objects (Edge | Wire | Face | Solid or Iterable of), objects to split + bisect_by (Plane | Face, optional): plane to segment part. Defaults to Plane.XZ. keep (Keep, optional): selector for which segment to keep. Defaults to Keep.TOP. mode (Mode, optional): combination mode. Defaults to Mode.REPLACE. @@ -926,7 +953,7 @@ def split( Raises: ValueError: missing objects """ - context: Builder = Builder._get_context("split") + context: Builder | None = Builder._get_context("split") if objects is None: if context is None or context is not None and context._obj is None: @@ -937,7 +964,7 @@ def split( validate_inputs(context, "split", object_list) - new_objects = [] + new_objects: list[SplitType] = [] for obj in object_list: bottom = None if keep == Keep.BOTH: @@ -963,18 +990,18 @@ def split( return split_compound -#:TypeVar("SweepType"): Type of objects which can be swept -SweepType = Union[Compound, Edge, Wire, Face, Solid] +SweepType: TypeAlias = Compound | Edge | Wire | Face | Solid +"""Type of objects which can be swept""" def sweep( - sections: SweepType | Iterable[SweepType] = None, - path: Curve | Edge | Wire | Iterable[Edge] = None, + sections: SweepType | Iterable[SweepType] | None = None, + path: Curve | Edge | Wire | Iterable[Edge] | None = None, multisection: bool = False, is_frenet: bool = False, transition: Transition = Transition.TRANSFORMED, - normal: VectorLike = None, - binormal: Edge | Wire = None, + normal: VectorLike | None = None, + binormal: Edge | Wire | None = None, clean: bool = True, mode: Mode = Mode.ADD, ) -> Part | Sketch: @@ -983,19 +1010,19 @@ def sweep( Sweep pending 1D or 2D objects along path. Args: - sections (Union[Compound, Edge, Wire, Face, Solid]): cross sections to sweep into object - path (Union[Curve, Edge, Wire], optional): path to follow. + sections (Compound | Edge | Wire | Face | Solid): cross sections to sweep into object + path (Curve | Edge | Wire, optional): path to follow. Defaults to context pending_edges. multisection (bool, optional): sweep multiple on path. Defaults to False. is_frenet (bool, optional): use frenet algorithm. Defaults to False. transition (Transition, optional): discontinuity handling option. Defaults to Transition.TRANSFORMED. normal (VectorLike, optional): fixed normal. Defaults to None. - binormal (Union[Edge, Wire], optional): guide rotation along path. Defaults to None. + binormal (Edge | Wire, optional): guide rotation along path. Defaults to None. clean (bool, optional): Remove extraneous internal structure. Defaults to True. mode (Mode, optional): combination. Defaults to Mode.ADD. """ - context: Builder = Builder._get_context("sweep") + context: Builder | None = Builder._get_context("sweep") section_list = ( [*sections] if isinstance(sections, (list, tuple, filter)) else [sections] @@ -1005,7 +1032,11 @@ def sweep( validate_inputs(context, "sweep", section_list) if path is None: - if context is None or context is not None and not context.pending_edges: + if ( + context is None + or not isinstance(context, (BuildPart, BuildSketch)) + or not context.pending_edges + ): raise ValueError("path must be provided") path_wire = Wire(context.pending_edges) context.pending_edges = [] @@ -1030,8 +1061,8 @@ def sweep( else: raise ValueError("No sections provided") - edge_list = [] - face_list = [] + edge_list: list[Edge] = [] + face_list: list[Face] = [] for sec in section_list: if isinstance(sec, (Curve, Wire, Edge)): edge_list.extend(sec.edges()) @@ -1040,6 +1071,7 @@ def sweep( # sweep to create solids new_solids = [] + binormal_mode: Wire | Vector | None if face_list: if binormal is None and normal is not None: binormal_mode = Vector(normal) @@ -1066,7 +1098,7 @@ def sweep( ] # sweep to create faces - new_faces = [] + new_faces: list[Face] = [] if edge_list: for sec in section_list: swept = Shell.sweep(sec, path_wire, transition) From 475bf42a6dc14992540f0ce5547e7add432724ae Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 12 Jan 2025 13:43:53 -0500 Subject: [PATCH 110/518] Fixed objects_part.py typing problems --- src/build123d/objects_part.py | 60 ++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/src/build123d/objects_part.py b/src/build123d/objects_part.py index cce0175..9a3da0e 100644 --- a/src/build123d/objects_part.py +++ b/src/build123d/objects_part.py @@ -30,12 +30,11 @@ from __future__ import annotations from math import radians, tan -from typing import Union from build123d.build_common import LocationList, validate_inputs from build123d.build_enums import Align, Mode from build123d.build_part import BuildPart -from build123d.geometry import Location, Plane, Rotation, RotationLike, Vector -from build123d.topology import Compound, Part, Solid, tuplify +from build123d.geometry import Location, Plane, Rotation, RotationLike +from build123d.topology import Compound, Part, ShapeList, Solid, tuplify class BasePartObject(Part): @@ -46,7 +45,7 @@ class BasePartObject(Part): Args: solid (Solid): object to create rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Union[Align, tuple[Align, Align, Align]], optional): align min, center, + align (Align | tuple[Align, Align, Align] | None, optional): align min, center, or max of object. Defaults to None. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ @@ -57,7 +56,7 @@ class BasePartObject(Part): self, part: Part | Solid, rotation: RotationLike = (0, 0, 0), - align: Align | tuple[Align, Align, Align] = None, + align: Align | tuple[Align, Align, Align] | None = None, mode: Mode = Mode.ADD, ): if align is not None: @@ -66,7 +65,7 @@ class BasePartObject(Part): offset = bbox.to_align_offset(align) part.move(Location(offset)) - context: BuildPart = BuildPart._get_context(self, log=False) + context: BuildPart | None = BuildPart._get_context(self, log=False) rotate = Rotation(*rotation) if isinstance(rotation, tuple) else rotation self.rotation = rotate if context is None: @@ -111,7 +110,7 @@ class Box(BasePartObject): width (float): box size height (float): box size rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Union[Align, tuple[Align, Align, Align]], optional): align min, center, + align (Align | tuple[Align, Align, Align] | None, optional): align min, center, or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). mode (Mode, optional): combine mode. Defaults to Mode.ADD. """ @@ -131,7 +130,7 @@ class Box(BasePartObject): ), mode: Mode = Mode.ADD, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.length = length @@ -156,7 +155,7 @@ class Cone(BasePartObject): height (float): cone size arc_size (float, optional): angular size of cone. Defaults to 360. rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Union[Align, tuple[Align, Align, Align]], optional): align min, center, + align (Align | tuple[Align, Align, Align] | None, optional): align min, center, or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). mode (Mode, optional): combine mode. Defaults to Mode.ADD. """ @@ -177,7 +176,7 @@ class Cone(BasePartObject): ), mode: Mode = Mode.ADD, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.bottom_radius = bottom_radius @@ -218,10 +217,10 @@ class CounterBoreHole(BasePartObject): radius: float, counter_bore_radius: float, counter_bore_depth: float, - depth: float = None, + depth: float | None = None, mode: Mode = Mode.SUBTRACT, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.radius = radius @@ -235,7 +234,7 @@ class CounterBoreHole(BasePartObject): raise ValueError("No depth provided") self.mode = mode - solid = Solid.make_cylinder( + fused = Solid.make_cylinder( radius, self.hole_depth, Plane(origin=(0, 0, 0), z_dir=(0, 0, -1)) ).fuse( Solid.make_cylinder( @@ -244,6 +243,10 @@ class CounterBoreHole(BasePartObject): Plane((0, 0, -counter_bore_depth)), ) ) + if isinstance(fused, ShapeList): + solid = Part(fused) + else: + solid = fused super().__init__(part=solid, rotation=(0, 0, 0), mode=mode) @@ -266,11 +269,11 @@ class CounterSinkHole(BasePartObject): self, radius: float, counter_sink_radius: float, - depth: float = None, + depth: float | None = None, counter_sink_angle: float = 82, # Common tip angle mode: Mode = Mode.SUBTRACT, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.radius = radius @@ -285,7 +288,7 @@ class CounterSinkHole(BasePartObject): self.mode = mode cone_height = counter_sink_radius / tan(radians(counter_sink_angle / 2.0)) - solid = Solid.make_cylinder( + fused = Solid.make_cylinder( radius, self.hole_depth, Plane(origin=(0, 0, 0), z_dir=(0, 0, -1)) ).fuse( Solid.make_cone( @@ -296,6 +299,11 @@ class CounterSinkHole(BasePartObject): ), Solid.make_cylinder(counter_sink_radius, self.hole_depth), ) + if isinstance(fused, ShapeList): + solid = Part(fused) + else: + solid = fused + super().__init__(part=solid, rotation=(0, 0, 0), mode=mode) @@ -309,7 +317,7 @@ class Cylinder(BasePartObject): height (float): cylinder size arc_size (float, optional): angular size of cone. Defaults to 360. rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Union[Align, tuple[Align, Align, Align]], optional): align min, center, + align (Align | tuple[Align, Align, Align] | None, optional): align min, center, or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). mode (Mode, optional): combine mode. Defaults to Mode.ADD. """ @@ -329,7 +337,7 @@ class Cylinder(BasePartObject): ), mode: Mode = Mode.ADD, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.radius = radius @@ -363,10 +371,10 @@ class Hole(BasePartObject): def __init__( self, radius: float, - depth: float = None, + depth: float | None = None, mode: Mode = Mode.SUBTRACT, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.radius = radius @@ -405,7 +413,7 @@ class Sphere(BasePartObject): arc_size2 (float, optional): angular size of sphere. Defaults to 90. arc_size3 (float, optional): angular size of sphere. Defaults to 360. rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Union[Align, tuple[Align, Align, Align]], optional): align min, center, + align (Align | tuple[Align, Align, Align] | None, optional): align min, center, or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). mode (Mode, optional): combine mode. Defaults to Mode.ADD. """ @@ -426,7 +434,7 @@ class Sphere(BasePartObject): ), mode: Mode = Mode.ADD, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.radius = radius @@ -458,7 +466,7 @@ class Torus(BasePartObject): major_arc_size (float, optional): angular size of torus. Defaults to 0. minor_arc_size (float, optional): angular size or torus. Defaults to 360. rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Union[Align, tuple[Align, Align, Align]], optional): align min, center, + align (Align | tuple[Align, Align, Align] | None, optional): align min, center, or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). mode (Mode, optional): combine mode. Defaults to Mode.ADD. """ @@ -480,7 +488,7 @@ class Torus(BasePartObject): ), mode: Mode = Mode.ADD, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) self.major_radius = major_radius @@ -516,7 +524,7 @@ class Wedge(BasePartObject): xmax (float): maximum X location zmax (float): maximum Z location rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Union[Align, tuple[Align, Align, Align]], optional): align min, center, + align (Align | tuple[Align, Align, Align] | None, optional): align min, center, or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). mode (Mode, optional): combine mode. Defaults to Mode.ADD. """ @@ -540,7 +548,7 @@ class Wedge(BasePartObject): ), mode: Mode = Mode.ADD, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) if any([value <= 0 for value in [xsize, ysize, zsize]]): From 88f6b692a3cf377e7d42d05b72c955cd9a8c357d Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 12 Jan 2025 14:08:14 -0500 Subject: [PATCH 111/518] Fixed operations_sketch.py typing problems --- src/build123d/operations_sketch.py | 43 +++++++++++++++++++----------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index d305b51..4883be5 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -28,9 +28,9 @@ license: """ from __future__ import annotations -from typing import Union from collections.abc import Iterable +from scipy.spatial import Voronoi from build123d.build_enums import Mode, SortBy from build123d.topology import ( Compound, @@ -46,7 +46,6 @@ from build123d.topology import ( from build123d.geometry import Vector, TOLERANCE from build123d.build_common import flatten_sequence, validate_inputs from build123d.build_sketch import BuildSketch -from scipy.spatial import Voronoi def full_round( @@ -77,7 +76,7 @@ def full_round( geometric center of the arc, and the third the radius of the arc """ - context: BuildSketch = BuildSketch._get_context("full_round") + context: BuildSketch | None = BuildSketch._get_context("full_round") if not isinstance(edge, Edge): raise ValueError("A single Edge must be provided") @@ -108,7 +107,11 @@ def full_round( # Refine the largest empty circle center estimate by averaging the best # three candidates. The minimum distance between the edges and this # center is the circle radius. - best_three = [(float("inf"), None), (float("inf"), None), (float("inf"), None)] + best_three: list[tuple[float, int]] = [ + (float("inf"), int()), + (float("inf"), int()), + (float("inf"), int()), + ] for i, v in enumerate(voronoi_vertices): distances = [edge_group[i].distance_to(v) for i in range(3)] @@ -125,7 +128,9 @@ def full_round( # Extract the indices of the best three and average them best_indices = [x[1] for x in best_three] - voronoi_circle_center = sum(voronoi_vertices[i] for i in best_indices) / 3 + voronoi_circle_center: Vector = ( + sum((voronoi_vertices[i] for i in best_indices), Vector(0, 0, 0)) / 3.0 + ) # Determine where the connected edges intersect with the largest empty circle connected_edges_end_points = [ @@ -142,7 +147,7 @@ def full_round( for i, e in enumerate(connected_edges) ] for param in connected_edges_end_params: - if not (0.0 < param < 1.0): + if not 0.0 < param < 1.0: raise ValueError("Invalid geometry to create the end arc") common_vertex_points = [ @@ -177,7 +182,14 @@ def full_round( ) # Recover other edges - other_edges = edge.topo_parent.edges() - topo_explore_connected_edges(edge) - [edge] + if edge.topo_parent is None: + other_edges: ShapeList[Edge] = ShapeList() + else: + other_edges = ( + edge.topo_parent.edges() + - topo_explore_connected_edges(edge) + - ShapeList([edge]) + ) # Rebuild the face # Note that the longest wire must be the perimeter and others holes @@ -195,7 +207,7 @@ def full_round( def make_face( - edges: Edge | Iterable[Edge] = None, mode: Mode = Mode.ADD + edges: Edge | Iterable[Edge] | None = None, mode: Mode = Mode.ADD ) -> Sketch: """Sketch Operation: make_face @@ -206,7 +218,7 @@ def make_face( sketch pending edges. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ - context: BuildSketch = BuildSketch._get_context("make_face") + context: BuildSketch | None = BuildSketch._get_context("make_face") if edges is not None: outer_edges = flatten_sequence(edges) @@ -230,7 +242,7 @@ def make_face( def make_hull( - edges: Edge | Iterable[Edge] = None, mode: Mode = Mode.ADD + edges: Edge | Iterable[Edge] | None = None, mode: Mode = Mode.ADD ) -> Sketch: """Sketch Operation: make_hull @@ -241,7 +253,7 @@ def make_hull( sketch pending edges. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ - context: BuildSketch = BuildSketch._get_context("make_hull") + context: BuildSketch | None = BuildSketch._get_context("make_hull") if edges is not None: hull_edges = flatten_sequence(edges) @@ -268,7 +280,7 @@ def make_hull( def trace( - lines: Curve | Edge | Wire | Iterable[Curve | Edge | Wire] = None, + lines: Curve | Edge | Wire | Iterable[Curve | Edge | Wire] | None = None, line_width: float = 1, mode: Mode = Mode.ADD, ) -> Sketch: @@ -277,7 +289,7 @@ def trace( Convert edges, wires or pending edges into faces by sweeping a perpendicular line along them. Args: - lines (Union[Curve, Edge, Wire, Iterable[Union[Curve, Edge, Wire]]], optional): lines to + lines (Curve | Edge | Wire | Iterable[Curve | Edge | Wire]], optional): lines to trace. Defaults to sketch pending edges. line_width (float, optional): Defaults to 1. mode (Mode, optional): combination mode. Defaults to Mode.ADD. @@ -288,7 +300,7 @@ def trace( Returns: Sketch: Traced lines """ - context: BuildSketch = BuildSketch._get_context("trace") + context: BuildSketch | None = BuildSketch._get_context("trace") if lines is not None: trace_lines = flatten_sequence(lines) @@ -298,7 +310,7 @@ def trace( else: raise ValueError("No objects to trace") - new_faces = [] + new_faces: list[Face] = [] for edge in trace_edges: trace_pen = edge.perpendicular_line(line_width, 0) new_faces.extend(Face.sweep(trace_pen, edge).faces()) @@ -306,6 +318,7 @@ def trace( context._add_to_context(*new_faces, mode=mode) context.pending_edges = ShapeList() + # pylint: disable=no-value-for-parameter combined_faces = Face.fuse(*new_faces) if len(new_faces) > 1 else new_faces[0] result = ( Sketch(combined_faces) From 7feb43c694e3468a45f488ff5a876d213c032ca9 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Sun, 12 Jan 2025 13:21:18 -0600 Subject: [PATCH 112/518] pyproject.toml -> update cadquery-ocp & ocpsvg versions to avoid incompatibility with upcoming OCP >= 7.8.0 --- pyproject.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6ef699d..bd7d83f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,15 +35,15 @@ classifiers = [ ] dependencies = [ - "cadquery-ocp >= 7.7.0", - "typing_extensions >= 4.6.0, <5", - "numpy >= 2, <3", - "svgpathtools >= 1.5.1, <2", - "anytree >= 2.8.0, <3", + "cadquery-ocp >= 7.7.0, < 7.8.0", + "typing_extensions >= 4.6.0, < 5", + "numpy >= 2, < 3", + "svgpathtools >= 1.5.1, < 2", + "anytree >= 2.8.0, < 3", "ezdxf >= 1.1.0, < 2", - "ipython >= 8.0.0, <9", + "ipython >= 8.0.0, < 9", "py-lib3mf >= 2.3.1", - "ocpsvg", + "ocpsvg < 0.4", "trianglesolver" ] From c207ee00b397592644479121c564bc257d42ed47 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 12 Jan 2025 14:46:09 -0500 Subject: [PATCH 113/518] Fixed typing problems in drafting.py --- src/build123d/drafting.py | 77 ++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index e2929e1..2c995ab 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -29,7 +29,7 @@ license: from dataclasses import dataclass from datetime import date from math import copysign, floor, gcd, log2, pi -from typing import ClassVar, Optional, Union +from typing import cast, ClassVar, TypeAlias from collections.abc import Iterable @@ -102,7 +102,7 @@ class Arrow(BaseSketchObject): Args: arrow_size (float): arrow head tip to tail length - shaft_path (Union[Edge, Wire]): line describing the shaft shape + shaft_path (Edge | Wire): line describing the shaft shape shaft_width (float): line width of shaft head_at_start (bool, optional): Defaults to True. head_type (HeadType, optional): arrow head shape. Defaults to HeadType.CURVED. @@ -141,17 +141,15 @@ class Arrow(BaseSketchObject): shaft_pen = shaft_path.perpendicular_line(shaft_width, 0) shaft = sweep(shaft_pen, shaft_path, mode=Mode.PRIVATE) - arrow = arrow_head.fuse(shaft).clean() + arrow = cast(Compound, arrow_head.fuse(shaft)).clean() super().__init__(arrow, rotation=0, align=None, mode=mode) -PathDescriptor = Union[ - Wire, - Edge, - list[Union[Vector, Vertex, tuple[float, float, float]]], -] -PointLike = Union[Vector, Vertex, tuple[float, float, float]] +PointLike: TypeAlias = Vector | Vertex | tuple[float, float, float] +"""General type for points in 3D space""" +PathDescriptor: TypeAlias = Wire | Edge | list[PointLike] +"""General type for a path in 3D space""" @dataclass @@ -223,7 +221,7 @@ class Draft: def _number_with_units( self, number: float, - tolerance: float | tuple[float, float] = None, + tolerance: float | tuple[float, float] | None = None, display_units: bool | None = None, ) -> str: """Convert a raw number to a unit of measurement string based on the class settings""" @@ -295,7 +293,7 @@ class Draft: def _label_to_str( self, - label: str, + label: str | None, line_wire: Wire, label_angle: bool, tolerance: float | tuple[float, float] | None, @@ -351,7 +349,7 @@ class DimensionLine(BaseSketchObject): argument is desired not an actual measurement. Defaults to None. arrows (tuple[bool, bool], optional): a pair of boolean values controlling the placement of the start and end arrows. Defaults to (True, True). - tolerance (Union[float, tuple[float, float]], optional): an optional tolerance + tolerance (float | tuple[float, float], optional): an optional tolerance value to add to the extracted length value. If a single tolerance value is provided it is shown as ± the provided value while a pair of values are shown as separate + and - values. Defaults to None. @@ -368,14 +366,14 @@ class DimensionLine(BaseSketchObject): def __init__( self, path: PathDescriptor, - draft: Draft = None, - sketch: Sketch = None, - label: str = None, + draft: Draft, + sketch: Sketch | None = None, + label: str | None = None, arrows: tuple[bool, bool] = (True, True), - tolerance: float | tuple[float, float] = None, + tolerance: float | tuple[float, float] | None = None, label_angle: bool = False, mode: Mode = Mode.ADD, - ) -> Sketch: + ): # pylint: disable=too-many-locals context = BuildSketch._get_context(self) @@ -452,22 +450,35 @@ class DimensionLine(BaseSketchObject): flip_label = path_obj.tangent_at(u_value).get_angle(Vector(1, 0, 0)) >= 180 loc = Draft._sketch_location(path_obj, u_value, flip_label) placed_label = label_shape.located(loc) - self_intersection = Sketch.intersect(d_line, placed_label).area + self_intersection = cast( + Sketch | None, Sketch.intersect(d_line, placed_label) + ) + if self_intersection is None: + self_intersection_area = 0.0 + else: + self_intersection_area = self_intersection.area d_line += placed_label bbox_size = d_line.bounding_box().size # Minimize size while avoiding intersections - common_area = ( - 0.0 if sketch is None else Sketch.intersect(d_line, sketch).area - ) - common_area += self_intersection + if sketch is None: + common_area = 0.0 + else: + line_intersection = cast( + Sketch | None, Sketch.intersect(d_line, sketch) + ) + if line_intersection is None: + common_area = 0.0 + else: + common_area = line_intersection.area + common_area += self_intersection_area score = (d_line.area - 10 * common_area) / bbox_size.X d_lines[d_line] = score # Sort by score to find the best option - d_lines = sorted(d_lines.items(), key=lambda x: x[1]) + sorted_d_lines = sorted(d_lines.items(), key=lambda x: x[1]) - super().__init__(obj=d_lines[-1][0], rotation=0, align=None, mode=mode) + super().__init__(obj=sorted_d_lines[-1][0], rotation=0, align=None, mode=mode) class ExtensionLine(BaseSketchObject): @@ -489,7 +500,7 @@ class ExtensionLine(BaseSketchObject): is desired not an actual measurement. Defaults to None. arrows (tuple[bool, bool], optional): a pair of boolean values controlling the placement of the start and end arrows. Defaults to (True, True). - tolerance (Union[float, tuple[float, float]], optional): an optional tolerance + tolerance (float | tuple[float, float], optional): an optional tolerance value to add to the extracted length value. If a single tolerance value is provided it is shown as ± the provided value while a pair of values are shown as separate + and - values. Defaults to None. @@ -507,12 +518,12 @@ class ExtensionLine(BaseSketchObject): border: PathDescriptor, offset: float, draft: Draft, - sketch: Sketch = None, - label: str = None, + sketch: Sketch | None = None, + label: str | None = None, arrows: tuple[bool, bool] = (True, True), - tolerance: float | tuple[float, float] = None, + tolerance: float | tuple[float, float] | None = None, label_angle: bool = False, - project_line: VectorLike = None, + project_line: VectorLike | None = None, mode: Mode = Mode.ADD, ): # pylint: disable=too-many-locals @@ -531,7 +542,7 @@ class ExtensionLine(BaseSketchObject): if offset == 0: raise ValueError("A dimension line should be used if offset is 0") dimension_path = object_to_measure.offset_2d( - distance=offset, side=side_lut[copysign(1, offset)], closed=False + distance=offset, side=side_lut[int(copysign(1, offset))], closed=False ) dimension_label_str = ( label @@ -629,7 +640,7 @@ class TechnicalDrawing(BaseSketchObject): title: str = "Title", sub_title: str = "Sub Title", drawing_number: str = "B3D-1", - sheet_number: int = None, + sheet_number: int | None = None, drawing_scale: float = 1.0, nominal_text_size: float = 10.0, line_width: float = 0.5, @@ -691,12 +702,12 @@ class TechnicalDrawing(BaseSketchObject): 4: 3 / 12, 5: 5 / 12, } - for i, label in enumerate(["F", "E", "D", "C", "B", "A"]): + for i, grid_label in enumerate(["F", "E", "D", "C", "B", "A"]): for y_index in [-0.5, 0.5]: grid_labels += Pos( x_centers[i] * frame_width, y_index * (frame_height + 1.5 * nominal_text_size), - ) * Sketch(Compound.make_text(label, nominal_text_size).wrapped) + ) * Sketch(Compound.make_text(grid_label, nominal_text_size).wrapped) # Text Box Frame bf_pnt1 = frame_wire.edges().sort_by(Axis.Y)[0] @ 0.5 From 18f591d0a27da0f6a116428affecdc9c37de7561 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 12 Jan 2025 19:24:23 -0500 Subject: [PATCH 114/518] Fixed typing problems in exporters.py --- mypy.ini | 11 +++- src/build123d/exporters.py | 113 +++++++++++++++++++++---------------- 2 files changed, 75 insertions(+), 49 deletions(-) diff --git a/mypy.ini b/mypy.ini index 947693e..2fb7f4b 100644 --- a/mypy.ini +++ b/mypy.ini @@ -8,7 +8,7 @@ ignore_missing_imports = True [mypy-build123d.topology.jupyter_tools.*] ignore_missing_imports = True -[mypy-IPython.lib.pretty.*] +[mypy-IPython.*] ignore_missing_imports = True [mypy-numpy.*] @@ -28,3 +28,12 @@ ignore_missing_imports = True [mypy-vtkmodules.*] ignore_missing_imports = True + +[mypy-ezdxf.*] +ignore_missing_imports = True + +[mypy-setuptools_scm.*] +ignore_missing_imports = True + +[mypy-py_lib3mf.*] +ignore_missing_imports = True diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 9d0ba2e..221e34e 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -34,9 +34,8 @@ import math import xml.etree.ElementTree as ET from copy import copy from enum import Enum, auto -from os import PathLike, fsdecode, fspath -from pathlib import Path -from typing import List, Optional, Tuple, Union +from os import PathLike, fsdecode +from typing import Any, TypeAlias from collections.abc import Callable, Iterable @@ -45,16 +44,15 @@ import svgpathtools as PT from ezdxf import zoom from ezdxf.colors import RGB, aci2rgb from ezdxf.math import Vec2 -from OCP.BRepLib import BRepLib # type: ignore -from OCP.BRepTools import BRepTools_WireExplorer # type: ignore -from OCP.Geom import Geom_BezierCurve # type: ignore -from OCP.GeomConvert import GeomConvert # type: ignore -from OCP.GeomConvert import GeomConvert_BSplineCurveToBezierCurve # type: ignore -from OCP.gp import gp_Ax2, gp_Dir, gp_Pnt, gp_Vec, gp_XYZ # type: ignore -from OCP.HLRAlgo import HLRAlgo_Projector # type: ignore -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape # type: ignore -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum # type: ignore -from OCP.TopExp import TopExp_Explorer # type: ignore +from OCP.BRepLib import BRepLib +from OCP.Geom import Geom_BezierCurve +from OCP.GeomConvert import GeomConvert +from OCP.GeomConvert import GeomConvert_BSplineCurveToBezierCurve +from OCP.gp import gp_Ax2, gp_Dir, gp_Pnt, gp_Vec, gp_XYZ +from OCP.HLRAlgo import HLRAlgo_Projector +from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape +from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum +from OCP.TopExp import TopExp_Explorer from OCP.TopoDS import TopoDS from typing_extensions import Self @@ -69,7 +67,8 @@ from build123d.topology import ( ) from build123d.build_common import UNITS_PER_METER -PathSegment = Union[PT.Line, PT.Arc, PT.QuadraticBezier, PT.CubicBezier] +PathSegment: TypeAlias = PT.Line | PT.Arc | PT.QuadraticBezier | PT.CubicBezier +"""A type alias for the various path segment types in the svgpathtools library.""" # --------------------------------------------------------------------------- # --------------------------------------------------------------------------- @@ -82,7 +81,7 @@ class Drawing: self, shape: Shape, *, - look_at: VectorLike = None, + look_at: VectorLike | None = None, look_from: VectorLike = (1, -1, 1), look_up: VectorLike = (0, 0, 1), with_hidden: bool = True, @@ -562,7 +561,7 @@ class ExportDXF(Export2D): """ # ezdxf :doc:`line type `. - kwargs = {} + kwargs: dict[str, Any] = {} if line_type is not None: linetype = self._linetype(line_type) @@ -587,7 +586,7 @@ class ExportDXF(Export2D): # The linetype is not in the doc yet. # Add it from our available definitions. if linetype in Export2D.LINETYPE_DEFS: - desc, pattern = Export2D.LINETYPE_DEFS.get(linetype) + desc, pattern = Export2D.LINETYPE_DEFS.get(linetype) # type: ignore[misc] self._document.linetypes.add( name=linetype, pattern=[self._linetype_scale * v for v in pattern], @@ -605,7 +604,7 @@ class ExportDXF(Export2D): Adds a shape to the specified layer. Args: - shape (Union[Shape, Iterable[Shape]]): The shape or collection of shapes to be + shape (Shape | Iterable[Shape]): The shape or collection of shapes to be added. It can be a single Shape object or an iterable of Shape objects. layer (str, optional): The name of the layer where the shape will be added. If not specified, the default layer will be used. Defaults to "". @@ -641,8 +640,8 @@ class ExportDXF(Export2D): Writes the DXF data to the specified file name. Args: - file_name (Union[PathLike, str, bytes]): The file name (including path) where the DXF data will - be written. + file_name (PathLike | str | bytes): The file name (including path) where + the DXF data will be written. """ # Reset the main CAD viewport of the model space to the # extents of its entities. @@ -757,6 +756,8 @@ class ExportDXF(Export2D): ) # need to apply the transform on the geometry level + if edge.wrapped is None or edge.location is None: + raise ValueError(f"Edge is empty {edge}.") t = edge.location.wrapped.Transformation() spline.Transform(t) @@ -828,17 +829,17 @@ class ExportSVG(Export2D): should fit the strokes of the shapes. Defaults to True. precision (int, optional): The number of decimal places used for rounding coordinates in the SVG. Defaults to 6. - fill_color (Union[ColorIndex, RGB, None], optional): The default fill color + fill_color (ColorIndex | RGB | None, optional): The default fill color for shapes. It can be specified as a ColorIndex, an RGB tuple, or None. Defaults to None. - line_color (Union[ColorIndex, RGB, None], optional): The default line color for + line_color (ColorIndex | RGB | None, optional): The default line color for shapes. It can be specified as a ColorIndex or an RGB tuple, or None. Defaults to Export2D.DEFAULT_COLOR_INDEX. line_weight (float, optional): The default line weight (stroke width) for shapes, in millimeters. Defaults to Export2D.DEFAULT_LINE_WEIGHT. line_type (LineType, optional): The default line type for shapes. It should be a LineType enum. Defaults to Export2D.DEFAULT_LINE_TYPE. - dot_length (Union[DotLength, float], optional): The width of rendered dots in a + dot_length (DotLength | float, optional): The width of rendered dots in a Can be either a DotLength enum or a float value in tenths of an inch. Defaults to DotLength.INKSCAPE_COMPAT. @@ -878,21 +879,28 @@ class ExportSVG(Export2D): line_type: LineType, ): def convert_color( - c: ColorIndex | RGB | Color | None, + input_color: ColorIndex | RGB | Color | None, ) -> Color | None: - if isinstance(c, ColorIndex): + if isinstance(input_color, ColorIndex): # The easydxf color indices BLACK and WHITE have the same # value (7), and are both mapped to (255,255,255) by the # aci2rgb() function. We prefer (0,0,0). - if c == ColorIndex.BLACK: - c = RGB(0, 0, 0) + if input_color == ColorIndex.BLACK: + rgb_color = RGB(0, 0, 0) else: - c = aci2rgb(c.value) - elif isinstance(c, tuple): - c = RGB(*c) - if isinstance(c, RGB): - c = Color(*c.to_floats(), 1) - return c + rgb_color = aci2rgb(input_color.value) + elif isinstance(input_color, tuple): + rgb_color = RGB(*input_color) + else: + rgb_color = input_color # If not ColorIndex or tuple, it's already RGB or None + + if isinstance(rgb_color, RGB): + red, green, blue = rgb_color.to_floats() + final_color = Color(red, green, blue, 1.0) + else: + final_color = rgb_color # If not RGB, it's None or already a Color + + return final_color self.name = name self.fill_color = convert_color(fill_color) @@ -929,7 +937,7 @@ class ExportSVG(Export2D): self.dot_length = dot_length self._non_planar_point_count = 0 self._layers: dict[str, ExportSVG._Layer] = {} - self._bounds: BoundBox = None + self._bounds: BoundBox | None = None # Add the default layer. self.add_layer( @@ -957,10 +965,10 @@ class ExportSVG(Export2D): Args: name (str): The name of the layer. Must be unique among all layers. - fill_color (Union[ColorIndex, RGB, Color, None], optional): The fill color for shapes + fill_color (ColorIndex | RGB | Color | None, optional): The fill color for shapes on this layer. It can be specified as a ColorIndex, an RGB tuple, a Color, or None. Defaults to None. - line_color (Union[ColorIndex, RGB, Color, None], optional): The line color for shapes on + line_color (ColorIndex | RGB | Color | None, optional): The line color for shapes on this layer. It can be specified as a ColorIndex or an RGB tuple, a Color, or None. Defaults to Export2D.DEFAULT_COLOR_INDEX. line_weight (float, optional): The line weight (stroke width) for shapes on @@ -1002,7 +1010,7 @@ class ExportSVG(Export2D): Adds a shape or a collection of shapes to the specified layer. Args: - shape (Union[Shape, Iterable[Shape]]): The shape or collection of shapes to be + shape (Shape | Iterable[Shape]): The shape or collection of shapes to be added. It can be a single Shape object or an iterable of Shape objects. layer (str, optional): The name of the layer where the shape(s) will be added. Defaults to "". @@ -1014,12 +1022,12 @@ class ExportSVG(Export2D): """ if layer not in self._layers: raise ValueError(f"Undefined layer: {layer}.") - layer = self._layers[layer] + _layer = self._layers[layer] if isinstance(shape, Shape): - self._add_single_shape(shape, layer, reverse_wires) + self._add_single_shape(shape, _layer, reverse_wires) else: for s in shape: - self._add_single_shape(s, layer, reverse_wires) + self._add_single_shape(s, _layer, reverse_wires) def _add_single_shape(self, shape: Shape, layer: _Layer, reverse_wires: bool): # pylint: disable=too-many-locals @@ -1283,6 +1291,8 @@ class ExportSVG(Export2D): u2 = adaptor.LastParameter() # Apply the shape location to the geometry. + if edge.wrapped is None or edge.location is None: + raise ValueError(f"Edge is empty {edge}.") t = edge.location.wrapped.Transformation() spline.Transform(t) # describe_bspline(spline) @@ -1347,6 +1357,8 @@ class ExportSVG(Export2D): } def _edge_segments(self, edge: Edge, reverse: bool) -> list[PathSegment]: + if edge.wrapped is None: + raise ValueError(f"Edge is empty {edge}.") edge_reversed = edge.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED geom_type = edge.geom_type segments = self._SEGMENT_LOOKUP.get(geom_type, ExportSVG._other_segments) @@ -1391,10 +1403,12 @@ class ExportSVG(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def _group_for_layer(self, layer: _Layer, attribs: dict = None) -> ET.Element: - def _color_attribs(c: Color) -> tuple[str, str]: - if c: - (r, g, b, a) = tuple(c) + def _group_for_layer( + self, layer: _Layer, attribs: dict | None = None + ) -> ET.Element: + def _color_attribs(color: Color | None) -> tuple[str, str | None]: + if color is not None: + (r, g, b, a) = tuple(color) (r, g, b, a) = (int(r * 255), int(g * 255), int(b * 255), round(a, 3)) rgb = f"rgb({r},{g},{b})" opacity = f"{a}" if a < 1 else None @@ -1403,9 +1417,9 @@ class ExportSVG(Export2D): if attribs is None: attribs = {} - (fill, fill_opacity) = _color_attribs(layer.fill_color) + fill, fill_opacity = _color_attribs(layer.fill_color) attribs["fill"] = fill - if fill_opacity: + if fill_opacity is not None: attribs["fill-opacity"] = fill_opacity (stroke, stroke_opacity) = _color_attribs(layer.line_color) attribs["stroke"] = stroke @@ -1435,10 +1449,12 @@ class ExportSVG(Export2D): Writes the SVG data to the specified file path. Args: - path (Union[PathLike, str, bytes]): The file path where the SVG data will be written. + path (PathLike | str | bytes): The file path where the SVG data will be written. """ # pylint: disable=too-many-locals bb = self._bounds + if bb is None: + raise ValueError("No shapes to export.") doc_margin = self.margin if self.fit_to_stroke: max_line_weight = max(l.line_weight for l in self._layers.values()) @@ -1479,4 +1495,5 @@ class ExportSVG(Export2D): xml = ET.ElementTree(svg) ET.indent(xml, " ") - xml.write(path, encoding="utf-8", xml_declaration=True, default_namespace=False) + # xml.write(path, encoding="utf-8", xml_declaration=True, default_namespace=False) + xml.write(path, encoding="utf-8", xml_declaration=True, default_namespace=None) From 5f7dfc2bb9b1cac74518c49137cafc03e53de297 Mon Sep 17 00:00:00 2001 From: Anthony Date: Mon, 13 Jan 2025 12:06:33 +1100 Subject: [PATCH 115/518] Test and fix for exporting small arcs to SVG. --- src/build123d/exporters.py | 13 +++++++++++++ tests/test_exporters.py | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 221e34e..810d9c9 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -36,6 +36,7 @@ from copy import copy from enum import Enum, auto from os import PathLike, fsdecode from typing import Any, TypeAlias +from warnings import warn from collections.abc import Callable, Iterable @@ -1196,6 +1197,12 @@ class ExportSVG(Export2D): def _circle_segments(self, edge: Edge, reverse: bool) -> list[PathSegment]: # pylint: disable=too-many-locals + if edge.length < 1e-6: + warn( + "Skipping arc that is too small to export safely (length < 1e-6).", + stacklevel=7, + ) + return [] curve = edge.geom_adaptor() circle = curve.Circle() radius = circle.Radius() @@ -1242,6 +1249,12 @@ class ExportSVG(Export2D): def _ellipse_segments(self, edge: Edge, reverse: bool) -> list[PathSegment]: # pylint: disable=too-many-locals + if edge.length < 1e-6: + warn( + "Skipping ellipse that is too small to export safely (length < 1e-6).", + stacklevel=7, + ) + return [] curve = edge.geom_adaptor() ellipse = curve.Ellipse() minor_radius = ellipse.MinorRadius() diff --git a/tests/test_exporters.py b/tests/test_exporters.py index a038057..f95a92e 100644 --- a/tests/test_exporters.py +++ b/tests/test_exporters.py @@ -29,6 +29,7 @@ from build123d import ( add, mirror, section, + ThreePointArc, ) from build123d.exporters import ExportSVG, ExportDXF, Drawing, LineType @@ -173,6 +174,24 @@ class ExportersTestCase(unittest.TestCase): svg.add_shape(sketch) svg.write("test-colors.svg") + def test_svg_small_arc(self): + pnts = ((0, 0), (0, 0.000001), (0.000001, 0)) + small_arc = ThreePointArc(pnts).scale(0.01) + with self.assertWarns(UserWarning): + svg_exporter = ExportSVG() + segments = svg_exporter._circle_segments(small_arc.edges()[0], False) + self.assertEqual(len(segments), 0, "Small arc should produce no segments") + + def test_svg_small_ellipse(self): + pnts = ((0, 0), (0, 0.000001), (0.000002, 0)) + small_ellipse = ThreePointArc(pnts).scale(0.01) + with self.assertWarns(UserWarning): + svg_exporter = ExportSVG() + segments = svg_exporter._ellipse_segments(small_ellipse.edges()[0], False) + self.assertEqual( + len(segments), 0, "Small ellipse should produce no segments" + ) + @pytest.mark.parametrize( "format", (Path, fsencode, fsdecode), ids=["path", "bytes", "str"] From 453ae630585a1e62896f127c71486814bdb7ec35 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 13 Jan 2025 10:42:49 -0600 Subject: [PATCH 116/518] pyproject.toml -> update cadquery-ocp, ocpsvg pins and formatting consistency --- pyproject.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b89afad..31a1eb2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,16 +35,16 @@ classifiers = [ ] dependencies = [ - "cadquery-ocp >= 7.8.1", - "typing_extensions >= 4.6.0, <5", - "numpy >= 2, <3", - "svgpathtools >= 1.5.1, <2", - "anytree >= 2.8.0, <3", + "cadquery-ocp >= 7.8.0, < 7.9.0", + "typing_extensions >= 4.6.0, < 5", + "numpy >= 2, < 3", + "svgpathtools >= 1.5.1, < 2", + "anytree >= 2.8.0, < 3", "ezdxf >= 1.1.0, < 2", - "ipython >= 8.0.0, <9", + "ipython >= 8.0.0, < 9", "py-lib3mf >= 2.3.1", - "ocpsvg", - "trianglesolver" + "ocpsvg >= 0.4", + "trianglesolver", ] [project.urls] From c0c3189b81140177b8f1448e6f505abc7d159421 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 13 Jan 2025 11:50:47 -0500 Subject: [PATCH 117/518] Fixed typing problems --- src/build123d/build_common.py | 67 ++++++++++++++++++----------------- src/build123d/build_part.py | 51 +++++++++++++------------- 2 files changed, 61 insertions(+), 57 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 92a785e..0586f71 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -50,7 +50,7 @@ import functools from abc import ABC, abstractmethod from itertools import product from math import sqrt, cos, pi -from typing import Any, overload, Type, TypeVar +from typing import Any, cast, overload, Type, TypeVar from collections.abc import Callable, Iterable from typing_extensions import Self @@ -139,7 +139,7 @@ T = TypeVar("T", Any, list[Any]) def flatten_sequence(*obj: T) -> ShapeList[Any]: """Convert a sequence of object potentially containing iterables into a flat list""" - flat_list = ShapeList() + flat_list: ShapeList[Any] = ShapeList() for item in obj: # Note: an Iterable can't be used here as it will match with Vector & Vertex # and break them into a list of floats. @@ -201,8 +201,29 @@ class Builder(ABC): # Abstract class variables _tag = "Builder" _obj_name = "None" - _shape: Shape # The type of the shape the builder creates - _sub_class: Curve | Sketch | Part # The class of the shape the builder creates + # _shape: Shape # The type of the shape the builder creates + # _sub_class: Curve | Sketch | Part # The class of the shape the builder creates + + def __init__( + self, + *workplanes: Face | Plane | Location, + mode: Mode = Mode.ADD, + ): + self.mode = mode + planes = WorkplaneList._convert_to_planes(workplanes) + self.workplanes = planes if planes else [Plane.XY] + self._reset_tok = None + current_frame = inspect.currentframe() + assert current_frame is not None + assert current_frame.f_back is not None + self._python_frame = current_frame.f_back.f_back + self.parent_frame = None + self.builder_parent = None + self.lasts: dict = {Vertex: [], Edge: [], Face: [], Solid: []} + self.workplanes_context = None + self.exit_workplanes: list[Plane] = [] + self.obj_before: Shape | None = None + self.to_combine: list[Shape] = [] @property @abstractmethod @@ -226,27 +247,6 @@ class Builder(ABC): before_list = [] if self.obj_before is None else [self.obj_before] return new_edges(*(before_list + self.to_combine), combined=self._obj) - def __init__( - self, - *workplanes: Face | Plane | Location, - mode: Mode = Mode.ADD, - ): - self.mode = mode - planes = WorkplaneList._convert_to_planes(workplanes) - self.workplanes = planes if planes else [Plane.XY] - self._reset_tok = None - current_frame = inspect.currentframe() - assert current_frame is not None - assert current_frame.f_back is not None - self._python_frame = current_frame.f_back.f_back - self.parent_frame = None - self.builder_parent = None - self.lasts: dict = {Vertex: [], Edge: [], Face: [], Solid: []} - self.workplanes_context = None - self.exit_workplanes: list[Plane] = [] - self.obj_before: Shape | None = None - self.to_combine: list[Shape] = [] - def __enter__(self): """Upon entering record the parent and a token to restore contextvars""" @@ -316,14 +316,12 @@ class Builder(ABC): """Integrate a sequence of objects into existing builder object""" return NotImplementedError # pragma: no cover - T = TypeVar("T", bound="Builder") - @classmethod def _get_context( - cls: Type[T], + cls, caller: Builder | Shape | Joint | str | None = None, log: bool = True, - ) -> T | None: + ) -> Builder | None: """Return the instance of the current builder""" result = cls._current.get(None) context_name = "None" if result is None else type(result).__name__ @@ -374,8 +372,11 @@ class Builder(ABC): self.obj_before = self._obj self.to_combine = list(objects) if mode != Mode.PRIVATE and len(objects) > 0: - # Categorize the input objects by type - typed = {} + # Typed dictionary: keys are classes, values are lists of instances of those classes + typed: dict[ + Type[Edge | Wire | Face | Solid | Compound], + list[Edge | Wire | Face | Solid | Compound], + ] = {cls: [] for cls in [Edge, Wire, Face, Solid, Compound]} for cls in [Edge, Wire, Face, Solid, Compound]: typed[cls] = [obj for obj in objects if isinstance(obj, cls)] @@ -1297,13 +1298,13 @@ class WorkplaneList: @overload @classmethod - def localize(cls, points: VectorLike) -> Vector: ... + def localize(cls, points: VectorLike) -> Vector: ... # type: ignore[overload-overlap] @overload @classmethod def localize(cls, *points: VectorLike) -> list[Vector]: ... - @classmethod + @classmethod # type: ignore[misc] def localize(cls, *points: VectorLike): """Localize a sequence of points to the active workplane (only used by BuildLine where there is only one active workplane) diff --git a/src/build123d/build_part.py b/src/build123d/build_part.py index f8354f8..3120f44 100644 --- a/src/build123d/build_part.py +++ b/src/build123d/build_part.py @@ -31,8 +31,6 @@ license: from __future__ import annotations -from typing import Union - from build123d.build_common import Builder, logger from build123d.build_enums import Mode from build123d.geometry import Location, Plane @@ -59,13 +57,30 @@ class BuildPart(Builder): _shape = Solid # Type of shapes being constructed _sub_class = Part # Class of part/_obj - @property - def _obj(self) -> Part: - return self.part + def __init__( + self, + *workplanes: Face | Plane | Location, + mode: Mode = Mode.ADD, + ): + self.joints: dict[str, Joint] = {} + self._part: Part | None = None # Use a private attribute + self.pending_faces: list[Face] = [] + self.pending_face_planes: list[Plane] = [] + self.pending_planes: list[Plane] = [] + self.pending_edges: list[Edge] = [] + super().__init__(*workplanes, mode=mode) - @_obj.setter - def _obj(self, value: Part) -> None: - self.part = value + @property + def part(self) -> Part | None: + """Get the current part""" + return self._part + + @part.setter + def part(self, value: Part) -> None: + """Set the current part""" + self._part = value + + _obj = part # Alias _obj to part @property def pending_edges_as_wire(self) -> Wire: @@ -73,24 +88,11 @@ class BuildPart(Builder): return Wire.combine(self.pending_edges)[0] @property - def location(self) -> Location: + def location(self) -> Location | None: """Builder's location""" return self.part.location if self.part is not None else Location() - def __init__( - self, - *workplanes: Face | Plane | Location, - mode: Mode = Mode.ADD, - ): - self.joints: dict[str, Joint] = {} - self.part: Part = None - self.pending_faces: list[Face] = [] - self.pending_face_planes: list[Plane] = [] - self.pending_planes: list[Plane] = [] - self.pending_edges: list[Edge] = [] - super().__init__(*workplanes, mode=mode) - - def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane = None): + def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane | None = None): """Add objects to BuildPart pending lists Args: @@ -104,7 +106,8 @@ class BuildPart(Builder): face_plane, ) self.pending_faces.append(face) - self.pending_face_planes.append(face_plane) + if face_plane is not None: + self.pending_face_planes.append(face_plane) new_edges = [o for o in objects if isinstance(o, Edge)] for edge in new_edges: From 51cd21986029d492fc10befaab2cadecfd402e93 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 13 Jan 2025 11:54:49 -0600 Subject: [PATCH 118/518] pyproject.toml -> support python 3.13 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 31a1eb2..b474035 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ authors = [ ] description = "A python CAD programming library" readme = "README.md" -requires-python = ">= 3.10, < 3.13" +requires-python = ">= 3.10, < 3.14" keywords = [ "3d models", "3d printing", @@ -61,5 +61,5 @@ exclude = ["build123d._dev"] write_to = "src/build123d/_version.py" [tool.black] -target-version = ["py310", "py311", "py312"] +target-version = ["py310", "py311", "py312", "py313"] line-length = 88 From 33957e30dbc1ec5551ffb2d5743119cb8221c957 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 13 Jan 2025 11:55:45 -0600 Subject: [PATCH 119/518] test.yml -> test on py310 and py313 (dropping py312) --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f4efd4e..b636f04 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,8 @@ jobs: python-version: [ "3.10", # "3.11", - "3.12", + # "3.12", + "3.13", ] os: [macos-13, macos-14, ubuntu-latest, windows-latest] From 4394187b6e0d7b95b434ec8581aca4eefb81407f Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 13 Jan 2025 11:56:39 -0600 Subject: [PATCH 120/518] mypy.yml -> mypy with py310 and py313 (dropping py312) --- .github/workflows/mypy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 9008650..79f10a2 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -9,7 +9,8 @@ jobs: python-version: [ "3.10", # "3.11", - "3.12", + # "3.12", + "3.13", ] runs-on: ubuntu-latest From 953019a4a6d3ab8de6576ec5fd18695ac3a8eca3 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 13 Jan 2025 14:48:01 -0500 Subject: [PATCH 121/518] Fixed typing problems --- mypy.ini | 3 +++ src/build123d/build_common.py | 9 ++++--- src/build123d/build_line.py | 24 +++++++++++-------- src/build123d/build_sketch.py | 39 +++++++++++++++++-------------- src/build123d/importers.py | 6 ++--- src/build123d/joints.py | 20 ++++++++++++---- src/build123d/mesher.py | 13 ++++++----- src/build123d/operations_part.py | 4 +++- src/build123d/topology/one_d.py | 6 ++--- src/build123d/topology/three_d.py | 6 ++--- src/build123d/topology/two_d.py | 21 ++++++++++------- src/build123d/topology/utils.py | 5 +--- 12 files changed, 90 insertions(+), 66 deletions(-) diff --git a/mypy.ini b/mypy.ini index 2fb7f4b..2960c49 100644 --- a/mypy.ini +++ b/mypy.ini @@ -17,6 +17,9 @@ ignore_missing_imports = True [mypy-OCP.*] ignore_missing_imports = True +[mypy-ocpsvg.*] +ignore_missing_imports = True + [mypy-scipy.*] ignore_missing_imports = True diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 0586f71..bd492cb 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -174,6 +174,9 @@ operations_apply_to = { "thicken": ["BuildPart"], } +B = TypeVar("B", bound="Builder") +"""Builder type hint""" + class Builder(ABC): """Builder @@ -318,10 +321,10 @@ class Builder(ABC): @classmethod def _get_context( - cls, + cls: Type[B], caller: Builder | Shape | Joint | str | None = None, log: bool = True, - ) -> Builder | None: + ) -> B | None: """Return the instance of the current builder""" result = cls._current.get(None) context_name = "None" if result is None else type(result).__name__ @@ -335,7 +338,7 @@ class Builder(ABC): caller_name = "None" logger.info("%s context requested by %s", context_name, caller_name) - return result + return cast(B, result) def _add_to_context( self, diff --git a/src/build123d/build_line.py b/src/build123d/build_line.py index 6657cbe..79c8252 100644 --- a/src/build123d/build_line.py +++ b/src/build123d/build_line.py @@ -69,24 +69,28 @@ class BuildLine(Builder): _shape = Edge # Type of shapes being constructed _sub_class = Curve # Class of line/_obj - @property - def _obj(self) -> Curve: - return self.line - - @_obj.setter - def _obj(self, value: Curve) -> None: - self.line = value - def __init__( self, workplane: Face | Plane | Location = Plane.XY, mode: Mode = Mode.ADD, ): - self.line: Curve = None + self._line: Curve | None = None super().__init__(workplane, mode=mode) if len(self.workplanes) > 1: raise ValueError("BuildLine only accepts one workplane") + @property + def line(self) -> Curve | None: + """Get the current line""" + return self._line + + @line.setter + def line(self, value: Curve) -> None: + """Set the current line""" + self._line = value + + _obj = line # Alias _obj to line + def __exit__(self, exception_type, exception_value, traceback): """Upon exiting restore context and send object to parent""" self._current.reset(self._reset_tok) @@ -126,6 +130,6 @@ class BuildLine(Builder): """solid() not implemented""" raise NotImplementedError("solid() doesn't apply to BuildLine") - def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane = None): + def _add_to_pending(self, *objects: Edge | Face, face_plane: Plane | None = None): """_add_to_pending not implemented""" raise NotImplementedError("_add_to_pending doesn't apply to BuildLine") diff --git a/src/build123d/build_sketch.py b/src/build123d/build_sketch.py index 26423bd..b42721e 100644 --- a/src/build123d/build_sketch.py +++ b/src/build123d/build_sketch.py @@ -63,14 +63,27 @@ class BuildSketch(Builder): _shape = Face # Type of shapes being constructed _sub_class = Sketch # Class of sketch/_obj - @property - def _obj(self) -> Sketch: - """The builder's object""" - return self.sketch_local + def __init__( + self, + *workplanes: Face | Plane | Location, + mode: Mode = Mode.ADD, + ): + self.mode = mode + self._sketch_local: Sketch | None = None + self.pending_edges: ShapeList[Edge] = ShapeList() + super().__init__(*workplanes, mode=mode) - @_obj.setter - def _obj(self, value: Sketch) -> None: - self.sketch_local = value + @property + def sketch_local(self) -> Sketch | None: + """Get the builder's object""" + return self._sketch_local + + @sketch_local.setter + def sketch_local(self, value: Sketch) -> None: + """Set the builder's object""" + self._sketch_local = value + + _obj = sketch_local # Alias _obj to sketch_local @property def sketch(self): @@ -85,16 +98,6 @@ class BuildSketch(Builder): global_objs.append(plane.from_local_coords(self._obj)) return Sketch(Compound(global_objs).wrapped) - def __init__( - self, - *workplanes: Face | Plane | Location, - mode: Mode = Mode.ADD, - ): - self.mode = mode - self.sketch_local: Sketch = None - self.pending_edges: ShapeList[Edge] = ShapeList() - super().__init__(*workplanes, mode=mode) - def solids(self, *args): """solids() not implemented""" raise NotImplementedError("solids() doesn't apply to BuildSketch") @@ -108,7 +111,7 @@ class BuildSketch(Builder): wires = Wire.combine(self.pending_edges) return wires if len(wires) > 1 else wires[0] - def _add_to_pending(self, *objects: Edge, face_plane: Plane = None): + def _add_to_pending(self, *objects: Edge, face_plane: Plane | None = None): """Integrate a sequence of objects into existing builder object""" if face_plane: raise NotImplementedError("face_plane arg not supported for this method") diff --git a/src/build123d/importers.py b/src/build123d/importers.py index fa81eca..ef495ab 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -108,10 +108,11 @@ def import_brep(file_name: PathLike | str | bytes) -> Shape: shape = TopoDS_Shape() builder = BRep_Builder() - BRepTools.Read_s(shape, fsdecode(file_name), builder) + file_name_str = fsdecode(file_name) + BRepTools.Read_s(shape, file_name_str, builder) if shape.IsNull(): - raise ValueError(f"Could not import {file_name}") + raise ValueError(f"Could not import {file_name_str}") return Compound.cast(shape) @@ -219,7 +220,6 @@ def import_step(filename: PathLike | str | bytes) -> Compound: reader.Transfer(doc) root = Compound() - root.for_construction = None root.children = build_assembly() # Remove empty Compound wrapper if single free object if len(root.children) == 1: diff --git a/src/build123d/joints.py b/src/build123d/joints.py index b0bbd8a..361b205 100644 --- a/src/build123d/joints.py +++ b/src/build123d/joints.py @@ -84,7 +84,7 @@ class RigidJoint(Joint): to_part: Solid | Compound | None = None, joint_location: Location | None = None, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) if to_part is None: if context is not None: @@ -97,6 +97,8 @@ class RigidJoint(Joint): if joint_location is None: joint_location = Location() + if part_or_builder.location is None: + raise ValueError("Part must have a location") self.relative_location = part_or_builder.location.inverse() * joint_location part_or_builder.joints[label] = self super().__init__(label, part_or_builder) @@ -269,7 +271,7 @@ class RevoluteJoint(Joint): angle_reference: VectorLike | None = None, angular_range: tuple[float, float] = (0, 360), ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) if to_part is None: if context is not None: @@ -287,6 +289,8 @@ class RevoluteJoint(Joint): else: self.angle_reference = Plane(origin=(0, 0, 0), z_dir=axis.direction).x_dir self._angle: float | None = None + if part_or_builder.location is None: + raise ValueError("Part must have a location") self.relative_axis = axis.located(part_or_builder.location.inverse()) part_or_builder.joints[label] = self super().__init__(label, part_or_builder) @@ -384,7 +388,7 @@ class LinearJoint(Joint): axis: Axis = Axis.Z, linear_range: tuple[float, float] = (0, inf), ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) if to_part is None: if context is not None: @@ -396,6 +400,8 @@ class LinearJoint(Joint): self.axis = axis self.linear_range = linear_range self.position = None + if part_or_builder.location is None: + raise ValueError("Part must have a location") self.relative_axis = axis.located(part_or_builder.location.inverse()) self.angle = None part_or_builder.joints[label] = self @@ -571,7 +577,7 @@ class CylindricalJoint(Joint): linear_range: tuple[float, float] = (0, inf), angular_range: tuple[float, float] = (0, 360), ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) if to_part is None: if context is not None: @@ -591,6 +597,8 @@ class CylindricalJoint(Joint): self.angle_reference = Plane(origin=(0, 0, 0), z_dir=axis.direction).x_dir self.angular_range = angular_range self.linear_range = linear_range + if part_or_builder.location is None: + raise ValueError("Part must have a location") self.relative_axis = axis.located(part_or_builder.location.inverse()) self.position: float | None = None self.angle: float | None = None @@ -733,7 +741,7 @@ class BallJoint(Joint): ] = ((0, 360), (0, 360), (0, 360)), angle_reference: Plane = Plane.XY, ): - context: BuildPart = BuildPart._get_context(self) + context: BuildPart | None = BuildPart._get_context(self) validate_inputs(context, self) if to_part is None: if context is not None: @@ -745,6 +753,8 @@ class BallJoint(Joint): if joint_location is None: joint_location = Location() + if part_or_builder.location is None: + raise ValueError("Part must have a location") self.relative_location = part_or_builder.location.inverse() * joint_location part_or_builder.joints[label] = self self.angular_range = angular_range diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index aa28fa4..d596093 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -86,10 +86,10 @@ import ctypes import math import os import sys -import uuid import warnings from os import PathLike, fsdecode from typing import Union +from uuid import UUID from collections.abc import Iterable @@ -295,6 +295,8 @@ class Mesher: ocp_mesh_vertices.append(pnt) # Store the triangles from the triangulated faces + if facet.wrapped is None: + continue facet_reversed = facet.wrapped.Orientation() == ta.TopAbs_REVERSED order = [1, 3, 2] if facet_reversed else [1, 2, 3] for tri in poly_triangulation.Triangles(): @@ -305,7 +307,7 @@ class Mesher: @staticmethod def _create_3mf_mesh( ocp_mesh_vertices: list[tuple[float, float, float]], - triangles: list[list[int, int, int]], + triangles: list[list[int]], ): # Round off the vertices to avoid vertices within tolerance being # considered as different vertices @@ -337,7 +339,7 @@ class Mesher: # Remove degenerate triangles if len(set(mapped_indices)) != 3: continue - c_array = (ctypes.c_uint * 3)(*mapped_indices) + c_array = (ctypes.c_uint * 3)(*mapped_indices) # type: ignore[assignment] triangles_3mf.append(Lib3MF.Triangle(c_array)) return (vertices_3mf, triangles_3mf) @@ -360,8 +362,8 @@ class Mesher: linear_deflection: float = 0.001, angular_deflection: float = 0.1, mesh_type: MeshType = MeshType.MODEL, - part_number: str = None, - uuid_value: uuid = None, + part_number: str | None = None, + uuid_value: UUID | None = None, ): """add_shape @@ -507,7 +509,6 @@ class Mesher: # Extract 3MF meshes and translate to OCP meshes mesh_iterator: Lib3MF.MeshObjectIterator = self.model.GetMeshObjects() - self.meshes: list[Lib3MF.MeshObject] for _i in range(mesh_iterator.Count()): mesh_iterator.MoveNext() self.meshes.append(mesh_iterator.GetCurrentMeshObject()) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 3781977..b843c1e 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -164,6 +164,8 @@ def extrude( target_object = context.part else: target_object = target + if target_object is None: + raise ValueError("No target object provided") new_solids.append( Solid.extrude_until( @@ -509,7 +511,7 @@ def section( if obj is not None: to_section = obj - elif context is not None: + elif context is not None and context.part is not None: to_section = context.part else: raise ValueError("No object to section") diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 92d75ba..819779f 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -437,7 +437,7 @@ class Mixin1D(Shape): return result - def edge(self) -> Edge: + def edge(self) -> Edge | None: """Return the Edge""" return Shape.get_single_shape(self, "Edge") @@ -1086,7 +1086,7 @@ class Mixin1D(Shape): return Vector(gp_Dir(res)) - def vertex(self) -> Vertex: + def vertex(self) -> Vertex | None: """Return the Vertex""" return Shape.get_single_shape(self, "Vertex") @@ -1094,7 +1094,7 @@ class Mixin1D(Shape): """vertices - all the vertices in this Shape""" return Shape.get_shape_list(self, "Vertex") - def wire(self) -> Wire: + def wire(self) -> Wire | None: """Return the Wire""" return Shape.get_single_shape(self, "Wire") diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index a62bb40..c776614 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -576,7 +576,7 @@ class Mixin3D(Shape): return offset_solid - def solid(self) -> Solid: + def solid(self) -> Solid | None: """Return the Solid""" return Shape.get_single_shape(self, "Solid") @@ -1043,9 +1043,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): ) @classmethod - def make_loft( - cls, objs: Iterable[Vertex | Wire], ruled: bool = False - ) -> Solid: + def make_loft(cls, objs: Iterable[Vertex | Wire], ruled: bool = False) -> Solid: """make loft Makes a loft from a list of wires and vertices. Vertices can appear only at the diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 620c8ee..4d24e58 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -187,7 +187,7 @@ class Mixin2D(Shape): return new_surface - def face(self) -> Face: + def face(self) -> Face | None: """Return the Face""" return Shape.get_single_shape(self, "Face") @@ -246,7 +246,7 @@ class Mixin2D(Shape): """Return a copy of self moved along the normal by amount""" return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - def shell(self) -> Shell: + def shell(self) -> Shell | None: """Return the Shell""" return Shape.get_single_shape(self, "Shell") @@ -1191,10 +1191,15 @@ class Face(Mixin2D, Shape[TopoDS_Face]): intersected_shapes.append(Shell(topods_shell)) intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) - intersected_shapes = ShapeList( - s.face() if len(s.faces()) == 1 else s for s in intersected_shapes - ) - return intersected_shapes + projected_shapes: ShapeList[Face | Shell] = ShapeList() + for shape in intersected_shapes: + if len(shape.faces()) == 1: + shape_face = shape.face() + if shape_face is not None: + projected_shapes.append(shape_face) + else: + projected_shapes.append(shape) + return projected_shapes def to_arcs(self, tolerance: float = 1e-3) -> Face: """to_arcs @@ -1306,9 +1311,7 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): return Shell(TopoDS.Shell_s(_extrude_topods_shape(obj.wrapped, direction))) @classmethod - def make_loft( - cls, objs: Iterable[Vertex | Wire], ruled: bool = False - ) -> Shell: + def make_loft(cls, objs: Iterable[Vertex | Wire], ruled: bool = False) -> Shell: """make loft Makes a loft from a list of wires and vertices. Vertices can appear only at the diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index 176b869..c876ba2 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -54,7 +54,7 @@ license: from __future__ import annotations from math import radians, sin, cos, isclose -from typing import Any, Union, TYPE_CHECKING +from typing import Any, TYPE_CHECKING from collections.abc import Iterable @@ -91,9 +91,6 @@ from .shape_core import Shape, ShapeList, downcast, shapetype, unwrap_topods_com if TYPE_CHECKING: # pragma: no cover from .zero_d import Vertex # pylint: disable=R0801 from .one_d import Edge, Wire # pylint: disable=R0801 - from .two_d import Face, Shell # pylint: disable=R0801 - from .three_d import Solid # pylint: disable=R0801 - from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: From e923f733e024373b64fee6a06cfcd331abbc7a74 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 13 Jan 2025 19:44:30 -0500 Subject: [PATCH 122/518] Typing problems solved(?) --- src/build123d/exporters3d.py | 2 ++ src/build123d/geometry.py | 8 ++++---- src/build123d/mesher.py | 4 ++-- src/build123d/objects_curve.py | 24 +++++++++++++++++------- src/build123d/operations_generic.py | 9 ++++++--- src/build123d/persistence.py | 4 ++-- 6 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index b1c4dde..f084246 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -215,6 +215,8 @@ def export_gltf( # Map from OCCT's right-handed +Z up coordinate system to glTF's right-handed +Y # up coordinate system # https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#coordinate-system-and-units + if to_export.location is None: + raise ValueError("Shape must have a location to export to glTF") original_location = to_export.location to_export.location *= Location((0, 0, 0), (1, 0, 0), -90) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index a8525ce..4f7f851 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -34,7 +34,7 @@ from __future__ import annotations # other pylint warning to temp remove: # too-many-arguments, too-many-locals, too-many-public-methods, # too-many-statements, too-many-instance-attributes, too-many-branches -import copy +import copy as copy_module import json import logging import numpy as np @@ -1519,7 +1519,7 @@ class Location: except KeyError as exc: raise ValueError(f"Unknown object type {other}") from exc - result: Shape = copy.deepcopy(other, None) # type: ignore[arg-type] + result: Shape = copy_module.deepcopy(other, None) # type: ignore[arg-type] result.wrapped = f_downcast(other.wrapped.Moved(self.wrapped)) return result @@ -2407,7 +2407,7 @@ class Plane(metaclass=PlaneMeta): Returns: Plane: relocated plane """ - self_copy = copy.deepcopy(self) + self_copy = copy_module.deepcopy(self) self_copy.wrapped.Transform(loc.wrapped.Transformation()) return Plane(self_copy.wrapped) @@ -2504,7 +2504,7 @@ class Plane(metaclass=PlaneMeta): except KeyError as exc: raise ValueError(f"Unknown object type {obj}") from exc - new_shape: Shape = copy.deepcopy(obj, None) # type: ignore[arg-type] + new_shape: Shape = copy_module.deepcopy(obj, None) # type: ignore[arg-type] new_shape.wrapped = f_downcast( BRepBuilderAPI_Transform( obj.wrapped, transform_matrix.wrapped.Trsf() diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index d596093..0b4ff06 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -81,7 +81,7 @@ license: # pylint has trouble with the OCP imports # pylint: disable=no-name-in-module, import-error -import copy +import copy as copy_module import ctypes import math import os @@ -396,7 +396,7 @@ class Mesher: # Mesh the shape ocp_mesh_vertices, triangles = Mesher._mesh_shape( - copy.deepcopy(b3d_shape), + copy_module.deepcopy(b3d_shape), linear_deflection, angular_deflection, ) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index b6604d0..e293ac6 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -28,7 +28,7 @@ license: from __future__ import annotations -import copy +import copy as copy_module from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize from typing import Union @@ -151,7 +151,9 @@ class CenterArc(BaseEdgeObject): if context is None: circle_workplane = Plane.XY else: - circle_workplane = copy.copy(WorkplaneList._get_context().workplanes[0]) + circle_workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) circle_workplane.origin = center_point arc_direction = ( AngularDirection.COUNTER_CLOCKWISE @@ -415,7 +417,9 @@ class EllipticalCenterArc(BaseEdgeObject): if context is None: ellipse_workplane = Plane.XY else: - ellipse_workplane = copy.copy(WorkplaneList._get_context().workplanes[0]) + ellipse_workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) ellipse_workplane.origin = center_pnt curve = Edge.make_ellipse( x_radius=x_radius, @@ -601,7 +605,9 @@ class JernArc(BaseEdgeObject): if context is None: jern_workplane = Plane.XY else: - jern_workplane = copy.copy(WorkplaneList._get_context().workplanes[0]) + jern_workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) jern_workplane.origin = start start_tangent = Vector(tangent).transform( jern_workplane.reverse_transform, is_direction=True @@ -615,7 +621,7 @@ class JernArc(BaseEdgeObject): Axis(start, jern_workplane.z_dir), arc_size ) if abs(arc_size) >= 360: - circle_plane = copy.copy(jern_workplane) + circle_plane = copy_module.copy(jern_workplane) circle_plane.origin = self.center_point circle_plane.x_dir = self.start - circle_plane.origin arc = Edge.make_circle(radius, circle_plane) @@ -732,7 +738,9 @@ class PolarLine(BaseEdgeObject): if context is None: polar_workplane = Plane.XY else: - polar_workplane = copy.copy(WorkplaneList._get_context().workplanes[0]) + polar_workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) if direction is not None: direction_localized = WorkplaneList.localize(direction) @@ -879,7 +887,9 @@ class SagittaArc(BaseEdgeObject): if context is None: sagitta_workplane = Plane.XY else: - sagitta_workplane = copy.copy(WorkplaneList._get_context().workplanes[0]) + sagitta_workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) sagitta_vector: Vector = (end - start).normalized() * abs(sagitta) sagitta_vector = sagitta_vector.rotate( Axis(sagitta_workplane.origin, sagitta_workplane.z_dir), diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 2deeeaa..80b0f00 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -27,7 +27,7 @@ license: """ -import copy +import copy as copy_module import logging from math import radians, tan from typing import cast, TypeAlias @@ -537,7 +537,7 @@ def mirror( validate_inputs(context, "mirror", object_list) - mirrored = [copy.deepcopy(o).mirror(about) for o in object_list] + mirrored = [copy_module.deepcopy(o).mirror(about) for o in object_list] if context is not None: context._add_to_context(*mirrored, mode=mode) @@ -794,11 +794,14 @@ def project( if mode != Mode.PRIVATE and point_list: raise ValueError("Points can only be projected in PRIVATE mode") if target is None: - target = context._obj + target = context.part projection_flip = -1 else: target = Face.make_rect(3 * object_size, 3 * object_size, plane=working_plane) + if target is None: + raise ValueError("A target object could not be determined") + validate_inputs(context, "project") projected_shapes = [] diff --git a/src/build123d/persistence.py b/src/build123d/persistence.py index 3876289..a60bdb3 100644 --- a/src/build123d/persistence.py +++ b/src/build123d/persistence.py @@ -51,7 +51,7 @@ from OCP.TopoDS import ( from build123d.topology import downcast -def serialize_shape(shape: TopoDS_Shape) -> bytes: +def serialize_shape(shape: TopoDS_Shape) -> bytes | None: """ Serialize a OCP shape, this method can be used to provide a custom serialization algo for pickle """ @@ -77,7 +77,7 @@ def deserialize_shape(buffer: bytes) -> TopoDS_Shape: return downcast(shape) -def serialize_location(location: TopLoc_Location) -> bytes: +def serialize_location(location: TopLoc_Location) -> bytes | None: """ Serialize a OCP location, this method can be used to provide a custom serialization algo for pickle From 60a4d24cd4f8b6aa711f9d3dda27cabc08145c5c Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 13 Jan 2025 20:18:18 -0500 Subject: [PATCH 123/518] Fixed more typing problems --- src/build123d/build_common.py | 6 +++++- src/build123d/exporters.py | 19 ++++++++++--------- src/build123d/topology/shape_core.py | 13 +++++-------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index bd492cb..fc6e350 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -1322,7 +1322,11 @@ class WorkplaneList: points_per_workplane = [] workplane = WorkplaneList._get_context().workplanes[0] localized_pts = [ - workplane.from_local_coords(pt) if isinstance(pt, tuple) else pt + ( + cast(Vector, workplane.from_local_coords(Vector(pt))) + if isinstance(pt, tuple) + else Vector(pt) + ) for pt in points ] if len(localized_pts) == 1: diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 810d9c9..67c3b04 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -46,6 +46,7 @@ from ezdxf import zoom from ezdxf.colors import RGB, aci2rgb from ezdxf.math import Vec2 from OCP.BRepLib import BRepLib +from OCP.BRepTools import BRepTools_WireExplorer from OCP.Geom import Geom_BezierCurve from OCP.GeomConvert import GeomConvert from OCP.GeomConvert import GeomConvert_BSplineCurveToBezierCurve @@ -1109,15 +1110,15 @@ class ExportSVG(Export2D): @staticmethod def _wire_edges(wire: Wire, reverse: bool) -> list[Edge]: - # edges = [] - # explorer = BRepTools_WireExplorer(wire.wrapped) - # while explorer.More(): - # topo_edge = explorer.Current() - # edges.append(Edge(topo_edge)) - # explorer.Next() - edges = wire.edges() - if reverse: - edges.reverse() + edges = [] + explorer = BRepTools_WireExplorer(wire.wrapped) + while explorer.More(): + topo_edge = explorer.Current() + edges.append(Edge(topo_edge)) + explorer.Next() + # edges = wire.edges() + # if reverse: + # edges.reverse() return edges # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 6933c55..b30e596 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -53,13 +53,10 @@ from abc import ABC, abstractmethod from typing import ( cast as tcast, Any, - Dict, Generic, Optional, Protocol, SupportsIndex, - Tuple, - Type, TypeVar, Union, overload, @@ -70,7 +67,7 @@ from collections.abc import Callable, Iterable, Iterator import OCP.GeomAbs as ga import OCP.TopAbs as ta -from IPython.lib.pretty import pretty, PrettyPrinter +from IPython.lib.pretty import pretty, RepresentationPrinter from OCP.Aspect import Aspect_TOL_SOLID from OCP.BOPAlgo import BOPAlgo_GlueEnum from OCP.BRep import BRep_Tool @@ -2204,7 +2201,9 @@ class GroupBy(Generic[T, K]): """Select group by shape""" return self.group(self.key_f(shape)) - def _repr_pretty_(self, printer: PrettyPrinter, cycle: bool = False) -> None: + def _repr_pretty_( + self, printer: RepresentationPrinter, cycle: bool = False + ) -> None: """ Render a formatted representation of the object for pretty-printing in interactive environments. @@ -2840,9 +2839,7 @@ def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shap while explorer.More(): item = explorer.Current() - out[hash(item)] = ( - item # needed to avoid pseudo-duplicate entities - ) + out[hash(item)] = item # needed to avoid pseudo-duplicate entities explorer.Next() return list(out.values()) From 2d63dc7e753dd52fb1228719662899ef0995609f Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 13 Jan 2025 20:21:29 -0500 Subject: [PATCH 124/518] Updated _wire_edges --- src/build123d/exporters.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 67c3b04..29f74d8 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -1110,6 +1110,8 @@ class ExportSVG(Export2D): @staticmethod def _wire_edges(wire: Wire, reverse: bool) -> list[Edge]: + # Note that BRepTools_WireExplorer can return edges in a different order + # than the standard edges() method. edges = [] explorer = BRepTools_WireExplorer(wire.wrapped) while explorer.More(): @@ -1117,8 +1119,8 @@ class ExportSVG(Export2D): edges.append(Edge(topo_edge)) explorer.Next() # edges = wire.edges() - # if reverse: - # edges.reverse() + if reverse: + edges.reverse() return edges # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 9e6bc2d0ae251117e039132603c58f1c42ae6095 Mon Sep 17 00:00:00 2001 From: drbh Date: Mon, 13 Jan 2025 20:22:36 -0500 Subject: [PATCH 125/518] feat: create mesh in fewer iterations --- src/build123d/mesher.py | 62 ++++++++++++++++++++++------------------- tests/test_mesher.py | 14 ++++++++++ 2 files changed, 48 insertions(+), 28 deletions(-) diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index 0b4ff06..f4ba23c 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -312,36 +312,42 @@ class Mesher: # Round off the vertices to avoid vertices within tolerance being # considered as different vertices digits = -int(round(math.log(TOLERANCE, 10), 1)) - ocp_mesh_vertices = [ - (round(x, digits), round(y, digits), round(z, digits)) - for x, y, z in ocp_mesh_vertices + + # Create vertex to index mapping directly + vertex_to_idx = {} + next_idx = 0 + vert_table = {} + + # First pass - create mapping + for i, (x, y, z) in enumerate(ocp_mesh_vertices): + key = (round(x, digits), round(y, digits), round(z, digits)) + if key not in vertex_to_idx: + vertex_to_idx[key] = next_idx + next_idx += 1 + vert_table[i] = vertex_to_idx[key] + + # Create vertices array in one shot + vertices_3mf = [ + Lib3MF.Position((ctypes.c_float * 3)(*v)) + for v in vertex_to_idx.keys() ] - """Create the data to create a 3mf mesh""" - # Create a lookup table of face vertex to shape vertex - unique_vertices = list(set(ocp_mesh_vertices)) - vert_table = { - i: unique_vertices.index(pnt) for i, pnt in enumerate(ocp_mesh_vertices) - } - - # Create vertex list of 3MF positions - vertices_3mf = [] - for pnt in unique_vertices: - c_array = (ctypes.c_float * 3)(*pnt) - vertices_3mf.append(Lib3MF.Position(c_array)) - # mesh_3mf.AddVertex Should AddVertex be used to save memory? - - # Create triangle point list + + # Pre-allocate triangles array and process in bulk + c_uint3 = ctypes.c_uint * 3 triangles_3mf = [] - for vertex_indices in triangles: - mapped_indices = [ - vert_table[i] for i in [vertex_indices[i] for i in range(3)] - ] - # Remove degenerate triangles - if len(set(mapped_indices)) != 3: - continue - c_array = (ctypes.c_uint * 3)(*mapped_indices) # type: ignore[assignment] - triangles_3mf.append(Lib3MF.Triangle(c_array)) - + + # Process triangles in bulk + for tri in triangles: + # Map indices directly without list comprehension + a, b, c = tri[0], tri[1], tri[2] + mapped_a = vert_table[a] + mapped_b = vert_table[b] + mapped_c = vert_table[c] + + # Quick degenerate check without set creation + if mapped_a != mapped_b and mapped_b != mapped_c and mapped_c != mapped_a: + triangles_3mf.append(Lib3MF.Triangle(c_uint3(mapped_a, mapped_b, mapped_c))) + return (vertices_3mf, triangles_3mf) def _add_color(self, b3d_shape: Shape, mesh_3mf: Lib3MF.MeshObject): diff --git a/tests/test_mesher.py b/tests/test_mesher.py index 77c82fb..16d2d23 100644 --- a/tests/test_mesher.py +++ b/tests/test_mesher.py @@ -2,6 +2,7 @@ import unittest, uuid from packaging.specifiers import SpecifierSet from pathlib import Path from os import fsdecode, fsencode +import time import pytest @@ -16,6 +17,19 @@ from build123d.topology import Compound, Solid from build123d.geometry import Axis, Color, Location, Vector, VectorLike from build123d.mesher import Mesher +class InternalApiBenchmark(unittest.TestCase): + def test_create_3mf_mesh(self): + start = time.perf_counter() + for i in [100, 1000, 10000, 100000]: + vertices = [(float(i), 0.0, 0.0) for i in range(i)] + triangles = [[i, i+1, i+2] for i in range(0, i-3, 3)] + start = time.perf_counter() + Mesher()._create_3mf_mesh(vertices, triangles) + runtime = time.perf_counter() - start + print(f"| {i} | {runtime:.3f} |") + final_runtime = time.perf_counter() - start + max_runtime = 1.0 + self.assertLessEqual(final_runtime, max_runtime, f"All meshes took {final_runtime:.3f}s > {max_runtime}s") class DirectApiTestCase(unittest.TestCase): def assertTupleAlmostEquals( From d12f80cc65a663656235059059d6eae651306fe0 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 13 Jan 2025 20:39:50 -0500 Subject: [PATCH 126/518] Fixed convert color making typing explicit --- src/build123d/exporters.py | 74 ++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 18 deletions(-) diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 29f74d8..49339ee 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -881,26 +881,64 @@ class ExportSVG(Export2D): line_type: LineType, ): def convert_color( - input_color: ColorIndex | RGB | Color | None, + input_color: ColorIndex | RGB | Color | tuple | None, ) -> Color | None: - if isinstance(input_color, ColorIndex): - # The easydxf color indices BLACK and WHITE have the same - # value (7), and are both mapped to (255,255,255) by the - # aci2rgb() function. We prefer (0,0,0). - if input_color == ColorIndex.BLACK: - rgb_color = RGB(0, 0, 0) - else: - rgb_color = aci2rgb(input_color.value) - elif isinstance(input_color, tuple): - rgb_color = RGB(*input_color) - else: - rgb_color = input_color # If not ColorIndex or tuple, it's already RGB or None + """ + Convert various color representations into a `Color` object. - if isinstance(rgb_color, RGB): - red, green, blue = rgb_color.to_floats() - final_color = Color(red, green, blue, 1.0) - else: - final_color = rgb_color # If not RGB, it's None or already a Color + This function takes an input color, which can be of type `ColorIndex`, `RGB`, + `Color`, `tuple`, or `None`, and converts it into a `Color` object. If the input + is `None`, the function returns `None`. It handles specific cases for `ColorIndex.BLACK` + and other `ColorIndex` values using the `aci2rgb` function. + + Args: + input_color (ColorIndex | RGB | Color | tuple | None): The input color to be converted. + - `ColorIndex`: A predefined color index from `easydxf`. Special handling for + `ColorIndex.BLACK` ensures it maps to `RGB(0, 0, 0)` instead of the default + `aci2rgb` mapping to `RGB(255, 255, 255)`. + - `RGB`: A direct representation of red, green, and blue components. + - `Color`: An existing `Color` object. + - `tuple`: A tuple of RGB values (e.g., `(255, 0, 0)` for red). + - `None`: Represents no color. + + Returns: + Color | None: The converted `Color` object or `None` if the input was `None`. + + Raises: + ValueError: If the input color type is unsupported. + + Notes: + - The `easydxf` color indices BLACK and WHITE have the same value (7), and both + are mapped to `(255, 255, 255)` by the `aci2rgb()` function. This implementation + overrides the default mapping to prefer `(0, 0, 0)` for `ColorIndex.BLACK`. + """ + final_color: Color | None + match input_color: + case ColorIndex.BLACK: + # Map BLACK explicitly to RGB(0, 0, 0) + final_color = Color(0.0, 0.0, 0.0, 1.0) + case ColorIndex() as color_index: + # Convert other ColorIndex values using aci2rgb + rgb_color = aci2rgb(color_index.value) + red, green, blue = rgb_color.to_floats() + final_color = Color(red, green, blue, 1.0) + case tuple() as color_tuple: + # Convert tuple directly to Color + rgb_color = RGB(*color_tuple) + red, green, blue = rgb_color.to_floats() + final_color = Color(red, green, blue, 1.0) + case RGB() as rgb: + # Convert RGB directly to Color + red, green, blue = rgb.to_floats() + final_color = Color(red, green, blue, 1.0) + case Color() as color: + # Already a Color + final_color = color + case None: + # If None, return None + final_color = None + case _: + raise ValueError(f"Unsupported input type: {type(input_color)}") return final_color From 86b04b3994ef7df25f0385879026ec03c5ce1dd9 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 13 Jan 2025 20:48:49 -0500 Subject: [PATCH 127/518] Added mypy badge to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1bf4995..57eca34 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![tests](https://github.com/gumyr/build123d/actions/workflows/test.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/test.yml) [![pylint](https://github.com/gumyr/build123d/actions/workflows/lint.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/lint.yml) [![codecov](https://codecov.io/gh/gumyr/build123d/branch/dev/graph/badge.svg)](https://codecov.io/gh/gumyr/build123d) +[![mypy](https://github.com/gumyr/build123d/actions/workflows/mypy.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/mypy.yml) Build123d is a python-based, parametric, boundary representation (BREP) modeling framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as FreeCAD and SolidWorks. From 07122935516d58808d19dfc7e621dcefc46e6656 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 13 Jan 2025 22:31:47 -0600 Subject: [PATCH 128/518] pyproject.toml -> optional dependencies --- pyproject.toml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index b474035..1005d53 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,6 +52,43 @@ dependencies = [ "Documentation" = "https://build123d.readthedocs.io/en/latest/index.html" "Bug Tracker" = "https://github.com/gumyr/build123d/issues" +[project.optional-dependencies] +# enable the optional ocp_vscode visualization package +ocp_vscode = [ + "ocp_vscode", +] + +# development dependencies +development = [ + "wheel", + "pytest", + "pytest-cov", + "pylint", + "mypy", + "black", +] + +# dependency to run the pytest benchmarks +benchmark = [ + "pytest-benchmark", +] + +# dependencies to build the docs +docs = [ + "sphinx", + "sphinx-design", + "sphinx-copybutton", + "sphinx-hoverxref", +] + +# all dependencies +all = [ + "build123d[ocp_vscode]", + "build123d[development]", + "build123d[benchmark]", + "build123d[docs]", +] + [tool.setuptools.packages.find] where = ["src"] # exclude build123d._dev from wheels From 769f180dac4039821475aceb1fea74769c79657b Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 10:05:11 -0500 Subject: [PATCH 129/518] Updating badges --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 57eca34..288427a 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,12 @@ [![Documentation Status](https://readthedocs.org/projects/build123d/badge/?version=latest)](https://build123d.readthedocs.io/en/latest/?badge=latest) [![tests](https://github.com/gumyr/build123d/actions/workflows/test.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/test.yml) [![pylint](https://github.com/gumyr/build123d/actions/workflows/lint.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/lint.yml) -[![codecov](https://codecov.io/gh/gumyr/build123d/branch/dev/graph/badge.svg)](https://codecov.io/gh/gumyr/build123d) [![mypy](https://github.com/gumyr/build123d/actions/workflows/mypy.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/mypy.yml) +[![codecov](https://codecov.io/gh/gumyr/build123d/branch/dev/graph/badge.svg)](https://codecov.io/gh/gumyr/build123d) + +[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/build123d)](https://pypi.org/project/build123d/) +[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) +[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) Build123d is a python-based, parametric, boundary representation (BREP) modeling framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as FreeCAD and SolidWorks. From f876f616f836561a95c0da4dca857b4a6ac3a335 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 10:07:44 -0500 Subject: [PATCH 130/518] Updating badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 288427a..cc4f2d1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [![mypy](https://github.com/gumyr/build123d/actions/workflows/mypy.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/mypy.yml) [![codecov](https://codecov.io/gh/gumyr/build123d/branch/dev/graph/badge.svg)](https://codecov.io/gh/gumyr/build123d) -[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/build123d)](https://pypi.org/project/build123d/) +![Python Versions](https://img.shields.io/badge/python-3.10%20|%203.11%20|%203.12%20|%203.13-blue) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) From b44c678bb0566c1317f225c9d5aee005fa4093b8 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 10:10:59 -0500 Subject: [PATCH 131/518] Updating badges --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index cc4f2d1..b1340aa 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,12 @@ [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) +[![PyPI version](https://img.shields.io/pypi/v/build123d.svg)](https://pypi.org/project/build123d/) +[![Downloads](https://pepy.tech/badge/build123d)](https://pepy.tech/project/build123d) +[![Downloads/month](https://pepy.tech/badge/build123d/month)](https://pepy.tech/project/build123d) +[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/build123d.svg)](https://pypi.org/project/build123d/) +[![PyPI - Wheel](https://img.shields.io/pypi/wheel/build123d.svg)](https://pypi.org/project/build123d/) + Build123d is a python-based, parametric, boundary representation (BREP) modeling framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as FreeCAD and SolidWorks. Build123d could be considered as an evolution of [CadQuery](https://cadquery.readthedocs.io/en/latest/index.html) where the somewhat restrictive Fluent API (method chaining) is replaced with stateful context managers - e.g. `with` blocks - thus enabling the full python toolbox: for loops, references to objects, object sorting and filtering, etc. From 1c2b3f14905eee2804f5cec86fc571bf664c2363 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 10:11:32 -0500 Subject: [PATCH 132/518] Updating badges --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b1340aa..a7e67bc 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ [![PyPI version](https://img.shields.io/pypi/v/build123d.svg)](https://pypi.org/project/build123d/) [![Downloads](https://pepy.tech/badge/build123d)](https://pepy.tech/project/build123d) [![Downloads/month](https://pepy.tech/badge/build123d/month)](https://pepy.tech/project/build123d) -[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/build123d.svg)](https://pypi.org/project/build123d/) [![PyPI - Wheel](https://img.shields.io/pypi/wheel/build123d.svg)](https://pypi.org/project/build123d/) Build123d is a python-based, parametric, boundary representation (BREP) modeling framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as FreeCAD and SolidWorks. From 041e2a5d73f461c3ee4eedb642cf93493fc7d6b3 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 10:12:48 -0500 Subject: [PATCH 133/518] Updating badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7e67bc..2ebd0b0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@

build123d logo -

[![Documentation Status](https://readthedocs.org/projects/build123d/badge/?version=latest)](https://build123d.readthedocs.io/en/latest/?badge=latest) [![tests](https://github.com/gumyr/build123d/actions/workflows/test.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/test.yml) @@ -16,6 +15,7 @@ [![Downloads](https://pepy.tech/badge/build123d)](https://pepy.tech/project/build123d) [![Downloads/month](https://pepy.tech/badge/build123d/month)](https://pepy.tech/project/build123d) [![PyPI - Wheel](https://img.shields.io/pypi/wheel/build123d.svg)](https://pypi.org/project/build123d/) +

Build123d is a python-based, parametric, boundary representation (BREP) modeling framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as FreeCAD and SolidWorks. From a4c8d847188eb3b3aebc6d45bdaace40255ea94a Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 10:14:35 -0500 Subject: [PATCH 134/518] Updating badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ebd0b0..a7e67bc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@

build123d logo +

[![Documentation Status](https://readthedocs.org/projects/build123d/badge/?version=latest)](https://build123d.readthedocs.io/en/latest/?badge=latest) [![tests](https://github.com/gumyr/build123d/actions/workflows/test.yml/badge.svg)](https://github.com/gumyr/build123d/actions/workflows/test.yml) @@ -15,7 +16,6 @@ [![Downloads](https://pepy.tech/badge/build123d)](https://pepy.tech/project/build123d) [![Downloads/month](https://pepy.tech/badge/build123d/month)](https://pepy.tech/project/build123d) [![PyPI - Wheel](https://img.shields.io/pypi/wheel/build123d.svg)](https://pypi.org/project/build123d/) -

Build123d is a python-based, parametric, boundary representation (BREP) modeling framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as FreeCAD and SolidWorks. From 4ee07ada6f628b4fa03d3a9f0044390bf287818b Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 10:18:47 -0500 Subject: [PATCH 135/518] Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7e67bc..8bb86b6 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The recommended method for most users is to install **build123d** is: pip install build123d ``` -To get the latest non-released version of **build123d*** one can install from GitHub using one of the following two commands: +To get the latest non-released version of **build123d** one can install from GitHub using one of the following two commands: In Linux/MacOS, use the following command: ``` From 393d64ea3fe8efbd1a5b06eca6ce615865fad070 Mon Sep 17 00:00:00 2001 From: snoyer Date: Tue, 14 Jan 2025 20:08:15 +0400 Subject: [PATCH 136/518] add typing for common param values --- src/build123d/importers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build123d/importers.py b/src/build123d/importers.py index 364b62b..4979306 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -35,7 +35,7 @@ import re import unicodedata from math import degrees from pathlib import Path -from typing import Optional, TextIO, Union +from typing import Literal, Optional, TextIO, Union import warnings from OCP.BRep import BRep_Builder @@ -338,7 +338,7 @@ def import_svg( *, flip_y: bool = True, ignore_visibility: bool = False, - label_by: str = "id", + label_by: Literal["id", "class", "inkscape:label"] | str = "id", is_inkscape_label: bool | None = None, # TODO remove for `1.0` release ) -> ShapeList[Wire | Face]: """import_svg From 7811afc54483fe3be7d4ab59bf69587f7a398dde Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 11:30:37 -0500 Subject: [PATCH 137/518] Re-enabling tests after topology split --- tests/test_direct_api.py | 104 +++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index f26c958..b2a622f 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -690,39 +690,38 @@ class TestCadObjects(DirectApiTestCase): self.assertAlmostEqual(many_rad.radius, 1.0) -# TODO: Enable after the split of topology.py -# class TestCleanMethod(unittest.TestCase): -# def setUp(self): -# # Create a mock object -# self.solid = Solid() -# self.solid.wrapped = MagicMock() # Simulate a valid `wrapped` object +class TestCleanMethod(unittest.TestCase): + def setUp(self): + # Create a mock object + self.solid = Solid() + self.solid.wrapped = MagicMock() # Simulate a valid `wrapped` object -# @patch("build123d.topology.shape_core.ShapeUpgrade_UnifySameDomain") -# def test_clean_warning_on_exception(self, mock_shape_upgrade): -# # Mock the upgrader -# mock_upgrader = mock_shape_upgrade.return_value -# mock_upgrader.Build.side_effect = Exception("Mocked Build failure") + @patch("build123d.topology.shape_core.ShapeUpgrade_UnifySameDomain") + def test_clean_warning_on_exception(self, mock_shape_upgrade): + # Mock the upgrader + mock_upgrader = mock_shape_upgrade.return_value + mock_upgrader.Build.side_effect = Exception("Mocked Build failure") -# # Capture warnings -# with self.assertWarns(Warning) as warn_context: -# self.solid.clean() + # Capture warnings + with self.assertWarns(Warning) as warn_context: + self.solid.clean() -# # Assert the warning message -# self.assertIn("Unable to clean", str(warn_context.warning)) + # Assert the warning message + self.assertIn("Unable to clean", str(warn_context.warning)) -# # Verify the upgrader was constructed with the correct arguments -# mock_shape_upgrade.assert_called_once_with(self.solid.wrapped, True, True, True) + # Verify the upgrader was constructed with the correct arguments + mock_shape_upgrade.assert_called_once_with(self.solid.wrapped, True, True, True) -# # Verify the Build method was called -# mock_upgrader.Build.assert_called_once() + # Verify the Build method was called + mock_upgrader.Build.assert_called_once() -# def test_clean_with_none_wrapped(self): -# # Set `wrapped` to None to simulate the error condition -# self.solid.wrapped = None + def test_clean_with_none_wrapped(self): + # Set `wrapped` to None to simulate the error condition + self.solid.wrapped = None -# # Call clean and ensure it returns self -# result = self.solid.clean() -# self.assertIs(result, self.solid) # Ensure it returns the same object + # Call clean and ensure it returns self + result = self.solid.clean() + self.assertIs(result, self.solid) # Ensure it returns the same object class TestColor(DirectApiTestCase): @@ -3793,34 +3792,33 @@ class TestShapeList(DirectApiTestCase): def test_group_by_str_repr(self): nonagon = RegularPolygon(5, 9) - # TODO: re-enable this test once the topology refactor complete - # expected = [ - # "[[],", - # " [,", - # " ],", - # " [,", - # " ],", - # " [,", - # " ],", - # " [,", - # " ]]", - # ] - # self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) + expected = [ + "[[],", + " [,", + " ],", + " [,", + " ],", + " [,", + " ],", + " [,", + " ]]", + ] + self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) - # expected_repr = ( - # "[[]," - # " [," - # " ]," - # " [," - # " ]," - # " [," - # " ]," - # " [," - # " ]]" - # ) - # self.assertDunderReprEqual( - # repr(nonagon.edges().group_by(Axis.X)), expected_repr - # ) + expected_repr = ( + "[[]," + " [," + " ]," + " [," + " ]," + " [," + " ]," + " [," + " ]]" + ) + self.assertDunderReprEqual( + repr(nonagon.edges().group_by(Axis.X)), expected_repr + ) f = io.StringIO() p = pretty.PrettyPrinter(f) From dd8416a141a2285c3f0bdccdef0fa33be9acd015 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 14 Jan 2025 11:32:28 -0600 Subject: [PATCH 138/518] move mesher benchmark to `test_benchmarks.py` --- tests/test_benchmarks.py | 18 ++++++++++++++++++ tests/test_mesher.py | 13 ------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py index 7f9484f..34bac6b 100644 --- a/tests/test_benchmarks.py +++ b/tests/test_benchmarks.py @@ -1,11 +1,13 @@ import pytest import importlib from math import sqrt +import time from build123d import * pytest_benchmark = pytest.importorskip("pytest_benchmark") + def test_ppp_0101(benchmark): def model(): """ @@ -616,9 +618,11 @@ def test_ttt_23_02_02(benchmark): benchmark(model) + # def test_ttt_23_T_24(benchmark): # excluding because it requires sympy + def test_ttt_24_SPO_06(benchmark): def model(): densa = 7800 / 1e6 # carbon steel density g/mm^3 @@ -675,3 +679,17 @@ def test_ttt_24_SPO_06(benchmark): assert p.part.scale(IN).volume * densa / LB == pytest.approx(3.92, 0.03) benchmark(model) + + +@pytest.mark.parametrize("test_input", [100, 1000, 10000, 100000]) +def test_mesher_benchmark(benchmark, test_input): + # in the 100_000 case test should take on the order of 0.2 seconds + # but usually less than 1 second + def test_create_3mf_mesh(i): + vertices = [(float(i), 0.0, 0.0) for i in range(i)] + triangles = [[i, i + 1, i + 2] for i in range(0, i - 3, 3)] + mesher = Mesher()._create_3mf_mesh(vertices, triangles) + assert len(mesher[0]) == i + assert len(mesher[1]) == int(i / 3) + + benchmark(test_create_3mf_mesh, test_input) diff --git a/tests/test_mesher.py b/tests/test_mesher.py index 16d2d23..9547d08 100644 --- a/tests/test_mesher.py +++ b/tests/test_mesher.py @@ -17,19 +17,6 @@ from build123d.topology import Compound, Solid from build123d.geometry import Axis, Color, Location, Vector, VectorLike from build123d.mesher import Mesher -class InternalApiBenchmark(unittest.TestCase): - def test_create_3mf_mesh(self): - start = time.perf_counter() - for i in [100, 1000, 10000, 100000]: - vertices = [(float(i), 0.0, 0.0) for i in range(i)] - triangles = [[i, i+1, i+2] for i in range(0, i-3, 3)] - start = time.perf_counter() - Mesher()._create_3mf_mesh(vertices, triangles) - runtime = time.perf_counter() - start - print(f"| {i} | {runtime:.3f} |") - final_runtime = time.perf_counter() - start - max_runtime = 1.0 - self.assertLessEqual(final_runtime, max_runtime, f"All meshes took {final_runtime:.3f}s > {max_runtime}s") class DirectApiTestCase(unittest.TestCase): def assertTupleAlmostEquals( From 09e99b19d35bfa9c6676b0b816a0db4c21908010 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 14 Jan 2025 11:38:01 -0600 Subject: [PATCH 139/518] remove unused imports time, importlib --- tests/test_benchmarks.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py index 34bac6b..7755ab2 100644 --- a/tests/test_benchmarks.py +++ b/tests/test_benchmarks.py @@ -1,7 +1,5 @@ import pytest -import importlib from math import sqrt -import time from build123d import * From 7b16193559090718438e0479ccbf07fae0ea8c54 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 14 Jan 2025 13:38:27 -0500 Subject: [PATCH 140/518] Fixing Issue #796 + pylint improvements --- src/build123d/geometry.py | 108 ++++++++++++++++++++------------------ tests/test_direct_api.py | 10 ++++ 2 files changed, 67 insertions(+), 51 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 4f7f851..370435c 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -131,7 +131,8 @@ class Vector: x (float): x component y (float): y component z (float): z component - vec (Vector | Sequence(float) | gp_Vec | gp_Pnt | gp_Dir | gp_XYZ): vector representations + vec (Vector | Sequence(float) | gp_Vec | gp_Pnt | gp_Dir | gp_XYZ): vector + representations Note that if no z value is provided it's assumed to be zero. If no values are provided the returned Vector has the value of 0, 0, 0. @@ -477,7 +478,8 @@ class Vector: Vector: transformed vector """ if not is_direction: - # to gp_Pnt to obey build123d transformation convention (in OCP.vectors do not translate) + # to gp_Pnt to obey build123d transformation convention (in OCP.vectors do not + # translate) pnt = self.to_pnt() pnt_t = pnt.Transformed(affine_transform.wrapped.Trsf()) return_value = Vector(gp_Vec(pnt_t.XYZ())) @@ -524,16 +526,16 @@ class Vector: if axis is not None: return axis.intersect(self) - elif plane is not None: + if plane is not None: return plane.intersect(self) - elif vector is not None and self == vector: + if vector is not None and self == vector: return vector - elif location is not None: + if location is not None: return location.intersect(self) - elif shape is not None: + if shape is not None: return shape.intersect(self) @@ -1637,16 +1639,16 @@ class Location: if axis is not None: return axis.intersect(self) - elif plane is not None: + if plane is not None: return plane.intersect(self) - elif vector is not None and self.position == vector: + if vector is not None and self.position == vector: return vector - elif location is not None and self == location: + if location is not None and self == location: return self - elif shape is not None: + if shape is not None: return shape.intersect(self) @@ -1700,7 +1702,8 @@ class Rotation(Location): X (float): rotation in degrees about X axis Y (float): rotation in degrees about Y axis Z (float): rotation in degrees about Z axis - optionally specify rotation ordering with Intrinsic or Extrinsic enums, defaults to Intrinsic.XYZ + optionally specify rotation ordering with Intrinsic or Extrinsic enums, + defaults to Intrinsic.XYZ """ @@ -1781,29 +1784,30 @@ class Pos(Location): """Position by X, Y, Z""" def __init__(self, *args, **kwargs): - position = [0, 0, 0] - # VectorLike - if len(args) == 1 and isinstance(args[0], (tuple, Vector)): - position = list(args[0]) - # Vertex - elif len(args) == 1 and isinstance(args[0], Iterable): - position = list(args[0]) - # Values - elif 1 <= len(args) <= 3 and all([isinstance(v, (float, int)) for v in args]): - position = list(args) + [0] * (3 - len(args)) + x, y, z, v = 0, 0, 0, None - unknown_args = ", ".join(set(kwargs.keys()).difference(["v", "X", "Y", "Z"])) - if unknown_args: - raise ValueError(f"Unexpected argument(s) {unknown_args}") + # Handle args + if args: + if all(isinstance(v, (float, int)) for v in args): + x, y, z = Vector(args) + elif len(args) == 1: + x, y, z = Vector(args[0]) + else: + raise TypeError(f"Invalid inputs to Pos {args}") - if "X" in kwargs: - position[0] = kwargs["X"] - if "Y" in kwargs: - position[1] = kwargs["Y"] - if "Z" in kwargs: - position[2] = kwargs["Z"] + # Handle kwargs + x = kwargs.pop("X", x) + y = kwargs.pop("Y", y) + z = kwargs.pop("Z", z) + v = kwargs.pop("v", Vector(x, y, z)) - super().__init__(tuple(position)) + # Handle unexpected kwargs + if kwargs: + raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + + if v is not None: + x, y, z = v + super().__init__(Vector(x, y, z)) class Matrix: @@ -2374,8 +2378,10 @@ class Plane(metaclass=PlaneMeta): manually chain together multiple rotate() commands. Args: - rotation (VectorLike, optional): (xDegrees, yDegrees, zDegrees). Defaults to (0, 0, 0). - ordering (Intrinsic | Extrinsic, optional): order of rotations in Intrinsic or Extrinsic rotation mode, defaults to Intrinsic.XYZ + rotation (VectorLike, optional): (xDegrees, yDegrees, zDegrees). + Defaults to (0, 0, 0). + ordering (Intrinsic | Extrinsic, optional): order of rotations in + Intrinsic or Extrinsic rotation mode, defaults to Intrinsic.XYZ Returns: Plane: a copy of this plane rotated as requested. @@ -2600,24 +2606,24 @@ class Plane(metaclass=PlaneMeta): if axis is not None: if self.contains(axis): return axis + + geom_line = Geom_Line(axis.wrapped) + geom_plane = Geom_Plane(self.local_coord_system) + + intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) + + if ( + intersection_calculator.IsDone() + and intersection_calculator.NbPoints() == 1 + ): + # Get the intersection point + intersection_point = Vector(intersection_calculator.Point(1)) else: - geom_line = Geom_Line(axis.wrapped) - geom_plane = Geom_Plane(self.local_coord_system) + intersection_point = None - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) + return intersection_point - if ( - intersection_calculator.IsDone() - and intersection_calculator.NbPoints() == 1 - ): - # Get the intersection point - intersection_point = Vector(intersection_calculator.Point(1)) - else: - intersection_point = None - - return intersection_point - - elif plane is not None: + if plane is not None: surface1 = Geom_Plane(self.wrapped) surface2 = Geom_Plane(plane.wrapped) intersector = GeomAPI_IntSS(surface1, surface2, TOLERANCE) @@ -2628,15 +2634,15 @@ class Plane(metaclass=PlaneMeta): axis = intersection_line.Position() return Axis(axis) - elif vector is not None and self.contains(vector): + if vector is not None and self.contains(vector): return vector - elif location is not None: + if location is not None: pln = Plane(location) if pln.origin == self.origin and pln.z_dir == self.z_dir: return location - elif shape is not None: + if shape is not None: return shape.intersect(self) diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index b2a622f..8446cf9 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -2027,6 +2027,16 @@ class TestLocation(DirectApiTestCase): self.assertIsNone(b.intersect(b.moved(Pos(X=10)))) + def test_pos(self): + with self.assertRaises(TypeError): + Pos(0, "foo") + self.assertEqual(Pos(1, 2, 3).position, Vector(1, 2, 3)) + self.assertEqual(Pos((1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(v=(1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(X=1, Y=2, Z=3).position, Vector(1, 2, 3)) + self.assertEqual(Pos(Vector(1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(1, Y=2, Z=3).position, Vector(1, 2, 3)) + class TestMatrix(DirectApiTestCase): def test_matrix_creation_and_access(self): From 2559262ffffb40e0093650badbf47d22fbcd58b4 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 14 Jan 2025 13:02:09 -0600 Subject: [PATCH 141/518] add missing [docs] dependencies, pin sphinx to a new version, point readthedocs to a .[docs] installation --- .readthedocs.yaml | 11 +++++++++-- docs/requirements.txt | 1 + pyproject.toml | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 3c263a9..9925d2f 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -15,7 +15,14 @@ build: sphinx: configuration: docs/conf.py -# Explicitly set the version of Python and its requirements python: install: - - requirements: docs/requirements.txt + - method: pip + path: . + extra_requirements: + - docs + +# Explicitly set the version of Python and its requirements +# python: +# install: +# - requirements: docs/requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt index feec70d..c8e4e60 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,4 @@ +# TODO: delete this file as it is no longer used to build the docs # Defining the exact version will make sure things don't break sphinx==5.3.0 sphinx_rtd_theme>=0.5.1 diff --git a/pyproject.toml b/pyproject.toml index 1005d53..970a0d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -75,10 +75,12 @@ benchmark = [ # dependencies to build the docs docs = [ - "sphinx", + "sphinx==8.1.3", # pin for stability of docs builds "sphinx-design", "sphinx-copybutton", "sphinx-hoverxref", + "sphinx-rtd-theme", + "sphinx_autodoc_typehints", ] # all dependencies From cd69e6ef022a7bce77ace7d9b5227fab56c142d1 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 15 Jan 2025 10:06:39 -0500 Subject: [PATCH 142/518] Improve Edge.intersect & coverage --- src/build123d/topology/one_d.py | 62 ++++++++++++++------------------- tests/test_direct_api.py | 27 ++++++++++++++ 2 files changed, 54 insertions(+), 35 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 819779f..a4c27b0 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -54,11 +54,14 @@ from __future__ import annotations import copy import itertools import warnings +from collections.abc import Iterable from itertools import combinations from math import radians, inf, pi, cos, copysign, ceil, floor -from typing import Tuple, Union, overload, TYPE_CHECKING - -from collections.abc import Iterable +from typing import Literal, overload, TYPE_CHECKING +from typing_extensions import Self +from numpy import ndarray +from scipy.optimize import minimize +from scipy.spatial import ConvexHull import OCP.TopAbs as ta from OCP.BRep import BRep_Tool @@ -163,12 +166,6 @@ from build123d.geometry import ( VectorLike, logger, ) -from numpy import ndarray -from scipy.optimize import minimize -from scipy.spatial import ConvexHull -from typing_extensions import Self - -from typing import Literal from .shape_core import ( Shape, @@ -370,10 +367,10 @@ class Mixin1D(Shape): of the infinite number of valid planes. Args: - lines (sequence of Union[Edge,Wire]): edges in common with self + lines (sequence of Edge | Wire): edges in common with self Returns: - Union[None, Plane]: Either the common plane or None + None | Plane: Either the common plane or None """ # pylint: disable=too-many-locals # Note: BRepLib_FindSurface is not helpful as it requires the @@ -912,7 +909,7 @@ class Mixin1D(Shape): Split this shape by the provided plane or face. Args: - surface (Union[Plane,Face]): surface to segment shape + surface (Plane | Face): surface to segment shape keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. Returns: @@ -1044,7 +1041,7 @@ class Mixin1D(Shape): is either a float (or int) parameter or a point that lies on the shape. Args: - position (Union[float, VectorLike]): distance, parameter value, or + position (float | VectorLike): distance, parameter value, or point on shape. Defaults to 0.5. position_mode (PositionMode, optional): position calculation mode. Defaults to PositionMode.PARAMETER. @@ -1650,7 +1647,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Distribute locations along edge or wire. Args: - self: Union[Wire:Edge]: + self: Wire:Edge: count(int): Number of locations to generate start(float): position along Edge|Wire to start. Defaults to 0.0. stop(float): position along Edge|Wire to end. Defaults to 1.0. @@ -1824,10 +1821,10 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): """intersect Edge with Edge or Axis Args: - other (Union[Edge, Axis]): other object + other (Edge | Axis): other object Returns: - Union[Shape, None]: Compound of vertices and/or edges + Shape | None: Compound of vertices and/or edges """ edges: list[Edge] = [] planes: list[Plane] = [] @@ -1846,10 +1843,16 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): # Find any edge / edge intersection points points_sets: list[set[Vector]] = [] + # Find crossing points for edge_pair in combinations([self] + edges, 2): intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) points_sets.append(set(intersection_points)) + # Find common end points + self_end_points = set(Vector(v) for v in self.vertices()) + edge_end_points = set(Vector(v) for edge in edges for v in edge.vertices()) + common_end_points = set.intersection(self_end_points, edge_end_points) + # Find any edge / plane intersection points & edges for edge, plane in itertools.product([self] + edges, planes): # Find point intersections @@ -1867,15 +1870,18 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): points_sets.append(set(plane_intersection_points)) # Find edge intersections - if (edge_plane := edge.common_plane()) is not None: # is a 2D edge - if plane.z_dir in (edge_plane.z_dir, -edge_plane.z_dir): - edges_common_to_planes.append(edge) + if all( + plane.contains(v) for v in edge.positions(i / 7 for i in range(8)) + ): # is a 2D edge + edges_common_to_planes.append(edge) edges.extend(edges_common_to_planes) # Find the intersection of all sets common_points = set.intersection(*points_sets) - common_vertices = [Vertex(*pnt) for pnt in common_points] + common_vertices = [ + Vertex(pnt) for pnt in common_points.union(common_end_points) + ] # Find Edge/Edge overlaps common_edges: list[Edge] = [] @@ -2054,20 +2060,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() return Edge(new_edge) - def _intersect_with_edge(self, edge: Edge) -> tuple[list[Vertex], list[Edge]]: - """find intersection vertices and edges""" - - # Find any intersection points - vertex_intersections = [ - Vertex(pnt) for pnt in self.find_intersection_points(edge) - ] - - # Find Edge/Edge overlaps - intersect_op = BRepAlgoAPI_Common() - edge_intersections = self._bool_op((self,), (edge,), intersect_op).edges() - - return vertex_intersections, edge_intersections - class Wire(Mixin1D, Shape[TopoDS_Wire]): """A Wire in build123d is a topological entity representing a connected sequence @@ -2313,7 +2305,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Combine a list of wires and edges into a list of Wires. Args: - wires (Iterable[Union[Wire, Edge]]): unsorted + wires (Iterable[Wire | Edge]): unsorted tol (float, optional): tolerance. Defaults to 1e-9. Returns: diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 8446cf9..da5bfef 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -2027,6 +2027,33 @@ class TestLocation(DirectApiTestCase): self.assertIsNone(b.intersect(b.moved(Pos(X=10)))) + # Look for common vertices + e1 = Edge.make_line((0, 0), (1, 0)) + e2 = Edge.make_line((1, 0), (1, 1)) + e3 = Edge.make_line((1, 0), (2, 0)) + i = e1.intersect(e2) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + i = e1.intersect(e3) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + + # Intersect with plane + e1 = Edge.make_line((0, 0), (2, 0)) + p1 = Plane.YZ.offset(1) + i = e1.intersect(p1) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + + e2 = Edge.make_line(p1.origin, p1.origin + 2 * p1.x_dir) + i = e2.intersect(p1) + self.assertEqual(len(i.vertices()), 2) + self.assertEqual(len(i.edges()), 1) + self.assertAlmostEqual(i.edge().length, 2, 5) + + with self.assertRaises(ValueError): + e1.intersect("line") + def test_pos(self): with self.assertRaises(TypeError): Pos(0, "foo") From d78ca933fcda7ff2d54a8664a560418f6f247a60 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 15 Jan 2025 12:46:19 -0600 Subject: [PATCH 143/518] readthedocs fixes to topology inheritance diagram, add mixin classes to `topology/__init__.py`, delete docs/requirements.txt, streamline workflows --- .github/actions/setup/action.yml | 3 +-- docs/direct_api_reference.rst | 4 +++- docs/requirements.txt | 11 ----------- src/build123d/topology/__init__.py | 6 +++--- 4 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 docs/requirements.txt diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index fdb5eba..9b459bb 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -14,5 +14,4 @@ runs: - name: Install Requirements shell: bash run: | - pip install wheel mypy pytest pytest-cov pylint - pip install . + pip install .[development] diff --git a/docs/direct_api_reference.rst b/docs/direct_api_reference.rst index b54c86f..02b6cfc 100644 --- a/docs/direct_api_reference.rst +++ b/docs/direct_api_reference.rst @@ -1,3 +1,4 @@ + #################### Direct API Reference #################### @@ -52,7 +53,7 @@ supplementary functionality specific to 1D `~topology.Solid`) objects respectively. Note that a :class:`~topology.Compound` may be contain only 1D, 2D (:class:`~topology.Face`) or 3D objects. -.. inheritance-diagram:: topology +.. inheritance-diagram:: topology.shape_core topology.zero_d topology.one_d topology.two_d topology.three_d topology.composite topology.utils :parts: 1 .. py:module:: topology @@ -63,6 +64,7 @@ Note that a :class:`~topology.Compound` may be contain only 1D, 2D (:class:`~top :special-members: __neg__ .. autoclass:: Mixin1D :special-members: __matmul__, __mod__ +.. autoclass:: Mixin2D .. autoclass:: Mixin3D .. autoclass:: Shape :special-members: __add__, __sub__, __and__, __rmul__, __eq__, __copy__, __deepcopy__, __hash__ diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index c8e4e60..0000000 --- a/docs/requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -# TODO: delete this file as it is no longer used to build the docs -# Defining the exact version will make sure things don't break -sphinx==5.3.0 -sphinx_rtd_theme>=0.5.1 -docutils<0.17 -readthedocs-sphinx-search>=0.3.2 -sphinx_autodoc_typehints==1.12.0 -sphinx_copybutton -sphinx-hoverxref -sphinx_design --e git+https://github.com/gumyr/build123d.git#egg=build123d diff --git a/src/build123d/topology/__init__.py b/src/build123d/topology/__init__.py index 6b810b5..abee547 100644 --- a/src/build123d/topology/__init__.py +++ b/src/build123d/topology/__init__.py @@ -51,9 +51,9 @@ from .utils import ( find_max_dimension, ) from .zero_d import Vertex, topo_explore_common_vertex -from .one_d import Edge, Wire, edges_to_wires, topo_explore_connected_edges -from .two_d import Face, Shell, sort_wires_by_build_order -from .three_d import Solid +from .one_d import Edge, Wire, Mixin1D, edges_to_wires, topo_explore_connected_edges +from .two_d import Face, Shell, Mixin2D,sort_wires_by_build_order +from .three_d import Solid, Mixin3D from .composite import Compound, Curve, Sketch, Part __all__ = [ From 19d925f774c16074f9dbaa9f77650b56d1639661 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 16 Jan 2025 14:18:10 -0500 Subject: [PATCH 144/518] Improved split with a non-planar tool --- src/build123d/topology/one_d.py | 59 +++++++++++++++++++++------------ tests/test_direct_api.py | 13 ++++++++ 2 files changed, 50 insertions(+), 22 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index a4c27b0..62993b7 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -78,10 +78,10 @@ from OCP.BRepBuilderAPI import ( ) from OCP.BRepExtrema import BRepExtrema_DistShapeShape from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d -from OCP.BRepGProp import BRepGProp +from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepOffset import BRepOffset_MakeOffset from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset +from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace from OCP.BRepProj import BRepProj_Projection from OCP.BRepTools import BRepTools from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse @@ -104,7 +104,7 @@ from OCP.GeomAPI import ( GeomAPI_PointsToBSpline, GeomAPI_ProjectPointOnCurve, ) -from OCP.GeomAbs import GeomAbs_Intersection, GeomAbs_JoinType +from OCP.GeomAbs import GeomAbs_JoinType from OCP.GeomAdaptor import GeomAdaptor_Curve from OCP.GeomFill import ( GeomFill_CorrectedFrenet, @@ -116,7 +116,6 @@ from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds from OCP.ShapeFix import ShapeFix_Shape, ShapeFix_Wireframe from OCP.Standard import Standard_Failure, Standard_NoSuchObject -from OCP.StdFail import StdFail_NotDone from OCP.TColStd import ( TColStd_Array1OfReal, TColStd_HArray1OfBoolean, @@ -131,7 +130,14 @@ from OCP.TopTools import ( TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape, ) -from OCP.TopoDS import TopoDS, TopoDS_Compound, TopoDS_Shape, TopoDS_Edge, TopoDS_Wire +from OCP.TopoDS import ( + TopoDS, + TopoDS_Compound, + TopoDS_Edge, + TopoDS_Shape, + TopoDS_Shell, + TopoDS_Wire, +) from OCP.gp import ( gp_Ax1, gp_Ax2, @@ -953,21 +959,29 @@ class Mixin1D(Shape): split_result = unwrap_topods_compound(split_result, True) if not isinstance(tool, Plane): - # Create solids from the surfaces for sorting by thickening - offset_builder = BRepOffset_MakeOffset() - offset_builder.Initialize( - tool.wrapped, - Offset=0.1, - Tol=1.0e-5, - Intersection=True, - Join=GeomAbs_Intersection, - Thickening=True, + # Get a TopoDS_Face to work with from the tool + if isinstance(trim_tool, TopoDS_Shell): + faceExplorer = TopExp_Explorer(trim_tool, ta.TopAbs_FACE) + tool_face = TopoDS.Face_s(faceExplorer.Current()) + else: + tool_face = trim_tool + + # Create a reference point off the +ve side of the tool + surface_point = gp_Pnt() + surface_normal = gp_Vec() + u_min, u_max, v_min, v_max = BRepTools.UVBounds_s(tool_face) + BRepGProp_Face(tool_face).Normal( + (u_min + u_max) / 2, (v_min + v_max) / 2, surface_point, surface_normal ) - offset_builder.MakeOffsetShape() - try: - tool_thickened = downcast(offset_builder.Shape()) - except StdFail_NotDone as err: - raise RuntimeError("Error determining top/bottom") from err + normalized_surface_normal = Vector( + surface_normal.X(), surface_normal.Y(), surface_normal.Z() + ).normalized() + surface_point = Vector(surface_point) + ref_point = surface_point + normalized_surface_normal + + # Create a HalfSpace - Solidish object to determine top/bottom + halfSpaceMaker = BRepPrimAPI_MakeHalfSpace(trim_tool, ref_point.to_pnt()) + tool_solid = halfSpaceMaker.Solid() tops: list[Shape] = [] bottoms: list[Shape] = [] @@ -979,10 +993,11 @@ class Mixin1D(Shape): else: # Intersect self and the thickened tool is_up_obj = _topods_bool_op( - (part,), (tool_thickened,), BRepAlgoAPI_Common() + (part,), (tool_solid,), BRepAlgoAPI_Common() ) - # Calculate volume of intersection - BRepGProp.VolumeProperties_s(is_up_obj, properties) + # Check for valid intersections + BRepGProp.LinearProperties_s(is_up_obj, properties) + # Mass represents the total length for linear properties is_up = properties.Mass() >= TOLERANCE (tops if is_up else bottoms).append(sub_shape) diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index da5bfef..4c10981 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -3248,6 +3248,19 @@ class TestShape(DirectApiTestCase): outer_vol = 5 * 5 self.assertAlmostEqual(split.volume, outer_vol - inner_vol) + def test_split_edge_by_shell(self): + edge = Edge.make_line((-5, 0, 0), (5, 0, 0)) + tool = Wire.make_rect(4, 4) + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + top = edge.split(tool_shell, keep=Keep.TOP) + self.assertEqual(len(top), 2) + self.assertAlmostEqual(top[0].length, 3, 5) + + def test_split_return_none(self): + shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) + split_shape = shape.split(Plane.XY, keep=Keep.INSIDE) + self.assertIsNone(split_shape) + def test_split_by_perimeter(self): # Test 0 - extract a spherical cap target0 = Solid.make_sphere(10).rotate(Axis.Z, 90) From eebd82d06a85d1d9ba6d2772bbaf535c47408ca5 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 17 Jan 2025 10:09:23 -0500 Subject: [PATCH 145/518] Added Keep.ALL to split --- src/build123d/build_enums.py | 5 +++-- src/build123d/topology/one_d.py | 12 ++++++++++++ tests/test_direct_api.py | 6 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index 9d890fe..8f8059a 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -179,11 +179,12 @@ class Intrinsic(Enum): class Keep(Enum): """Split options""" - TOP = auto() + ALL = auto() BOTTOM = auto() + BOTH = auto() INSIDE = auto() OUTSIDE = auto() - BOTH = auto() + TOP = auto() def __repr__(self): return f"<{self.__class__.__name__}.{self.name}>" diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 62993b7..b5a3acf 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -898,6 +898,10 @@ class Mixin1D(Shape): ) -> Self | list[Self] | None: """split and keep inside or outside""" + @overload + def split(self, tool: TrimmingTool, keep: Literal[Keep.ALL]) -> list[Self]: + """split and return the unordered pieces""" + @overload def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ Self | list[Self] | None, @@ -958,6 +962,14 @@ class Mixin1D(Shape): if isinstance(split_result, TopoDS_Compound): split_result = unwrap_topods_compound(split_result, True) + # For speed the user may just want all the objects which they + # can sort more efficiently then the generic algoritm below + if keep == Keep.ALL: + return ShapeList( + self.__class__.cast(part) + for part in get_top_level_topods_shapes(split_result) + ) + if not isinstance(tool, Plane): # Get a TopoDS_Face to work with from the tool if isinstance(trim_tool, TopoDS_Shell): diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 4c10981..4dcbfaf 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -3248,6 +3248,12 @@ class TestShape(DirectApiTestCase): outer_vol = 5 * 5 self.assertAlmostEqual(split.volume, outer_vol - inner_vol) + def test_split_keep_all(self): + shape = Box(1, 1, 1) + split_shape = shape.split(Plane.XY, keep=Keep.ALL) + self.assertTrue(isinstance(split_shape, ShapeList)) + self.assertEqual(len(split_shape), 2) + def test_split_edge_by_shell(self): edge = Edge.make_line((-5, 0, 0), (5, 0, 0)) tool = Wire.make_rect(4, 4) From 65ead1cce6a598095a93411953feff650ddf93fc Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Sat, 18 Jan 2025 15:56:29 -0600 Subject: [PATCH 146/518] exporters3d.py -> add build123d to exported steps --- src/build123d/exporters3d.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index f084246..b3c483c 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -46,7 +46,7 @@ from OCP.RWGltf import RWGltf_CafWriter from OCP.STEPCAFControl import STEPCAFControl_Controller, STEPCAFControl_Writer from OCP.STEPControl import STEPControl_Controller, STEPControl_StepModelType from OCP.StlAPI import StlAPI_Writer -from OCP.TCollection import TCollection_AsciiString, TCollection_ExtendedString +from OCP.TCollection import TCollection_AsciiString, TCollection_ExtendedString, TCollection_HAsciiString from OCP.TColStd import TColStd_IndexedDataMapOfStringString from OCP.TDataStd import TDataStd_Name from OCP.TDF import TDF_Label @@ -55,6 +55,7 @@ from OCP.TopExp import TopExp_Explorer from OCP.XCAFApp import XCAFApp_Application from OCP.XCAFDoc import XCAFDoc_ColorType, XCAFDoc_DocumentTool from OCP.XSControl import XSControl_WorkSession +from OCP.APIHeaderSection import APIHeaderSection_MakeHeader from build123d.build_common import UNITS_PER_METER from build123d.build_enums import PrecisionMode, Unit @@ -298,16 +299,12 @@ def export_step( writer.SetLayerMode(True) writer.SetNameMode(True) - # - # APIHeaderSection doesn't seem to be supported by OCP - TBD - # - - # APIHeaderSection_MakeHeader makeHeader(writer.Writer().Model()) - # makeHeader.SetName(TCollection_HAsciiString(path)) - # makeHeader.SetAuthorValue (1, TCollection_HAsciiString("Volker")); - # makeHeader.SetOrganizationValue (1, TCollection_HAsciiString("myCompanyName")); - # makeHeader.SetOriginatingSystem(TCollection_HAsciiString("myApplicationName")); - # makeHeader.SetDescriptionValue(1, TCollection_HAsciiString("myApplication Model")); + header = APIHeaderSection_MakeHeader(writer.Writer().Model()) + # header.SetName(TCollection_HAsciiString(path)) + # header.SetAuthorValue(1, TCollection_HAsciiString("Volker")); + # header.SetOrganizationValue(1, TCollection_HAsciiString("myCompanyName")); + header.SetOriginatingSystem(TCollection_HAsciiString("build123d")); + # header.SetDescriptionValue(1, TCollection_HAsciiString("myApplication Model")); STEPCAFControl_Controller.Init_s() STEPControl_Controller.Init_s() From 7aaea78094114dd389cdd0f0cc7c4f6e6d84353c Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Sun, 19 Jan 2025 15:11:31 -0600 Subject: [PATCH 147/518] exporters3d.py -> reorganize import, remove semicolon add comment about header properties --- src/build123d/exporters3d.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index b3c483c..dd47af4 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -36,6 +36,7 @@ from typing import Union import OCP.TopAbs as ta from anytree import PreOrderIter +from OCP.APIHeaderSection import APIHeaderSection_MakeHeader from OCP.BRepMesh import BRepMesh_IncrementalMesh from OCP.BRepTools import BRepTools from OCP.IFSelect import IFSelect_ReturnStatus @@ -55,7 +56,6 @@ from OCP.TopExp import TopExp_Explorer from OCP.XCAFApp import XCAFApp_Application from OCP.XCAFDoc import XCAFDoc_ColorType, XCAFDoc_DocumentTool from OCP.XSControl import XSControl_WorkSession -from OCP.APIHeaderSection import APIHeaderSection_MakeHeader from build123d.build_common import UNITS_PER_METER from build123d.build_enums import PrecisionMode, Unit @@ -301,9 +301,10 @@ def export_step( header = APIHeaderSection_MakeHeader(writer.Writer().Model()) # header.SetName(TCollection_HAsciiString(path)) + # consider using e.g. the non *Value versions instead # header.SetAuthorValue(1, TCollection_HAsciiString("Volker")); # header.SetOrganizationValue(1, TCollection_HAsciiString("myCompanyName")); - header.SetOriginatingSystem(TCollection_HAsciiString("build123d")); + header.SetOriginatingSystem(TCollection_HAsciiString("build123d")) # header.SetDescriptionValue(1, TCollection_HAsciiString("myApplication Model")); STEPCAFControl_Controller.Init_s() From 254eec1df1d51c5e0b5eb0d2df50423defe18df3 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Sun, 19 Jan 2025 20:28:01 -0600 Subject: [PATCH 148/518] pyproject.toml -> add optional `cadquery-ocp-stubs` to [development] optional extras Please review version pins too --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 970a0d9..9daf205 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ classifiers = [ ] dependencies = [ - "cadquery-ocp >= 7.8.0, < 7.9.0", + "cadquery-ocp >= 7.8, < 7.9", "typing_extensions >= 4.6.0, < 5", "numpy >= 2, < 3", "svgpathtools >= 1.5.1, < 2", @@ -60,6 +60,7 @@ ocp_vscode = [ # development dependencies development = [ + "cadquery-ocp-stubs >= 7.8, < 7.9", "wheel", "pytest", "pytest-cov", From cc9f6c613d458cc35959a80aef72c2ad282dece3 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 20 Jan 2025 13:01:54 -0500 Subject: [PATCH 149/518] Adding the MC length constant --- src/build123d/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index a16a83d..a1f59ca 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -28,6 +28,7 @@ modify_copyreg() __all__ = [ # Length Constants + "MC", "MM", "CM", "M", From 9ce9306a671612c72cdf299cbeece80e79e1eb4e Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 21 Jan 2025 13:34:32 -0600 Subject: [PATCH 150/518] exporters3d.py -> set step file name to build123d label attribute --- src/build123d/exporters3d.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index dd47af4..7f2b53b 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -300,7 +300,8 @@ def export_step( writer.SetNameMode(True) header = APIHeaderSection_MakeHeader(writer.Writer().Model()) - # header.SetName(TCollection_HAsciiString(path)) + if to_export.label: + header.SetName(TCollection_HAsciiString(to_export.label)) # consider using e.g. the non *Value versions instead # header.SetAuthorValue(1, TCollection_HAsciiString("Volker")); # header.SetOrganizationValue(1, TCollection_HAsciiString("myCompanyName")); From 23e035a1ce105a72712b88fd3fbc74c39c95f221 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 21 Jan 2025 21:37:52 -0500 Subject: [PATCH 151/518] Split test_direct_api.py in many smaller tests --- tests/__init__.py | 0 tests/test_direct_api.py | 17 +- tests/test_direct_api/test_always_equal.py | 40 ++ tests/test_direct_api/test_assembly.py | 127 ++++ tests/test_direct_api/test_axis.py | 208 ++++++ tests/test_direct_api/test_bound_box.py | 107 +++ tests/test_direct_api/test_cad_objects.py | 267 ++++++++ tests/test_direct_api/test_clean_method.py | 72 ++ tests/test_direct_api/test_color.py | 127 ++++ tests/test_direct_api/test_compound.py | 165 +++++ .../test_direct_api_test_case.py | 60 ++ tests/test_direct_api/test_edge.py | 293 +++++++++ tests/test_direct_api/test_face.py | 459 +++++++++++++ tests/test_direct_api/test_functions.py | 107 +++ tests/test_direct_api/test_group_by.py | 71 ++ tests/test_direct_api/test_import_export.py | 70 ++ tests/test_direct_api/test_jupyter.py | 60 ++ tests/test_direct_api/test_location.py | 392 +++++++++++ tests/test_direct_api/test_matrix.py | 197 ++++++ tests/test_direct_api/test_mixin1_d.py | 321 +++++++++ tests/test_direct_api/test_mixin3_d.py | 157 +++++ tests/test_direct_api/test_plane.py | 504 ++++++++++++++ tests/test_direct_api/test_projection.py | 106 +++ tests/test_direct_api/test_rotation.py | 61 ++ tests/test_direct_api/test_shape.py | 615 ++++++++++++++++++ tests/test_direct_api/test_shape_list.py | 364 +++++++++++ tests/test_direct_api/test_shells.py | 118 ++++ tests/test_direct_api/test_skip_clean.py | 70 ++ tests/test_direct_api/test_solid.py | 245 +++++++ tests/test_direct_api/test_v_t_k_poly_data.py | 89 +++ tests/test_direct_api/test_vector.py | 287 ++++++++ tests/test_direct_api/test_vector_like.py | 58 ++ tests/test_direct_api/test_vertex.py | 111 ++++ tests/test_direct_api/test_wire.py | 223 +++++++ 34 files changed, 6158 insertions(+), 10 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/test_direct_api/test_always_equal.py create mode 100644 tests/test_direct_api/test_assembly.py create mode 100644 tests/test_direct_api/test_axis.py create mode 100644 tests/test_direct_api/test_bound_box.py create mode 100644 tests/test_direct_api/test_cad_objects.py create mode 100644 tests/test_direct_api/test_clean_method.py create mode 100644 tests/test_direct_api/test_color.py create mode 100644 tests/test_direct_api/test_compound.py create mode 100644 tests/test_direct_api/test_direct_api_test_case.py create mode 100644 tests/test_direct_api/test_edge.py create mode 100644 tests/test_direct_api/test_face.py create mode 100644 tests/test_direct_api/test_functions.py create mode 100644 tests/test_direct_api/test_group_by.py create mode 100644 tests/test_direct_api/test_import_export.py create mode 100644 tests/test_direct_api/test_jupyter.py create mode 100644 tests/test_direct_api/test_location.py create mode 100644 tests/test_direct_api/test_matrix.py create mode 100644 tests/test_direct_api/test_mixin1_d.py create mode 100644 tests/test_direct_api/test_mixin3_d.py create mode 100644 tests/test_direct_api/test_plane.py create mode 100644 tests/test_direct_api/test_projection.py create mode 100644 tests/test_direct_api/test_rotation.py create mode 100644 tests/test_direct_api/test_shape.py create mode 100644 tests/test_direct_api/test_shape_list.py create mode 100644 tests/test_direct_api/test_shells.py create mode 100644 tests/test_direct_api/test_skip_clean.py create mode 100644 tests/test_direct_api/test_solid.py create mode 100644 tests/test_direct_api/test_v_t_k_poly_data.py create mode 100644 tests/test_direct_api/test_vector.py create mode 100644 tests/test_direct_api/test_vector_like.py create mode 100644 tests/test_direct_api/test_vertex.py create mode 100644 tests/test_direct_api/test_wire.py diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 4dcbfaf..7d2f47c 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -1054,18 +1054,15 @@ class TestEdge(DirectApiTestCase): line.find_intersection_points(Plane.YZ) # def test_intersections_tolerance(self): + # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) + # l1 = Edge.make_line((1, 0), (2, 0)) + # i1 = l1.intersect(*r1) - # Multiple operands not currently supported + # r2 = Rectangle(2, 2).edges() + # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) + # i2 = l2.intersect(*r2) - # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) - # l1 = Edge.make_line((1, 0), (2, 0)) - # i1 = l1.intersect(*r1) - - # r2 = Rectangle(2, 2).edges() - # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) - # i2 = l2.intersect(*r2) - - # self.assertEqual(len(i1.vertices()), len(i2.vertices())) + # self.assertEqual(len(i1.vertices()), len(i2.vertices())) def test_trim(self): line = Edge.make_line((-2, 0), (2, 0)) diff --git a/tests/test_direct_api/test_always_equal.py b/tests/test_direct_api/test_always_equal.py new file mode 100644 index 0000000..9b2292f --- /dev/null +++ b/tests/test_direct_api/test_always_equal.py @@ -0,0 +1,40 @@ +""" +build123d direct api tests + +name: test_always_equal.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_assembly.py b/tests/test_direct_api/test_assembly.py new file mode 100644 index 0000000..b464a0c --- /dev/null +++ b/tests/test_direct_api/test_assembly.py @@ -0,0 +1,127 @@ +""" +build123d direct api tests + +name: test_assembly.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import re +import unittest + +from build123d.topology import Compound, Solid + + +class TestAssembly(unittest.TestCase): + @staticmethod + def create_test_assembly() -> Compound: + box = Solid.make_box(1, 1, 1) + box.orientation = (45, 45, 0) + box.label = "box" + sphere = Solid.make_sphere(1) + sphere.label = "sphere" + sphere.position = (1, 2, 3) + assembly = Compound(label="assembly", children=[box]) + sphere.parent = assembly + return assembly + + def assertTopoEqual(self, actual_topo: str, expected_topo_lines: list[str]): + actual_topo_lines = actual_topo.splitlines() + self.assertEqual(len(actual_topo_lines), len(expected_topo_lines)) + for actual_line, expected_line in zip(actual_topo_lines, expected_topo_lines): + start, end = re.split(r"at 0x[0-9a-f]+,", expected_line, 2, re.I) + self.assertTrue(actual_line.startswith(start)) + self.assertTrue(actual_line.endswith(end)) + + def test_attributes(self): + box = Solid.make_box(1, 1, 1) + box.label = "box" + sphere = Solid.make_sphere(1) + sphere.label = "sphere" + assembly = Compound(label="assembly", children=[box]) + sphere.parent = assembly + + self.assertEqual(len(box.children), 0) + self.assertEqual(box.label, "box") + self.assertEqual(box.parent, assembly) + self.assertEqual(sphere.parent, assembly) + self.assertEqual(len(assembly.children), 2) + + def test_show_topology_compound(self): + assembly = TestAssembly.create_test_assembly() + expected = [ + "assembly Compound at 0x7fced0fd1b50, Location(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))", + "├── box Solid at 0x7fced102d3a0, Location(p=(0.00, 0.00, 0.00), o=(45.00, 45.00, -0.00))", + "└── sphere Solid at 0x7fced0fd1f10, Location(p=(1.00, 2.00, 3.00), o=(-0.00, 0.00, -0.00))", + ] + self.assertTopoEqual(assembly.show_topology("Solid"), expected) + + def test_show_topology_shape_location(self): + assembly = TestAssembly.create_test_assembly() + expected = [ + "Solid at 0x7f3754501530, Position(1.0, 2.0, 3.0)", + "└── Shell at 0x7f3754501a70, Position(1.0, 2.0, 3.0)", + " └── Face at 0x7f3754501030, Position(1.0, 2.0, 3.0)", + ] + self.assertTopoEqual( + assembly.children[1].show_topology("Face", show_center=False), expected + ) + + def test_show_topology_shape(self): + assembly = TestAssembly.create_test_assembly() + expected = [ + "Solid at 0x7f6279043ab0, Center(1.0, 2.0, 3.0)", + "└── Shell at 0x7f62790438f0, Center(1.0, 2.0, 3.0)", + " └── Face at 0x7f62790439f0, Center(1.0, 2.0, 3.0)", + ] + self.assertTopoEqual(assembly.children[1].show_topology("Face"), expected) + + def test_remove_child(self): + assembly = TestAssembly.create_test_assembly() + self.assertEqual(len(assembly.children), 2) + assembly.children = list(assembly.children)[1:] + self.assertEqual(len(assembly.children), 1) + + def test_do_children_intersect(self): + ( + overlap, + pair, + distance, + ) = TestAssembly.create_test_assembly().do_children_intersect() + self.assertFalse(overlap) + box = Solid.make_box(1, 1, 1) + box.orientation = (45, 45, 0) + box.label = "box" + sphere = Solid.make_sphere(1) + sphere.label = "sphere" + sphere.position = (0, 0, 0) + assembly = Compound(label="assembly", children=[box]) + sphere.parent = assembly + overlap, pair, distance = assembly.do_children_intersect() + self.assertTrue(overlap) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py new file mode 100644 index 0000000..f4d0a4a --- /dev/null +++ b/tests/test_direct_api/test_axis.py @@ -0,0 +1,208 @@ +""" +build123d direct api tests + +name: test_axis.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import unittest + +from OCP.gp import gp_Ax1, gp_Dir, gp_Pnt +from build123d.geometry import Axis, Location, Plane, Vector +from build123d.topology import Edge +from tests.base_test import DirectApiTestCase, AlwaysEqual + + +class TestAxis(DirectApiTestCase): + """Test the Axis class""" + + def test_axis_init(self): + test_axis = Axis((1, 2, 3), (0, 0, 1)) + self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis((1, 2, 3), direction=(0, 0, 1)) + self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis(origin=(1, 2, 3), direction=(0, 0, 1)) + self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis(Edge.make_line((1, 2, 3), (1, 2, 4))) + self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis(edge=Edge.make_line((1, 2, 3), (1, 2, 4))) + self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + + with self.assertRaises(ValueError): + Axis("one", "up") + with self.assertRaises(ValueError): + Axis(one="up") + + def test_axis_from_occt(self): + occt_axis = gp_Ax1(gp_Pnt(1, 1, 1), gp_Dir(0, 1, 0)) + test_axis = Axis(occt_axis) + self.assertVectorAlmostEquals(test_axis.position, (1, 1, 1), 5) + self.assertVectorAlmostEquals(test_axis.direction, (0, 1, 0), 5) + + def test_axis_repr_and_str(self): + self.assertEqual(repr(Axis.X), "((0.0, 0.0, 0.0),(1.0, 0.0, 0.0))") + self.assertEqual(str(Axis.Y), "Axis: ((0.0, 0.0, 0.0),(0.0, 1.0, 0.0))") + + def test_axis_copy(self): + x_copy = copy.copy(Axis.X) + self.assertVectorAlmostEquals(x_copy.position, (0, 0, 0), 5) + self.assertVectorAlmostEquals(x_copy.direction, (1, 0, 0), 5) + x_copy = copy.deepcopy(Axis.X) + self.assertVectorAlmostEquals(x_copy.position, (0, 0, 0), 5) + self.assertVectorAlmostEquals(x_copy.direction, (1, 0, 0), 5) + + def test_axis_to_location(self): + # TODO: Verify this is correct + x_location = Axis.X.location + self.assertTrue(isinstance(x_location, Location)) + self.assertVectorAlmostEquals(x_location.position, (0, 0, 0), 5) + self.assertVectorAlmostEquals(x_location.orientation, (0, 90, 180), 5) + + def test_axis_located(self): + y_axis = Axis.Z.located(Location((0, 0, 1), (-90, 0, 0))) + self.assertVectorAlmostEquals(y_axis.position, (0, 0, 1), 5) + self.assertVectorAlmostEquals(y_axis.direction, (0, 1, 0), 5) + + def test_axis_to_plane(self): + x_plane = Axis.X.to_plane() + self.assertTrue(isinstance(x_plane, Plane)) + self.assertVectorAlmostEquals(x_plane.origin, (0, 0, 0), 5) + self.assertVectorAlmostEquals(x_plane.z_dir, (1, 0, 0), 5) + + def test_axis_is_coaxial(self): + self.assertTrue(Axis.X.is_coaxial(Axis((0, 0, 0), (1, 0, 0)))) + self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 1), (1, 0, 0)))) + self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 0), (0, 1, 0)))) + + def test_axis_is_normal(self): + self.assertTrue(Axis.X.is_normal(Axis.Y)) + self.assertFalse(Axis.X.is_normal(Axis.X)) + + def test_axis_is_opposite(self): + self.assertTrue(Axis.X.is_opposite(Axis((1, 1, 1), (-1, 0, 0)))) + self.assertFalse(Axis.X.is_opposite(Axis.X)) + + def test_axis_is_parallel(self): + self.assertTrue(Axis.X.is_parallel(Axis((1, 1, 1), (1, 0, 0)))) + self.assertFalse(Axis.X.is_parallel(Axis.Y)) + + def test_axis_angle_between(self): + self.assertAlmostEqual(Axis.X.angle_between(Axis.Y), 90, 5) + self.assertAlmostEqual( + Axis.X.angle_between(Axis((1, 1, 1), (-1, 0, 0))), 180, 5 + ) + + def test_axis_reverse(self): + self.assertVectorAlmostEquals(Axis.X.reverse().direction, (-1, 0, 0), 5) + + def test_axis_reverse_op(self): + axis = -Axis.X + self.assertVectorAlmostEquals(axis.direction, (-1, 0, 0), 5) + + def test_axis_as_edge(self): + edge = Edge(Axis.X) + self.assertTrue(isinstance(edge, Edge)) + common = (edge & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() + self.assertAlmostEqual(common.length, 1, 5) + + def test_axis_intersect(self): + common = (Axis.X.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() + self.assertAlmostEqual(common.length, 1, 5) + + common = (Axis.X & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() + self.assertAlmostEqual(common.length, 1, 5) + + intersection = Axis.X & Axis((1, 0, 0), (0, 1, 0)) + self.assertVectorAlmostEquals(intersection, (1, 0, 0), 5) + + i = Axis.X & Axis((1, 0, 0), (1, 0, 0)) + self.assertEqual(i, Axis.X) + + intersection = Axis((1, 2, 3), (0, 0, 1)) & Plane.XY + self.assertTupleAlmostEquals(intersection.to_tuple(), (1, 2, 0), 5) + + arc = Edge.make_circle(20, start_angle=0, end_angle=180) + ax0 = Axis((-20, 30, 0), (4, -3, 0)) + intersections = arc.intersect(ax0).vertices().sort_by(Axis.X) + self.assertTupleAlmostEquals(tuple(intersections[0]), (-5.6, 19.2, 0), 5) + self.assertTupleAlmostEquals(tuple(intersections[1]), (20, 0, 0), 5) + + intersections = ax0.intersect(arc).vertices().sort_by(Axis.X) + self.assertTupleAlmostEquals(tuple(intersections[0]), (-5.6, 19.2, 0), 5) + self.assertTupleAlmostEquals(tuple(intersections[1]), (20, 0, 0), 5) + + i = Axis((0, 0, 1), (1, 1, 1)) & Vector(0.5, 0.5, 1.5) + self.assertTrue(isinstance(i, Vector)) + self.assertVectorAlmostEquals(i, (0.5, 0.5, 1.5), 5) + self.assertIsNone(Axis.Y & Vector(2, 0, 0)) + + l = Edge.make_line((0, 0, 1), (0, 0, 2)) ^ 1 + i: Location = Axis.Z & l + self.assertTrue(isinstance(i, Location)) + self.assertVectorAlmostEquals(i.position, l.position, 5) + self.assertVectorAlmostEquals(i.orientation, l.orientation, 5) + + self.assertIsNone(Axis.Z & Edge.make_line((0, 0, 1), (1, 0, 0)).location_at(1)) + self.assertIsNone(Axis.Z & Edge.make_line((1, 0, 1), (1, 0, 2)).location_at(1)) + + # TODO: uncomment when generalized edge to surface intersections are complete + # non_planar = ( + # Solid.make_cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True) + # ) + # intersections = Axis((0, 0, 5), (1, 0, 0)) & non_planar + + # self.assertTrue(len(intersections.vertices(), 2)) + # self.assertTupleAlmostEquals( + # intersection.vertices()[0].to_tuple(), (-1, 0, 5), 5 + # ) + # self.assertTupleAlmostEquals( + # intersection.vertices()[1].to_tuple(), (1, 0, 5), 5 + # ) + + def test_axis_equal(self): + self.assertEqual(Axis.X, Axis.X) + self.assertEqual(Axis.Y, Axis.Y) + self.assertEqual(Axis.Z, Axis.Z) + self.assertEqual(Axis.X, AlwaysEqual()) + + def test_axis_not_equal(self): + self.assertNotEqual(Axis.X, Axis.Y) + random_obj = object() + self.assertNotEqual(Axis.X, random_obj) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_bound_box.py b/tests/test_direct_api/test_bound_box.py new file mode 100644 index 0000000..c06eaff --- /dev/null +++ b/tests/test_direct_api/test_bound_box.py @@ -0,0 +1,107 @@ +""" +build123d direct api tests + +name: test_bound_box.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import BoundBox, Vector +from build123d.topology import Solid, Vertex +from tests.base_test import DirectApiTestCase + + +class TestBoundBox(DirectApiTestCase): + def test_basic_bounding_box(self): + v = Vertex(1, 1, 1) + v2 = Vertex(2, 2, 2) + self.assertEqual(BoundBox, type(v.bounding_box())) + self.assertEqual(BoundBox, type(v2.bounding_box())) + + bb1 = v.bounding_box().add(v2.bounding_box()) + + # OCC uses some approximations + self.assertAlmostEqual(bb1.size.X, 1.0, 1) + + # Test adding to an existing bounding box + v0 = Vertex(0, 0, 0) + bb2 = v0.bounding_box().add(v.bounding_box()) + + bb3 = bb1.add(bb2) + self.assertVectorAlmostEquals(bb3.size, (2, 2, 2), 7) + + bb3 = bb2.add((3, 3, 3)) + self.assertVectorAlmostEquals(bb3.size, (3, 3, 3), 7) + + bb3 = bb2.add(Vector(3, 3, 3)) + self.assertVectorAlmostEquals(bb3.size, (3, 3, 3), 7) + + # Test 2D bounding boxes + bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) + bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box()) + bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box()) + # Test that bb2 contains bb1 + self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2)) + self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1)) + # Test that neither bounding box contains the other + self.assertIsNone(BoundBox.find_outside_box_2d(bb1, bb3)) + + # Test creation of a bounding box from a shape - note the low accuracy comparison + # as the box is a little larger than the shape + bb1 = BoundBox.from_topo_ds(Solid.make_cylinder(1, 1).wrapped, optimal=False) + self.assertVectorAlmostEquals(bb1.size, (2, 2, 1), 1) + + bb2 = BoundBox.from_topo_ds( + Solid.make_cylinder(0.5, 0.5).translate((0, 0, 0.1)).wrapped, optimal=False + ) + self.assertTrue(bb2.is_inside(bb1)) + + def test_bounding_box_repr(self): + bb = Solid.make_box(1, 1, 1).bounding_box() + self.assertEqual( + repr(bb), "bbox: 0.0 <= x <= 1.0, 0.0 <= y <= 1.0, 0.0 <= z <= 1.0" + ) + + def test_center_of_boundbox(self): + self.assertVectorAlmostEquals( + Solid.make_box(1, 1, 1).bounding_box().center(), + (0.5, 0.5, 0.5), + 5, + ) + + def test_combined_center_of_boundbox(self): + pass + + def test_clean_boundbox(self): + s = Solid.make_sphere(3) + self.assertVectorAlmostEquals(s.bounding_box().size, (6, 6, 6), 5) + s.mesh(1e-3) + self.assertVectorAlmostEquals(s.bounding_box().size, (6, 6, 6), 5) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_cad_objects.py b/tests/test_direct_api/test_cad_objects.py new file mode 100644 index 0000000..fa9a186 --- /dev/null +++ b/tests/test_direct_api/test_cad_objects.py @@ -0,0 +1,267 @@ +""" +build123d direct api tests + +name: test_cad_objects.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge +from OCP.gp import gp, gp_Ax2, gp_Circ, gp_Elips, gp_Pnt +from build123d.build_enums import CenterOf +from build123d.geometry import Plane, Vector +from build123d.topology import Edge, Face, Wire +from tests.base_test import DirectApiTestCase, DEG2RAD + + +class TestCadObjects(DirectApiTestCase): + def _make_circle(self): + circle = gp_Circ(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 2.0) + return Edge.cast(BRepBuilderAPI_MakeEdge(circle).Edge()) + + def _make_ellipse(self): + ellipse = gp_Elips(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 4.0, 2.0) + return Edge.cast(BRepBuilderAPI_MakeEdge(ellipse).Edge()) + + def test_edge_wrapper_center(self): + e = self._make_circle() + + self.assertVectorAlmostEquals(e.center(CenterOf.MASS), (1.0, 2.0, 3.0), 3) + + def test_edge_wrapper_ellipse_center(self): + e = self._make_ellipse() + w = Wire([e]) + self.assertVectorAlmostEquals(Face(w).center(), (1.0, 2.0, 3.0), 3) + + def test_edge_wrapper_make_circle(self): + halfCircleEdge = Edge.make_circle(radius=10, start_angle=0, end_angle=180) + + # self.assertVectorAlmostEquals((0.0, 5.0, 0.0), halfCircleEdge.centerOfBoundBox(0.0001),3) + self.assertVectorAlmostEquals(halfCircleEdge.start_point(), (10.0, 0.0, 0.0), 3) + self.assertVectorAlmostEquals(halfCircleEdge.end_point(), (-10.0, 0.0, 0.0), 3) + + def test_edge_wrapper_make_tangent_arc(self): + tangent_arc = Edge.make_tangent_arc( + Vector(1, 1), # starts at 1, 1 + Vector(0, 1), # tangent at start of arc is in the +y direction + Vector(2, 1), # arc cureturn_values 180 degrees and ends at 2, 1 + ) + self.assertVectorAlmostEquals(tangent_arc.start_point(), (1, 1, 0), 3) + self.assertVectorAlmostEquals(tangent_arc.end_point(), (2, 1, 0), 3) + self.assertVectorAlmostEquals(tangent_arc.tangent_at(0), (0, 1, 0), 3) + self.assertVectorAlmostEquals(tangent_arc.tangent_at(0.5), (1, 0, 0), 3) + self.assertVectorAlmostEquals(tangent_arc.tangent_at(1), (0, -1, 0), 3) + + def test_edge_wrapper_make_ellipse1(self): + # Check x_radius > y_radius + x_radius, y_radius = 20, 10 + angle1, angle2 = -75.0, 90.0 + arcEllipseEdge = Edge.make_ellipse( + x_radius=x_radius, + y_radius=y_radius, + plane=Plane.XY, + start_angle=angle1, + end_angle=angle2, + ) + + start = ( + x_radius * math.cos(angle1 * DEG2RAD), + y_radius * math.sin(angle1 * DEG2RAD), + 0.0, + ) + end = ( + x_radius * math.cos(angle2 * DEG2RAD), + y_radius * math.sin(angle2 * DEG2RAD), + 0.0, + ) + self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) + self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) + + def test_edge_wrapper_make_ellipse2(self): + # Check x_radius < y_radius + x_radius, y_radius = 10, 20 + angle1, angle2 = 0.0, 45.0 + arcEllipseEdge = Edge.make_ellipse( + x_radius=x_radius, + y_radius=y_radius, + plane=Plane.XY, + start_angle=angle1, + end_angle=angle2, + ) + + start = ( + x_radius * math.cos(angle1 * DEG2RAD), + y_radius * math.sin(angle1 * DEG2RAD), + 0.0, + ) + end = ( + x_radius * math.cos(angle2 * DEG2RAD), + y_radius * math.sin(angle2 * DEG2RAD), + 0.0, + ) + self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) + self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) + + def test_edge_wrapper_make_circle_with_ellipse(self): + # Check x_radius == y_radius + x_radius, y_radius = 20, 20 + angle1, angle2 = 15.0, 60.0 + arcEllipseEdge = Edge.make_ellipse( + x_radius=x_radius, + y_radius=y_radius, + plane=Plane.XY, + start_angle=angle1, + end_angle=angle2, + ) + + start = ( + x_radius * math.cos(angle1 * DEG2RAD), + y_radius * math.sin(angle1 * DEG2RAD), + 0.0, + ) + end = ( + x_radius * math.cos(angle2 * DEG2RAD), + y_radius * math.sin(angle2 * DEG2RAD), + 0.0, + ) + self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) + self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) + + def test_face_wrapper_make_rect(self): + mplane = Face.make_rect(10, 10) + + self.assertVectorAlmostEquals(mplane.normal_at(), (0.0, 0.0, 1.0), 3) + + # def testCompoundcenter(self): + # """ + # Tests whether or not a proper weighted center can be found for a compound + # """ + + # def cylinders(self, radius, height): + + # c = Solid.make_cylinder(radius, height, Vector()) + + # # Combine all the cylinders into a single compound + # r = self.eachpoint(lambda loc: c.located(loc), True).combinesolids() + + # return r + + # Workplane.cyl = cylinders + + # # Now test. here we want weird workplane to see if the objects are transformed right + # s = ( + # Workplane("XY") + # .rect(2.0, 3.0, for_construction=true) + # .vertices() + # .cyl(0.25, 0.5) + # ) + + # self.assertEqual(4, len(s.val().solids())) + # self.assertVectorAlmostEquals((0.0, 0.0, 0.25), s.val().center, 3) + + def test_translate(self): + e = Edge.make_circle(2, Plane((1, 2, 3))) + e2 = e.translate(Vector(0, 0, 1)) + + self.assertVectorAlmostEquals(e2.center(CenterOf.MASS), (1.0, 2.0, 4.0), 3) + + def test_vertices(self): + e = Edge.cast(BRepBuilderAPI_MakeEdge(gp_Pnt(0, 0, 0), gp_Pnt(1, 1, 0)).Edge()) + self.assertEqual(2, len(e.vertices())) + + def test_edge_wrapper_radius(self): + # get a radius from a simple circle + e0 = Edge.make_circle(2.4) + self.assertAlmostEqual(e0.radius, 2.4) + + # radius of an arc + e1 = Edge.make_circle( + 1.8, Plane(origin=(5, 6, 7), z_dir=(1, 1, 1)), start_angle=20, end_angle=30 + ) + self.assertAlmostEqual(e1.radius, 1.8) + + # test value errors + e2 = Edge.make_ellipse(10, 20) + with self.assertRaises(ValueError): + e2.radius + + # radius from a wire + w0 = Wire.make_circle(10, Plane(origin=(1, 2, 3), z_dir=(-1, 0, 1))) + self.assertAlmostEqual(w0.radius, 10) + + # radius from a wire with multiple edges + rad = 2.3 + plane = Plane(origin=(7, 8, 0), z_dir=(1, 0.5, 0.1)) + w1 = Wire( + [ + Edge.make_circle(rad, plane, 0, 10), + Edge.make_circle(rad, plane, 10, 25), + Edge.make_circle(rad, plane, 25, 230), + ] + ) + self.assertAlmostEqual(w1.radius, rad) + + # test value error from wire + w2 = Wire.make_polygon( + [ + Vector(-1, 0, 0), + Vector(0, 1, 0), + Vector(1, -1, 0), + ] + ) + with self.assertRaises(ValueError): + w2.radius + + # (I think) the radius of a wire is the radius of it's first edge. + # Since this is stated in the docstring better make sure. + no_rad = Wire( + [ + Edge.make_line(Vector(0, 0, 0), Vector(0, 1, 0)), + Edge.make_circle(1.0, start_angle=90, end_angle=270), + ] + ) + with self.assertRaises(ValueError): + no_rad.radius + yes_rad = Wire( + [ + Edge.make_circle(1.0, start_angle=90, end_angle=270), + Edge.make_line(Vector(0, -1, 0), Vector(0, 1, 0)), + ] + ) + self.assertAlmostEqual(yes_rad.radius, 1.0) + many_rad = Wire( + [ + Edge.make_circle(1.0, start_angle=0, end_angle=180), + Edge.make_circle(3.0, Plane((2, 0, 0)), start_angle=180, end_angle=359), + ] + ) + self.assertAlmostEqual(many_rad.radius, 1.0) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_clean_method.py b/tests/test_direct_api/test_clean_method.py new file mode 100644 index 0000000..4c5dfa0 --- /dev/null +++ b/tests/test_direct_api/test_clean_method.py @@ -0,0 +1,72 @@ +""" +build123d direct api tests + +name: test_clean_method.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from unittest.mock import patch, MagicMock + +from build123d.topology import Solid + + +class TestCleanMethod(unittest.TestCase): + def setUp(self): + # Create a mock object + self.solid = Solid() + self.solid.wrapped = MagicMock() # Simulate a valid `wrapped` object + + @patch("build123d.topology.shape_core.ShapeUpgrade_UnifySameDomain") + def test_clean_warning_on_exception(self, mock_shape_upgrade): + # Mock the upgrader + mock_upgrader = mock_shape_upgrade.return_value + mock_upgrader.Build.side_effect = Exception("Mocked Build failure") + + # Capture warnings + with self.assertWarns(Warning) as warn_context: + self.solid.clean() + + # Assert the warning message + self.assertIn("Unable to clean", str(warn_context.warning)) + + # Verify the upgrader was constructed with the correct arguments + mock_shape_upgrade.assert_called_once_with(self.solid.wrapped, True, True, True) + + # Verify the Build method was called + mock_upgrader.Build.assert_called_once() + + def test_clean_with_none_wrapped(self): + # Set `wrapped` to None to simulate the error condition + self.solid.wrapped = None + + # Call clean and ensure it returns self + result = self.solid.clean() + self.assertIs(result, self.solid) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py new file mode 100644 index 0000000..f18ab95 --- /dev/null +++ b/tests/test_direct_api/test_color.py @@ -0,0 +1,127 @@ +""" +build123d direct api tests + +name: test_color.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import unittest + +from build123d.geometry import Color +from tests.base_test import DirectApiTestCase + + +class TestColor(DirectApiTestCase): + def test_name1(self): + c = Color("blue") + self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) + + def test_name2(self): + c = Color("blue", alpha=0.5) + self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) + + def test_name3(self): + c = Color("blue", 0.5) + self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) + + def test_rgb0(self): + c = Color(0.0, 1.0, 0.0) + self.assertTupleAlmostEquals(tuple(c), (0, 1, 0, 1), 5) + + def test_rgba1(self): + c = Color(1.0, 1.0, 0.0, 0.5) + self.assertEqual(c.wrapped.GetRGB().Red(), 1.0) + self.assertEqual(c.wrapped.GetRGB().Green(), 1.0) + self.assertEqual(c.wrapped.GetRGB().Blue(), 0.0) + self.assertEqual(c.wrapped.Alpha(), 0.5) + + def test_rgba2(self): + c = Color(1.0, 1.0, 0.0, alpha=0.5) + self.assertTupleAlmostEquals(tuple(c), (1, 1, 0, 0.5), 5) + + def test_rgba3(self): + c = Color(red=0.1, green=0.2, blue=0.3, alpha=0.5) + self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.5), 5) + + def test_bad_color_name(self): + with self.assertRaises(ValueError): + Color("build123d") + + def test_to_tuple(self): + c = Color("blue", alpha=0.5) + self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) + + def test_hex(self): + c = Color(0x996692) + self.assertTupleAlmostEquals( + tuple(c), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), 5 + ) + + c = Color(0x006692, 0x80) + self.assertTupleAlmostEquals( + tuple(c), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), 5 + ) + + c = Color(0x006692, alpha=0x80) + self.assertTupleAlmostEquals(tuple(c), (0, 102 / 255, 146 / 255, 128 / 255), 5) + + c = Color(color_code=0x996692, alpha=0xCC) + self.assertTupleAlmostEquals( + tuple(c), (153 / 255, 102 / 255, 146 / 255, 204 / 255), 5 + ) + + c = Color(0.0, 0.0, 1.0, 1.0) + self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) + + c = Color(0, 0, 1, 1) + self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) + + def test_copy(self): + c = Color(0.1, 0.2, 0.3, alpha=0.4) + c_copy = copy.copy(c) + self.assertTupleAlmostEquals(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), 5) + + def test_str_repr(self): + c = Color(1, 0, 0) + self.assertEqual(str(c), "Color: (1.0, 0.0, 0.0, 1.0) ~ RED") + self.assertEqual(repr(c), "Color(1.0, 0.0, 0.0, 1.0)") + + def test_tuple(self): + c = Color((0.1,)) + self.assertTupleAlmostEquals(tuple(c), (0.1, 1.0, 1.0, 1.0), 5) + c = Color((0.1, 0.2)) + self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 1.0, 1.0), 5) + c = Color((0.1, 0.2, 0.3)) + self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 1.0), 5) + c = Color((0.1, 0.2, 0.3, 0.4)) + self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.4), 5) + c = Color(color_tuple=(0.1, 0.2, 0.3, 0.4)) + self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.4), 5) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_compound.py b/tests/test_direct_api/test_compound.py new file mode 100644 index 0000000..8ee33ca --- /dev/null +++ b/tests/test_direct_api/test_compound.py @@ -0,0 +1,165 @@ +""" +build123d direct api tests + +name: test_compound.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import itertools +import unittest + +from build123d.build_common import GridLocations, PolarLocations +from build123d.build_enums import Align, CenterOf +from build123d.geometry import Location, Plane +from build123d.objects_part import Box +from build123d.objects_sketch import Circle +from build123d.topology import Compound, Edge, Face, ShapeList, Solid, Sketch +from tests.base_test import DirectApiTestCase + + +class TestCompound(DirectApiTestCase): + def test_make_text(self): + arc = Edge.make_three_point_arc((-50, 0, 0), (0, 20, 0), (50, 0, 0)) + text = Compound.make_text("test", 10, text_path=arc) + self.assertEqual(len(text.faces()), 4) + text = Compound.make_text( + "test", 10, align=(Align.MAX, Align.MAX), text_path=arc + ) + self.assertEqual(len(text.faces()), 4) + + def test_fuse(self): + box1 = Solid.make_box(1, 1, 1) + box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) + combined = Compound([box1]).fuse(box2, glue=True) + self.assertTrue(combined.is_valid()) + self.assertAlmostEqual(combined.volume, 2, 5) + fuzzy = Compound([box1]).fuse(box2, tol=1e-6) + self.assertTrue(fuzzy.is_valid()) + self.assertAlmostEqual(fuzzy.volume, 2, 5) + + def test_remove(self): + box1 = Solid.make_box(1, 1, 1) + box2 = Solid.make_box(1, 1, 1, Plane((2, 0, 0))) + combined = Compound([box1, box2]) + self.assertTrue(len(combined._remove(box2).solids()), 1) + + def test_repr(self): + simple = Compound([Solid.make_box(1, 1, 1)]) + simple_str = repr(simple).split("0x")[0] + repr(simple).split(", ")[1] + self.assertEqual(simple_str, "Compound at label()") + + assembly = Compound([Solid.make_box(1, 1, 1)]) + assembly.children = [Solid.make_box(1, 1, 1)] + assembly.label = "test" + assembly_str = repr(assembly).split("0x")[0] + repr(assembly).split(", l")[1] + self.assertEqual(assembly_str, "Compound at abel(test), #children(1)") + + def test_center(self): + test_compound = Compound( + [ + Solid.make_box(2, 2, 2).locate(Location((-1, -1, -1))), + Solid.make_box(1, 1, 1).locate(Location((8.5, -0.5, -0.5))), + ] + ) + self.assertVectorAlmostEquals(test_compound.center(CenterOf.MASS), (1, 0, 0), 5) + self.assertVectorAlmostEquals( + test_compound.center(CenterOf.BOUNDING_BOX), (4.25, 0, 0), 5 + ) + with self.assertRaises(ValueError): + test_compound.center(CenterOf.GEOMETRY) + + def test_triad(self): + triad = Compound.make_triad(10) + bbox = triad.bounding_box() + self.assertGreater(bbox.min.X, -10 / 8) + self.assertLess(bbox.min.X, 0) + self.assertGreater(bbox.min.Y, -10 / 8) + self.assertLess(bbox.min.Y, 0) + self.assertGreater(bbox.min.Y, -10 / 8) + self.assertAlmostEqual(bbox.min.Z, 0, 4) + self.assertLess(bbox.size.Z, 12.5) + self.assertEqual(triad.volume, 0) + + def test_volume(self): + e = Edge.make_line((0, 0), (1, 1)) + self.assertAlmostEqual(e.volume, 0, 5) + + f = Face.make_rect(1, 1) + self.assertAlmostEqual(f.volume, 0, 5) + + b = Solid.make_box(1, 1, 1) + self.assertAlmostEqual(b.volume, 1, 5) + + bb = Box(1, 1, 1) + self.assertAlmostEqual(bb.volume, 1, 5) + + c = Compound(children=[e, f, b, bb, b.translate((0, 5, 0))]) + self.assertAlmostEqual(c.volume, 3, 5) + # N.B. b and bb overlap but still add to Compound volume + + def test_constructor(self): + with self.assertRaises(TypeError): + Compound(foo="bar") + + def test_len(self): + self.assertEqual(len(Compound()), 0) + skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) + self.assertEqual(len(skt), 4) + + def test_iteration(self): + skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) + for c1, c2 in itertools.combinations(skt, 2): + self.assertGreaterEqual((c1.position - c2.position).length, 10) + + def test_unwrap(self): + skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) + skt2 = Compound(children=[skt]) + self.assertEqual(len(skt2), 1) + skt3 = skt2.unwrap(fully=False) + self.assertEqual(len(skt3), 4) + + comp1 = Compound().unwrap() + self.assertEqual(len(comp1), 0) + comp2 = Compound(children=[Face.make_rect(1, 1)]) + comp3 = Compound(children=[comp2]) + self.assertEqual(len(comp3), 1) + self.assertTrue(isinstance(next(iter(comp3)), Compound)) + comp4 = comp3.unwrap(fully=True) + self.assertTrue(isinstance(comp4, Face)) + + def test_get_top_level_shapes(self): + base_shapes = Compound(children=PolarLocations(15, 20) * Box(4, 4, 4)) + fls = base_shapes.get_top_level_shapes() + self.assertTrue(isinstance(fls, ShapeList)) + self.assertEqual(len(fls), 20) + self.assertTrue(all(isinstance(s, Solid) for s in fls)) + + b1 = Box(1, 1, 1).solid() + self.assertEqual(b1.get_top_level_shapes()[0], b1) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_direct_api_test_case.py b/tests/test_direct_api/test_direct_api_test_case.py new file mode 100644 index 0000000..a165857 --- /dev/null +++ b/tests/test_direct_api/test_direct_api_test_case.py @@ -0,0 +1,60 @@ +""" +build123d direct api tests + +name: test_direct_api_test_case.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from typing import Optional + +from build123d.geometry import Vector, VectorLike + + +class DirectApiTestCase(unittest.TestCase): + def assertTupleAlmostEquals( + self, + first: tuple[float, ...], + second: tuple[float, ...], + places: int, + msg: str | None = None, + ): + """Check Tuples""" + self.assertEqual(len(second), len(first)) + for i, j in zip(second, first): + self.assertAlmostEqual(i, j, places, msg=msg) + + def assertVectorAlmostEquals( + self, first: Vector, second: VectorLike, places: int, msg: str | None = None + ): + second_vector = Vector(second) + self.assertAlmostEqual(first.X, second_vector.X, places, msg=msg) + self.assertAlmostEqual(first.Y, second_vector.Y, places, msg=msg) + self.assertAlmostEqual(first.Z, second_vector.Z, places, msg=msg) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py new file mode 100644 index 0000000..da36172 --- /dev/null +++ b/tests/test_direct_api/test_edge.py @@ -0,0 +1,293 @@ +""" +build123d direct api tests + +name: test_edge.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.build_enums import AngularDirection +from build123d.geometry import Axis, Plane, Vector +from build123d.objects_curve import CenterArc, EllipticalCenterArc +from build123d.topology import Edge +from tests.base_test import DirectApiTestCase + + +class TestEdge(DirectApiTestCase): + def test_close(self): + self.assertAlmostEqual( + Edge.make_circle(1, end_angle=180).close().length, math.pi + 2, 5 + ) + self.assertAlmostEqual(Edge.make_circle(1).close().length, 2 * math.pi, 5) + + def test_make_half_circle(self): + half_circle = Edge.make_circle(radius=1, start_angle=0, end_angle=180) + self.assertVectorAlmostEquals(half_circle.start_point(), (1, 0, 0), 3) + self.assertVectorAlmostEquals(half_circle.end_point(), (-1, 0, 0), 3) + + def test_make_half_circle2(self): + half_circle = Edge.make_circle(radius=1, start_angle=270, end_angle=90) + self.assertVectorAlmostEquals(half_circle.start_point(), (0, -1, 0), 3) + self.assertVectorAlmostEquals(half_circle.end_point(), (0, 1, 0), 3) + + def test_make_clockwise_half_circle(self): + half_circle = Edge.make_circle( + radius=1, + start_angle=180, + end_angle=0, + angular_direction=AngularDirection.CLOCKWISE, + ) + self.assertVectorAlmostEquals(half_circle.end_point(), (1, 0, 0), 3) + self.assertVectorAlmostEquals(half_circle.start_point(), (-1, 0, 0), 3) + + def test_make_clockwise_half_circle2(self): + half_circle = Edge.make_circle( + radius=1, + start_angle=90, + end_angle=-90, + angular_direction=AngularDirection.CLOCKWISE, + ) + self.assertVectorAlmostEquals(half_circle.start_point(), (0, 1, 0), 3) + self.assertVectorAlmostEquals(half_circle.end_point(), (0, -1, 0), 3) + + def test_arc_center(self): + self.assertVectorAlmostEquals(Edge.make_ellipse(2, 1).arc_center, (0, 0, 0), 5) + with self.assertRaises(ValueError): + Edge.make_line((0, 0, 0), (0, 0, 1)).arc_center + + def test_spline_with_parameters(self): + spline = Edge.make_spline( + points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 0.4, 1.0] + ) + self.assertVectorAlmostEquals(spline.end_point(), (2, 0, 0), 5) + with self.assertRaises(ValueError): + Edge.make_spline( + points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 1.0] + ) + with self.assertRaises(ValueError): + Edge.make_spline( + points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], tangents=[(1, 1, 0)] + ) + + def test_spline_approx(self): + spline = Edge.make_spline_approx([(0, 0), (1, 1), (2, 1), (3, 0)]) + self.assertVectorAlmostEquals(spline.end_point(), (3, 0, 0), 5) + spline = Edge.make_spline_approx( + [(0, 0), (1, 1), (2, 1), (3, 0)], smoothing=(1.0, 5.0, 10.0) + ) + self.assertVectorAlmostEquals(spline.end_point(), (3, 0, 0), 5) + + def test_distribute_locations(self): + line = Edge.make_line((0, 0, 0), (10, 0, 0)) + locs = line.distribute_locations(3) + for i, x in enumerate([0, 5, 10]): + self.assertVectorAlmostEquals(locs[i].position, (x, 0, 0), 5) + self.assertVectorAlmostEquals(locs[0].orientation, (0, 90, 180), 5) + + locs = line.distribute_locations(3, positions_only=True) + for i, x in enumerate([0, 5, 10]): + self.assertVectorAlmostEquals(locs[i].position, (x, 0, 0), 5) + self.assertVectorAlmostEquals(locs[0].orientation, (0, 0, 0), 5) + + def test_to_wire(self): + edge = Edge.make_line((0, 0, 0), (1, 1, 1)) + for end in [0, 1]: + self.assertVectorAlmostEquals( + edge.position_at(end), + edge.to_wire().position_at(end), + 5, + ) + + def test_arc_center2(self): + edges = [ + Edge.make_circle(1, plane=Plane((1, 2, 3)), end_angle=30), + Edge.make_ellipse(1, 0.5, plane=Plane((1, 2, 3)), end_angle=30), + ] + for edge in edges: + self.assertVectorAlmostEquals(edge.arc_center, (1, 2, 3), 5) + with self.assertRaises(ValueError): + Edge.make_line((0, 0), (1, 1)).arc_center + + def test_find_intersection_points(self): + circle = Edge.make_circle(1) + line = Edge.make_line((0, -2), (0, 2)) + crosses = circle.find_intersection_points(line) + for target, actual in zip([(0, 1, 0), (0, -1, 0)], crosses): + self.assertVectorAlmostEquals(actual, target, 5) + + with self.assertRaises(ValueError): + circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) + with self.assertRaises(ValueError): + circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) + + self_intersect = Edge.make_spline([(-3, 2), (3, -2), (4, 0), (3, 2), (-3, -2)]) + self.assertVectorAlmostEquals( + self_intersect.find_intersection_points()[0], + (-2.6861636507066047, 0, 0), + 5, + ) + line = Edge.make_line((1, -2), (1, 2)) + crosses = line.find_intersection_points(Axis.X) + self.assertVectorAlmostEquals(crosses[0], (1, 0, 0), 5) + + with self.assertRaises(ValueError): + line.find_intersection_points(Plane.YZ) + + # def test_intersections_tolerance(self): + # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) + # l1 = Edge.make_line((1, 0), (2, 0)) + # i1 = l1.intersect(*r1) + + # r2 = Rectangle(2, 2).edges() + # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) + # i2 = l2.intersect(*r2) + + # self.assertEqual(len(i1.vertices()), len(i2.vertices())) + + def test_trim(self): + line = Edge.make_line((-2, 0), (2, 0)) + self.assertVectorAlmostEquals( + line.trim(0.25, 0.75).position_at(0), (-1, 0, 0), 5 + ) + self.assertVectorAlmostEquals( + line.trim(0.25, 0.75).position_at(1), (1, 0, 0), 5 + ) + with self.assertRaises(ValueError): + line.trim(0.75, 0.25) + + def test_trim_to_length(self): + + e1 = Edge.make_line((0, 0), (10, 10)) + e1_trim = e1.trim_to_length(0.0, 10) + self.assertAlmostEqual(e1_trim.length, 10, 5) + + e2 = Edge.make_circle(10, start_angle=0, end_angle=90) + e2_trim = e2.trim_to_length(0.5, 1) + self.assertAlmostEqual(e2_trim.length, 1, 5) + self.assertVectorAlmostEquals( + e2_trim.position_at(0), Vector(10, 0, 0).rotate(Axis.Z, 45), 5 + ) + + e3 = Edge.make_spline( + [(0, 10, 0), (-4, 5, 2), (0, 0, 0)], tangents=[(-1, 0), (1, 0)] + ) + e3_trim = e3.trim_to_length(0, 7) + self.assertAlmostEqual(e3_trim.length, 7, 5) + + a4 = Axis((0, 0, 0), (1, 1, 1)) + e4_trim = Edge(a4).trim_to_length(0.5, 2) + self.assertAlmostEqual(e4_trim.length, 2, 5) + + def test_bezier(self): + with self.assertRaises(ValueError): + Edge.make_bezier((1, 1)) + cntl_pnts = [(1, 2, 3)] * 30 + with self.assertRaises(ValueError): + Edge.make_bezier(*cntl_pnts) + with self.assertRaises(ValueError): + Edge.make_bezier((0, 0, 0), (1, 1, 1), weights=[1.0]) + + bezier = Edge.make_bezier((0, 0), (0, 1), (1, 1), (1, 0)) + bbox = bezier.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (0, 0, 0), 5) + self.assertVectorAlmostEquals(bbox.max, (1, 0.75, 0), 5) + + def test_mid_way(self): + mid = Edge.make_mid_way( + Edge.make_line((0, 0), (0, 1)), Edge.make_line((1, 0), (1, 1)), 0.25 + ) + self.assertVectorAlmostEquals(mid.position_at(0), (0.25, 0, 0), 5) + self.assertVectorAlmostEquals(mid.position_at(1), (0.25, 1, 0), 5) + + def test_distribute_locations2(self): + with self.assertRaises(ValueError): + Edge.make_circle(1).distribute_locations(1) + + locs = Edge.make_circle(1).distribute_locations(5, positions_only=True) + for i, loc in enumerate(locs): + self.assertVectorAlmostEquals( + loc.position, + Vector(1, 0, 0).rotate(Axis.Z, i * 90).to_tuple(), + 5, + ) + self.assertVectorAlmostEquals(loc.orientation, (0, 0, 0), 5) + + def test_find_tangent(self): + circle = Edge.make_circle(1) + parm = circle.find_tangent(135)[0] + self.assertVectorAlmostEquals( + circle @ parm, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 + ) + line = Edge.make_line((0, 0), (1, 1)) + parm = line.find_tangent(45)[0] + self.assertAlmostEqual(parm, 0, 5) + parm = line.find_tangent(0) + self.assertEqual(len(parm), 0) + + def test_param_at_point(self): + u = Edge.make_circle(1).param_at_point((0, 1)) + self.assertAlmostEqual(u, 0.25, 5) + + u = 0.3 + edge = Edge.make_line((0, 0), (34, 56)) + pnt = edge.position_at(u) + self.assertAlmostEqual(edge.param_at_point(pnt), u, 5) + + ca = CenterArc((0, 0), 1, -200, 220).edge() + for u in [0.3, 1.0]: + pnt = ca.position_at(u) + self.assertAlmostEqual(ca.param_at_point(pnt), u, 5) + + ea = EllipticalCenterArc((15, 0), 10, 5, start_angle=90, end_angle=270).edge() + for u in [0.3, 0.9]: + pnt = ea.position_at(u) + self.assertAlmostEqual(ea.param_at_point(pnt), u, 5) + + with self.assertRaises(ValueError): + edge.param_at_point((-1, 1)) + + def test_conical_helix(self): + helix = Edge.make_helix(1, 4, 1, normal=(-1, 0, 0), angle=10, lefthand=True) + self.assertAlmostEqual(helix.bounding_box().min.X, -4, 5) + + def test_reverse(self): + e1 = Edge.make_line((0, 0), (1, 1)) + self.assertVectorAlmostEquals(e1 @ 0.1, (0.1, 0.1, 0), 5) + self.assertVectorAlmostEquals(e1.reversed() @ 0.1, (0.9, 0.9, 0), 5) + + e2 = Edge.make_circle(1, start_angle=0, end_angle=180) + e2r = e2.reversed() + self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) + + def test_init(self): + with self.assertRaises(TypeError): + Edge(direction=(1, 0, 0)) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py new file mode 100644 index 0000000..45f8da5 --- /dev/null +++ b/tests/test_direct_api/test_face.py @@ -0,0 +1,459 @@ +""" +build123d direct api tests + +name: test_face.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import os +import platform +import random +import unittest + +from build123d.build_common import Locations +from build123d.build_enums import Align, CenterOf, GeomType +from build123d.build_line import BuildLine +from build123d.build_part import BuildPart +from build123d.build_sketch import BuildSketch +from build123d.exporters3d import export_stl +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.importers import import_stl +from build123d.objects_curve import Polyline +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import Rectangle, RegularPolygon +from build123d.operations_generic import fillet +from build123d.operations_part import extrude +from build123d.operations_sketch import make_face +from build123d.topology import Edge, Face, Solid, Wire +from tests.base_test import DirectApiTestCase + + +class TestFace(DirectApiTestCase): + def test_make_surface_from_curves(self): + bottom_edge = Edge.make_circle(radius=1, end_angle=90) + top_edge = Edge.make_circle(radius=1, plane=Plane((0, 0, 1)), end_angle=90) + curved = Face.make_surface_from_curves(bottom_edge, top_edge) + self.assertTrue(curved.is_valid()) + self.assertAlmostEqual(curved.area, math.pi / 2, 5) + self.assertVectorAlmostEquals( + curved.normal_at(), (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 + ) + + bottom_wire = Wire.make_circle(1) + top_wire = Wire.make_circle(1, Plane((0, 0, 1))) + curved = Face.make_surface_from_curves(bottom_wire, top_wire) + self.assertTrue(curved.is_valid()) + self.assertAlmostEqual(curved.area, 2 * math.pi, 5) + + def test_center(self): + test_face = Face(Wire.make_polygon([(0, 0), (1, 0), (1, 1), (0, 0)])) + self.assertVectorAlmostEquals( + test_face.center(CenterOf.MASS), (2 / 3, 1 / 3, 0), 1 + ) + self.assertVectorAlmostEquals( + test_face.center(CenterOf.BOUNDING_BOX), + (0.5, 0.5, 0), + 5, + ) + + def test_face_volume(self): + rect = Face.make_rect(1, 1) + self.assertAlmostEqual(rect.volume, 0, 5) + + def test_chamfer_2d(self): + test_face = Face.make_rect(10, 10) + test_face = test_face.chamfer_2d( + distance=1, distance2=2, vertices=test_face.vertices() + ) + self.assertAlmostEqual(test_face.area, 100 - 4 * 0.5 * 1 * 2) + + def test_chamfer_2d_reference(self): + test_face = Face.make_rect(10, 10) + edge = test_face.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + test_face = test_face.chamfer_2d( + distance=1, distance2=2, vertices=[vertex], edge=edge + ) + self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 9) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 8) + + def test_chamfer_2d_reference_inverted(self): + test_face = Face.make_rect(10, 10) + edge = test_face.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + test_face = test_face.chamfer_2d( + distance=2, distance2=1, vertices=[vertex], edge=edge + ) + self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 8) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 9) + + def test_chamfer_2d_error_checking(self): + with self.assertRaises(ValueError): + test_face = Face.make_rect(10, 10) + edge = test_face.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + other_edge = test_face.edges().sort_by(Axis.Y)[-1] + test_face = test_face.chamfer_2d( + distance=1, distance2=2, vertices=[vertex], edge=other_edge + ) + + def test_make_rect(self): + test_face = Face.make_plane() + self.assertVectorAlmostEquals(test_face.normal_at(), (0, 0, 1), 5) + + def test_length_width(self): + test_face = Face.make_rect(8, 10, Plane.XZ) + self.assertAlmostEqual(test_face.length, 8, 5) + self.assertAlmostEqual(test_face.width, 10, 5) + + def test_geometry(self): + box = Solid.make_box(1, 1, 2) + self.assertEqual(box.faces().sort_by(Axis.Z).last.geometry, "SQUARE") + self.assertEqual(box.faces().sort_by(Axis.Y).last.geometry, "RECTANGLE") + with BuildPart() as test: + with BuildSketch(): + RegularPolygon(1, 3) + extrude(amount=1) + self.assertEqual(test.faces().sort_by(Axis.Z).last.geometry, "POLYGON") + + def test_is_planar(self): + self.assertTrue(Face.make_rect(1, 1).is_planar) + self.assertFalse( + Solid.make_cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0].is_planar + ) + # Some of these faces have geom_type BSPLINE but are planar + mount = Solid.make_loft( + [ + Rectangle((1 + 16 + 4), 20, align=(Align.MIN, Align.CENTER)).wire(), + Pos(1, 0, 4) + * Rectangle(16, 20, align=(Align.MIN, Align.CENTER)).wire(), + ], + ) + self.assertTrue(all(f.is_planar for f in mount.faces())) + + def test_negate(self): + square = Face.make_rect(1, 1) + self.assertVectorAlmostEquals(square.normal_at(), (0, 0, 1), 5) + flipped_square = -square + self.assertVectorAlmostEquals(flipped_square.normal_at(), (0, 0, -1), 5) + + def test_offset(self): + bbox = Face.make_rect(2, 2, Plane.XY).offset(5).bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-1, -1, 5), 5) + self.assertVectorAlmostEquals(bbox.max, (1, 1, 5), 5) + + def test_make_from_wires(self): + outer = Wire.make_circle(10) + inners = [ + Wire.make_circle(1).locate(Location((-2, 2, 0))), + Wire.make_circle(1).locate(Location((2, 2, 0))), + ] + happy = Face(outer, inners) + self.assertAlmostEqual(happy.area, math.pi * (10**2 - 2), 5) + + outer = Edge.make_circle(10, end_angle=180).to_wire() + with self.assertRaises(ValueError): + Face(outer, inners) + with self.assertRaises(ValueError): + Face(Wire.make_circle(10, Plane.XZ), inners) + + outer = Wire.make_circle(10) + inners = [ + Wire.make_circle(1).locate(Location((-2, 2, 0))), + Edge.make_circle(1, end_angle=180).to_wire().locate(Location((2, 2, 0))), + ] + with self.assertRaises(ValueError): + Face(outer, inners) + + def test_sew_faces(self): + patches = [ + Face.make_rect(1, 1, Plane((x, y, z))) + for x in range(2) + for y in range(2) + for z in range(3) + ] + random.shuffle(patches) + sheets = Face.sew_faces(patches) + self.assertEqual(len(sheets), 3) + self.assertEqual(len(sheets[0]), 4) + self.assertTrue(isinstance(sheets[0][0], Face)) + + def test_surface_from_array_of_points(self): + pnts = [ + [ + Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) + for x in range(11) + ] + for y in range(11) + ] + surface = Face.make_surface_from_array_of_points(pnts) + bbox = surface.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (0, 0, -1), 3) + self.assertVectorAlmostEquals(bbox.max, (10, 10, 2), 2) + + def test_bezier_surface(self): + points = [ + [ + (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) + for x in range(-1, 2) + ] + for y in range(-1, 2) + ] + surface = Face.make_bezier_surface(points) + bbox = surface.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-1, -1, 0), 3) + self.assertVectorAlmostEquals(bbox.max, (+1, +1, +1), 1) + self.assertLess(bbox.max.Z, 1.0) + + weights = [ + [2 if x == 0 or y == 0 else 1 for x in range(-1, 2)] for y in range(-1, 2) + ] + surface = Face.make_bezier_surface(points, weights) + bbox = surface.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-1, -1, 0), 3) + self.assertGreater(bbox.max.Z, 1.0) + + too_many_points = [ + [ + (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) + for x in range(-1, 27) + ] + for y in range(-1, 27) + ] + + with self.assertRaises(ValueError): + Face.make_bezier_surface([[(0, 0)]]) + with self.assertRaises(ValueError): + Face.make_bezier_surface(points, [[1, 1], [1, 1]]) + with self.assertRaises(ValueError): + Face.make_bezier_surface(too_many_points) + + def test_thicken(self): + pnts = [ + [ + Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) + for x in range(11) + ] + for y in range(11) + ] + surface = Face.make_surface_from_array_of_points(pnts) + solid = Solid.thicken(surface, 1) + self.assertAlmostEqual(solid.volume, 101.59, 2) + + square = Face.make_rect(10, 10) + bbox = Solid.thicken(square, 1, normal_override=(0, 0, -1)).bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-5, -5, -1), 5) + self.assertVectorAlmostEquals(bbox.max, (5, 5, 0), 5) + + def test_make_holes(self): + radius = 10 + circumference = 2 * math.pi * radius + hex_diagonal = 4 * (circumference / 10) / 3 + cylinder = Solid.make_cylinder(radius, hex_diagonal * 5) + cylinder_wall: Face = cylinder.faces().filter_by(GeomType.PLANE, reverse=True)[ + 0 + ] + with BuildSketch(Plane.XZ.offset(radius)) as hex: + with Locations((0, hex_diagonal)): + RegularPolygon( + hex_diagonal * 0.4, 6, align=(Align.CENTER, Align.CENTER) + ) + hex_wire_vertical: Wire = hex.sketch.faces()[0].outer_wire() + + projected_wire: Wire = hex_wire_vertical.project_to_shape( + target_object=cylinder, center=(0, 0, hex_wire_vertical.center().Z) + )[0] + projected_wires = [ + projected_wire.rotate(Axis.Z, -90 + i * 360 / 10).translate( + (0, 0, (j + (i % 2) / 2) * hex_diagonal) + ) + for i in range(5) + for j in range(4 - i % 2) + ] + cylinder_walls_with_holes = cylinder_wall.make_holes(projected_wires) + self.assertTrue(cylinder_walls_with_holes.is_valid()) + self.assertLess(cylinder_walls_with_holes.area, cylinder_wall.area) + + def test_is_inside(self): + square = Face.make_rect(10, 10) + self.assertTrue(square.is_inside((1, 1))) + self.assertFalse(square.is_inside((20, 1))) + + def test_import_stl(self): + torus = Solid.make_torus(10, 1) + # exporter = Mesher() + # exporter.add_shape(torus) + # exporter.write("test_torus.stl") + export_stl(torus, "test_torus.stl") + imported_torus = import_stl("test_torus.stl") + # The torus from stl is tessellated therefore the areas will only be close + self.assertAlmostEqual(imported_torus.area, torus.area, 0) + os.remove("test_torus.stl") + + def test_is_coplanar(self): + square = Face.make_rect(1, 1, plane=Plane.XZ) + self.assertTrue(square.is_coplanar(Plane.XZ)) + self.assertTrue((-square).is_coplanar(Plane.XZ)) + self.assertFalse(square.is_coplanar(Plane.XY)) + surface: Face = Solid.make_sphere(1).faces()[0] + self.assertFalse(surface.is_coplanar(Plane.XY)) + + def test_center_location(self): + square = Face.make_rect(1, 1, plane=Plane.XZ) + cl = square.center_location + self.assertVectorAlmostEquals(cl.position, (0, 0, 0), 5) + self.assertVectorAlmostEquals(Plane(cl).z_dir, Plane.XZ.z_dir, 5) + + def test_position_at(self): + square = Face.make_rect(2, 2, plane=Plane.XZ.offset(1)) + p = square.position_at(0.25, 0.75) + self.assertVectorAlmostEquals(p, (-0.5, -1.0, 0.5), 5) + + def test_location_at(self): + bottom = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.Z)[0] + loc = bottom.location_at(0.5, 0.5) + self.assertVectorAlmostEquals(loc.position, (0.5, 1, 0), 5) + self.assertVectorAlmostEquals(loc.orientation, (-180, 0, -180), 5) + + front = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.X)[0] + loc = front.location_at(0.5, 0.5, x_dir=(0, 0, 1)) + self.assertVectorAlmostEquals(loc.position, (0.0, 1.0, 1.5), 5) + self.assertVectorAlmostEquals(loc.orientation, (0, -90, 0), 5) + + def test_make_surface(self): + corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] + net_exterior = Wire( + [ + Edge.make_line(corners[3], corners[1]), + Edge.make_line(corners[1], corners[0]), + Edge.make_line(corners[0], corners[2]), + Edge.make_three_point_arc( + corners[2], + (corners[2] + corners[3]) / 2 - Vector(0, 0, 3), + corners[3], + ), + ] + ) + surface = Face.make_surface( + net_exterior, + surface_points=[Vector(0, 0, -5)], + ) + hole_flat = Wire.make_circle(10) + hole = hole_flat.project_to_shape(surface, (0, 0, -1))[0] + surface = Face.make_surface( + exterior=net_exterior, + surface_points=[Vector(0, 0, -5)], + interior_wires=[hole], + ) + self.assertTrue(surface.is_valid()) + self.assertEqual(surface.geom_type, GeomType.BSPLINE) + bbox = surface.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-50.5, -24.5, -5.113393280136395), 5) + self.assertVectorAlmostEquals(bbox.max, (50.5, 24.5, 0), 5) + + # With no surface point + surface = Face.make_surface(net_exterior) + bbox = surface.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-50.5, -24.5, -3), 5) + self.assertVectorAlmostEquals(bbox.max, (50.5, 24.5, 0), 5) + + # Exterior Edge + surface = Face.make_surface([Edge.make_circle(50)], surface_points=[(0, 0, -5)]) + bbox = surface.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-50, -50, -5), 5) + self.assertVectorAlmostEquals(bbox.max, (50, 50, 0), 5) + + def test_make_surface_error_checking(self): + with self.assertRaises(ValueError): + Face.make_surface(Edge.make_line((0, 0), (1, 0))) + + with self.assertRaises(RuntimeError): + Face.make_surface([Edge.make_line((0, 0), (1, 0))]) + + if platform.system() != "Darwin": + with self.assertRaises(RuntimeError): + Face.make_surface( + [Edge.make_circle(50)], surface_points=[(0, 0, -50), (0, 0, 50)] + ) + + with self.assertRaises(RuntimeError): + Face.make_surface( + [Edge.make_circle(50)], + interior_wires=[Wire.make_circle(5, Plane.XZ)], + ) + + def test_sweep(self): + edge = Edge.make_line((1, 0), (2, 0)) + path = Wire.make_circle(1) + circle_with_hole = Face.sweep(edge, path) + self.assertTrue(isinstance(circle_with_hole, Face)) + self.assertAlmostEqual(circle_with_hole.area, math.pi * (2**2 - 1**1), 5) + with self.assertRaises(ValueError): + Face.sweep(edge, Polyline((0, 0), (0.1, 0), (0.2, 0.1))) + + def test_to_arcs(self): + with BuildSketch() as bs: + with BuildLine() as bl: + Polyline((0, 0), (1, 0), (1.5, 0.5), (2, 0), (2, 1), (0, 1), (0, 0)) + fillet(bl.vertices(), radius=0.1) + make_face() + smooth = bs.faces()[0] + fragmented = smooth.to_arcs() + self.assertLess(len(smooth.edges()), len(fragmented.edges())) + + def test_outer_wire(self): + face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() + self.assertAlmostEqual(face.outer_wire().length, 4, 5) + + def test_wire(self): + face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() + with self.assertWarns(UserWarning): + outer = face.wire() + self.assertAlmostEqual(outer.length, 4, 5) + + def test_constructor(self): + with self.assertRaises(ValueError): + Face(bob="fred") + + def test_normal_at(self): + face = Face.make_rect(1, 1) + self.assertVectorAlmostEquals(face.normal_at(0, 0), (0, 0, 1), 5) + self.assertVectorAlmostEquals( + face.normal_at(face.position_at(0, 0)), (0, 0, 1), 5 + ) + with self.assertRaises(ValueError): + face.normal_at(0) + with self.assertRaises(ValueError): + face.normal_at(center=(0, 0)) + face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] + self.assertVectorAlmostEquals(face.normal_at(0, 1), (1, 0, 0), 5) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_functions.py b/tests/test_direct_api/test_functions.py new file mode 100644 index 0000000..3f2bdf2 --- /dev/null +++ b/tests/test_direct_api/test_functions.py @@ -0,0 +1,107 @@ +""" +build123d direct api tests + +name: test_functions.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.geometry import Plane, Vector +from build123d.objects_part import Box +from build123d.topology import ( + Compound, + Face, + Solid, + edges_to_wires, + polar, + new_edges, + delta, + unwrap_topods_compound, +) + + +class TestFunctions(unittest.TestCase): + def test_edges_to_wires(self): + square_edges = Face.make_rect(1, 1).edges() + rectangle_edges = Face.make_rect(2, 1, Plane((5, 0))).edges() + wires = edges_to_wires(square_edges + rectangle_edges) + self.assertEqual(len(wires), 2) + self.assertAlmostEqual(wires[0].length, 4, 5) + self.assertAlmostEqual(wires[1].length, 6, 5) + + def test_polar(self): + pnt = polar(1, 30) + self.assertAlmostEqual(pnt[0], math.sqrt(3) / 2, 5) + self.assertAlmostEqual(pnt[1], 0.5, 5) + + def test_new_edges(self): + c = Solid.make_cylinder(1, 5) + s = Solid.make_sphere(2) + s_minus_c = s - c + seams = new_edges(c, s, combined=s_minus_c) + self.assertEqual(len(seams), 1) + self.assertAlmostEqual(seams[0].radius, 1, 5) + + def test_delta(self): + cyl = Solid.make_cylinder(1, 5) + sph = Solid.make_sphere(2) + con = Solid.make_cone(2, 1, 2) + plug = delta([cyl, sph, con], [sph, con]) + self.assertEqual(len(plug), 1) + self.assertEqual(plug[0], cyl) + + def test_parse_intersect_args(self): + + with self.assertRaises(TypeError): + Vector(1, 1, 1) & ("x", "y", "z") + + def test_unwrap_topods_compound(self): + # Complex Compound + b1 = Box(1, 1, 1).solid() + b2 = Box(2, 2, 2).solid() + c1 = Compound([b1, b2]) + c2 = Compound([b1, c1]) + c3 = Compound([c2]) + c4 = Compound([c3]) + self.assertEqual(c4.wrapped.NbChildren(), 1) + c5 = Compound(unwrap_topods_compound(c4.wrapped, False)) + self.assertEqual(c5.wrapped.NbChildren(), 2) + + # unwrap fully + c0 = Compound([b1]) + c1 = Compound([c0]) + result = Compound.cast(unwrap_topods_compound(c1.wrapped, True)) + self.assertTrue(isinstance(result, Solid)) + + # unwrap not fully + result = Compound.cast(unwrap_topods_compound(c1.wrapped, False)) + self.assertTrue(isinstance(result, Compound)) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_group_by.py b/tests/test_direct_api/test_group_by.py new file mode 100644 index 0000000..6d0ed3f --- /dev/null +++ b/tests/test_direct_api/test_group_by.py @@ -0,0 +1,71 @@ +""" +build123d direct api tests + +name: test_group_by.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import pprint +import unittest + +from build123d.geometry import Axis +from build123d.topology import Solid + + +class TestGroupBy(unittest.TestCase): + + def setUp(self): + # Ensure the class variable is in its default state before each test + self.v = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) + + def test_str(self): + self.assertEqual( + str(self.v), + f"""[[Vertex(0.0, 0.0, 0.0), + Vertex(0.0, 1.0, 0.0), + Vertex(1.0, 0.0, 0.0), + Vertex(1.0, 1.0, 0.0)], + [Vertex(0.0, 0.0, 1.0), + Vertex(0.0, 1.0, 1.0), + Vertex(1.0, 0.0, 1.0), + Vertex(1.0, 1.0, 1.0)]]""", + ) + + def test_repr(self): + self.assertEqual( + repr(self.v), + "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", + ) + + def test_pp(self): + self.assertEqual( + pprint.pformat(self.v), + "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", + ) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_import_export.py b/tests/test_direct_api/test_import_export.py new file mode 100644 index 0000000..9dbabce --- /dev/null +++ b/tests/test_direct_api/test_import_export.py @@ -0,0 +1,70 @@ +""" +build123d direct api tests + +name: test_import_export.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import os +import unittest + +from build123d.exporters3d import export_brep, export_step +from build123d.importers import import_brep, import_step, import_stl +from build123d.mesher import Mesher +from build123d.topology import Solid +from tests.base_test import DirectApiTestCase + + +class TestImportExport(DirectApiTestCase): + def test_import_export(self): + original_box = Solid.make_box(1, 1, 1) + export_step(original_box, "test_box.step") + step_box = import_step("test_box.step") + self.assertTrue(step_box.is_valid()) + self.assertAlmostEqual(step_box.volume, 1, 5) + export_brep(step_box, "test_box.brep") + brep_box = import_brep("test_box.brep") + self.assertTrue(brep_box.is_valid()) + self.assertAlmostEqual(brep_box.volume, 1, 5) + os.remove("test_box.step") + os.remove("test_box.brep") + with self.assertRaises(FileNotFoundError): + step_box = import_step("test_box.step") + + def test_import_stl(self): + # export solid + original_box = Solid.make_box(1, 2, 3) + exporter = Mesher() + exporter.add_shape(original_box) + exporter.write("test.stl") + + # import as face + stl_box = import_stl("test.stl") + self.assertVectorAlmostEquals(stl_box.position, (0, 0, 0), 5) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_jupyter.py b/tests/test_direct_api/test_jupyter.py new file mode 100644 index 0000000..870be3f --- /dev/null +++ b/tests/test_direct_api/test_jupyter.py @@ -0,0 +1,60 @@ +""" +build123d direct api tests + +name: test_jupyter.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import Vector +from build123d.jupyter_tools import to_vtkpoly_string, display +from build123d.topology import Solid +from tests.base_test import DirectApiTestCase + + +class TestJupyter(DirectApiTestCase): + def test_repr_javascript(self): + shape = Solid.make_box(1, 1, 1) + + # Test no exception on rendering to js + js1 = shape._repr_javascript_() + + assert "function render" in js1 + + def test_display_error(self): + with self.assertRaises(AttributeError): + display(Vector()) + + with self.assertRaises(ValueError): + to_vtkpoly_string("invalid") + + with self.assertRaises(ValueError): + display("invalid") + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py new file mode 100644 index 0000000..662d28f --- /dev/null +++ b/tests/test_direct_api/test_location.py @@ -0,0 +1,392 @@ +""" +build123d direct api tests + +name: test_location.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import json +import math +import os +import unittest +from random import uniform + +from OCP.gp import ( + gp_Ax1, + gp_Dir, + gp_EulerSequence, + gp_Pnt, + gp_Quaternion, + gp_Trsf, + gp_Vec, +) +from build123d.build_common import GridLocations +from build123d.build_enums import Extrinsic, Intrinsic +from build123d.geometry import Axis, Location, LocationEncoder, Plane, Pos, Vector +from build123d.topology import Edge, Solid, Vertex +from tests.base_test import DirectApiTestCase, RAD2DEG, AlwaysEqual + + +class TestLocation(DirectApiTestCase): + def test_location(self): + loc0 = Location() + T = loc0.wrapped.Transformation().TranslationPart() + self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 0), 6) + angle = loc0.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + self.assertAlmostEqual(0, angle) + + # Tuple + loc0 = Location((0, 0, 1)) + + T = loc0.wrapped.Transformation().TranslationPart() + self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + + # List + loc0 = Location([0, 0, 1]) + + T = loc0.wrapped.Transformation().TranslationPart() + self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + + # Vector + loc1 = Location(Vector(0, 0, 1)) + + T = loc1.wrapped.Transformation().TranslationPart() + self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + + # rotation + translation + loc2 = Location(Vector(0, 0, 1), Vector(0, 0, 1), 45) + + angle = loc2.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + self.assertAlmostEqual(45, angle) + + # gp_Trsf + T = gp_Trsf() + T.SetTranslation(gp_Vec(0, 0, 1)) + loc3 = Location(T) + + self.assertEqual( + loc1.wrapped.Transformation().TranslationPart().Z(), + loc3.wrapped.Transformation().TranslationPart().Z(), + ) + + # Test creation from the OCP.gp.gp_Trsf object + loc4 = Location(gp_Trsf()) + self.assertTupleAlmostEquals(loc4.to_tuple()[0], (0, 0, 0), 7) + self.assertTupleAlmostEquals(loc4.to_tuple()[1], (0, 0, 0), 7) + + # Test creation from Plane and Vector + loc4 = Location(Plane.XY, (0, 0, 1)) + self.assertTupleAlmostEquals(loc4.to_tuple()[0], (0, 0, 1), 7) + self.assertTupleAlmostEquals(loc4.to_tuple()[1], (0, 0, 0), 7) + + # Test composition + loc4 = Location((0, 0, 0), Vector(0, 0, 1), 15) + + loc5 = loc1 * loc4 + loc6 = loc4 * loc4 + loc7 = loc4**2 + + T = loc5.wrapped.Transformation().TranslationPart() + self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + + angle5 = ( + loc5.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + ) + self.assertAlmostEqual(15, angle5) + + angle6 = ( + loc6.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + ) + self.assertAlmostEqual(30, angle6) + + angle7 = ( + loc7.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + ) + self.assertAlmostEqual(30, angle7) + + # Test error handling on creation + with self.assertRaises(TypeError): + Location("xy_plane") + + # Test that the computed rotation matrix and intrinsic euler angles return the same + + about_x = uniform(-2 * math.pi, 2 * math.pi) + about_y = uniform(-2 * math.pi, 2 * math.pi) + about_z = uniform(-2 * math.pi, 2 * math.pi) + + rot_x = gp_Trsf() + rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), about_x) + rot_y = gp_Trsf() + rot_y.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), about_y) + rot_z = gp_Trsf() + rot_z.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), about_z) + loc1 = Location(rot_x * rot_y * rot_z) + + q = gp_Quaternion() + q.SetEulerAngles( + gp_EulerSequence.gp_Intrinsic_XYZ, + about_x, + about_y, + about_z, + ) + t = gp_Trsf() + t.SetRotationPart(q) + loc2 = Location(t) + + self.assertTupleAlmostEquals(loc1.to_tuple()[0], loc2.to_tuple()[0], 6) + self.assertTupleAlmostEquals(loc1.to_tuple()[1], loc2.to_tuple()[1], 6) + + loc1 = Location((1, 2), 34) + self.assertTupleAlmostEquals(loc1.to_tuple()[0], (1, 2, 0), 6) + self.assertTupleAlmostEquals(loc1.to_tuple()[1], (0, 0, 34), 6) + + rot_angles = (-115.00, 35.00, -135.00) + loc2 = Location((1, 2, 3), rot_angles) + self.assertTupleAlmostEquals(loc2.to_tuple()[0], (1, 2, 3), 6) + self.assertTupleAlmostEquals(loc2.to_tuple()[1], rot_angles, 6) + + loc3 = Location(loc2) + self.assertTupleAlmostEquals(loc3.to_tuple()[0], (1, 2, 3), 6) + self.assertTupleAlmostEquals(loc3.to_tuple()[1], rot_angles, 6) + + def test_location_parameters(self): + loc = Location((10, 20, 30)) + self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) + + loc = Location((10, 20, 30), (10, 20, 30)) + self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) + self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) + + loc = Location((10, 20, 30), (10, 20, 30), Intrinsic.XYZ) + self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) + self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) + + loc = Location((10, 20, 30), (30, 20, 10), Extrinsic.ZYX) + self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) + self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) + + with self.assertRaises(TypeError): + Location(x=10) + + with self.assertRaises(TypeError): + Location((10, 20, 30), (30, 20, 10), (10, 20, 30)) + + with self.assertRaises(TypeError): + Location(Intrinsic.XYZ) + + def test_location_repr_and_str(self): + self.assertEqual( + repr(Location()), "(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))" + ) + self.assertEqual( + str(Location()), + "Location: (position=(0.00, 0.00, 0.00), orientation=(-0.00, 0.00, -0.00))", + ) + loc = Location((1, 2, 3), (33, 45, 67)) + self.assertEqual( + str(loc), + "Location: (position=(1.00, 2.00, 3.00), orientation=(33.00, 45.00, 67.00))", + ) + + def test_location_inverted(self): + loc = Location(Plane.XZ) + self.assertVectorAlmostEquals(loc.inverse().orientation, (-90, 0, 0), 6) + + def test_set_position(self): + loc = Location(Plane.XZ) + loc.position = (1, 2, 3) + self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 6) + self.assertVectorAlmostEquals(loc.orientation, (90, 0, 0), 6) + + def test_set_orientation(self): + loc = Location((1, 2, 3), (90, 0, 0)) + loc.orientation = (-90, 0, 0) + self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 6) + self.assertVectorAlmostEquals(loc.orientation, (-90, 0, 0), 6) + + def test_copy(self): + loc1 = Location((1, 2, 3), (90, 45, 22.5)) + loc2 = copy.copy(loc1) + loc3 = copy.deepcopy(loc1) + self.assertVectorAlmostEquals(loc1.position, loc2.position.to_tuple(), 6) + self.assertVectorAlmostEquals(loc1.orientation, loc2.orientation.to_tuple(), 6) + self.assertVectorAlmostEquals(loc1.position, loc3.position.to_tuple(), 6) + self.assertVectorAlmostEquals(loc1.orientation, loc3.orientation.to_tuple(), 6) + + def test_to_axis(self): + axis = Location((1, 2, 3), (-90, 0, 0)).to_axis() + self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 6) + self.assertVectorAlmostEquals(axis.direction, (0, 1, 0), 6) + + def test_equal(self): + loc = Location((1, 2, 3), (4, 5, 6)) + same = Location((1, 2, 3), (4, 5, 6)) + + self.assertEqual(loc, same) + self.assertEqual(loc, AlwaysEqual()) + + def test_not_equal(self): + loc = Location((1, 2, 3), (40, 50, 60)) + diff_position = Location((3, 2, 1), (40, 50, 60)) + diff_orientation = Location((1, 2, 3), (60, 50, 40)) + + self.assertNotEqual(loc, diff_position) + self.assertNotEqual(loc, diff_orientation) + self.assertNotEqual(loc, object()) + + def test_neg(self): + loc = Location((1, 2, 3), (0, 35, 127)) + n_loc = -loc + self.assertVectorAlmostEquals(n_loc.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(n_loc.orientation, (180, -35, -127), 5) + + def test_mult_iterable(self): + locs = Location((1, 2, 0)) * GridLocations(4, 4, 2, 1) + self.assertVectorAlmostEquals(locs[0].position, (-1, 2, 0), 5) + self.assertVectorAlmostEquals(locs[1].position, (3, 2, 0), 5) + + def test_as_json(self): + data_dict = { + "part1": { + "joint_one": Location((1, 2, 3), (4, 5, 6)), + "joint_two": Location((7, 8, 9), (10, 11, 12)), + }, + "part2": { + "joint_one": Location((13, 14, 15), (16, 17, 18)), + "joint_two": Location((19, 20, 21), (22, 23, 24)), + }, + } + + # Serializing json with custom Location encoder + json_object = json.dumps(data_dict, indent=4, cls=LocationEncoder) + + # Writing to sample.json + with open("sample.json", "w") as outfile: + outfile.write(json_object) + + # Reading from sample.json + with open("sample.json") as infile: + read_json = json.load(infile, object_hook=LocationEncoder.location_hook) + + # Validate locations + for key, value in read_json.items(): + for k, v in value.items(): + if key == "part1" and k == "joint_one": + self.assertVectorAlmostEquals(v.position, (1, 2, 3), 5) + elif key == "part1" and k == "joint_two": + self.assertVectorAlmostEquals(v.position, (7, 8, 9), 5) + elif key == "part2" and k == "joint_one": + self.assertVectorAlmostEquals(v.position, (13, 14, 15), 5) + elif key == "part2" and k == "joint_two": + self.assertVectorAlmostEquals(v.position, (19, 20, 21), 5) + else: + self.assertTrue(False) + os.remove("sample.json") + + def test_intersection(self): + e = Edge.make_line((0, 0, 0), (1, 1, 1)) + l0 = e.location_at(0) + l1 = e.location_at(1) + self.assertIsNone(l0 & l1) + self.assertEqual(l1 & l1, l1) + + i = l1 & Vector(1, 1, 1) + self.assertTrue(isinstance(i, Vector)) + self.assertVectorAlmostEquals(i, (1, 1, 1), 5) + + i = l1 & Axis((0.5, 0.5, 0.5), (1, 1, 1)) + self.assertTrue(isinstance(i, Location)) + self.assertEqual(i, l1) + + p = Plane.XY.rotated((45, 0, 0)).shift_origin((1, 0, 0)) + l = Location((1, 0, 0), (1, 0, 0), 45) + i = l & p + self.assertTrue(isinstance(i, Location)) + self.assertVectorAlmostEquals(i.position, (1, 0, 0), 5) + self.assertVectorAlmostEquals(i.orientation, l.orientation, 5) + + b = Solid.make_box(1, 1, 1) + l = Location((0.5, 0.5, 0.5), (1, 0, 0), 45) + i = (l & b).vertex() + self.assertTrue(isinstance(i, Vertex)) + self.assertVectorAlmostEquals(Vector(i), (0.5, 0.5, 0.5), 5) + + e1 = Edge.make_line((0, -1), (2, 1)) + e2 = Edge.make_line((0, 1), (2, -1)) + e3 = Edge.make_line((0, 0), (2, 0)) + + i = e1.intersect(e2, e3) + self.assertTrue(isinstance(i, Vertex)) + self.assertVectorAlmostEquals(i, (1, 0, 0), 5) + + e4 = Edge.make_line((1, -1), (1, 1)) + e5 = Edge.make_line((2, -1), (2, 1)) + i = e3.intersect(e4, e5) + self.assertIsNone(i) + + self.assertIsNone(b.intersect(b.moved(Pos(X=10)))) + + # Look for common vertices + e1 = Edge.make_line((0, 0), (1, 0)) + e2 = Edge.make_line((1, 0), (1, 1)) + e3 = Edge.make_line((1, 0), (2, 0)) + i = e1.intersect(e2) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + i = e1.intersect(e3) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + + # Intersect with plane + e1 = Edge.make_line((0, 0), (2, 0)) + p1 = Plane.YZ.offset(1) + i = e1.intersect(p1) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + + e2 = Edge.make_line(p1.origin, p1.origin + 2 * p1.x_dir) + i = e2.intersect(p1) + self.assertEqual(len(i.vertices()), 2) + self.assertEqual(len(i.edges()), 1) + self.assertAlmostEqual(i.edge().length, 2, 5) + + with self.assertRaises(ValueError): + e1.intersect("line") + + def test_pos(self): + with self.assertRaises(TypeError): + Pos(0, "foo") + self.assertEqual(Pos(1, 2, 3).position, Vector(1, 2, 3)) + self.assertEqual(Pos((1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(v=(1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(X=1, Y=2, Z=3).position, Vector(1, 2, 3)) + self.assertEqual(Pos(Vector(1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(1, Y=2, Z=3).position, Vector(1, 2, 3)) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_matrix.py b/tests/test_direct_api/test_matrix.py new file mode 100644 index 0000000..23d9fbc --- /dev/null +++ b/tests/test_direct_api/test_matrix.py @@ -0,0 +1,197 @@ +""" +build123d direct api tests + +name: test_matrix.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import math +import unittest + +from OCP.gp import gp_Ax1, gp_Dir, gp_Pnt, gp_Trsf +from build123d.geometry import Axis, Matrix, Vector +from tests.base_test import DirectApiTestCase, DEG2RAD + + +class TestMatrix(DirectApiTestCase): + def test_matrix_creation_and_access(self): + def matrix_vals(m): + return [[m[r, c] for c in range(4)] for r in range(4)] + + # default constructor creates a 4x4 identity matrix + m = Matrix() + identity = [ + [1.0, 0.0, 0.0, 0.0], + [0.0, 1.0, 0.0, 0.0], + [0.0, 0.0, 1.0, 0.0], + [0.0, 0.0, 0.0, 1.0], + ] + self.assertEqual(identity, matrix_vals(m)) + + vals4x4 = [ + [1.0, 0.0, 0.0, 1.0], + [0.0, 1.0, 0.0, 2.0], + [0.0, 0.0, 1.0, 3.0], + [0.0, 0.0, 0.0, 1.0], + ] + vals4x4_tuple = tuple(tuple(r) for r in vals4x4) + + # test constructor with 16-value input + m = Matrix(vals4x4) + self.assertEqual(vals4x4, matrix_vals(m)) + m = Matrix(vals4x4_tuple) + self.assertEqual(vals4x4, matrix_vals(m)) + + # test constructor with 12-value input (the last 4 are an implied + # [0,0,0,1]) + m = Matrix(vals4x4[:3]) + self.assertEqual(vals4x4, matrix_vals(m)) + m = Matrix(vals4x4_tuple[:3]) + self.assertEqual(vals4x4, matrix_vals(m)) + + # Test 16-value input with invalid values for the last 4 + invalid = [ + [1.0, 0.0, 0.0, 1.0], + [0.0, 1.0, 0.0, 2.0], + [0.0, 0.0, 1.0, 3.0], + [1.0, 2.0, 3.0, 4.0], + ] + with self.assertRaises(ValueError): + Matrix(invalid) + # Test input with invalid type + with self.assertRaises(TypeError): + Matrix("invalid") + # Test input with invalid size / nested types + with self.assertRaises(TypeError): + Matrix([[1, 2, 3, 4], [1, 2, 3], [1, 2, 3, 4]]) + with self.assertRaises(TypeError): + Matrix([1, 2, 3]) + + # Invalid sub-type + with self.assertRaises(TypeError): + Matrix([[1, 2, 3, 4], "abc", [1, 2, 3, 4]]) + + # test out-of-bounds access + m = Matrix() + with self.assertRaises(IndexError): + m[0, 4] + with self.assertRaises(IndexError): + m[4, 0] + with self.assertRaises(IndexError): + m["ab"] + + # test __repr__ methods + m = Matrix(vals4x4) + mRepr = "Matrix([[1.0, 0.0, 0.0, 1.0],\n [0.0, 1.0, 0.0, 2.0],\n [0.0, 0.0, 1.0, 3.0],\n [0.0, 0.0, 0.0, 1.0]])" + self.assertEqual(repr(m), mRepr) + self.assertEqual(str(eval(repr(m))), mRepr) + + def test_matrix_functionality(self): + # Test rotate methods + def matrix_almost_equal(m, target_matrix): + for r, row in enumerate(target_matrix): + for c, target_value in enumerate(row): + self.assertAlmostEqual(m[r, c], target_value) + + root_3_over_2 = math.sqrt(3) / 2 + m_rotate_x_30 = [ + [1, 0, 0, 0], + [0, root_3_over_2, -1 / 2, 0], + [0, 1 / 2, root_3_over_2, 0], + [0, 0, 0, 1], + ] + mx = Matrix() + mx.rotate(Axis.X, 30 * DEG2RAD) + matrix_almost_equal(mx, m_rotate_x_30) + + m_rotate_y_30 = [ + [root_3_over_2, 0, 1 / 2, 0], + [0, 1, 0, 0], + [-1 / 2, 0, root_3_over_2, 0], + [0, 0, 0, 1], + ] + my = Matrix() + my.rotate(Axis.Y, 30 * DEG2RAD) + matrix_almost_equal(my, m_rotate_y_30) + + m_rotate_z_30 = [ + [root_3_over_2, -1 / 2, 0, 0], + [1 / 2, root_3_over_2, 0, 0], + [0, 0, 1, 0], + [0, 0, 0, 1], + ] + mz = Matrix() + mz.rotate(Axis.Z, 30 * DEG2RAD) + matrix_almost_equal(mz, m_rotate_z_30) + + # Test matrix multiply vector + v = Vector(1, 0, 0) + self.assertVectorAlmostEquals(mz.multiply(v), (root_3_over_2, 1 / 2, 0), 7) + + # Test matrix multiply matrix + m_rotate_xy_30 = [ + [root_3_over_2, 0, 1 / 2, 0], + [1 / 4, root_3_over_2, -root_3_over_2 / 2, 0], + [-root_3_over_2 / 2, 1 / 2, 3 / 4, 0], + [0, 0, 0, 1], + ] + mxy = mx.multiply(my) + matrix_almost_equal(mxy, m_rotate_xy_30) + + # Test matrix inverse + vals4x4 = [[1, 2, 3, 4], [5, 1, 6, 7], [8, 9, 1, 10], [0, 0, 0, 1]] + vals4x4_invert = [ + [-53 / 144, 25 / 144, 1 / 16, -53 / 144], + [43 / 144, -23 / 144, 1 / 16, -101 / 144], + [37 / 144, 7 / 144, -1 / 16, -107 / 144], + [0, 0, 0, 1], + ] + m = Matrix(vals4x4).inverse() + matrix_almost_equal(m, vals4x4_invert) + + # Test matrix created from transfer function + rot_x = gp_Trsf() + θ = math.pi + rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), θ) + m = Matrix(rot_x) + rot_x_matrix = [ + [1, 0, 0, 0], + [0, math.cos(θ), -math.sin(θ), 0], + [0, math.sin(θ), math.cos(θ), 0], + [0, 0, 0, 1], + ] + matrix_almost_equal(m, rot_x_matrix) + + # Test copy + m2 = copy.copy(m) + matrix_almost_equal(m2, rot_x_matrix) + m3 = copy.deepcopy(m) + matrix_almost_equal(m3, rot_x_matrix) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py new file mode 100644 index 0000000..63589e4 --- /dev/null +++ b/tests/test_direct_api/test_mixin1_d.py @@ -0,0 +1,321 @@ +""" +build123d direct api tests + +name: test_mixin1_d.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.build_enums import CenterOf, GeomType, PositionMode, Side, SortBy +from build123d.geometry import Axis, Location, Plane, Vector +from build123d.objects_part import Box, Cylinder +from build123d.topology import Compound, Edge, Face, Wire +from tests.base_test import DirectApiTestCase + + +class TestMixin1D(DirectApiTestCase): + """Test the add in methods""" + + def test_position_at(self): + self.assertVectorAlmostEquals( + Edge.make_line((0, 0, 0), (1, 1, 1)).position_at(0.5), + (0.5, 0.5, 0.5), + 5, + ) + # Not sure what PARAMETER mode returns - but it's in the ballpark + point = ( + Edge.make_line((0, 0, 0), (1, 1, 1)) + .position_at(0.5, position_mode=PositionMode.PARAMETER) + .to_tuple() + ) + self.assertTrue(all([0.0 < v < 1.0 for v in point])) + + wire = Wire([Edge.make_line((0, 0, 0), (10, 0, 0))]) + self.assertVectorAlmostEquals(wire.position_at(0.3), (3, 0, 0), 5) + self.assertVectorAlmostEquals( + wire.position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 + ) + self.assertVectorAlmostEquals(wire.edge().position_at(0.3), (3, 0, 0), 5) + self.assertVectorAlmostEquals( + wire.edge().position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 + ) + + circle_wire = Wire( + [ + Edge.make_circle(1, start_angle=0, end_angle=180), + Edge.make_circle(1, start_angle=180, end_angle=360), + ] + ) + p1 = circle_wire.position_at(math.pi, position_mode=PositionMode.LENGTH) + p2 = circle_wire.position_at(math.pi / circle_wire.length) + self.assertVectorAlmostEquals(p1, (-1, 0, 0), 14) + self.assertVectorAlmostEquals(p2, (-1, 0, 0), 14) + self.assertVectorAlmostEquals(p1, p2, 14) + + circle_edge = Edge.make_circle(1) + p3 = circle_edge.position_at(math.pi, position_mode=PositionMode.LENGTH) + p4 = circle_edge.position_at(math.pi / circle_edge.length) + self.assertVectorAlmostEquals(p3, (-1, 0, 0), 14) + self.assertVectorAlmostEquals(p4, (-1, 0, 0), 14) + self.assertVectorAlmostEquals(p3, p4, 14) + + circle = Wire( + [ + Edge.make_circle(2, start_angle=0, end_angle=180), + Edge.make_circle(2, start_angle=180, end_angle=360), + ] + ) + self.assertVectorAlmostEquals( + circle.position_at(0.5), + (-2, 0, 0), + 5, + ) + self.assertVectorAlmostEquals( + circle.position_at(2 * math.pi, position_mode=PositionMode.LENGTH), + (-2, 0, 0), + 5, + ) + + def test_positions(self): + e = Edge.make_line((0, 0, 0), (1, 1, 1)) + distances = [i / 4 for i in range(3)] + pts = e.positions(distances) + for i, position in enumerate(pts): + self.assertVectorAlmostEquals(position, (i / 4, i / 4, i / 4), 5) + + def test_tangent_at(self): + self.assertVectorAlmostEquals( + Edge.make_circle(1, start_angle=0, end_angle=90).tangent_at(1.0), + (-1, 0, 0), + 5, + ) + tangent = ( + Edge.make_circle(1, start_angle=0, end_angle=90) + .tangent_at(0.0, position_mode=PositionMode.PARAMETER) + .to_tuple() + ) + self.assertTrue(all([0.0 <= v <= 1.0 for v in tangent])) + + self.assertVectorAlmostEquals( + Edge.make_circle(1, start_angle=0, end_angle=180).tangent_at( + math.pi / 2, position_mode=PositionMode.LENGTH + ), + (-1, 0, 0), + 5, + ) + + def test_tangent_at_point(self): + circle = Wire( + [ + Edge.make_circle(1, start_angle=0, end_angle=180), + Edge.make_circle(1, start_angle=180, end_angle=360), + ] + ) + pnt_on_circle = Vector(math.cos(math.pi / 4), math.sin(math.pi / 4)) + tan = circle.tangent_at(pnt_on_circle) + self.assertVectorAlmostEquals(tan, (-math.sqrt(2) / 2, math.sqrt(2) / 2), 5) + + def test_tangent_at_by_length(self): + circle = Edge.make_circle(1) + tan = circle.tangent_at(circle.length * 0.5, position_mode=PositionMode.LENGTH) + self.assertVectorAlmostEquals(tan, (0, -1), 5) + + def test_tangent_at_error(self): + with self.assertRaises(ValueError): + Edge.make_circle(1).tangent_at("start") + + def test_normal(self): + self.assertVectorAlmostEquals( + Edge.make_circle( + 1, Plane(origin=(0, 0, 0), z_dir=(1, 0, 0)), start_angle=0, end_angle=60 + ).normal(), + (1, 0, 0), + 5, + ) + self.assertVectorAlmostEquals( + Edge.make_ellipse( + 1, + 0.5, + Plane(origin=(0, 0, 0), z_dir=(1, 1, 0)), + start_angle=0, + end_angle=90, + ).normal(), + (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), + 5, + ) + self.assertVectorAlmostEquals( + Edge.make_spline( + [ + (1, 0), + (math.sqrt(2) / 2, math.sqrt(2) / 2), + (0, 1), + ], + tangents=((0, 1, 0), (-1, 0, 0)), + ).normal(), + (0, 0, 1), + 5, + ) + with self.assertRaises(ValueError): + Edge.make_line((0, 0, 0), (1, 1, 1)).normal() + + def test_center(self): + c = Edge.make_circle(1, start_angle=0, end_angle=180) + self.assertVectorAlmostEquals(c.center(), (0, 1, 0), 5) + self.assertVectorAlmostEquals( + c.center(CenterOf.MASS), + (0, 0.6366197723675814, 0), + 5, + ) + self.assertVectorAlmostEquals(c.center(CenterOf.BOUNDING_BOX), (0, 0.5, 0), 5) + + def test_location_at(self): + loc = Edge.make_circle(1).location_at(0.25) + self.assertVectorAlmostEquals(loc.position, (0, 1, 0), 5) + self.assertVectorAlmostEquals(loc.orientation, (0, -90, -90), 5) + + loc = Edge.make_circle(1).location_at( + math.pi / 2, position_mode=PositionMode.LENGTH + ) + self.assertVectorAlmostEquals(loc.position, (0, 1, 0), 5) + self.assertVectorAlmostEquals(loc.orientation, (0, -90, -90), 5) + + def test_locations(self): + locs = Edge.make_circle(1).locations([i / 4 for i in range(4)]) + self.assertVectorAlmostEquals(locs[0].position, (1, 0, 0), 5) + self.assertVectorAlmostEquals(locs[0].orientation, (-90, 0, -180), 5) + self.assertVectorAlmostEquals(locs[1].position, (0, 1, 0), 5) + self.assertVectorAlmostEquals(locs[1].orientation, (0, -90, -90), 5) + self.assertVectorAlmostEquals(locs[2].position, (-1, 0, 0), 5) + self.assertVectorAlmostEquals(locs[2].orientation, (90, 0, 0), 5) + self.assertVectorAlmostEquals(locs[3].position, (0, -1, 0), 5) + self.assertVectorAlmostEquals(locs[3].orientation, (0, 90, 90), 5) + + def test_project(self): + target = Face.make_rect(10, 10, Plane.XY.rotated((0, 45, 0))) + circle = Edge.make_circle(1).locate(Location((0, 0, 10))) + ellipse: Wire = circle.project(target, (0, 0, -1)) + bbox = ellipse.bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-1, -1, -1), 5) + self.assertVectorAlmostEquals(bbox.max, (1, 1, 1), 5) + + def test_project2(self): + target = Cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] + square = Wire.make_rect(1, 1, Plane.YZ).locate(Location((10, 0, 0))) + projections: list[Wire] = square.project( + target, direction=(-1, 0, 0), closest=False + ) + self.assertEqual(len(projections), 2) + + def test_is_forward(self): + plate = Box(10, 10, 1) - Cylinder(1, 1) + hole_edges = plate.edges().filter_by(GeomType.CIRCLE) + self.assertTrue(hole_edges.sort_by(Axis.Z)[-1].is_forward) + self.assertFalse(hole_edges.sort_by(Axis.Z)[0].is_forward) + + def test_offset_2d(self): + base_wire = Wire.make_polygon([(0, 0), (1, 0), (1, 1)], close=False) + corner = base_wire.vertices().group_by(Axis.Y)[0].sort_by(Axis.X)[-1] + base_wire = base_wire.fillet_2d(0.4, [corner]) + offset_wire = base_wire.offset_2d(0.1, side=Side.LEFT) + self.assertTrue(offset_wire.is_closed) + self.assertEqual(len(offset_wire.edges().filter_by(GeomType.LINE)), 6) + self.assertEqual(len(offset_wire.edges().filter_by(GeomType.CIRCLE)), 2) + offset_wire_right = base_wire.offset_2d(0.1, side=Side.RIGHT) + self.assertAlmostEqual( + offset_wire_right.edges() + .filter_by(GeomType.CIRCLE) + .sort_by(SortBy.RADIUS)[-1] + .radius, + 0.5, + 4, + ) + h_perimeter = Compound.make_text("h", font_size=10).wire() + with self.assertRaises(RuntimeError): + h_perimeter.offset_2d(-1) + + # Test for returned Edge - can't find a way to do this + # base_edge = Edge.make_circle(10, start_angle=40, end_angle=50) + # self.assertTrue(isinstance(offset_edge, Edge)) + # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) + # self.assertTrue(offset_edge.geom_type == GeomType.CIRCLE) + # self.assertAlmostEqual(offset_edge.radius, 12, 5) + # base_edge = Edge.make_line((0, 1), (1, 10)) + # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) + # self.assertTrue(isinstance(offset_edge, Edge)) + # self.assertTrue(offset_edge.geom_type == GeomType.LINE) + # self.assertAlmostEqual(offset_edge.position_at(0).X, 3) + + def test_common_plane(self): + # Straight and circular lines + l = Edge.make_line((0, 0, 0), (5, 0, 0)) + c = Edge.make_circle(2, Plane.XZ, -90, 90) + common = l.common_plane(c) + self.assertAlmostEqual(common.z_dir.X, 0, 5) + self.assertAlmostEqual(abs(common.z_dir.Y), 1, 5) # the direction isn't known + self.assertAlmostEqual(common.z_dir.Z, 0, 5) + + # Co-axial straight lines + l1 = Edge.make_line((0, 0), (1, 1)) + l2 = Edge.make_line((0.25, 0.25), (0.75, 0.75)) + common = l1.common_plane(l2) + # the z_dir isn't know + self.assertAlmostEqual(common.x_dir.Z, 0, 5) + + # Parallel lines + l1 = Edge.make_line((0, 0), (1, 0)) + l2 = Edge.make_line((0, 1), (1, 1)) + common = l1.common_plane(l2) + self.assertAlmostEqual(common.z_dir.X, 0, 5) + self.assertAlmostEqual(common.z_dir.Y, 0, 5) + self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known + + # Many lines + common = Edge.common_plane(*Wire.make_rect(10, 10).edges()) + self.assertAlmostEqual(common.z_dir.X, 0, 5) + self.assertAlmostEqual(common.z_dir.Y, 0, 5) + self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known + + # Wire and Edges + c = Wire.make_circle(1, Plane.YZ) + lines = Wire.make_rect(2, 2, Plane.YZ).edges() + common = c.common_plane(*lines) + self.assertAlmostEqual(abs(common.z_dir.X), 1, 5) # the direction isn't known + self.assertAlmostEqual(common.z_dir.Y, 0, 5) + self.assertAlmostEqual(common.z_dir.Z, 0, 5) + + def test_edge_volume(self): + edge = Edge.make_line((0, 0), (1, 1)) + self.assertAlmostEqual(edge.volume, 0, 5) + + def test_wire_volume(self): + wire = Wire.make_rect(1, 1) + self.assertAlmostEqual(wire.volume, 0, 5) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_mixin3_d.py b/tests/test_direct_api/test_mixin3_d.py new file mode 100644 index 0000000..100c680 --- /dev/null +++ b/tests/test_direct_api/test_mixin3_d.py @@ -0,0 +1,157 @@ +""" +build123d direct api tests + +name: test_mixin3_d.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from unittest.mock import patch + +from build123d.build_enums import CenterOf, Kind +from build123d.geometry import Axis, Plane +from build123d.topology import Face, Shape, Solid +from tests.base_test import DirectApiTestCase + + +class TestMixin3D(DirectApiTestCase): + """Test that 3D add ins""" + + def test_chamfer(self): + box = Solid.make_box(1, 1, 1) + chamfer_box = box.chamfer(0.1, None, box.edges().sort_by(Axis.Z)[-1:]) + self.assertAlmostEqual(chamfer_box.volume, 1 - 0.005, 5) + + def test_chamfer_asym_length(self): + box = Solid.make_box(1, 1, 1) + chamfer_box = box.chamfer(0.1, 0.2, box.edges().sort_by(Axis.Z)[-1:]) + self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) + + def test_chamfer_asym_length_with_face(self): + box = Solid.make_box(1, 1, 1) + face = box.faces().sort_by(Axis.Z)[0] + edge = [face.edges().sort_by(Axis.Y)[0]] + chamfer_box = box.chamfer(0.1, 0.2, edge, face=face) + self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) + + def test_chamfer_too_high_length(self): + box = Solid.make_box(1, 1, 1) + face = box.faces + self.assertRaises( + ValueError, box.chamfer, 2, None, box.edges().sort_by(Axis.Z)[-1:] + ) + + def test_chamfer_edge_not_part_of_face(self): + box = Solid.make_box(1, 1, 1) + edge = box.edges().sort_by(Axis.Z)[-1:] + face = box.faces().sort_by(Axis.Z)[0] + self.assertRaises(ValueError, box.chamfer, 0.1, None, edge, face=face) + + @patch.object(Shape, "is_valid", return_value=False) + def test_chamfer_invalid_shape_raises_error(self, mock_is_valid): + box = Solid.make_box(1, 1, 1) + + # Assert that ValueError is raised + with self.assertRaises(ValueError) as chamfer_context: + max = box.chamfer(0.1, None, box.edges()) + + # Check the error message + self.assertEqual( + str(chamfer_context.exception), + "Failed creating a chamfer, try a smaller length value(s)", + ) + + # Verify is_valid was called + mock_is_valid.assert_called_once() + + def test_hollow(self): + shell_box = Solid.make_box(1, 1, 1).hollow([], thickness=-0.1) + self.assertAlmostEqual(shell_box.volume, 1 - 0.8**3, 5) + + shell_box = Solid.make_box(1, 1, 1) + shell_box = shell_box.hollow( + shell_box.faces().filter_by(Axis.Z), thickness=0.1, kind=Kind.INTERSECTION + ) + self.assertAlmostEqual(shell_box.volume, 1 * 1.2**2 - 1**3, 5) + + shell_box = Solid.make_box(1, 1, 1).hollow( + [], thickness=0.1, kind=Kind.INTERSECTION + ) + self.assertAlmostEqual(shell_box.volume, 1.2**3 - 1**3, 5) + + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).hollow([], thickness=0.1, kind=Kind.TANGENT) + + def test_is_inside(self): + self.assertTrue(Solid.make_box(1, 1, 1).is_inside((0.5, 0.5, 0.5))) + + def test_dprism(self): + # face + f = Face.make_rect(0.5, 0.5) + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [f], additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) + + # face with depth + f = Face.make_rect(0.5, 0.5) + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [f], depth=0.5, thru_all=False, additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) + + # face until + f = Face.make_rect(0.5, 0.5) + limit = Face.make_rect(1, 1, Plane((0, 0, 0.5))) + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [f], up_to_face=limit, thru_all=False, additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) + + # wire + w = Face.make_rect(0.5, 0.5).outer_wire() + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [w], additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) + + def test_center(self): + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).center(CenterOf.GEOMETRY) + + self.assertVectorAlmostEquals( + Solid.make_box(1, 1, 1).center(CenterOf.BOUNDING_BOX), + (0.5, 0.5, 0.5), + 5, + ) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_plane.py b/tests/test_direct_api/test_plane.py new file mode 100644 index 0000000..f88664f --- /dev/null +++ b/tests/test_direct_api/test_plane.py @@ -0,0 +1,504 @@ +""" +build123d direct api tests + +name: test_plane.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import math +import random +import unittest + +from OCP.BRepGProp import BRepGProp +from OCP.GProp import GProp_GProps +from build123d.build_common import Locations +from build123d.build_enums import Align, GeomType, Mode +from build123d.build_part import BuildPart +from build123d.build_sketch import BuildSketch +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import Circle, Rectangle +from build123d.operations_generic import fillet, add +from build123d.operations_part import extrude +from build123d.topology import Edge, Face, Solid, Vertex +from tests.base_test import DirectApiTestCase, AlwaysEqual + + +class TestPlane(DirectApiTestCase): + """Plane with class properties""" + + def test_class_properties(self): + """Validate + Name x_dir y_dir z_dir + ======= ====== ====== ====== + XY +x +y +z + YZ +y +z +x + ZX +z +x +y + XZ +x +z -y + YX +y +x -z + ZY +z +y -x + front +x +z -y + back -x +z +y + left -y +z -x + right +y +z +x + top +x +y +z + bottom +x -y -z + isometric +x+y -x+y+z +x+y-z + """ + planes = [ + (Plane.XY, (1, 0, 0), (0, 0, 1)), + (Plane.YZ, (0, 1, 0), (1, 0, 0)), + (Plane.ZX, (0, 0, 1), (0, 1, 0)), + (Plane.XZ, (1, 0, 0), (0, -1, 0)), + (Plane.YX, (0, 1, 0), (0, 0, -1)), + (Plane.ZY, (0, 0, 1), (-1, 0, 0)), + (Plane.front, (1, 0, 0), (0, -1, 0)), + (Plane.back, (-1, 0, 0), (0, 1, 0)), + (Plane.left, (0, -1, 0), (-1, 0, 0)), + (Plane.right, (0, 1, 0), (1, 0, 0)), + (Plane.top, (1, 0, 0), (0, 0, 1)), + (Plane.bottom, (1, 0, 0), (0, 0, -1)), + ( + Plane.isometric, + (1 / 2**0.5, 1 / 2**0.5, 0), + (1 / 3**0.5, -1 / 3**0.5, 1 / 3**0.5), + ), + ] + for plane, x_dir, z_dir in planes: + self.assertVectorAlmostEquals(plane.x_dir, x_dir, 5) + self.assertVectorAlmostEquals(plane.z_dir, z_dir, 5) + + def test_plane_init(self): + # from origin + o = (0, 0, 0) + x = (1, 0, 0) + y = (0, 1, 0) + z = (0, 0, 1) + planes = [ + Plane(o), + Plane(o, x), + Plane(o, x, z), + Plane(o, x, z_dir=z), + Plane(o, x_dir=x, z_dir=z), + Plane(o, x_dir=x), + Plane(o, z_dir=z), + Plane(origin=o, x_dir=x, z_dir=z), + Plane(origin=o, x_dir=x), + Plane(origin=o, z_dir=z), + ] + for p in planes: + self.assertVectorAlmostEquals(p.origin, o, 6) + self.assertVectorAlmostEquals(p.x_dir, x, 6) + self.assertVectorAlmostEquals(p.y_dir, y, 6) + self.assertVectorAlmostEquals(p.z_dir, z, 6) + with self.assertRaises(TypeError): + Plane() + with self.assertRaises(TypeError): + Plane(o, z_dir="up") + + # rotated location around z + loc = Location((0, 0, 0), (0, 0, 45)) + p_from_loc = Plane(loc) + p_from_named_loc = Plane(location=loc) + for p in [p_from_loc, p_from_named_loc]: + self.assertVectorAlmostEquals(p.origin, (0, 0, 0), 6) + self.assertVectorAlmostEquals( + p.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 + ) + self.assertVectorAlmostEquals( + p.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 + ) + self.assertVectorAlmostEquals(p.z_dir, (0, 0, 1), 6) + self.assertVectorAlmostEquals(loc.position, p.location.position, 6) + self.assertVectorAlmostEquals(loc.orientation, p.location.orientation, 6) + + # rotated location around x and origin <> (0,0,0) + loc = Location((0, 2, -1), (45, 0, 0)) + p = Plane(loc) + self.assertVectorAlmostEquals(p.origin, (0, 2, -1), 6) + self.assertVectorAlmostEquals(p.x_dir, (1, 0, 0), 6) + self.assertVectorAlmostEquals( + p.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6 + ) + self.assertVectorAlmostEquals( + p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 + ) + self.assertVectorAlmostEquals(loc.position, p.location.position, 6) + self.assertVectorAlmostEquals(loc.orientation, p.location.orientation, 6) + + # from a face + f = Face.make_rect(1, 2).located(Location((1, 2, 3), (45, 0, 45))) + p_from_face = Plane(f) + p_from_named_face = Plane(face=f) + plane_from_gp_pln = Plane(gp_pln=p_from_face.wrapped) + p_deep_copy = copy.deepcopy(p_from_face) + for p in [p_from_face, p_from_named_face, plane_from_gp_pln, p_deep_copy]: + self.assertVectorAlmostEquals(p.origin, (1, 2, 3), 6) + self.assertVectorAlmostEquals(p.x_dir, (math.sqrt(2) / 2, 0.5, 0.5), 6) + self.assertVectorAlmostEquals(p.y_dir, (-math.sqrt(2) / 2, 0.5, 0.5), 6) + self.assertVectorAlmostEquals( + p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 + ) + self.assertVectorAlmostEquals(f.location.position, p.location.position, 6) + self.assertVectorAlmostEquals( + f.location.orientation, p.location.orientation, 6 + ) + + # from a face with x_dir + f = Face.make_rect(1, 2) + x = (1, 1) + y = (-1, 1) + planes = [ + Plane(f, x), + Plane(f, x_dir=x), + Plane(face=f, x_dir=x), + ] + for p in planes: + self.assertVectorAlmostEquals(p.origin, (0, 0, 0), 6) + self.assertVectorAlmostEquals(p.x_dir, Vector(x).normalized(), 6) + self.assertVectorAlmostEquals(p.y_dir, Vector(y).normalized(), 6) + self.assertVectorAlmostEquals(p.z_dir, (0, 0, 1), 6) + + with self.assertRaises(TypeError): + Plane(Edge.make_line((0, 0), (0, 1))) + + # can be instantiated from planar faces of surface types other than Geom_Plane + # this loft creates the trapezoid faces of type Geom_BSplineSurface + lofted_solid = Solid.make_loft( + [ + Rectangle(3, 1).wire(), + Pos(0, 0, 1) * Rectangle(1, 1).wire(), + ] + ) + + expected = [ + # Trapezoid face, negative y coordinate + ( + Axis.X.direction, # plane x_dir + Axis.Z.direction, # plane y_dir + -Axis.Y.direction, # plane z_dir + ), + # Trapezoid face, positive y coordinate + ( + -Axis.X.direction, + Axis.Z.direction, + Axis.Y.direction, + ), + ] + # assert properties of the trapezoid faces + for i, f in enumerate(lofted_solid.faces() | Plane.XZ > Axis.Y): + p = Plane(f) + f_props = GProp_GProps() + BRepGProp.SurfaceProperties_s(f.wrapped, f_props) + self.assertVectorAlmostEquals(p.origin, f_props.CentreOfMass(), 6) + self.assertVectorAlmostEquals(p.x_dir, expected[i][0], 6) + self.assertVectorAlmostEquals(p.y_dir, expected[i][1], 6) + self.assertVectorAlmostEquals(p.z_dir, expected[i][2], 6) + + def test_plane_neg(self): + p = Plane( + origin=(1, 2, 3), + x_dir=Vector(1, 2, 3).normalized(), + z_dir=Vector(4, 5, 6).normalized(), + ) + p2 = -p + self.assertVectorAlmostEquals(p2.origin, p.origin, 6) + self.assertVectorAlmostEquals(p2.x_dir, p.x_dir, 6) + self.assertVectorAlmostEquals(p2.z_dir, -p.z_dir, 6) + self.assertVectorAlmostEquals( + p2.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6 + ) + p3 = p.reverse() + self.assertVectorAlmostEquals(p3.origin, p.origin, 6) + self.assertVectorAlmostEquals(p3.x_dir, p.x_dir, 6) + self.assertVectorAlmostEquals(p3.z_dir, -p.z_dir, 6) + self.assertVectorAlmostEquals( + p3.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6 + ) + + def test_plane_mul(self): + p = Plane(origin=(1, 2, 3), x_dir=(1, 0, 0), z_dir=(0, 0, 1)) + p2 = p * Location((1, 2, -1), (0, 0, 45)) + self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) + self.assertVectorAlmostEquals( + p2.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 + ) + self.assertVectorAlmostEquals( + p2.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 + ) + self.assertVectorAlmostEquals(p2.z_dir, (0, 0, 1), 6) + + p2 = p * Location((1, 2, -1), (0, 45, 0)) + self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) + self.assertVectorAlmostEquals( + p2.x_dir, (math.sqrt(2) / 2, 0, -math.sqrt(2) / 2), 6 + ) + self.assertVectorAlmostEquals(p2.y_dir, (0, 1, 0), 6) + self.assertVectorAlmostEquals( + p2.z_dir, (math.sqrt(2) / 2, 0, math.sqrt(2) / 2), 6 + ) + + p2 = p * Location((1, 2, -1), (45, 0, 0)) + self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) + self.assertVectorAlmostEquals(p2.x_dir, (1, 0, 0), 6) + self.assertVectorAlmostEquals( + p2.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6 + ) + self.assertVectorAlmostEquals( + p2.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 + ) + with self.assertRaises(TypeError): + p2 * Vector(1, 1, 1) + + def test_plane_methods(self): + # Test error checking + p = Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 0)) + with self.assertRaises(ValueError): + p.to_local_coords("box") + + # Test translation to local coordinates + local_box = p.to_local_coords(Solid.make_box(1, 1, 1)) + local_box_vertices = [(v.X, v.Y, v.Z) for v in local_box.vertices()] + target_vertices = [ + (0, -1, 0), + (0, 0, 0), + (0, -1, 1), + (0, 0, 1), + (1, -1, 0), + (1, 0, 0), + (1, -1, 1), + (1, 0, 1), + ] + for i, target_point in enumerate(target_vertices): + self.assertTupleAlmostEquals(target_point, local_box_vertices[i], 7) + + def test_localize_vertex(self): + vertex = Vertex(random.random(), random.random(), random.random()) + self.assertTupleAlmostEquals( + Plane.YZ.to_local_coords(vertex).to_tuple(), + Plane.YZ.to_local_coords(Vector(vertex)).to_tuple(), + 5, + ) + + def test_repr(self): + self.assertEqual( + repr(Plane.XY), + "Plane(o=(0.00, 0.00, 0.00), x=(1.00, 0.00, 0.00), z=(0.00, 0.00, 1.00))", + ) + + def test_shift_origin_axis(self): + cyl = Cylinder(1, 2, align=Align.MIN) + top = cyl.faces().sort_by(Axis.Z)[-1] + pln = Plane(top).shift_origin(Axis.Z) + with BuildPart() as p: + add(cyl) + with BuildSketch(pln): + with Locations((1, 1)): + Circle(0.5) + extrude(amount=-2, mode=Mode.SUBTRACT) + self.assertAlmostEqual(p.part.volume, math.pi * (1**2 - 0.5**2) * 2, 5) + + def test_shift_origin_vertex(self): + box = Box(1, 1, 1, align=Align.MIN) + front = box.faces().sort_by(Axis.X)[-1] + pln = Plane(front).shift_origin( + front.vertices().group_by(Axis.Z)[-1].sort_by(Axis.Y)[-1] + ) + with BuildPart() as p: + add(box) + with BuildSketch(pln): + with Locations((-0.5, 0.5)): + Circle(0.5) + extrude(amount=-1, mode=Mode.SUBTRACT) + self.assertAlmostEqual(p.part.volume, 1**3 - math.pi * (0.5**2) * 1, 5) + + def test_shift_origin_vector(self): + with BuildPart() as p: + Box(4, 4, 2) + b = fillet(p.edges().filter_by(Axis.Z), 0.5) + top = p.faces().sort_by(Axis.Z)[-1] + ref = ( + top.edges() + .filter_by(GeomType.CIRCLE) + .group_by(Axis.X)[-1] + .sort_by(Axis.Y)[0] + .arc_center + ) + pln = Plane(top, x_dir=(0, 1, 0)).shift_origin(ref) + with BuildSketch(pln): + with Locations((0.5, 0.5)): + Rectangle(2, 2, align=Align.MIN) + extrude(amount=-1, mode=Mode.SUBTRACT) + self.assertAlmostEqual(p.part.volume, b.volume - 2**2 * 1, 5) + + def test_shift_origin_error(self): + with self.assertRaises(ValueError): + Plane.XY.shift_origin(Vertex(1, 1, 1)) + + with self.assertRaises(ValueError): + Plane.XY.shift_origin((1, 1, 1)) + + with self.assertRaises(ValueError): + Plane.XY.shift_origin(Axis((0, 0, 1), (0, 1, 0))) + + with self.assertRaises(TypeError): + Plane.XY.shift_origin(Edge.make_line((0, 0), (1, 1))) + + def test_move(self): + pln = Plane.XY.move(Location((1, 2, 3))) + self.assertVectorAlmostEquals(pln.origin, (1, 2, 3), 5) + + def test_rotated(self): + rotated_plane = Plane.XY.rotated((45, 0, 0)) + self.assertVectorAlmostEquals(rotated_plane.x_dir, (1, 0, 0), 5) + self.assertVectorAlmostEquals( + rotated_plane.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 5 + ) + + def test_invalid_plane(self): + # Test plane creation error handling + with self.assertRaises(ValueError): + Plane(origin=(0, 0, 0), x_dir=(0, 0, 0), z_dir=(0, 1, 1)) + with self.assertRaises(ValueError): + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 0)) + + def test_plane_equal(self): + # default orientation + self.assertEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + ) + # moved origin + self.assertEqual( + Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + ) + # moved x-axis + self.assertEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), + ) + # moved z-axis + self.assertEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), + ) + # __eq__ cooperation + self.assertEqual(Plane.XY, AlwaysEqual()) + + def test_plane_not_equal(self): + # type difference + for value in [None, 0, 1, "abc"]: + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), value + ) + # origin difference + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + ) + # x-axis difference + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), + ) + # z-axis difference + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), + ) + + def test_to_location(self): + loc = Plane(origin=(1, 2, 3), x_dir=(0, 1, 0), z_dir=(0, 0, 1)).location + self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(loc.orientation, (0, 0, 90), 5) + + def test_intersect(self): + self.assertVectorAlmostEquals( + Plane.XY.intersect(Axis((1, 2, 3), (0, 0, -1))), (1, 2, 0), 5 + ) + self.assertIsNone(Plane.XY.intersect(Axis((1, 2, 3), (0, 1, 0)))) + + self.assertEqual(Plane.XY.intersect(Plane.XZ), Axis.X) + + self.assertIsNone(Plane.XY.intersect(Plane.XY.offset(1))) + + with self.assertRaises(ValueError): + Plane.XY.intersect("Plane.XZ") + + with self.assertRaises(ValueError): + Plane.XY.intersect(pln=Plane.XZ) + + def test_from_non_planar_face(self): + flat = Face.make_rect(1, 1) + pln = Plane(flat) + self.assertTrue(isinstance(pln, Plane)) + cyl = ( + Solid.make_cylinder(1, 4).faces().filter_by(GeomType.PLANE, reverse=True)[0] + ) + with self.assertRaises(ValueError): + pln = Plane(cyl) + + def test_plane_intersect(self): + section = Plane.XY.intersect(Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5))) + self.assertEqual(len(section.solids()), 0) + self.assertEqual(len(section.faces()), 1) + self.assertAlmostEqual(section.face().area, 2) + + section = Plane.XY & Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5)) + self.assertEqual(len(section.solids()), 0) + self.assertEqual(len(section.faces()), 1) + self.assertAlmostEqual(section.face().area, 2) + + self.assertEqual(Plane.XY & Plane.XZ, Axis.X) + # x_axis_as_edge = Plane.XY & Plane.XZ + # common = (x_axis_as_edge.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() + # self.assertAlmostEqual(common.length, 1, 5) + + i = Plane.XY & Vector(1, 2) + self.assertTrue(isinstance(i, Vector)) + self.assertVectorAlmostEquals(i, (1, 2, 0), 5) + + a = Axis((0, 0, 0), (1, 1, 0)) + i = Plane.XY & a + self.assertTrue(isinstance(i, Axis)) + self.assertEqual(i, a) + + a = Axis((1, 2, -1), (0, 0, 1)) + i = Plane.XY & a + self.assertTrue(isinstance(i, Vector)) + self.assertVectorAlmostEquals(i, Vector(1, 2, 0), 5) + + def test_plane_origin_setter(self): + pln = Plane.XY + pln.origin = (1, 2, 3) + ocp_origin = Vector(pln.wrapped.Location()) + self.assertVectorAlmostEquals(ocp_origin, (1, 2, 3), 5) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_projection.py b/tests/test_direct_api/test_projection.py new file mode 100644 index 0000000..62b23d4 --- /dev/null +++ b/tests/test_direct_api/test_projection.py @@ -0,0 +1,106 @@ +""" +build123d direct api tests + +name: test_projection.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.build_enums import Align +from build123d.geometry import Axis, Plane, Pos, Vector +from build123d.objects_part import Box +from build123d.topology import Compound, Edge, Solid, Wire +from tests.base_test import DirectApiTestCase + + +class TestProjection(DirectApiTestCase): + def test_flat_projection(self): + sphere = Solid.make_sphere(50) + projection_direction = Vector(0, -1, 0) + planar_text_faces = ( + Compound.make_text("Flat", 30, align=(Align.CENTER, Align.CENTER)) + .rotate(Axis.X, 90) + .faces() + ) + projected_text_faces = [ + f.project_to_shape(sphere, projection_direction)[0] + for f in planar_text_faces + ] + self.assertEqual(len(projected_text_faces), 4) + + def test_multiple_output_wires(self): + target = Box(10, 10, 4) - Pos((0, 0, 2)) * Box(5, 5, 2) + circle = Wire.make_circle(3, Plane.XY.offset(10)) + projection = circle.project_to_shape(target, (0, 0, -1)) + bbox = projection[0].bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-3, -3, 1), 2) + self.assertVectorAlmostEquals(bbox.max, (3, 3, 2), 2) + bbox = projection[1].bounding_box() + self.assertVectorAlmostEquals(bbox.min, (-3, -3, -2), 2) + self.assertVectorAlmostEquals(bbox.max, (3, 3, -2), 2) + + def test_text_projection(self): + sphere = Solid.make_sphere(50) + arch_path = ( + sphere.cut( + Solid.make_cylinder( + 80, 100, Plane(origin=(-50, 0, -70), z_dir=(1, 0, 0)) + ) + ) + .edges() + .sort_by(Axis.Z)[0] + ) + + projected_text = sphere.project_faces( + faces=Compound.make_text("dog", font_size=14), + path=arch_path, + start=0.01, # avoid a character spanning the sphere edge + ) + self.assertEqual(len(projected_text.solids()), 0) + self.assertEqual(len(projected_text.faces()), 3) + + def test_error_handling(self): + sphere = Solid.make_sphere(50) + circle = Wire.make_circle(1) + with self.assertRaises(ValueError): + circle.project_to_shape(sphere, center=None, direction=None)[0] + + def test_project_edge(self): + projection = Edge.make_circle(1, Plane.XY.offset(-5)).project_to_shape( + Solid.make_box(1, 1, 1), (0, 0, 1) + ) + self.assertVectorAlmostEquals(projection[0].position_at(1), (1, 0, 0), 5) + self.assertVectorAlmostEquals(projection[0].position_at(0), (0, 1, 0), 5) + self.assertVectorAlmostEquals(projection[0].arc_center, (0, 0, 0), 5) + + def test_to_axis(self): + with self.assertRaises(ValueError): + Edge.make_circle(1, end_angle=30).to_axis() + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_rotation.py b/tests/test_direct_api/test_rotation.py new file mode 100644 index 0000000..3efd378 --- /dev/null +++ b/tests/test_direct_api/test_rotation.py @@ -0,0 +1,61 @@ +""" +build123d direct api tests + +name: test_rotation.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.build_enums import Extrinsic, Intrinsic +from build123d.geometry import Rotation +from tests.base_test import DirectApiTestCase + + +class TestRotation(DirectApiTestCase): + def test_rotation_parameters(self): + r = Rotation(10, 20, 30) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + r = Rotation(10, 20, Z=30) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + r = Rotation(10, 20, Z=30, ordering=Intrinsic.XYZ) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + r = Rotation(10, Y=20, Z=30) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + r = Rotation((10, 20, 30)) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + r = Rotation(10, 20, 30, Intrinsic.XYZ) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + r = Rotation((30, 20, 10), Extrinsic.ZYX) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + r = Rotation((30, 20, 10), ordering=Extrinsic.ZYX) + self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + with self.assertRaises(TypeError): + Rotation(x=10) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py new file mode 100644 index 0000000..1907473 --- /dev/null +++ b/tests/test_direct_api/test_shape.py @@ -0,0 +1,615 @@ +""" +build123d direct api tests + +name: test_shape.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from random import uniform +from unittest.mock import patch + +from build123d.build_enums import CenterOf, Keep +from build123d.geometry import ( + Axis, + Color, + Location, + Matrix, + Plane, + Pos, + Rotation, + Vector, +) +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import Circle +from build123d.operations_part import extrude +from build123d.topology import ( + Compound, + Edge, + Face, + Shape, + ShapeList, + Shell, + Solid, + Vertex, + Wire, +) +from tests.base_test import DirectApiTestCase, AlwaysEqual + + +class TestShape(DirectApiTestCase): + """Misc Shape tests""" + + def test_mirror(self): + box_bb = Solid.make_box(1, 1, 1).mirror(Plane.XZ).bounding_box() + self.assertAlmostEqual(box_bb.min.X, 0, 5) + self.assertAlmostEqual(box_bb.max.X, 1, 5) + self.assertAlmostEqual(box_bb.min.Y, -1, 5) + self.assertAlmostEqual(box_bb.max.Y, 0, 5) + + box_bb = Solid.make_box(1, 1, 1).mirror().bounding_box() + self.assertAlmostEqual(box_bb.min.Z, -1, 5) + self.assertAlmostEqual(box_bb.max.Z, 0, 5) + + def test_compute_mass(self): + with self.assertRaises(NotImplementedError): + Shape.compute_mass(Vertex()) + + def test_combined_center(self): + objs = [Solid.make_box(1, 1, 1, Plane((x, 0, 0))) for x in [-2, 1]] + self.assertVectorAlmostEquals( + Shape.combined_center(objs, center_of=CenterOf.MASS), + (0, 0.5, 0.5), + 5, + ) + + objs = [Solid.make_sphere(1, Plane((x, 0, 0))) for x in [-2, 1]] + self.assertVectorAlmostEquals( + Shape.combined_center(objs, center_of=CenterOf.BOUNDING_BOX), + (-0.5, 0, 0), + 5, + ) + with self.assertRaises(ValueError): + Shape.combined_center(objs, center_of=CenterOf.GEOMETRY) + + def test_shape_type(self): + self.assertEqual(Vertex().shape_type(), "Vertex") + + def test_scale(self): + self.assertAlmostEqual(Solid.make_box(1, 1, 1).scale(2).volume, 2**3, 5) + + def test_fuse(self): + box1 = Solid.make_box(1, 1, 1) + box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) + combined = box1.fuse(box2, glue=True) + self.assertTrue(combined.is_valid()) + self.assertAlmostEqual(combined.volume, 2, 5) + fuzzy = box1.fuse(box2, tol=1e-6) + self.assertTrue(fuzzy.is_valid()) + self.assertAlmostEqual(fuzzy.volume, 2, 5) + + def test_faces_intersected_by_axis(self): + box = Solid.make_box(1, 1, 1, Plane((0, 0, 1))) + intersected_faces = box.faces_intersected_by_axis(Axis.Z) + self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[0] in intersected_faces) + self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[-1] in intersected_faces) + + def test_split(self): + shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) + split_shape = shape.split(Plane.XY, keep=Keep.BOTTOM) + self.assertTrue(isinstance(split_shape, list)) + self.assertEqual(len(split_shape), 2) + self.assertAlmostEqual(split_shape[0].volume + split_shape[1].volume, 0.25, 5) + split_shape = shape.split(Plane.XY, keep=Keep.TOP) + self.assertEqual(len(split_shape.solids()), 1) + self.assertTrue(isinstance(split_shape, Solid)) + self.assertAlmostEqual(split_shape.volume, 0.5, 5) + + s = Solid.make_cone(1, 0.5, 2, Plane.YZ.offset(10)) + tool = Solid.make_sphere(11).rotate(Axis.Z, 90).face() + s2 = s.split(tool, keep=Keep.TOP) + self.assertLess(s2.volume, s.volume) + self.assertGreater(s2.volume, 0.0) + + def test_split_by_non_planar_face(self): + box = Solid.make_box(1, 1, 1) + tool = Circle(1).wire() + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + top, bottom = box.split(tool_shell, keep=Keep.BOTH) + + self.assertFalse(top is None) + self.assertFalse(bottom is None) + self.assertGreater(top.volume, bottom.volume) + + def test_split_by_shell(self): + box = Solid.make_box(5, 5, 1) + tool = Wire.make_rect(4, 4) + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + split = box.split(tool_shell, keep=Keep.TOP) + inner_vol = 2 * 2 + outer_vol = 5 * 5 + self.assertAlmostEqual(split.volume, outer_vol - inner_vol) + + def test_split_keep_all(self): + shape = Box(1, 1, 1) + split_shape = shape.split(Plane.XY, keep=Keep.ALL) + self.assertTrue(isinstance(split_shape, ShapeList)) + self.assertEqual(len(split_shape), 2) + + def test_split_edge_by_shell(self): + edge = Edge.make_line((-5, 0, 0), (5, 0, 0)) + tool = Wire.make_rect(4, 4) + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + top = edge.split(tool_shell, keep=Keep.TOP) + self.assertEqual(len(top), 2) + self.assertAlmostEqual(top[0].length, 3, 5) + + def test_split_return_none(self): + shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) + split_shape = shape.split(Plane.XY, keep=Keep.INSIDE) + self.assertIsNone(split_shape) + + def test_split_by_perimeter(self): + # Test 0 - extract a spherical cap + target0 = Solid.make_sphere(10).rotate(Axis.Z, 90) + circle = Plane.YZ.offset(15) * Circle(5).face() + circle_projected = circle.project_to_shape(target0, (-1, 0, 0))[0] + circle_outerwire = circle_projected.edge() + inside0, outside0 = target0.split_by_perimeter(circle_outerwire, Keep.BOTH) + self.assertLess(inside0.area, outside0.area) + + # Test 1 - extract ring of a sphere + ring = Pos(Z=15) * (Circle(5) - Circle(3)).face() + ring_projected = ring.project_to_shape(target0, (0, 0, -1))[0] + ring_outerwire = ring_projected.outer_wire() + inside1, outside1 = target0.split_by_perimeter(ring_outerwire, Keep.BOTH) + if isinstance(inside1, list): + inside1 = Compound(inside1) + if isinstance(outside1, list): + outside1 = Compound(outside1) + self.assertLess(inside1.area, outside1.area) + self.assertEqual(len(outside1.faces()), 2) + + # Test 2 - extract multiple faces + target2 = Box(1, 10, 10) + square = Face.make_rect(3, 3, Plane((12, 0, 0), z_dir=(1, 0, 0))) + square_projected = square.project_to_shape(target2, (-1, 0, 0))[0] + outside2 = target2.split_by_perimeter( + square_projected.outer_wire(), Keep.OUTSIDE + ) + self.assertTrue(isinstance(outside2, Shell)) + inside2 = target2.split_by_perimeter(square_projected.outer_wire(), Keep.INSIDE) + self.assertTrue(isinstance(inside2, Face)) + + # Test 4 - invalid inputs + with self.assertRaises(ValueError): + _, _ = target2.split_by_perimeter(Edge.make_line((0, 0), (1, 0)), Keep.BOTH) + + with self.assertRaises(ValueError): + _, _ = target2.split_by_perimeter(Edge.make_circle(1), Keep.TOP) + + def test_distance(self): + sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) + sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) + self.assertAlmostEqual(sphere1.distance(sphere2), 8, 5) + + def test_distances(self): + sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) + sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) + sphere3 = Solid.make_sphere(1, Plane((-5, 0, 5))) + distances = [8, 3] + for i, distance in enumerate(sphere1.distances(sphere2, sphere3)): + self.assertAlmostEqual(distances[i], distance, 5) + + def test_max_fillet(self): + test_solids = [Solid.make_box(10, 8, 2), Solid.make_cone(5, 3, 8)] + max_values = [0.96, 3.84] + for i, test_object in enumerate(test_solids): + with self.subTest("solids" + str(i)): + max = test_object.max_fillet(test_object.edges()) + self.assertAlmostEqual(max, max_values[i], 2) + with self.assertRaises(RuntimeError): + test_solids[0].max_fillet( + test_solids[0].edges(), tolerance=1e-6, max_iterations=1 + ) + with self.assertRaises(ValueError): + box = Solid.make_box(1, 1, 1) + box.fillet(0.75, box.edges()) + # invalid_object = box.fillet(0.75, box.edges()) + # invalid_object.max_fillet(invalid_object.edges()) + + @patch.object(Shape, "is_valid", return_value=False) + def test_max_fillet_invalid_shape_raises_error(self, mock_is_valid): + box = Solid.make_box(1, 1, 1) + + # Assert that ValueError is raised + with self.assertRaises(ValueError) as max_fillet_context: + max = box.max_fillet(box.edges()) + + # Check the error message + self.assertEqual(str(max_fillet_context.exception), "Invalid Shape") + + # Verify is_valid was called + mock_is_valid.assert_called_once() + + def test_locate_bb(self): + bounding_box = Solid.make_cone(1, 2, 1).bounding_box() + relocated_bounding_box = Plane.XZ.from_local_coords(bounding_box) + self.assertAlmostEqual(relocated_bounding_box.min.X, -2, 5) + self.assertAlmostEqual(relocated_bounding_box.max.X, 2, 5) + self.assertAlmostEqual(relocated_bounding_box.min.Y, 0, 5) + self.assertAlmostEqual(relocated_bounding_box.max.Y, -1, 5) + self.assertAlmostEqual(relocated_bounding_box.min.Z, -2, 5) + self.assertAlmostEqual(relocated_bounding_box.max.Z, 2, 5) + + def test_is_equal(self): + box = Solid.make_box(1, 1, 1) + self.assertTrue(box.is_equal(box)) + + def test_equal(self): + box = Solid.make_box(1, 1, 1) + self.assertEqual(box, box) + self.assertEqual(box, AlwaysEqual()) + + def test_not_equal(self): + box = Solid.make_box(1, 1, 1) + diff = Solid.make_box(1, 2, 3) + self.assertNotEqual(box, diff) + self.assertNotEqual(box, object()) + + def test_tessellate(self): + box123 = Solid.make_box(1, 2, 3) + verts, triangles = box123.tessellate(1e-6) + self.assertEqual(len(verts), 24) + self.assertEqual(len(triangles), 12) + + def test_transformed(self): + """Validate that transformed works the same as changing location""" + rotation = (uniform(0, 360), uniform(0, 360), uniform(0, 360)) + offset = (uniform(0, 50), uniform(0, 50), uniform(0, 50)) + shape = Solid.make_box(1, 1, 1).transformed(rotation, offset) + predicted_location = Location(offset) * Rotation(*rotation) + located_shape = Solid.make_box(1, 1, 1).locate(predicted_location) + intersect = shape.intersect(located_shape) + self.assertAlmostEqual(intersect.volume, 1, 5) + + def test_position_and_orientation(self): + box = Solid.make_box(1, 1, 1).locate(Location((1, 2, 3), (10, 20, 30))) + self.assertVectorAlmostEquals(box.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(box.orientation, (10, 20, 30), 5) + + def test_distance_to_with_closest_points(self): + s0 = Solid.make_sphere(1).locate(Location((0, 2.1, 0))) + s1 = Solid.make_sphere(1) + distance, pnt0, pnt1 = s0.distance_to_with_closest_points(s1) + self.assertAlmostEqual(distance, 0.1, 5) + self.assertVectorAlmostEquals(pnt0, (0, 1.1, 0), 5) + self.assertVectorAlmostEquals(pnt1, (0, 1, 0), 5) + + def test_closest_points(self): + c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) + c1 = Edge.make_circle(1) + closest = c0.closest_points(c1) + self.assertVectorAlmostEquals(closest[0], c0.position_at(0.75).to_tuple(), 5) + self.assertVectorAlmostEquals(closest[1], c1.position_at(0.25).to_tuple(), 5) + + def test_distance_to(self): + c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) + c1 = Edge.make_circle(1) + distance = c0.distance_to(c1) + self.assertAlmostEqual(distance, 0.1, 5) + + def test_intersection(self): + box = Solid.make_box(1, 1, 1) + intersections = ( + box.intersect(Axis((0.5, 0.5, 4), (0, 0, -1))).vertices().sort_by(Axis.Z) + ) + self.assertVectorAlmostEquals(intersections[0], (0.5, 0.5, 0), 5) + self.assertVectorAlmostEquals(intersections[1], (0.5, 0.5, 1), 5) + + def test_clean_error(self): + """Note that this test is here to alert build123d to changes in bad OCCT clean behavior + with spheres or hemispheres. The extra edge in a sphere seems to be the cause of this. + """ + sphere = Solid.make_sphere(1) + divider = Solid.make_box(0.1, 3, 3, Plane(origin=(-0.05, -1.5, -1.5))) + positive_half, negative_half = (s.clean() for s in sphere.cut(divider).solids()) + self.assertGreater(abs(positive_half.volume - negative_half.volume), 0, 1) + + def test_clean_empty(self): + obj = Solid() + self.assertIs(obj, obj.clean()) + + def test_relocate(self): + box = Solid.make_box(10, 10, 10).move(Location((20, -5, -5))) + cylinder = Solid.make_cylinder(2, 50).move(Location((0, 0, 0), (0, 90, 0))) + + box_with_hole = box.cut(cylinder) + box_with_hole.relocate(box.location) + + self.assertEqual(box.location, box_with_hole.location) + + bbox1 = box.bounding_box() + bbox2 = box_with_hole.bounding_box() + self.assertVectorAlmostEquals(bbox1.min, bbox2.min, 5) + self.assertVectorAlmostEquals(bbox1.max, bbox2.max, 5) + + def test_project_to_viewport(self): + # Basic test + box = Solid.make_box(10, 10, 10) + visible, hidden = box.project_to_viewport((-20, 20, 20)) + self.assertEqual(len(visible), 9) + self.assertEqual(len(hidden), 3) + + # Contour edges + cyl = Solid.make_cylinder(2, 10) + visible, hidden = cyl.project_to_viewport((-20, 20, 20)) + # Note that some edges are broken into two + self.assertEqual(len(visible), 6) + self.assertEqual(len(hidden), 2) + + # Hidden contour edges + hole = box - cyl + visible, hidden = hole.project_to_viewport((-20, 20, 20)) + self.assertEqual(len(visible), 13) + self.assertEqual(len(hidden), 6) + + # Outline edges + sphere = Solid.make_sphere(5) + visible, hidden = sphere.project_to_viewport((-20, 20, 20)) + self.assertEqual(len(visible), 1) + self.assertEqual(len(hidden), 0) + + def test_vertex(self): + v = Edge.make_circle(1).vertex() + self.assertTrue(isinstance(v, Vertex)) + with self.assertWarns(UserWarning): + Wire.make_rect(1, 1).vertex() + + def test_edge(self): + e = Edge.make_circle(1).edge() + self.assertTrue(isinstance(e, Edge)) + with self.assertWarns(UserWarning): + Wire.make_rect(1, 1).edge() + + def test_wire(self): + w = Wire.make_circle(1).wire() + self.assertTrue(isinstance(w, Wire)) + with self.assertWarns(UserWarning): + Solid.make_box(1, 1, 1).wire() + + def test_compound(self): + c = Compound.make_text("hello", 10) + self.assertTrue(isinstance(c, Compound)) + c2 = Compound.make_text("world", 10) + with self.assertWarns(UserWarning): + Compound(children=[c, c2]).compound() + + def test_face(self): + f = Face.make_rect(1, 1) + self.assertTrue(isinstance(f, Face)) + with self.assertWarns(UserWarning): + Solid.make_box(1, 1, 1).face() + + def test_shell(self): + s = Solid.make_sphere(1).shell() + self.assertTrue(isinstance(s, Shell)) + with self.assertWarns(UserWarning): + extrude(Compound.make_text("two", 10), amount=5).shell() + + def test_solid(self): + s = Solid.make_sphere(1).solid() + self.assertTrue(isinstance(s, Solid)) + with self.assertWarns(UserWarning): + Compound(Solid.make_sphere(1).split(Plane.XY, keep=Keep.BOTH)).solid() + + def test_manifold(self): + self.assertTrue(Solid.make_box(1, 1, 1).is_manifold) + self.assertTrue(Solid.make_box(1, 1, 1).shell().is_manifold) + self.assertFalse( + Solid.make_box(1, 1, 1) + .shell() + .cut(Solid.make_box(0.5, 0.5, 0.5)) + .is_manifold + ) + self.assertTrue( + Compound( + children=[Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)] + ).is_manifold + ) + + def test_inherit_color(self): + # Create some objects and assign colors to them + b = Box(1, 1, 1).locate(Pos(2, 2, 0)) + b.color = Color("blue") # Blue + c = Cylinder(1, 1).locate(Pos(-2, 2, 0)) + a = Compound(children=[b, c]) + a.color = Color(0, 1, 0) + # Check that assigned colors stay and iheritance works + self.assertTupleAlmostEquals(tuple(a.color), (0, 1, 0, 1), 5) + self.assertTupleAlmostEquals(tuple(b.color), (0, 0, 1, 1), 5) + + def test_ocp_section(self): + # Vertex + verts, edges = Vertex(1, 2, 0)._ocp_section(Vertex(1, 2, 0)) + self.assertListEqual(verts, []) # ? + self.assertListEqual(edges, []) + + verts, edges = Vertex(1, 2, 0)._ocp_section(Edge.make_line((0, 0), (2, 4))) + self.assertListEqual(verts, []) # ? + self.assertListEqual(edges, []) + + verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_rect(5, 5)) + self.assertTupleAlmostEquals(tuple(verts[0]), (1, 2, 0), 5) + self.assertListEqual(edges, []) + + verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_plane(Plane.XY)) + self.assertTupleAlmostEquals(tuple(verts[0]), (1, 2, 0), 5) + self.assertListEqual(edges, []) + + # spline = Spline((-10, 10, -10), (-10, -5, -5), (20, 0, 5)) + # cylinder = Pos(Z=-10) * extrude(Circle(5), 20) + # cylinder2 = (Rot((0, 90, 0)) * cylinder).face() + # pln = Plane.XY + # box1 = Box(10, 10, 10, align=(Align.CENTER, Align.CENTER, Align.MIN)) + # box2 = Pos(Z=-10) * box1 + + # # vertices, edges = ocp_section(spline, Face.make_rect(1e6, 1e6, pln)) + # vertices1, edges1 = spline.ocp_section(Face.make_plane(pln)) + # print(vertices1, edges1) + + # vertices2, edges2 = cylinder.ocp_section(Face.make_plane(pln)) + # print(vertices2, edges2) + + # vertices3, edges3 = cylinder2.ocp_section(Face.make_plane(pln)) + # print(vertices3, edges3) + + # # vertices4, edges4 = cylinder2.ocp_section(cylinder) + + # vertices5, edges5 = box1.ocp_section(Face.make_plane(pln)) + # print(vertices5, edges5) + + # vertices6, edges6 = box1.ocp_section(box2.faces().sort_by(Axis.Z)[-1]) + + def test_copy_attributes_to(self): + box = Box(1, 1, 1) + box2 = Box(10, 10, 10) + box.label = "box" + box.color = Color("Red") + box.children = [Box(1, 1, 1), Box(2, 2, 2)] + box.topo_parent = box2 + + blank = Compound() + box.copy_attributes_to(blank) + self.assertEqual(blank.label, "box") + self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.color, Color("Red")))) + self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.children, box.children))) + self.assertEqual(blank.topo_parent, box2) + + def test_empty_shape(self): + empty = Solid() + box = Solid.make_box(1, 1, 1) + self.assertIsNone(empty.location) + self.assertIsNone(empty.position) + self.assertIsNone(empty.orientation) + self.assertFalse(empty.is_manifold) + with self.assertRaises(ValueError): + empty.geom_type + self.assertIs(empty, empty.fix()) + self.assertEqual(hash(empty), 0) + self.assertFalse(empty.is_same(Solid())) + self.assertFalse(empty.is_equal(Solid())) + self.assertTrue(empty.is_valid()) + empty_bbox = empty.bounding_box() + self.assertEqual(tuple(empty_bbox.size), (0, 0, 0)) + self.assertIs(empty, empty.mirror(Plane.XY)) + self.assertEqual(Shape.compute_mass(empty), 0) + self.assertEqual(empty.entities("Face"), []) + self.assertEqual(empty.area, 0) + self.assertIs(empty, empty.rotate(Axis.Z, 90)) + translate_matrix = [ + [1.0, 0.0, 0.0, 1.0], + [0.0, 1.0, 0.0, 2.0], + [0.0, 0.0, 1.0, 3.0], + [0.0, 0.0, 0.0, 1.0], + ] + self.assertIs(empty, empty.transform_shape(Matrix(translate_matrix))) + self.assertIs(empty, empty.transform_geometry(Matrix(translate_matrix))) + with self.assertRaises(ValueError): + empty.locate(Location()) + empty_loc = Location() + empty_loc.wrapped = None + with self.assertRaises(ValueError): + box.locate(empty_loc) + with self.assertRaises(ValueError): + empty.located(Location()) + with self.assertRaises(ValueError): + box.located(empty_loc) + with self.assertRaises(ValueError): + empty.move(Location()) + with self.assertRaises(ValueError): + box.move(empty_loc) + with self.assertRaises(ValueError): + empty.moved(Location()) + with self.assertRaises(ValueError): + box.moved(empty_loc) + with self.assertRaises(ValueError): + empty.relocate(Location()) + with self.assertRaises(ValueError): + box.relocate(empty_loc) + with self.assertRaises(ValueError): + empty.distance_to(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + empty.distance_to_with_closest_points(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + empty.distance_to(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + box.intersect(empty_loc) + self.assertEqual(empty._ocp_section(Vertex(1, 1, 1)), ([], [])) + self.assertEqual(empty.faces_intersected_by_axis(Axis.Z), ShapeList()) + with self.assertRaises(ValueError): + empty.split_by_perimeter(Circle(1).wire()) + with self.assertRaises(ValueError): + empty.distance(Vertex(1, 1, 1)) + with self.assertRaises(ValueError): + list(empty.distances(Vertex(0, 0, 0), Vertex(1, 1, 1))) + with self.assertRaises(ValueError): + list(box.distances(empty, Vertex(1, 1, 1))) + with self.assertRaises(ValueError): + empty.mesh(0.001) + with self.assertRaises(ValueError): + empty.tessellate(0.001) + with self.assertRaises(ValueError): + empty.to_splines() + empty_axis = Axis((0, 0, 0), (1, 0, 0)) + empty_axis.wrapped = None + with self.assertRaises(ValueError): + box.vertices().group_by(empty_axis) + empty_wire = Wire() + with self.assertRaises(ValueError): + box.vertices().group_by(empty_wire) + with self.assertRaises(ValueError): + box.vertices().sort_by(empty_axis) + with self.assertRaises(ValueError): + box.vertices().sort_by(empty_wire) + + def test_empty_selectors(self): + self.assertEqual(Vertex(1, 1, 1).edges(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).wires(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).faces(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).shells(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).solids(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).compounds(), ShapeList()) + self.assertIsNone(Vertex(1, 1, 1).edge()) + self.assertIsNone(Vertex(1, 1, 1).wire()) + self.assertIsNone(Vertex(1, 1, 1).face()) + self.assertIsNone(Vertex(1, 1, 1).shell()) + self.assertIsNone(Vertex(1, 1, 1).solid()) + self.assertIsNone(Vertex(1, 1, 1).compound()) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py new file mode 100644 index 0000000..3ceb5fa --- /dev/null +++ b/tests/test_direct_api/test_shape_list.py @@ -0,0 +1,364 @@ +""" +build123d direct api tests + +name: test_shape_list.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import io +import math +import re +import unittest + +from IPython.lib import pretty +from build123d.build_common import GridLocations, PolarLocations +from build123d.build_enums import GeomType, SortBy +from build123d.build_part import BuildPart +from build123d.geometry import Axis, Plane +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import RegularPolygon +from build123d.topology import ( + Compound, + Edge, + Face, + ShapeList, + Shell, + Solid, + Vertex, + Wire, +) +from tests.base_test import DirectApiTestCase, AlwaysEqual + + +class TestShapeList(DirectApiTestCase): + """Test ShapeList functionality""" + + def assertDunderStrEqual(self, actual: str, expected_lines: list[str]): + actual_lines = actual.splitlines() + self.assertEqual(len(actual_lines), len(expected_lines)) + for actual_line, expected_line in zip(actual_lines, expected_lines): + start, end = re.split(r"at 0x[0-9a-f]+", expected_line, 2, re.I) + self.assertTrue(actual_line.startswith(start)) + self.assertTrue(actual_line.endswith(end)) + + def assertDunderReprEqual(self, actual: str, expected: str): + splitter = r"at 0x[0-9a-f]+" + actual_split_list = re.split(splitter, actual, 0, re.I) + expected_split_list = re.split(splitter, expected, 0, re.I) + for actual_split, expected_split in zip(actual_split_list, expected_split_list): + self.assertEqual(actual_split, expected_split) + + def test_sort_by(self): + faces = Solid.make_box(1, 2, 3).faces() < SortBy.AREA + self.assertAlmostEqual(faces[-1].area, 2, 5) + + def test_filter_by_geomtype(self): + non_planar_faces = ( + Solid.make_cylinder(1, 1).faces().filter_by(GeomType.PLANE, reverse=True) + ) + self.assertEqual(len(non_planar_faces), 1) + self.assertAlmostEqual(non_planar_faces[0].area, 2 * math.pi, 5) + + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).faces().filter_by("True") + + def test_filter_by_axis(self): + box = Solid.make_box(1, 1, 1) + self.assertEqual(len(box.faces().filter_by(Axis.X)), 2) + self.assertEqual(len(box.edges().filter_by(Axis.X)), 4) + self.assertEqual(len(box.vertices().filter_by(Axis.X)), 0) + + def test_filter_by_callable_predicate(self): + boxes = [Solid.make_box(1, 1, 1) for _ in range(3)] + boxes[0].label = "A" + boxes[1].label = "A" + boxes[2].label = "B" + shapelist = ShapeList(boxes) + + self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "A")), 2) + self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "B")), 1) + + def test_first_last(self): + vertices = ( + Solid.make_box(1, 1, 1).vertices().sort_by(Axis((0, 0, 0), (1, 1, 1))) + ) + self.assertVectorAlmostEquals(vertices.last, (1, 1, 1), 5) + self.assertVectorAlmostEquals(vertices.first, (0, 0, 0), 5) + + def test_group_by(self): + vertices = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) + self.assertEqual(len(vertices[0]), 4) + + edges = Solid.make_box(1, 1, 1).edges().group_by(SortBy.LENGTH) + self.assertEqual(len(edges[0]), 12) + + edges = ( + Solid.make_cone(2, 1, 2) + .edges() + .filter_by(GeomType.CIRCLE) + .group_by(SortBy.RADIUS) + ) + self.assertEqual(len(edges[0]), 1) + + edges = (Solid.make_cone(2, 1, 2).edges() | GeomType.CIRCLE) << SortBy.RADIUS + self.assertAlmostEqual(edges[0].length, 2 * math.pi, 5) + + vertices = Solid.make_box(1, 1, 1).vertices().group_by(SortBy.DISTANCE) + self.assertVectorAlmostEquals(vertices[-1][0], (1, 1, 1), 5) + + box = Solid.make_box(1, 1, 2) + self.assertEqual(len(box.faces().group_by(SortBy.AREA)[0]), 2) + self.assertEqual(len(box.faces().group_by(SortBy.AREA)[1]), 4) + + line = Edge.make_line((0, 0, 0), (1, 1, 2)) + vertices_by_line = box.vertices().group_by(line) + self.assertEqual(len(vertices_by_line[0]), 1) + self.assertEqual(len(vertices_by_line[1]), 2) + self.assertEqual(len(vertices_by_line[2]), 1) + self.assertEqual(len(vertices_by_line[3]), 1) + self.assertEqual(len(vertices_by_line[4]), 2) + self.assertEqual(len(vertices_by_line[5]), 1) + self.assertVectorAlmostEquals(vertices_by_line[0][0], (0, 0, 0), 5) + self.assertVectorAlmostEquals(vertices_by_line[-1][0], (1, 1, 2), 5) + + with BuildPart() as boxes: + with GridLocations(10, 10, 3, 3): + Box(1, 1, 1) + with PolarLocations(100, 10): + Box(1, 1, 2) + self.assertEqual(len(boxes.solids().group_by(SortBy.VOLUME)[-1]), 10) + self.assertEqual(len((boxes.solids()) << SortBy.VOLUME), 9) + + with self.assertRaises(ValueError): + boxes.solids().group_by("AREA") + + def test_group_by_callable_predicate(self): + boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] + boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] + for box in boxesA: + box.label = "A" + for box in boxesB: + box.label = "B" + boxNoLabel = Solid.make_box(1, 1, 1) + + shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) + result = shapelist.group_by(lambda shape: shape.label) + + self.assertEqual([len(group) for group in result], [1, 3, 2]) + + def test_group_by_retrieve_groups(self): + boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] + boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] + for box in boxesA: + box.label = "A" + for box in boxesB: + box.label = "B" + boxNoLabel = Solid.make_box(1, 1, 1) + + shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) + result = shapelist.group_by(lambda shape: shape.label) + + self.assertEqual(len(result.group("")), 1) + self.assertEqual(len(result.group("A")), 3) + self.assertEqual(len(result.group("B")), 2) + self.assertEqual(result.group(""), result[0]) + self.assertEqual(result.group("A"), result[1]) + self.assertEqual(result.group("B"), result[2]) + self.assertEqual(result.group_for(boxesA[0]), result.group_for(boxesA[0])) + self.assertNotEqual(result.group_for(boxesA[0]), result.group_for(boxesB[0])) + with self.assertRaises(KeyError): + result.group("C") + + def test_group_by_str_repr(self): + nonagon = RegularPolygon(5, 9) + + expected = [ + "[[],", + " [,", + " ],", + " [,", + " ],", + " [,", + " ],", + " [,", + " ]]", + ] + self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) + + expected_repr = ( + "[[]," + " [," + " ]," + " [," + " ]," + " [," + " ]," + " [," + " ]]" + ) + self.assertDunderReprEqual( + repr(nonagon.edges().group_by(Axis.X)), expected_repr + ) + + f = io.StringIO() + p = pretty.PrettyPrinter(f) + nonagon.edges().group_by(Axis.X)._repr_pretty_(p, cycle=True) + self.assertEqual(f.getvalue(), "(...)") + + def test_distance(self): + with BuildPart() as box: + Box(1, 2, 3) + obj = (-0.2, 0.1, 0.5) + edges = box.edges().sort_by_distance(obj) + distances = [Vertex(*obj).distance_to(edge) for edge in edges] + self.assertTrue( + all([distances[i] >= distances[i - 1] for i in range(1, len(edges))]) + ) + + def test_distance_reverse(self): + with BuildPart() as box: + Box(1, 2, 3) + obj = (-0.2, 0.1, 0.5) + edges = box.edges().sort_by_distance(obj, reverse=True) + distances = [Vertex(*obj).distance_to(edge) for edge in edges] + self.assertTrue( + all([distances[i] <= distances[i - 1] for i in range(1, len(edges))]) + ) + + def test_distance_equal(self): + with BuildPart() as box: + Box(1, 1, 1) + self.assertEqual(len(box.edges().sort_by_distance((0, 0, 0))), 12) + + def test_vertices(self): + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + self.assertEqual(len(sl.vertices()), 8) + + def test_vertex(self): + sl = ShapeList([Edge.make_circle(1)]) + self.assertTupleAlmostEquals(sl.vertex().to_tuple(), (1, 0, 0), 5) + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + with self.assertWarns(UserWarning): + sl.vertex() + self.assertEqual(len(Edge().vertices()), 0) + + def test_edges(self): + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + self.assertEqual(len(sl.edges()), 8) + self.assertEqual(len(Edge().edges()), 0) + + def test_edge(self): + sl = ShapeList([Edge.make_circle(1)]) + self.assertAlmostEqual(sl.edge().length, 2 * 1 * math.pi, 5) + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + with self.assertWarns(UserWarning): + sl.edge() + + def test_wires(self): + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + self.assertEqual(len(sl.wires()), 2) + self.assertEqual(len(Wire().wires()), 0) + + def test_wire(self): + sl = ShapeList([Wire.make_circle(1)]) + self.assertAlmostEqual(sl.wire().length, 2 * 1 * math.pi, 5) + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + with self.assertWarns(UserWarning): + sl.wire() + + def test_faces(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + self.assertEqual(len(sl.faces()), 9) + self.assertEqual(len(Face().faces()), 0) + + def test_face(self): + sl = ShapeList( + [Vertex(1, 1, 1), Edge.make_line((0, 0), (1, 1)), Face.make_rect(2, 1)] + ) + self.assertAlmostEqual(sl.face().area, 2 * 1, 5) + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.face() + + def test_shells(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + self.assertEqual(len(sl.shells()), 2) + self.assertEqual(len(Shell().shells()), 0) + + def test_shell(self): + sl = ShapeList([Vertex(1, 1, 1), Solid.make_box(1, 1, 1)]) + self.assertAlmostEqual(sl.shell().area, 6 * 1 * 1, 5) + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.shell() + + def test_solids(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + self.assertEqual(len(sl.solids()), 2) + self.assertEqual(len(Solid().solids()), 0) + + def test_solid(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.solid() + sl = ShapeList([Solid.make_box(1, 2, 3), Vertex(1, 1, 1)]) + self.assertAlmostEqual(sl.solid().volume, 1 * 2 * 3, 5) + + def test_compounds(self): + sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) + self.assertEqual(len(sl.compounds()), 2) + self.assertEqual(len(Compound().compounds()), 0) + + def test_compound(self): + sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.compound() + sl = ShapeList([Box(1, 2, 3), Vertex(1, 1, 1)]) + self.assertAlmostEqual(sl.compound().volume, 1 * 2 * 3, 5) + + def test_equal(self): + box = Box(1, 1, 1) + cyl = Cylinder(1, 1) + sl = ShapeList([box, cyl]) + same = ShapeList([cyl, box]) + self.assertEqual(sl, same) + self.assertEqual(sl, AlwaysEqual()) + + def test_not_equal(self): + sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) + diff = ShapeList([Box(1, 1, 1), Box(1, 2, 3)]) + self.assertNotEqual(sl, diff) + self.assertNotEqual(sl, object()) + + def test_center(self): + self.assertEqual(tuple(ShapeList().center()), (0, 0, 0)) + self.assertEqual( + tuple(ShapeList(Vertex(i, 0, 0) for i in range(3)).center()), (1, 0, 0) + ) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_shells.py b/tests/test_direct_api/test_shells.py new file mode 100644 index 0000000..d1f3480 --- /dev/null +++ b/tests/test_direct_api/test_shells.py @@ -0,0 +1,118 @@ +""" +build123d direct api tests + +name: test_shells.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.geometry import Plane, Rot, Vector +from build123d.objects_curve import JernArc, Polyline, Spline +from build123d.objects_sketch import Circle +from build123d.operations_generic import sweep +from build123d.topology import Shell, Solid, Wire +from tests.base_test import DirectApiTestCase + + +class TestShells(DirectApiTestCase): + def test_shell_init(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + self.assertTrue(box_shell.is_valid()) + + def test_center(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + self.assertVectorAlmostEquals(box_shell.center(), (0.5, 0.5, 0.5), 5) + + def test_manifold_shell_volume(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + self.assertAlmostEqual(box_shell.volume, 1, 5) + + def test_nonmanifold_shell_volume(self): + box_faces = Solid.make_box(1, 1, 1).faces() + nm_shell = Shell(box_faces) + nm_shell -= nm_shell.faces()[0] + self.assertAlmostEqual(nm_shell.volume, 0, 5) + + def test_constructor(self): + with self.assertRaises(TypeError): + Shell(foo="bar") + + x_section = Rot(90) * Spline((0, -5), (-3, -2), (-2, 0), (-3, 2), (0, 5)) + surface = sweep(x_section, Circle(5).wire()) + single_face = Shell(surface.face()) + self.assertTrue(single_face.is_valid()) + single_face = Shell(surface.faces()) + self.assertTrue(single_face.is_valid()) + + def test_sweep(self): + path_c1 = JernArc((0, 0), (-1, 0), 1, 180) + path_e = path_c1.edge() + path_c2 = JernArc((0, 0), (-1, 0), 1, 180) + JernArc((0, 0), (1, 0), 2, -90) + path_w = path_c2.wire() + section_e = Circle(0.5).edge() + section_c2 = Polyline((0, 0), (0.1, 0), (0.2, 0.1)) + section_w = section_c2.wire() + + sweep_e_w = Shell.sweep((path_w ^ 0) * section_e, path_w) + sweep_w_e = Shell.sweep((path_e ^ 0) * section_w, path_e) + sweep_w_w = Shell.sweep((path_w ^ 0) * section_w, path_w) + sweep_c2_c1 = Shell.sweep((path_c1 ^ 0) * section_c2, path_c1) + sweep_c2_c2 = Shell.sweep((path_c2 ^ 0) * section_c2, path_c2) + + self.assertEqual(len(sweep_e_w.faces()), 2) + self.assertEqual(len(sweep_w_e.faces()), 2) + self.assertEqual(len(sweep_c2_c1.faces()), 2) + self.assertEqual(len(sweep_w_w.faces()), 3) # 3 with clean, 4 without + self.assertEqual(len(sweep_c2_c2.faces()), 3) # 3 with clean, 4 without + + def test_make_loft(self): + r = 3 + h = 2 + loft = Shell.make_loft( + [Wire.make_circle(r, Plane((0, 0, h))), Wire.make_circle(r)] + ) + self.assertEqual(loft.volume, 0, "A shell has no volume") + cylinder_area = 2 * math.pi * r * h + self.assertAlmostEqual(loft.area, cylinder_area) + + def test_thicken(self): + rect = Wire.make_rect(10, 5) + shell: Shell = Shell.extrude(rect, Vector(0, 0, 3)) + thick = Solid.thicken(shell, 1) + + self.assertEqual(isinstance(thick, Solid), True) + inner_vol = 3 * 10 * 5 + outer_vol = 3 * 12 * 7 + self.assertAlmostEqual(thick.volume, outer_vol - inner_vol) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_skip_clean.py b/tests/test_direct_api/test_skip_clean.py new file mode 100644 index 0000000..a39aeef --- /dev/null +++ b/tests/test_direct_api/test_skip_clean.py @@ -0,0 +1,70 @@ +""" +build123d direct api tests + +name: test_skip_clean.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.topology import SkipClean + + +class TestSkipClean(unittest.TestCase): + def setUp(self): + # Ensure the class variable is in its default state before each test + SkipClean.clean = True + + def test_context_manager_sets_clean_false(self): + # Verify `clean` is initially True + self.assertTrue(SkipClean.clean) + + # Use the context manager + with SkipClean(): + # Within the context, `clean` should be False + self.assertFalse(SkipClean.clean) + + # After exiting the context, `clean` should revert to True + self.assertTrue(SkipClean.clean) + + def test_exception_handling_does_not_affect_clean(self): + # Verify `clean` is initially True + self.assertTrue(SkipClean.clean) + + # Use the context manager and raise an exception + try: + with SkipClean(): + self.assertFalse(SkipClean.clean) + raise ValueError("Test exception") + except ValueError: + pass + + # Ensure `clean` is restored to True after an exception + self.assertTrue(SkipClean.clean) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_solid.py b/tests/test_direct_api/test_solid.py new file mode 100644 index 0000000..fad617a --- /dev/null +++ b/tests/test_direct_api/test_solid.py @@ -0,0 +1,245 @@ +""" +build123d direct api tests + +name: test_solid.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.build_enums import GeomType, Kind, Until +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.objects_curve import Spline +from build123d.objects_sketch import Circle, Rectangle +from build123d.topology import Compound, Edge, Face, Shell, Solid, Vertex, Wire +from tests.base_test import DirectApiTestCase + + +class TestSolid(DirectApiTestCase): + def test_make_solid(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + box = Solid(box_shell) + self.assertAlmostEqual(box.area, 6, 5) + self.assertAlmostEqual(box.volume, 1, 5) + self.assertTrue(box.is_valid()) + + def test_extrude(self): + v = Edge.extrude(Vertex(1, 1, 1), (0, 0, 1)) + self.assertAlmostEqual(v.length, 1, 5) + + e = Face.extrude(Edge.make_line((2, 1), (2, 0)), (0, 0, 1)) + self.assertAlmostEqual(e.area, 1, 5) + + w = Shell.extrude( + Wire([Edge.make_line((1, 1), (0, 2)), Edge.make_line((1, 1), (1, 0))]), + (0, 0, 1), + ) + self.assertAlmostEqual(w.area, 1 + math.sqrt(2), 5) + + f = Solid.extrude(Face.make_rect(1, 1), (0, 0, 1)) + self.assertAlmostEqual(f.volume, 1, 5) + + s = Compound.extrude( + Shell( + Solid.make_box(1, 1, 1) + .locate(Location((-2, 1, 0))) + .faces() + .sort_by(Axis((0, 0, 0), (1, 1, 1)))[-2:] + ), + (0.1, 0.1, 0.1), + ) + self.assertAlmostEqual(s.volume, 0.2, 5) + + with self.assertRaises(ValueError): + Solid.extrude(Solid.make_box(1, 1, 1), (0, 0, 1)) + + def test_extrude_taper(self): + a = 1 + rect = Face.make_rect(a, a) + flipped = -rect + for direction in [Vector(0, 0, 2), Vector(0, 0, -2)]: + for taper in [10, -10]: + offset_amt = -direction.length * math.tan(math.radians(taper)) + for face in [rect, flipped]: + with self.subTest( + f"{direction=}, {taper=}, flipped={face==flipped}" + ): + taper_solid = Solid.extrude_taper(face, direction, taper) + # V = 1/3 × h × (a² + b² + ab) + h = Vector(direction).length + b = a + 2 * offset_amt + v = h * (a**2 + b**2 + a * b) / 3 + self.assertAlmostEqual(taper_solid.volume, v, 5) + bbox = taper_solid.bounding_box() + size = max(1, b) / 2 + if direction.Z > 0: + self.assertVectorAlmostEquals( + bbox.min, (-size, -size, 0), 1 + ) + self.assertVectorAlmostEquals(bbox.max, (size, size, h), 1) + else: + self.assertVectorAlmostEquals( + bbox.min, (-size, -size, -h), 1 + ) + self.assertVectorAlmostEquals(bbox.max, (size, size, 0), 1) + + def test_extrude_taper_with_hole(self): + rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) + direction = Vector(0, 0, 0.5) + taper = 10 + taper_solid = Solid.extrude_taper(rect_hole, direction, taper) + offset_amt = -direction.length * math.tan(math.radians(taper)) + hole = taper_solid.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] + self.assertAlmostEqual(hole.radius, 0.25 - offset_amt, 5) + + def test_extrude_taper_with_hole_flipped(self): + rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) + direction = Vector(0, 0, 1) + taper = 10 + taper_solid_t = Solid.extrude_taper(rect_hole, direction, taper, True) + taper_solid_f = Solid.extrude_taper(rect_hole, direction, taper, False) + hole_t = taper_solid_t.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] + hole_f = taper_solid_f.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] + self.assertGreater(hole_t.radius, hole_f.radius) + + def test_extrude_taper_oblique(self): + rect = Face.make_rect(2, 1) + rect_hole = rect.make_holes([Wire.make_circle(0.25)]) + o_rect_hole = rect_hole.moved(Location((0, 0, 0), (1, 0.1, 0), 77)) + taper0 = Solid.extrude_taper(rect_hole, (0, 0, 1), 5) + taper1 = Solid.extrude_taper(o_rect_hole, o_rect_hole.normal_at(), 5) + self.assertAlmostEqual(taper0.volume, taper1.volume, 5) + + def test_extrude_linear_with_rotation(self): + # Face + base = Face.make_rect(1, 1) + twist = Solid.extrude_linear_with_rotation( + base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 + ) + self.assertAlmostEqual(twist.volume, 1, 5) + top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) + bottom = twist.faces().sort_by(Axis.Z)[0] + self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) + # Wire + base = Wire.make_rect(1, 1) + twist = Solid.extrude_linear_with_rotation( + base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 + ) + self.assertAlmostEqual(twist.volume, 1, 5) + top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) + bottom = twist.faces().sort_by(Axis.Z)[0] + self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) + + def test_make_loft(self): + loft = Solid.make_loft( + [Wire.make_rect(2, 2), Wire.make_circle(1, Plane((0, 0, 1)))] + ) + self.assertAlmostEqual(loft.volume, (4 + math.pi) / 2, 1) + + with self.assertRaises(ValueError): + Solid.make_loft([Wire.make_rect(1, 1)]) + + def test_make_loft_with_vertices(self): + loft = Solid.make_loft( + [Vertex(0, 0, -1), Wire.make_rect(1, 1.5), Vertex(0, 0, 1)], True + ) + self.assertAlmostEqual(loft.volume, 1, 5) + + with self.assertRaises(ValueError): + Solid.make_loft( + [Wire.make_rect(1, 1), Vertex(0, 0, 1), Wire.make_rect(1, 1)] + ) + + with self.assertRaises(ValueError): + Solid.make_loft([Vertex(0, 0, 1), Vertex(0, 0, 2)]) + + with self.assertRaises(ValueError): + Solid.make_loft( + [ + Vertex(0, 0, 1), + Wire.make_rect(1, 1), + Vertex(0, 0, 2), + Vertex(0, 0, 3), + ] + ) + + def test_extrude_until(self): + square = Face.make_rect(1, 1) + box = Solid.make_box(4, 4, 1, Plane((-2, -2, 3))) + extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.LAST) + self.assertAlmostEqual(extrusion.volume, 4, 5) + + square = Face.make_rect(1, 1) + box = Solid.make_box(4, 4, 1, Plane((-2, -2, -3))) + extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.PREVIOUS) + self.assertAlmostEqual(extrusion.volume, 2, 5) + + def test_sweep(self): + path = Edge.make_spline([(0, 0), (3, 5), (7, -2)]) + section = Wire.make_circle(1, Plane(path @ 0, z_dir=path % 0)) + area = Face(section).area + swept = Solid.sweep(section, path) + self.assertAlmostEqual(swept.volume, path.length * area, 0) + + def test_hollow_sweep(self): + path = Edge.make_line((0, 0, 0), (0, 0, 5)) + section = (Rectangle(1, 1) - Rectangle(0.1, 0.1)).faces()[0] + swept = Solid.sweep(section, path) + self.assertAlmostEqual(swept.volume, 5 * (1 - 0.1**2), 5) + + def test_sweep_multi(self): + f0 = Face.make_rect(1, 1) + f1 = Pos(X=10) * Circle(1).face() + path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (0, 0, -1))) + binormal = Edge.make_line((0, 1), (10, 1)) + swept = Solid.sweep_multi([f0, f1], path, is_frenet=True, binormal=binormal) + self.assertAlmostEqual(swept.volume, 23.78, 2) + + path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (1, 0, 0))) + swept = Solid.sweep_multi( + [f0, f1], path, is_frenet=True, binormal=Vector(5, 0, 1) + ) + self.assertAlmostEqual(swept.volume, 20.75, 2) + + def test_constructor(self): + with self.assertRaises(TypeError): + Solid(foo="bar") + + def test_offset_3d(self): + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).offset_3d(None, 0.1, kind=Kind.TANGENT) + + def test_revolve(self): + r = Solid.revolve( + Face.make_rect(1, 1, Plane((10, 0, 0))).wire(), 180, axis=Axis.Y + ) + self.assertEqual(len(r.faces()), 6) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_v_t_k_poly_data.py b/tests/test_direct_api/test_v_t_k_poly_data.py new file mode 100644 index 0000000..344e957 --- /dev/null +++ b/tests/test_direct_api/test_v_t_k_poly_data.py @@ -0,0 +1,89 @@ +""" +build123d direct api tests + +name: test_v_t_k_poly_data.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.topology import Solid +from vtkmodules.vtkCommonDataModel import vtkPolyData +from vtkmodules.vtkFiltersCore import vtkTriangleFilter + + +class TestVTKPolyData(unittest.TestCase): + def setUp(self): + # Create a simple test object (e.g., a cylinder) + self.object_under_test = Solid.make_cylinder(1, 2) + + def test_to_vtk_poly_data(self): + # Generate VTK data + vtk_data = self.object_under_test.to_vtk_poly_data( + tolerance=0.1, angular_tolerance=0.2, normals=True + ) + + # Verify the result is of type vtkPolyData + self.assertIsInstance(vtk_data, vtkPolyData) + + # Further verification can include: + # - Checking the number of points, polygons, or cells + self.assertGreater( + vtk_data.GetNumberOfPoints(), 0, "VTK data should have points." + ) + self.assertGreater( + vtk_data.GetNumberOfCells(), 0, "VTK data should have cells." + ) + + # Optionally, compare the output with a known reference object + # (if available) by exporting or analyzing the VTK data + known_filter = vtkTriangleFilter() + known_filter.SetInputData(vtk_data) + known_filter.Update() + known_output = known_filter.GetOutput() + + self.assertEqual( + vtk_data.GetNumberOfPoints(), + known_output.GetNumberOfPoints(), + "Number of points in VTK data does not match the expected output.", + ) + self.assertEqual( + vtk_data.GetNumberOfCells(), + known_output.GetNumberOfCells(), + "Number of cells in VTK data does not match the expected output.", + ) + + def test_empty_shape(self): + # Test handling of empty shape + empty_object = Solid() # Create an empty object + with self.assertRaises(ValueError) as context: + empty_object.to_vtk_poly_data() + + self.assertEqual(str(context.exception), "Cannot convert an empty shape") + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_vector.py b/tests/test_direct_api/test_vector.py new file mode 100644 index 0000000..9c635d7 --- /dev/null +++ b/tests/test_direct_api/test_vector.py @@ -0,0 +1,287 @@ +""" +build123d direct api tests + +name: test_vector.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import math +import unittest + +from OCP.gp import gp_Vec, gp_XYZ +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.topology import Solid, Vertex +from tests.base_test import DirectApiTestCase, DEG2RAD, AlwaysEqual + + +class TestVector(DirectApiTestCase): + """Test the Vector methods""" + + def test_vector_constructors(self): + v1 = Vector(1, 2, 3) + v2 = Vector((1, 2, 3)) + v3 = Vector(gp_Vec(1, 2, 3)) + v4 = Vector([1, 2, 3]) + v5 = Vector(gp_XYZ(1, 2, 3)) + v5b = Vector(X=1, Y=2, Z=3) + v5c = Vector(v=gp_XYZ(1, 2, 3)) + + for v in [v1, v2, v3, v4, v5, v5b, v5c]: + self.assertVectorAlmostEquals(v, (1, 2, 3), 4) + + v6 = Vector((1, 2)) + v7 = Vector([1, 2]) + v8 = Vector(1, 2) + v8b = Vector(X=1, Y=2) + + for v in [v6, v7, v8, v8b]: + self.assertVectorAlmostEquals(v, (1, 2, 0), 4) + + v9 = Vector() + self.assertVectorAlmostEquals(v9, (0, 0, 0), 4) + + v9.X = 1.0 + v9.Y = 2.0 + v9.Z = 3.0 + self.assertVectorAlmostEquals(v9, (1, 2, 3), 4) + self.assertVectorAlmostEquals(Vector(1, 2, 3, 4), (1, 2, 3), 4) + + v10 = Vector(1) + v11 = Vector((1,)) + v12 = Vector([1]) + v13 = Vector(X=1) + for v in [v10, v11, v12, v13]: + self.assertVectorAlmostEquals(v, (1, 0, 0), 4) + + vertex = Vertex(0, 0, 0).moved(Pos(0, 0, 10)) + self.assertVectorAlmostEquals(Vector(vertex), (0, 0, 10), 4) + + with self.assertRaises(TypeError): + Vector("vector") + with self.assertRaises(ValueError): + Vector(x=1) + + def test_vector_rotate(self): + """Validate vector rotate methods""" + vector_x = Vector(1, 0, 1).rotate(Axis.X, 45) + vector_y = Vector(1, 2, 1).rotate(Axis.Y, 45) + vector_z = Vector(-1, -1, 3).rotate(Axis.Z, 45) + self.assertVectorAlmostEquals( + vector_x, (1, -math.sqrt(2) / 2, math.sqrt(2) / 2), 7 + ) + self.assertVectorAlmostEquals(vector_y, (math.sqrt(2), 2, 0), 7) + self.assertVectorAlmostEquals(vector_z, (0, -math.sqrt(2), 3), 7) + + def test_get_signed_angle(self): + """Verify getSignedAngle calculations with and without a provided normal""" + a = math.pi / 3 + v1 = Vector(1, 0, 0) + v2 = Vector(math.cos(a), -math.sin(a), 0) + d1 = v1.get_signed_angle(v2) + d2 = v1.get_signed_angle(v2, Vector(0, 0, 1)) + self.assertAlmostEqual(d1, a * 180 / math.pi) + self.assertAlmostEqual(d2, -a * 180 / math.pi) + + def test_center(self): + v = Vector(1, 1, 1) + self.assertAlmostEqual(v, v.center()) + + def test_dot(self): + v1 = Vector(2, 2, 2) + v2 = Vector(1, -1, 1) + self.assertEqual(2.0, v1.dot(v2)) + + def test_vector_add(self): + result = Vector(1, 2, 0) + Vector(0, 0, 3) + self.assertVectorAlmostEquals(result, (1.0, 2.0, 3.0), 3) + + def test_vector_operators(self): + result = Vector(1, 1, 1) + Vector(2, 2, 2) + self.assertEqual(Vector(3, 3, 3), result) + + result = Vector(1, 2, 3) - Vector(3, 2, 1) + self.assertEqual(Vector(-2, 0, 2), result) + + result = Vector(1, 2, 3) * 2 + self.assertEqual(Vector(2, 4, 6), result) + + result = 3 * Vector(1, 2, 3) + self.assertEqual(Vector(3, 6, 9), result) + + result = Vector(2, 4, 6) / 2 + self.assertEqual(Vector(1, 2, 3), result) + + self.assertEqual(Vector(-1, -1, -1), -Vector(1, 1, 1)) + + self.assertEqual(0, abs(Vector(0, 0, 0))) + self.assertEqual(1, abs(Vector(1, 0, 0))) + self.assertEqual((1 + 4 + 9) ** 0.5, abs(Vector(1, 2, 3))) + + def test_vector_equals(self): + a = Vector(1, 2, 3) + b = Vector(1, 2, 3) + c = Vector(1, 2, 3.000001) + self.assertEqual(a, b) + self.assertEqual(a, c) + self.assertEqual(a, AlwaysEqual()) + + def test_vector_not_equal(self): + a = Vector(1, 2, 3) + b = Vector(3, 2, 1) + self.assertNotEqual(a, b) + self.assertNotEqual(a, object()) + + def test_vector_distance(self): + """ + Test line distance from plane. + """ + v = Vector(1, 2, 3) + + self.assertAlmostEqual(1, v.signed_distance_from_plane(Plane.YZ)) + self.assertAlmostEqual(2, v.signed_distance_from_plane(Plane.ZX)) + self.assertAlmostEqual(3, v.signed_distance_from_plane(Plane.XY)) + self.assertAlmostEqual(-1, v.signed_distance_from_plane(Plane.ZY)) + self.assertAlmostEqual(-2, v.signed_distance_from_plane(Plane.XZ)) + self.assertAlmostEqual(-3, v.signed_distance_from_plane(Plane.YX)) + + self.assertAlmostEqual(1, v.distance_to_plane(Plane.YZ)) + self.assertAlmostEqual(2, v.distance_to_plane(Plane.ZX)) + self.assertAlmostEqual(3, v.distance_to_plane(Plane.XY)) + self.assertAlmostEqual(1, v.distance_to_plane(Plane.ZY)) + self.assertAlmostEqual(2, v.distance_to_plane(Plane.XZ)) + self.assertAlmostEqual(3, v.distance_to_plane(Plane.YX)) + + def test_vector_project(self): + """ + Test line projection and plane projection methods of Vector + """ + decimal_places = 9 + + z_dir = Vector(1, 2, 3) + base = Vector(5, 7, 9) + x_dir = Vector(1, 0, 0) + + # test passing Plane object + point = Vector(10, 11, 12).project_to_plane(Plane(base, x_dir, z_dir)) + self.assertVectorAlmostEquals(point, (59 / 7, 55 / 7, 51 / 7), decimal_places) + + # test line projection + vec = Vector(10, 10, 10) + line = Vector(3, 4, 5) + angle = vec.get_angle(line) * DEG2RAD + + vecLineProjection = vec.project_to_line(line) + + self.assertVectorAlmostEquals( + vecLineProjection.normalized(), + line.normalized(), + decimal_places, + ) + self.assertAlmostEqual( + vec.length * math.cos(angle), vecLineProjection.length, decimal_places + ) + + def test_vector_not_implemented(self): + pass + + def test_vector_special_methods(self): + self.assertEqual(repr(Vector(1, 2, 3)), "Vector(1, 2, 3)") + self.assertEqual(str(Vector(1, 2, 3)), "Vector(1, 2, 3)") + self.assertEqual( + str(Vector(9.99999999999999, -23.649999999999995, -7.37188088351e-15)), + "Vector(10, -23.65, 0)", + ) + + def test_vector_iter(self): + self.assertEqual(sum([v for v in Vector(1, 2, 3)]), 6) + + def test_reverse(self): + self.assertVectorAlmostEquals(Vector(1, 2, 3).reverse(), (-1, -2, -3), 7) + + def test_copy(self): + v2 = copy.copy(Vector(1, 2, 3)) + v3 = copy.deepcopy(Vector(1, 2, 3)) + self.assertVectorAlmostEquals(v2, (1, 2, 3), 7) + self.assertVectorAlmostEquals(v3, (1, 2, 3), 7) + + def test_radd(self): + vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9)] + vector_sum = sum(vectors) + self.assertVectorAlmostEquals(vector_sum, (12, 15, 18), 5) + + def test_hash(self): + vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9), Vector(1, 2, 3)] + unique_vectors = list(set(vectors)) + self.assertEqual(len(vectors), 4) + self.assertEqual(len(unique_vectors), 3) + + def test_vector_transform(self): + a = Vector(1, 2, 3) + pxy = Plane.XY + pxy_o1 = Plane.XY.offset(1) + self.assertEqual(a.transform(pxy.forward_transform, is_direction=False), a) + self.assertEqual( + a.transform(pxy.forward_transform, is_direction=True), a.normalized() + ) + self.assertEqual( + a.transform(pxy_o1.forward_transform, is_direction=False), Vector(1, 2, 2) + ) + self.assertEqual( + a.transform(pxy_o1.forward_transform, is_direction=True), a.normalized() + ) + self.assertEqual( + a.transform(pxy_o1.reverse_transform, is_direction=False), Vector(1, 2, 4) + ) + self.assertEqual( + a.transform(pxy_o1.reverse_transform, is_direction=True), a.normalized() + ) + + def test_intersect(self): + v1 = Vector(1, 2, 3) + self.assertVectorAlmostEquals(v1 & Vector(1, 2, 3), (1, 2, 3), 5) + self.assertIsNone(v1 & Vector(0, 0, 0)) + + self.assertVectorAlmostEquals(v1 & Location((1, 2, 3)), (1, 2, 3), 5) + self.assertIsNone(v1 & Location()) + + self.assertVectorAlmostEquals(v1 & Axis((1, 2, 3), (1, 0, 0)), (1, 2, 3), 5) + self.assertIsNone(v1 & Axis.X) + + self.assertVectorAlmostEquals(v1 & Plane((1, 2, 3)), (1, 2, 3), 5) + self.assertIsNone(v1 & Plane.XY) + + self.assertVectorAlmostEquals( + (v1 & Solid.make_box(2, 4, 5)).vertex(), (1, 2, 3), 5 + ) + self.assertIsNone(v1.intersect(Solid.make_box(0.5, 0.5, 0.5))) + self.assertIsNone( + Vertex(-10, -10, -10).intersect(Solid.make_box(0.5, 0.5, 0.5)) + ) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_vector_like.py b/tests/test_direct_api/test_vector_like.py new file mode 100644 index 0000000..5e4d083 --- /dev/null +++ b/tests/test_direct_api/test_vector_like.py @@ -0,0 +1,58 @@ +""" +build123d direct api tests + +name: test_vector_like.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import Axis, Vector +from build123d.topology import Vertex +from tests.base_test import DirectApiTestCase + + +class TestVectorLike(DirectApiTestCase): + """Test typedef""" + + def test_axis_from_vertex(self): + axis = Axis(Vertex(1, 2, 3), Vertex(0, 0, 1)) + self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) + + def test_axis_from_vector(self): + axis = Axis(Vector(1, 2, 3), Vector(0, 0, 1)) + self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) + + def test_axis_from_tuple(self): + axis = Axis((1, 2, 3), (0, 0, 1)) + self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) + self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_vertex.py b/tests/test_direct_api/test_vertex.py new file mode 100644 index 0000000..550ba07 --- /dev/null +++ b/tests/test_direct_api/test_vertex.py @@ -0,0 +1,111 @@ +""" +build123d direct api tests + +name: test_vertex.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import Axis, Vector +from build123d.topology import Vertex +from tests.base_test import DirectApiTestCase + + +class TestVertex(DirectApiTestCase): + """Test the extensions to the cadquery Vertex class""" + + def test_basic_vertex(self): + v = Vertex() + self.assertEqual(0, v.X) + + v = Vertex(1, 1, 1) + self.assertEqual(1, v.X) + self.assertEqual(Vector, type(v.center())) + + self.assertVectorAlmostEquals(Vector(Vertex(Vector(1, 2, 3))), (1, 2, 3), 7) + self.assertVectorAlmostEquals(Vector(Vertex((4, 5, 6))), (4, 5, 6), 7) + self.assertVectorAlmostEquals(Vector(Vertex((7,))), (7, 0, 0), 7) + self.assertVectorAlmostEquals(Vector(Vertex((8, 9))), (8, 9, 0), 7) + + def test_vertex_volume(self): + v = Vertex(1, 1, 1) + self.assertAlmostEqual(v.volume, 0, 5) + + def test_vertex_add(self): + test_vertex = Vertex(0, 0, 0) + self.assertVectorAlmostEquals( + Vector(test_vertex + (100, -40, 10)), (100, -40, 10), 7 + ) + self.assertVectorAlmostEquals( + Vector(test_vertex + Vector(100, -40, 10)), (100, -40, 10), 7 + ) + self.assertVectorAlmostEquals( + Vector(test_vertex + Vertex(100, -40, 10)), + (100, -40, 10), + 7, + ) + with self.assertRaises(TypeError): + test_vertex + [1, 2, 3] + + def test_vertex_sub(self): + test_vertex = Vertex(0, 0, 0) + self.assertVectorAlmostEquals( + Vector(test_vertex - (100, -40, 10)), (-100, 40, -10), 7 + ) + self.assertVectorAlmostEquals( + Vector(test_vertex - Vector(100, -40, 10)), (-100, 40, -10), 7 + ) + self.assertVectorAlmostEquals( + Vector(test_vertex - Vertex(100, -40, 10)), + (-100, 40, -10), + 7, + ) + with self.assertRaises(TypeError): + test_vertex - [1, 2, 3] + + def test_vertex_str(self): + self.assertEqual(str(Vertex(0, 0, 0)), "Vertex(0.0, 0.0, 0.0)") + + def test_vertex_to_vector(self): + self.assertIsInstance(Vector(Vertex(0, 0, 0)), Vector) + self.assertVectorAlmostEquals(Vector(Vertex(0, 0, 0)), (0.0, 0.0, 0.0), 7) + + def test_vertex_init_error(self): + with self.assertRaises(TypeError): + Vertex(Axis.Z) + with self.assertRaises(ValueError): + Vertex(x=1) + with self.assertRaises(TypeError): + Vertex((Axis.X, Axis.Y, Axis.Z)) + + def test_no_intersect(self): + with self.assertRaises(NotImplementedError): + Vertex(1, 2, 3) & Vertex(5, 6, 7) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py new file mode 100644 index 0000000..7737bf4 --- /dev/null +++ b/tests/test_direct_api/test_wire.py @@ -0,0 +1,223 @@ +""" +build123d direct api tests + +name: test_wire.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import random +import unittest + +from build123d.build_enums import Side +from build123d.geometry import Axis, Color, Location +from build123d.objects_curve import Polyline, Spline +from build123d.objects_sketch import Circle, Rectangle, RegularPolygon +from build123d.topology import Edge, Face, Wire +from tests.base_test import DirectApiTestCase + + +class TestWire(DirectApiTestCase): + def test_ellipse_arc(self): + full_ellipse = Wire.make_ellipse(2, 1) + half_ellipse = Wire.make_ellipse( + 2, 1, start_angle=0, end_angle=180, closed=True + ) + self.assertAlmostEqual(full_ellipse.area / 2, half_ellipse.area, 5) + + def test_stitch(self): + half_ellipse1 = Wire.make_ellipse( + 2, 1, start_angle=0, end_angle=180, closed=False + ) + half_ellipse2 = Wire.make_ellipse( + 2, 1, start_angle=180, end_angle=360, closed=False + ) + ellipse = half_ellipse1.stitch(half_ellipse2) + self.assertEqual(len(ellipse.wires()), 1) + + def test_fillet_2d(self): + square = Wire.make_rect(1, 1) + squaroid = square.fillet_2d(0.1, square.vertices()) + self.assertAlmostEqual( + squaroid.length, 4 * (1 - 2 * 0.1) + 2 * math.pi * 0.1, 5 + ) + + def test_chamfer_2d(self): + square = Wire.make_rect(1, 1) + squaroid = square.chamfer_2d(0.1, 0.1, square.vertices()) + self.assertAlmostEqual( + squaroid.length, 4 * (1 - 2 * 0.1 + 0.1 * math.sqrt(2)), 5 + ) + + def test_chamfer_2d_edge(self): + square = Wire.make_rect(1, 1) + edge = square.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + square = square.chamfer_2d( + distance=0.1, distance2=0.2, vertices=[vertex], edge=edge + ) + self.assertAlmostEqual(square.edges().sort_by(Axis.Y)[0].length, 0.9) + + def test_make_convex_hull(self): + # overlapping_edges = [ + # Edge.make_circle(10, end_angle=60), + # Edge.make_circle(10, start_angle=30, end_angle=90), + # Edge.make_line((-10, 10), (10, -10)), + # ] + # with self.assertRaises(ValueError): + # Wire.make_convex_hull(overlapping_edges) + + adjoining_edges = [ + Edge.make_circle(10, end_angle=45), + Edge.make_circle(10, start_angle=315, end_angle=360), + Edge.make_line((-10, 10), (-10, -10)), + ] + hull_wire = Wire.make_convex_hull(adjoining_edges) + self.assertAlmostEqual(Face(hull_wire).area, 319.9612, 4) + + # def test_fix_degenerate_edges(self): + # # Can't find a way to create one + # edge0 = Edge.make_line((0, 0, 0), (1, 0, 0)) + # edge1 = Edge.make_line(edge0 @ 0, edge0 @ 0 + Vector(0, 1, 0)) + # edge1a = edge1.trim(0, 1e-7) + # edge1b = edge1.trim(1e-7, 1.0) + # edge2 = Edge.make_line(edge1 @ 1, edge1 @ 1 + Vector(1, 1, 0)) + # wire = Wire([edge0, edge1a, edge1b, edge2]) + # fixed_wire = wire.fix_degenerate_edges(1e-6) + # self.assertEqual(len(fixed_wire.edges()), 2) + + def test_trim(self): + e0 = Edge.make_line((0, 0), (1, 0)) + e1 = Edge.make_line((2, 0), (1, 0)) + e2 = Edge.make_line((2, 0), (3, 0)) + w1 = Wire([e0, e1, e2]) + t1 = w1.trim(0.2, 0.9).move(Location((0, 0.1, 0))) + self.assertAlmostEqual(t1.length, 2.1, 5) + + e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) + # Three edges are created 0->0.5->0.75->1.0 + o = e.offset_2d(10, side=Side.RIGHT, closed=False) + t2 = o.trim(0.1, 0.9) + self.assertAlmostEqual(t2.length, o.length * 0.8, 5) + + t3 = o.trim(0.5, 1.0) + self.assertAlmostEqual(t3.length, o.length * 0.5, 5) + + t4 = o.trim(0.5, 0.75) + self.assertAlmostEqual(t4.length, o.length * 0.25, 5) + + with self.assertRaises(ValueError): + o.trim(0.75, 0.25) + spline = Spline( + (0, 0, 0), + (0, 10, 0), + tangents=((0, 0, 1), (0, 0, -1)), + tangent_scalars=(2, 2), + ) + half = spline.trim(0.5, 1) + self.assertVectorAlmostEquals(spline @ 0.5, half @ 0, 4) + self.assertVectorAlmostEquals(spline @ 1, half @ 1, 4) + + w = Rectangle(3, 1).wire() + t5 = w.trim(0, 0.5) + self.assertAlmostEqual(t5.length, 4, 5) + t6 = w.trim(0.5, 1) + self.assertAlmostEqual(t6.length, 4, 5) + + p = RegularPolygon(10, 20).wire() + t7 = p.trim(0.1, 0.2) + self.assertAlmostEqual(p.length * 0.1, t7.length, 5) + + c = Circle(10).wire() + t8 = c.trim(0.4, 0.9) + self.assertAlmostEqual(c.length * 0.5, t8.length, 5) + + def test_param_at_point(self): + e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) + # Three edges are created 0->0.5->0.75->1.0 + o = e.offset_2d(10, side=Side.RIGHT, closed=False) + + e0 = Edge.make_line((0, 0), (1, 0)) + e1 = Edge.make_line((2, 0), (1, 0)) + e2 = Edge.make_line((2, 0), (3, 0)) + w1 = Wire([e0, e1, e2]) + for wire in [o, w1]: + u_value = random.random() + position = wire.position_at(u_value) + self.assertAlmostEqual(wire.param_at_point(position), u_value, 4) + + with self.assertRaises(ValueError): + o.param_at_point((-1, 1)) + + with self.assertRaises(ValueError): + w1.param_at_point((20, 20, 20)) + + def test_order_edges(self): + w1 = Wire( + [ + Edge.make_line((0, 0), (1, 0)), + Edge.make_line((1, 1), (1, 0)), + Edge.make_line((0, 1), (1, 1)), + ] + ) + ordered_edges = w1.order_edges() + self.assertFalse(all(e.is_forward for e in w1.edges())) + self.assertTrue(all(e.is_forward for e in ordered_edges)) + self.assertVectorAlmostEquals(ordered_edges[0] @ 0, (0, 0, 0), 5) + self.assertVectorAlmostEquals(ordered_edges[1] @ 0, (1, 0, 0), 5) + self.assertVectorAlmostEquals(ordered_edges[2] @ 0, (1, 1, 0), 5) + + def test_constructor(self): + e0 = Edge.make_line((0, 0), (1, 0)) + e1 = Edge.make_line((1, 0), (1, 1)) + w0 = Wire.make_circle(1) + w1 = Wire(e0) + self.assertTrue(w1.is_valid()) + w2 = Wire([e0]) + self.assertAlmostEqual(w2.length, 1, 5) + self.assertTrue(w2.is_valid()) + w3 = Wire([e0, e1]) + self.assertTrue(w3.is_valid()) + self.assertAlmostEqual(w3.length, 2, 5) + w4 = Wire(w0.wrapped) + self.assertTrue(w4.is_valid()) + w5 = Wire(obj=w0.wrapped) + self.assertTrue(w5.is_valid()) + w6 = Wire(obj=w0.wrapped, label="w6", color=Color("red")) + self.assertTrue(w6.is_valid()) + self.assertEqual(w6.label, "w6") + self.assertTupleAlmostEquals(tuple(w6.color), (1.0, 0.0, 0.0, 1.0), 5) + w7 = Wire(w6) + self.assertTrue(w7.is_valid()) + c0 = Polyline((0, 0), (1, 0), (1, 1)) + w8 = Wire(c0) + self.assertTrue(w8.is_valid()) + with self.assertRaises(ValueError): + Wire(bob="fred") + + +if __name__ == "__main__": + import unittest + + unittest.main() From bb6a542244001f75db470876136c937983f1d291 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 21 Jan 2025 21:42:05 -0500 Subject: [PATCH 152/518] Revert "Split test_direct_api.py in many smaller tests" This reverts commit 23e035a1ce105a72712b88fd3fbc74c39c95f221. --- tests/__init__.py | 0 tests/test_direct_api.py | 17 +- tests/test_direct_api/test_always_equal.py | 40 -- tests/test_direct_api/test_assembly.py | 127 ---- tests/test_direct_api/test_axis.py | 208 ------ tests/test_direct_api/test_bound_box.py | 107 --- tests/test_direct_api/test_cad_objects.py | 267 -------- tests/test_direct_api/test_clean_method.py | 72 -- tests/test_direct_api/test_color.py | 127 ---- tests/test_direct_api/test_compound.py | 165 ----- .../test_direct_api_test_case.py | 60 -- tests/test_direct_api/test_edge.py | 293 --------- tests/test_direct_api/test_face.py | 459 ------------- tests/test_direct_api/test_functions.py | 107 --- tests/test_direct_api/test_group_by.py | 71 -- tests/test_direct_api/test_import_export.py | 70 -- tests/test_direct_api/test_jupyter.py | 60 -- tests/test_direct_api/test_location.py | 392 ----------- tests/test_direct_api/test_matrix.py | 197 ------ tests/test_direct_api/test_mixin1_d.py | 321 --------- tests/test_direct_api/test_mixin3_d.py | 157 ----- tests/test_direct_api/test_plane.py | 504 -------------- tests/test_direct_api/test_projection.py | 106 --- tests/test_direct_api/test_rotation.py | 61 -- tests/test_direct_api/test_shape.py | 615 ------------------ tests/test_direct_api/test_shape_list.py | 364 ----------- tests/test_direct_api/test_shells.py | 118 ---- tests/test_direct_api/test_skip_clean.py | 70 -- tests/test_direct_api/test_solid.py | 245 ------- tests/test_direct_api/test_v_t_k_poly_data.py | 89 --- tests/test_direct_api/test_vector.py | 287 -------- tests/test_direct_api/test_vector_like.py | 58 -- tests/test_direct_api/test_vertex.py | 111 ---- tests/test_direct_api/test_wire.py | 223 ------- 34 files changed, 10 insertions(+), 6158 deletions(-) delete mode 100644 tests/__init__.py delete mode 100644 tests/test_direct_api/test_always_equal.py delete mode 100644 tests/test_direct_api/test_assembly.py delete mode 100644 tests/test_direct_api/test_axis.py delete mode 100644 tests/test_direct_api/test_bound_box.py delete mode 100644 tests/test_direct_api/test_cad_objects.py delete mode 100644 tests/test_direct_api/test_clean_method.py delete mode 100644 tests/test_direct_api/test_color.py delete mode 100644 tests/test_direct_api/test_compound.py delete mode 100644 tests/test_direct_api/test_direct_api_test_case.py delete mode 100644 tests/test_direct_api/test_edge.py delete mode 100644 tests/test_direct_api/test_face.py delete mode 100644 tests/test_direct_api/test_functions.py delete mode 100644 tests/test_direct_api/test_group_by.py delete mode 100644 tests/test_direct_api/test_import_export.py delete mode 100644 tests/test_direct_api/test_jupyter.py delete mode 100644 tests/test_direct_api/test_location.py delete mode 100644 tests/test_direct_api/test_matrix.py delete mode 100644 tests/test_direct_api/test_mixin1_d.py delete mode 100644 tests/test_direct_api/test_mixin3_d.py delete mode 100644 tests/test_direct_api/test_plane.py delete mode 100644 tests/test_direct_api/test_projection.py delete mode 100644 tests/test_direct_api/test_rotation.py delete mode 100644 tests/test_direct_api/test_shape.py delete mode 100644 tests/test_direct_api/test_shape_list.py delete mode 100644 tests/test_direct_api/test_shells.py delete mode 100644 tests/test_direct_api/test_skip_clean.py delete mode 100644 tests/test_direct_api/test_solid.py delete mode 100644 tests/test_direct_api/test_v_t_k_poly_data.py delete mode 100644 tests/test_direct_api/test_vector.py delete mode 100644 tests/test_direct_api/test_vector_like.py delete mode 100644 tests/test_direct_api/test_vertex.py delete mode 100644 tests/test_direct_api/test_wire.py diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 7d2f47c..4dcbfaf 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -1054,15 +1054,18 @@ class TestEdge(DirectApiTestCase): line.find_intersection_points(Plane.YZ) # def test_intersections_tolerance(self): - # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) - # l1 = Edge.make_line((1, 0), (2, 0)) - # i1 = l1.intersect(*r1) - # r2 = Rectangle(2, 2).edges() - # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) - # i2 = l2.intersect(*r2) + # Multiple operands not currently supported - # self.assertEqual(len(i1.vertices()), len(i2.vertices())) + # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) + # l1 = Edge.make_line((1, 0), (2, 0)) + # i1 = l1.intersect(*r1) + + # r2 = Rectangle(2, 2).edges() + # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) + # i2 = l2.intersect(*r2) + + # self.assertEqual(len(i1.vertices()), len(i2.vertices())) def test_trim(self): line = Edge.make_line((-2, 0), (2, 0)) diff --git a/tests/test_direct_api/test_always_equal.py b/tests/test_direct_api/test_always_equal.py deleted file mode 100644 index 9b2292f..0000000 --- a/tests/test_direct_api/test_always_equal.py +++ /dev/null @@ -1,40 +0,0 @@ -""" -build123d direct api tests - -name: test_always_equal.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - - -class AlwaysEqual: - def __eq__(self, other): - return True - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_assembly.py b/tests/test_direct_api/test_assembly.py deleted file mode 100644 index b464a0c..0000000 --- a/tests/test_direct_api/test_assembly.py +++ /dev/null @@ -1,127 +0,0 @@ -""" -build123d direct api tests - -name: test_assembly.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import re -import unittest - -from build123d.topology import Compound, Solid - - -class TestAssembly(unittest.TestCase): - @staticmethod - def create_test_assembly() -> Compound: - box = Solid.make_box(1, 1, 1) - box.orientation = (45, 45, 0) - box.label = "box" - sphere = Solid.make_sphere(1) - sphere.label = "sphere" - sphere.position = (1, 2, 3) - assembly = Compound(label="assembly", children=[box]) - sphere.parent = assembly - return assembly - - def assertTopoEqual(self, actual_topo: str, expected_topo_lines: list[str]): - actual_topo_lines = actual_topo.splitlines() - self.assertEqual(len(actual_topo_lines), len(expected_topo_lines)) - for actual_line, expected_line in zip(actual_topo_lines, expected_topo_lines): - start, end = re.split(r"at 0x[0-9a-f]+,", expected_line, 2, re.I) - self.assertTrue(actual_line.startswith(start)) - self.assertTrue(actual_line.endswith(end)) - - def test_attributes(self): - box = Solid.make_box(1, 1, 1) - box.label = "box" - sphere = Solid.make_sphere(1) - sphere.label = "sphere" - assembly = Compound(label="assembly", children=[box]) - sphere.parent = assembly - - self.assertEqual(len(box.children), 0) - self.assertEqual(box.label, "box") - self.assertEqual(box.parent, assembly) - self.assertEqual(sphere.parent, assembly) - self.assertEqual(len(assembly.children), 2) - - def test_show_topology_compound(self): - assembly = TestAssembly.create_test_assembly() - expected = [ - "assembly Compound at 0x7fced0fd1b50, Location(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))", - "├── box Solid at 0x7fced102d3a0, Location(p=(0.00, 0.00, 0.00), o=(45.00, 45.00, -0.00))", - "└── sphere Solid at 0x7fced0fd1f10, Location(p=(1.00, 2.00, 3.00), o=(-0.00, 0.00, -0.00))", - ] - self.assertTopoEqual(assembly.show_topology("Solid"), expected) - - def test_show_topology_shape_location(self): - assembly = TestAssembly.create_test_assembly() - expected = [ - "Solid at 0x7f3754501530, Position(1.0, 2.0, 3.0)", - "└── Shell at 0x7f3754501a70, Position(1.0, 2.0, 3.0)", - " └── Face at 0x7f3754501030, Position(1.0, 2.0, 3.0)", - ] - self.assertTopoEqual( - assembly.children[1].show_topology("Face", show_center=False), expected - ) - - def test_show_topology_shape(self): - assembly = TestAssembly.create_test_assembly() - expected = [ - "Solid at 0x7f6279043ab0, Center(1.0, 2.0, 3.0)", - "└── Shell at 0x7f62790438f0, Center(1.0, 2.0, 3.0)", - " └── Face at 0x7f62790439f0, Center(1.0, 2.0, 3.0)", - ] - self.assertTopoEqual(assembly.children[1].show_topology("Face"), expected) - - def test_remove_child(self): - assembly = TestAssembly.create_test_assembly() - self.assertEqual(len(assembly.children), 2) - assembly.children = list(assembly.children)[1:] - self.assertEqual(len(assembly.children), 1) - - def test_do_children_intersect(self): - ( - overlap, - pair, - distance, - ) = TestAssembly.create_test_assembly().do_children_intersect() - self.assertFalse(overlap) - box = Solid.make_box(1, 1, 1) - box.orientation = (45, 45, 0) - box.label = "box" - sphere = Solid.make_sphere(1) - sphere.label = "sphere" - sphere.position = (0, 0, 0) - assembly = Compound(label="assembly", children=[box]) - sphere.parent = assembly - overlap, pair, distance = assembly.do_children_intersect() - self.assertTrue(overlap) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py deleted file mode 100644 index f4d0a4a..0000000 --- a/tests/test_direct_api/test_axis.py +++ /dev/null @@ -1,208 +0,0 @@ -""" -build123d direct api tests - -name: test_axis.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import copy -import unittest - -from OCP.gp import gp_Ax1, gp_Dir, gp_Pnt -from build123d.geometry import Axis, Location, Plane, Vector -from build123d.topology import Edge -from tests.base_test import DirectApiTestCase, AlwaysEqual - - -class TestAxis(DirectApiTestCase): - """Test the Axis class""" - - def test_axis_init(self): - test_axis = Axis((1, 2, 3), (0, 0, 1)) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis((1, 2, 3), direction=(0, 0, 1)) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis(origin=(1, 2, 3), direction=(0, 0, 1)) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis(Edge.make_line((1, 2, 3), (1, 2, 4))) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis(edge=Edge.make_line((1, 2, 3), (1, 2, 4))) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) - - with self.assertRaises(ValueError): - Axis("one", "up") - with self.assertRaises(ValueError): - Axis(one="up") - - def test_axis_from_occt(self): - occt_axis = gp_Ax1(gp_Pnt(1, 1, 1), gp_Dir(0, 1, 0)) - test_axis = Axis(occt_axis) - self.assertVectorAlmostEquals(test_axis.position, (1, 1, 1), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 1, 0), 5) - - def test_axis_repr_and_str(self): - self.assertEqual(repr(Axis.X), "((0.0, 0.0, 0.0),(1.0, 0.0, 0.0))") - self.assertEqual(str(Axis.Y), "Axis: ((0.0, 0.0, 0.0),(0.0, 1.0, 0.0))") - - def test_axis_copy(self): - x_copy = copy.copy(Axis.X) - self.assertVectorAlmostEquals(x_copy.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_copy.direction, (1, 0, 0), 5) - x_copy = copy.deepcopy(Axis.X) - self.assertVectorAlmostEquals(x_copy.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_copy.direction, (1, 0, 0), 5) - - def test_axis_to_location(self): - # TODO: Verify this is correct - x_location = Axis.X.location - self.assertTrue(isinstance(x_location, Location)) - self.assertVectorAlmostEquals(x_location.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_location.orientation, (0, 90, 180), 5) - - def test_axis_located(self): - y_axis = Axis.Z.located(Location((0, 0, 1), (-90, 0, 0))) - self.assertVectorAlmostEquals(y_axis.position, (0, 0, 1), 5) - self.assertVectorAlmostEquals(y_axis.direction, (0, 1, 0), 5) - - def test_axis_to_plane(self): - x_plane = Axis.X.to_plane() - self.assertTrue(isinstance(x_plane, Plane)) - self.assertVectorAlmostEquals(x_plane.origin, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_plane.z_dir, (1, 0, 0), 5) - - def test_axis_is_coaxial(self): - self.assertTrue(Axis.X.is_coaxial(Axis((0, 0, 0), (1, 0, 0)))) - self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 1), (1, 0, 0)))) - self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 0), (0, 1, 0)))) - - def test_axis_is_normal(self): - self.assertTrue(Axis.X.is_normal(Axis.Y)) - self.assertFalse(Axis.X.is_normal(Axis.X)) - - def test_axis_is_opposite(self): - self.assertTrue(Axis.X.is_opposite(Axis((1, 1, 1), (-1, 0, 0)))) - self.assertFalse(Axis.X.is_opposite(Axis.X)) - - def test_axis_is_parallel(self): - self.assertTrue(Axis.X.is_parallel(Axis((1, 1, 1), (1, 0, 0)))) - self.assertFalse(Axis.X.is_parallel(Axis.Y)) - - def test_axis_angle_between(self): - self.assertAlmostEqual(Axis.X.angle_between(Axis.Y), 90, 5) - self.assertAlmostEqual( - Axis.X.angle_between(Axis((1, 1, 1), (-1, 0, 0))), 180, 5 - ) - - def test_axis_reverse(self): - self.assertVectorAlmostEquals(Axis.X.reverse().direction, (-1, 0, 0), 5) - - def test_axis_reverse_op(self): - axis = -Axis.X - self.assertVectorAlmostEquals(axis.direction, (-1, 0, 0), 5) - - def test_axis_as_edge(self): - edge = Edge(Axis.X) - self.assertTrue(isinstance(edge, Edge)) - common = (edge & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() - self.assertAlmostEqual(common.length, 1, 5) - - def test_axis_intersect(self): - common = (Axis.X.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() - self.assertAlmostEqual(common.length, 1, 5) - - common = (Axis.X & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() - self.assertAlmostEqual(common.length, 1, 5) - - intersection = Axis.X & Axis((1, 0, 0), (0, 1, 0)) - self.assertVectorAlmostEquals(intersection, (1, 0, 0), 5) - - i = Axis.X & Axis((1, 0, 0), (1, 0, 0)) - self.assertEqual(i, Axis.X) - - intersection = Axis((1, 2, 3), (0, 0, 1)) & Plane.XY - self.assertTupleAlmostEquals(intersection.to_tuple(), (1, 2, 0), 5) - - arc = Edge.make_circle(20, start_angle=0, end_angle=180) - ax0 = Axis((-20, 30, 0), (4, -3, 0)) - intersections = arc.intersect(ax0).vertices().sort_by(Axis.X) - self.assertTupleAlmostEquals(tuple(intersections[0]), (-5.6, 19.2, 0), 5) - self.assertTupleAlmostEquals(tuple(intersections[1]), (20, 0, 0), 5) - - intersections = ax0.intersect(arc).vertices().sort_by(Axis.X) - self.assertTupleAlmostEquals(tuple(intersections[0]), (-5.6, 19.2, 0), 5) - self.assertTupleAlmostEquals(tuple(intersections[1]), (20, 0, 0), 5) - - i = Axis((0, 0, 1), (1, 1, 1)) & Vector(0.5, 0.5, 1.5) - self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, (0.5, 0.5, 1.5), 5) - self.assertIsNone(Axis.Y & Vector(2, 0, 0)) - - l = Edge.make_line((0, 0, 1), (0, 0, 2)) ^ 1 - i: Location = Axis.Z & l - self.assertTrue(isinstance(i, Location)) - self.assertVectorAlmostEquals(i.position, l.position, 5) - self.assertVectorAlmostEquals(i.orientation, l.orientation, 5) - - self.assertIsNone(Axis.Z & Edge.make_line((0, 0, 1), (1, 0, 0)).location_at(1)) - self.assertIsNone(Axis.Z & Edge.make_line((1, 0, 1), (1, 0, 2)).location_at(1)) - - # TODO: uncomment when generalized edge to surface intersections are complete - # non_planar = ( - # Solid.make_cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True) - # ) - # intersections = Axis((0, 0, 5), (1, 0, 0)) & non_planar - - # self.assertTrue(len(intersections.vertices(), 2)) - # self.assertTupleAlmostEquals( - # intersection.vertices()[0].to_tuple(), (-1, 0, 5), 5 - # ) - # self.assertTupleAlmostEquals( - # intersection.vertices()[1].to_tuple(), (1, 0, 5), 5 - # ) - - def test_axis_equal(self): - self.assertEqual(Axis.X, Axis.X) - self.assertEqual(Axis.Y, Axis.Y) - self.assertEqual(Axis.Z, Axis.Z) - self.assertEqual(Axis.X, AlwaysEqual()) - - def test_axis_not_equal(self): - self.assertNotEqual(Axis.X, Axis.Y) - random_obj = object() - self.assertNotEqual(Axis.X, random_obj) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_bound_box.py b/tests/test_direct_api/test_bound_box.py deleted file mode 100644 index c06eaff..0000000 --- a/tests/test_direct_api/test_bound_box.py +++ /dev/null @@ -1,107 +0,0 @@ -""" -build123d direct api tests - -name: test_bound_box.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.geometry import BoundBox, Vector -from build123d.topology import Solid, Vertex -from tests.base_test import DirectApiTestCase - - -class TestBoundBox(DirectApiTestCase): - def test_basic_bounding_box(self): - v = Vertex(1, 1, 1) - v2 = Vertex(2, 2, 2) - self.assertEqual(BoundBox, type(v.bounding_box())) - self.assertEqual(BoundBox, type(v2.bounding_box())) - - bb1 = v.bounding_box().add(v2.bounding_box()) - - # OCC uses some approximations - self.assertAlmostEqual(bb1.size.X, 1.0, 1) - - # Test adding to an existing bounding box - v0 = Vertex(0, 0, 0) - bb2 = v0.bounding_box().add(v.bounding_box()) - - bb3 = bb1.add(bb2) - self.assertVectorAlmostEquals(bb3.size, (2, 2, 2), 7) - - bb3 = bb2.add((3, 3, 3)) - self.assertVectorAlmostEquals(bb3.size, (3, 3, 3), 7) - - bb3 = bb2.add(Vector(3, 3, 3)) - self.assertVectorAlmostEquals(bb3.size, (3, 3, 3), 7) - - # Test 2D bounding boxes - bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) - bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box()) - bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box()) - # Test that bb2 contains bb1 - self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2)) - self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1)) - # Test that neither bounding box contains the other - self.assertIsNone(BoundBox.find_outside_box_2d(bb1, bb3)) - - # Test creation of a bounding box from a shape - note the low accuracy comparison - # as the box is a little larger than the shape - bb1 = BoundBox.from_topo_ds(Solid.make_cylinder(1, 1).wrapped, optimal=False) - self.assertVectorAlmostEquals(bb1.size, (2, 2, 1), 1) - - bb2 = BoundBox.from_topo_ds( - Solid.make_cylinder(0.5, 0.5).translate((0, 0, 0.1)).wrapped, optimal=False - ) - self.assertTrue(bb2.is_inside(bb1)) - - def test_bounding_box_repr(self): - bb = Solid.make_box(1, 1, 1).bounding_box() - self.assertEqual( - repr(bb), "bbox: 0.0 <= x <= 1.0, 0.0 <= y <= 1.0, 0.0 <= z <= 1.0" - ) - - def test_center_of_boundbox(self): - self.assertVectorAlmostEquals( - Solid.make_box(1, 1, 1).bounding_box().center(), - (0.5, 0.5, 0.5), - 5, - ) - - def test_combined_center_of_boundbox(self): - pass - - def test_clean_boundbox(self): - s = Solid.make_sphere(3) - self.assertVectorAlmostEquals(s.bounding_box().size, (6, 6, 6), 5) - s.mesh(1e-3) - self.assertVectorAlmostEquals(s.bounding_box().size, (6, 6, 6), 5) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_cad_objects.py b/tests/test_direct_api/test_cad_objects.py deleted file mode 100644 index fa9a186..0000000 --- a/tests/test_direct_api/test_cad_objects.py +++ /dev/null @@ -1,267 +0,0 @@ -""" -build123d direct api tests - -name: test_cad_objects.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import unittest - -from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge -from OCP.gp import gp, gp_Ax2, gp_Circ, gp_Elips, gp_Pnt -from build123d.build_enums import CenterOf -from build123d.geometry import Plane, Vector -from build123d.topology import Edge, Face, Wire -from tests.base_test import DirectApiTestCase, DEG2RAD - - -class TestCadObjects(DirectApiTestCase): - def _make_circle(self): - circle = gp_Circ(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 2.0) - return Edge.cast(BRepBuilderAPI_MakeEdge(circle).Edge()) - - def _make_ellipse(self): - ellipse = gp_Elips(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 4.0, 2.0) - return Edge.cast(BRepBuilderAPI_MakeEdge(ellipse).Edge()) - - def test_edge_wrapper_center(self): - e = self._make_circle() - - self.assertVectorAlmostEquals(e.center(CenterOf.MASS), (1.0, 2.0, 3.0), 3) - - def test_edge_wrapper_ellipse_center(self): - e = self._make_ellipse() - w = Wire([e]) - self.assertVectorAlmostEquals(Face(w).center(), (1.0, 2.0, 3.0), 3) - - def test_edge_wrapper_make_circle(self): - halfCircleEdge = Edge.make_circle(radius=10, start_angle=0, end_angle=180) - - # self.assertVectorAlmostEquals((0.0, 5.0, 0.0), halfCircleEdge.centerOfBoundBox(0.0001),3) - self.assertVectorAlmostEquals(halfCircleEdge.start_point(), (10.0, 0.0, 0.0), 3) - self.assertVectorAlmostEquals(halfCircleEdge.end_point(), (-10.0, 0.0, 0.0), 3) - - def test_edge_wrapper_make_tangent_arc(self): - tangent_arc = Edge.make_tangent_arc( - Vector(1, 1), # starts at 1, 1 - Vector(0, 1), # tangent at start of arc is in the +y direction - Vector(2, 1), # arc cureturn_values 180 degrees and ends at 2, 1 - ) - self.assertVectorAlmostEquals(tangent_arc.start_point(), (1, 1, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.end_point(), (2, 1, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.tangent_at(0), (0, 1, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.tangent_at(0.5), (1, 0, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.tangent_at(1), (0, -1, 0), 3) - - def test_edge_wrapper_make_ellipse1(self): - # Check x_radius > y_radius - x_radius, y_radius = 20, 10 - angle1, angle2 = -75.0, 90.0 - arcEllipseEdge = Edge.make_ellipse( - x_radius=x_radius, - y_radius=y_radius, - plane=Plane.XY, - start_angle=angle1, - end_angle=angle2, - ) - - start = ( - x_radius * math.cos(angle1 * DEG2RAD), - y_radius * math.sin(angle1 * DEG2RAD), - 0.0, - ) - end = ( - x_radius * math.cos(angle2 * DEG2RAD), - y_radius * math.sin(angle2 * DEG2RAD), - 0.0, - ) - self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) - self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) - - def test_edge_wrapper_make_ellipse2(self): - # Check x_radius < y_radius - x_radius, y_radius = 10, 20 - angle1, angle2 = 0.0, 45.0 - arcEllipseEdge = Edge.make_ellipse( - x_radius=x_radius, - y_radius=y_radius, - plane=Plane.XY, - start_angle=angle1, - end_angle=angle2, - ) - - start = ( - x_radius * math.cos(angle1 * DEG2RAD), - y_radius * math.sin(angle1 * DEG2RAD), - 0.0, - ) - end = ( - x_radius * math.cos(angle2 * DEG2RAD), - y_radius * math.sin(angle2 * DEG2RAD), - 0.0, - ) - self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) - self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) - - def test_edge_wrapper_make_circle_with_ellipse(self): - # Check x_radius == y_radius - x_radius, y_radius = 20, 20 - angle1, angle2 = 15.0, 60.0 - arcEllipseEdge = Edge.make_ellipse( - x_radius=x_radius, - y_radius=y_radius, - plane=Plane.XY, - start_angle=angle1, - end_angle=angle2, - ) - - start = ( - x_radius * math.cos(angle1 * DEG2RAD), - y_radius * math.sin(angle1 * DEG2RAD), - 0.0, - ) - end = ( - x_radius * math.cos(angle2 * DEG2RAD), - y_radius * math.sin(angle2 * DEG2RAD), - 0.0, - ) - self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) - self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) - - def test_face_wrapper_make_rect(self): - mplane = Face.make_rect(10, 10) - - self.assertVectorAlmostEquals(mplane.normal_at(), (0.0, 0.0, 1.0), 3) - - # def testCompoundcenter(self): - # """ - # Tests whether or not a proper weighted center can be found for a compound - # """ - - # def cylinders(self, radius, height): - - # c = Solid.make_cylinder(radius, height, Vector()) - - # # Combine all the cylinders into a single compound - # r = self.eachpoint(lambda loc: c.located(loc), True).combinesolids() - - # return r - - # Workplane.cyl = cylinders - - # # Now test. here we want weird workplane to see if the objects are transformed right - # s = ( - # Workplane("XY") - # .rect(2.0, 3.0, for_construction=true) - # .vertices() - # .cyl(0.25, 0.5) - # ) - - # self.assertEqual(4, len(s.val().solids())) - # self.assertVectorAlmostEquals((0.0, 0.0, 0.25), s.val().center, 3) - - def test_translate(self): - e = Edge.make_circle(2, Plane((1, 2, 3))) - e2 = e.translate(Vector(0, 0, 1)) - - self.assertVectorAlmostEquals(e2.center(CenterOf.MASS), (1.0, 2.0, 4.0), 3) - - def test_vertices(self): - e = Edge.cast(BRepBuilderAPI_MakeEdge(gp_Pnt(0, 0, 0), gp_Pnt(1, 1, 0)).Edge()) - self.assertEqual(2, len(e.vertices())) - - def test_edge_wrapper_radius(self): - # get a radius from a simple circle - e0 = Edge.make_circle(2.4) - self.assertAlmostEqual(e0.radius, 2.4) - - # radius of an arc - e1 = Edge.make_circle( - 1.8, Plane(origin=(5, 6, 7), z_dir=(1, 1, 1)), start_angle=20, end_angle=30 - ) - self.assertAlmostEqual(e1.radius, 1.8) - - # test value errors - e2 = Edge.make_ellipse(10, 20) - with self.assertRaises(ValueError): - e2.radius - - # radius from a wire - w0 = Wire.make_circle(10, Plane(origin=(1, 2, 3), z_dir=(-1, 0, 1))) - self.assertAlmostEqual(w0.radius, 10) - - # radius from a wire with multiple edges - rad = 2.3 - plane = Plane(origin=(7, 8, 0), z_dir=(1, 0.5, 0.1)) - w1 = Wire( - [ - Edge.make_circle(rad, plane, 0, 10), - Edge.make_circle(rad, plane, 10, 25), - Edge.make_circle(rad, plane, 25, 230), - ] - ) - self.assertAlmostEqual(w1.radius, rad) - - # test value error from wire - w2 = Wire.make_polygon( - [ - Vector(-1, 0, 0), - Vector(0, 1, 0), - Vector(1, -1, 0), - ] - ) - with self.assertRaises(ValueError): - w2.radius - - # (I think) the radius of a wire is the radius of it's first edge. - # Since this is stated in the docstring better make sure. - no_rad = Wire( - [ - Edge.make_line(Vector(0, 0, 0), Vector(0, 1, 0)), - Edge.make_circle(1.0, start_angle=90, end_angle=270), - ] - ) - with self.assertRaises(ValueError): - no_rad.radius - yes_rad = Wire( - [ - Edge.make_circle(1.0, start_angle=90, end_angle=270), - Edge.make_line(Vector(0, -1, 0), Vector(0, 1, 0)), - ] - ) - self.assertAlmostEqual(yes_rad.radius, 1.0) - many_rad = Wire( - [ - Edge.make_circle(1.0, start_angle=0, end_angle=180), - Edge.make_circle(3.0, Plane((2, 0, 0)), start_angle=180, end_angle=359), - ] - ) - self.assertAlmostEqual(many_rad.radius, 1.0) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_clean_method.py b/tests/test_direct_api/test_clean_method.py deleted file mode 100644 index 4c5dfa0..0000000 --- a/tests/test_direct_api/test_clean_method.py +++ /dev/null @@ -1,72 +0,0 @@ -""" -build123d direct api tests - -name: test_clean_method.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest -from unittest.mock import patch, MagicMock - -from build123d.topology import Solid - - -class TestCleanMethod(unittest.TestCase): - def setUp(self): - # Create a mock object - self.solid = Solid() - self.solid.wrapped = MagicMock() # Simulate a valid `wrapped` object - - @patch("build123d.topology.shape_core.ShapeUpgrade_UnifySameDomain") - def test_clean_warning_on_exception(self, mock_shape_upgrade): - # Mock the upgrader - mock_upgrader = mock_shape_upgrade.return_value - mock_upgrader.Build.side_effect = Exception("Mocked Build failure") - - # Capture warnings - with self.assertWarns(Warning) as warn_context: - self.solid.clean() - - # Assert the warning message - self.assertIn("Unable to clean", str(warn_context.warning)) - - # Verify the upgrader was constructed with the correct arguments - mock_shape_upgrade.assert_called_once_with(self.solid.wrapped, True, True, True) - - # Verify the Build method was called - mock_upgrader.Build.assert_called_once() - - def test_clean_with_none_wrapped(self): - # Set `wrapped` to None to simulate the error condition - self.solid.wrapped = None - - # Call clean and ensure it returns self - result = self.solid.clean() - self.assertIs(result, self.solid) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py deleted file mode 100644 index f18ab95..0000000 --- a/tests/test_direct_api/test_color.py +++ /dev/null @@ -1,127 +0,0 @@ -""" -build123d direct api tests - -name: test_color.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import copy -import unittest - -from build123d.geometry import Color -from tests.base_test import DirectApiTestCase - - -class TestColor(DirectApiTestCase): - def test_name1(self): - c = Color("blue") - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) - - def test_name2(self): - c = Color("blue", alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) - - def test_name3(self): - c = Color("blue", 0.5) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) - - def test_rgb0(self): - c = Color(0.0, 1.0, 0.0) - self.assertTupleAlmostEquals(tuple(c), (0, 1, 0, 1), 5) - - def test_rgba1(self): - c = Color(1.0, 1.0, 0.0, 0.5) - self.assertEqual(c.wrapped.GetRGB().Red(), 1.0) - self.assertEqual(c.wrapped.GetRGB().Green(), 1.0) - self.assertEqual(c.wrapped.GetRGB().Blue(), 0.0) - self.assertEqual(c.wrapped.Alpha(), 0.5) - - def test_rgba2(self): - c = Color(1.0, 1.0, 0.0, alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (1, 1, 0, 0.5), 5) - - def test_rgba3(self): - c = Color(red=0.1, green=0.2, blue=0.3, alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.5), 5) - - def test_bad_color_name(self): - with self.assertRaises(ValueError): - Color("build123d") - - def test_to_tuple(self): - c = Color("blue", alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) - - def test_hex(self): - c = Color(0x996692) - self.assertTupleAlmostEquals( - tuple(c), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), 5 - ) - - c = Color(0x006692, 0x80) - self.assertTupleAlmostEquals( - tuple(c), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), 5 - ) - - c = Color(0x006692, alpha=0x80) - self.assertTupleAlmostEquals(tuple(c), (0, 102 / 255, 146 / 255, 128 / 255), 5) - - c = Color(color_code=0x996692, alpha=0xCC) - self.assertTupleAlmostEquals( - tuple(c), (153 / 255, 102 / 255, 146 / 255, 204 / 255), 5 - ) - - c = Color(0.0, 0.0, 1.0, 1.0) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) - - c = Color(0, 0, 1, 1) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) - - def test_copy(self): - c = Color(0.1, 0.2, 0.3, alpha=0.4) - c_copy = copy.copy(c) - self.assertTupleAlmostEquals(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), 5) - - def test_str_repr(self): - c = Color(1, 0, 0) - self.assertEqual(str(c), "Color: (1.0, 0.0, 0.0, 1.0) ~ RED") - self.assertEqual(repr(c), "Color(1.0, 0.0, 0.0, 1.0)") - - def test_tuple(self): - c = Color((0.1,)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 1.0, 1.0, 1.0), 5) - c = Color((0.1, 0.2)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 1.0, 1.0), 5) - c = Color((0.1, 0.2, 0.3)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 1.0), 5) - c = Color((0.1, 0.2, 0.3, 0.4)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.4), 5) - c = Color(color_tuple=(0.1, 0.2, 0.3, 0.4)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.4), 5) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_compound.py b/tests/test_direct_api/test_compound.py deleted file mode 100644 index 8ee33ca..0000000 --- a/tests/test_direct_api/test_compound.py +++ /dev/null @@ -1,165 +0,0 @@ -""" -build123d direct api tests - -name: test_compound.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import itertools -import unittest - -from build123d.build_common import GridLocations, PolarLocations -from build123d.build_enums import Align, CenterOf -from build123d.geometry import Location, Plane -from build123d.objects_part import Box -from build123d.objects_sketch import Circle -from build123d.topology import Compound, Edge, Face, ShapeList, Solid, Sketch -from tests.base_test import DirectApiTestCase - - -class TestCompound(DirectApiTestCase): - def test_make_text(self): - arc = Edge.make_three_point_arc((-50, 0, 0), (0, 20, 0), (50, 0, 0)) - text = Compound.make_text("test", 10, text_path=arc) - self.assertEqual(len(text.faces()), 4) - text = Compound.make_text( - "test", 10, align=(Align.MAX, Align.MAX), text_path=arc - ) - self.assertEqual(len(text.faces()), 4) - - def test_fuse(self): - box1 = Solid.make_box(1, 1, 1) - box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) - combined = Compound([box1]).fuse(box2, glue=True) - self.assertTrue(combined.is_valid()) - self.assertAlmostEqual(combined.volume, 2, 5) - fuzzy = Compound([box1]).fuse(box2, tol=1e-6) - self.assertTrue(fuzzy.is_valid()) - self.assertAlmostEqual(fuzzy.volume, 2, 5) - - def test_remove(self): - box1 = Solid.make_box(1, 1, 1) - box2 = Solid.make_box(1, 1, 1, Plane((2, 0, 0))) - combined = Compound([box1, box2]) - self.assertTrue(len(combined._remove(box2).solids()), 1) - - def test_repr(self): - simple = Compound([Solid.make_box(1, 1, 1)]) - simple_str = repr(simple).split("0x")[0] + repr(simple).split(", ")[1] - self.assertEqual(simple_str, "Compound at label()") - - assembly = Compound([Solid.make_box(1, 1, 1)]) - assembly.children = [Solid.make_box(1, 1, 1)] - assembly.label = "test" - assembly_str = repr(assembly).split("0x")[0] + repr(assembly).split(", l")[1] - self.assertEqual(assembly_str, "Compound at abel(test), #children(1)") - - def test_center(self): - test_compound = Compound( - [ - Solid.make_box(2, 2, 2).locate(Location((-1, -1, -1))), - Solid.make_box(1, 1, 1).locate(Location((8.5, -0.5, -0.5))), - ] - ) - self.assertVectorAlmostEquals(test_compound.center(CenterOf.MASS), (1, 0, 0), 5) - self.assertVectorAlmostEquals( - test_compound.center(CenterOf.BOUNDING_BOX), (4.25, 0, 0), 5 - ) - with self.assertRaises(ValueError): - test_compound.center(CenterOf.GEOMETRY) - - def test_triad(self): - triad = Compound.make_triad(10) - bbox = triad.bounding_box() - self.assertGreater(bbox.min.X, -10 / 8) - self.assertLess(bbox.min.X, 0) - self.assertGreater(bbox.min.Y, -10 / 8) - self.assertLess(bbox.min.Y, 0) - self.assertGreater(bbox.min.Y, -10 / 8) - self.assertAlmostEqual(bbox.min.Z, 0, 4) - self.assertLess(bbox.size.Z, 12.5) - self.assertEqual(triad.volume, 0) - - def test_volume(self): - e = Edge.make_line((0, 0), (1, 1)) - self.assertAlmostEqual(e.volume, 0, 5) - - f = Face.make_rect(1, 1) - self.assertAlmostEqual(f.volume, 0, 5) - - b = Solid.make_box(1, 1, 1) - self.assertAlmostEqual(b.volume, 1, 5) - - bb = Box(1, 1, 1) - self.assertAlmostEqual(bb.volume, 1, 5) - - c = Compound(children=[e, f, b, bb, b.translate((0, 5, 0))]) - self.assertAlmostEqual(c.volume, 3, 5) - # N.B. b and bb overlap but still add to Compound volume - - def test_constructor(self): - with self.assertRaises(TypeError): - Compound(foo="bar") - - def test_len(self): - self.assertEqual(len(Compound()), 0) - skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) - self.assertEqual(len(skt), 4) - - def test_iteration(self): - skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) - for c1, c2 in itertools.combinations(skt, 2): - self.assertGreaterEqual((c1.position - c2.position).length, 10) - - def test_unwrap(self): - skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) - skt2 = Compound(children=[skt]) - self.assertEqual(len(skt2), 1) - skt3 = skt2.unwrap(fully=False) - self.assertEqual(len(skt3), 4) - - comp1 = Compound().unwrap() - self.assertEqual(len(comp1), 0) - comp2 = Compound(children=[Face.make_rect(1, 1)]) - comp3 = Compound(children=[comp2]) - self.assertEqual(len(comp3), 1) - self.assertTrue(isinstance(next(iter(comp3)), Compound)) - comp4 = comp3.unwrap(fully=True) - self.assertTrue(isinstance(comp4, Face)) - - def test_get_top_level_shapes(self): - base_shapes = Compound(children=PolarLocations(15, 20) * Box(4, 4, 4)) - fls = base_shapes.get_top_level_shapes() - self.assertTrue(isinstance(fls, ShapeList)) - self.assertEqual(len(fls), 20) - self.assertTrue(all(isinstance(s, Solid) for s in fls)) - - b1 = Box(1, 1, 1).solid() - self.assertEqual(b1.get_top_level_shapes()[0], b1) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_direct_api_test_case.py b/tests/test_direct_api/test_direct_api_test_case.py deleted file mode 100644 index a165857..0000000 --- a/tests/test_direct_api/test_direct_api_test_case.py +++ /dev/null @@ -1,60 +0,0 @@ -""" -build123d direct api tests - -name: test_direct_api_test_case.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest -from typing import Optional - -from build123d.geometry import Vector, VectorLike - - -class DirectApiTestCase(unittest.TestCase): - def assertTupleAlmostEquals( - self, - first: tuple[float, ...], - second: tuple[float, ...], - places: int, - msg: str | None = None, - ): - """Check Tuples""" - self.assertEqual(len(second), len(first)) - for i, j in zip(second, first): - self.assertAlmostEqual(i, j, places, msg=msg) - - def assertVectorAlmostEquals( - self, first: Vector, second: VectorLike, places: int, msg: str | None = None - ): - second_vector = Vector(second) - self.assertAlmostEqual(first.X, second_vector.X, places, msg=msg) - self.assertAlmostEqual(first.Y, second_vector.Y, places, msg=msg) - self.assertAlmostEqual(first.Z, second_vector.Z, places, msg=msg) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py deleted file mode 100644 index da36172..0000000 --- a/tests/test_direct_api/test_edge.py +++ /dev/null @@ -1,293 +0,0 @@ -""" -build123d direct api tests - -name: test_edge.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import unittest - -from build123d.build_enums import AngularDirection -from build123d.geometry import Axis, Plane, Vector -from build123d.objects_curve import CenterArc, EllipticalCenterArc -from build123d.topology import Edge -from tests.base_test import DirectApiTestCase - - -class TestEdge(DirectApiTestCase): - def test_close(self): - self.assertAlmostEqual( - Edge.make_circle(1, end_angle=180).close().length, math.pi + 2, 5 - ) - self.assertAlmostEqual(Edge.make_circle(1).close().length, 2 * math.pi, 5) - - def test_make_half_circle(self): - half_circle = Edge.make_circle(radius=1, start_angle=0, end_angle=180) - self.assertVectorAlmostEquals(half_circle.start_point(), (1, 0, 0), 3) - self.assertVectorAlmostEquals(half_circle.end_point(), (-1, 0, 0), 3) - - def test_make_half_circle2(self): - half_circle = Edge.make_circle(radius=1, start_angle=270, end_angle=90) - self.assertVectorAlmostEquals(half_circle.start_point(), (0, -1, 0), 3) - self.assertVectorAlmostEquals(half_circle.end_point(), (0, 1, 0), 3) - - def test_make_clockwise_half_circle(self): - half_circle = Edge.make_circle( - radius=1, - start_angle=180, - end_angle=0, - angular_direction=AngularDirection.CLOCKWISE, - ) - self.assertVectorAlmostEquals(half_circle.end_point(), (1, 0, 0), 3) - self.assertVectorAlmostEquals(half_circle.start_point(), (-1, 0, 0), 3) - - def test_make_clockwise_half_circle2(self): - half_circle = Edge.make_circle( - radius=1, - start_angle=90, - end_angle=-90, - angular_direction=AngularDirection.CLOCKWISE, - ) - self.assertVectorAlmostEquals(half_circle.start_point(), (0, 1, 0), 3) - self.assertVectorAlmostEquals(half_circle.end_point(), (0, -1, 0), 3) - - def test_arc_center(self): - self.assertVectorAlmostEquals(Edge.make_ellipse(2, 1).arc_center, (0, 0, 0), 5) - with self.assertRaises(ValueError): - Edge.make_line((0, 0, 0), (0, 0, 1)).arc_center - - def test_spline_with_parameters(self): - spline = Edge.make_spline( - points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 0.4, 1.0] - ) - self.assertVectorAlmostEquals(spline.end_point(), (2, 0, 0), 5) - with self.assertRaises(ValueError): - Edge.make_spline( - points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 1.0] - ) - with self.assertRaises(ValueError): - Edge.make_spline( - points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], tangents=[(1, 1, 0)] - ) - - def test_spline_approx(self): - spline = Edge.make_spline_approx([(0, 0), (1, 1), (2, 1), (3, 0)]) - self.assertVectorAlmostEquals(spline.end_point(), (3, 0, 0), 5) - spline = Edge.make_spline_approx( - [(0, 0), (1, 1), (2, 1), (3, 0)], smoothing=(1.0, 5.0, 10.0) - ) - self.assertVectorAlmostEquals(spline.end_point(), (3, 0, 0), 5) - - def test_distribute_locations(self): - line = Edge.make_line((0, 0, 0), (10, 0, 0)) - locs = line.distribute_locations(3) - for i, x in enumerate([0, 5, 10]): - self.assertVectorAlmostEquals(locs[i].position, (x, 0, 0), 5) - self.assertVectorAlmostEquals(locs[0].orientation, (0, 90, 180), 5) - - locs = line.distribute_locations(3, positions_only=True) - for i, x in enumerate([0, 5, 10]): - self.assertVectorAlmostEquals(locs[i].position, (x, 0, 0), 5) - self.assertVectorAlmostEquals(locs[0].orientation, (0, 0, 0), 5) - - def test_to_wire(self): - edge = Edge.make_line((0, 0, 0), (1, 1, 1)) - for end in [0, 1]: - self.assertVectorAlmostEquals( - edge.position_at(end), - edge.to_wire().position_at(end), - 5, - ) - - def test_arc_center2(self): - edges = [ - Edge.make_circle(1, plane=Plane((1, 2, 3)), end_angle=30), - Edge.make_ellipse(1, 0.5, plane=Plane((1, 2, 3)), end_angle=30), - ] - for edge in edges: - self.assertVectorAlmostEquals(edge.arc_center, (1, 2, 3), 5) - with self.assertRaises(ValueError): - Edge.make_line((0, 0), (1, 1)).arc_center - - def test_find_intersection_points(self): - circle = Edge.make_circle(1) - line = Edge.make_line((0, -2), (0, 2)) - crosses = circle.find_intersection_points(line) - for target, actual in zip([(0, 1, 0), (0, -1, 0)], crosses): - self.assertVectorAlmostEquals(actual, target, 5) - - with self.assertRaises(ValueError): - circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) - with self.assertRaises(ValueError): - circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) - - self_intersect = Edge.make_spline([(-3, 2), (3, -2), (4, 0), (3, 2), (-3, -2)]) - self.assertVectorAlmostEquals( - self_intersect.find_intersection_points()[0], - (-2.6861636507066047, 0, 0), - 5, - ) - line = Edge.make_line((1, -2), (1, 2)) - crosses = line.find_intersection_points(Axis.X) - self.assertVectorAlmostEquals(crosses[0], (1, 0, 0), 5) - - with self.assertRaises(ValueError): - line.find_intersection_points(Plane.YZ) - - # def test_intersections_tolerance(self): - # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) - # l1 = Edge.make_line((1, 0), (2, 0)) - # i1 = l1.intersect(*r1) - - # r2 = Rectangle(2, 2).edges() - # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) - # i2 = l2.intersect(*r2) - - # self.assertEqual(len(i1.vertices()), len(i2.vertices())) - - def test_trim(self): - line = Edge.make_line((-2, 0), (2, 0)) - self.assertVectorAlmostEquals( - line.trim(0.25, 0.75).position_at(0), (-1, 0, 0), 5 - ) - self.assertVectorAlmostEquals( - line.trim(0.25, 0.75).position_at(1), (1, 0, 0), 5 - ) - with self.assertRaises(ValueError): - line.trim(0.75, 0.25) - - def test_trim_to_length(self): - - e1 = Edge.make_line((0, 0), (10, 10)) - e1_trim = e1.trim_to_length(0.0, 10) - self.assertAlmostEqual(e1_trim.length, 10, 5) - - e2 = Edge.make_circle(10, start_angle=0, end_angle=90) - e2_trim = e2.trim_to_length(0.5, 1) - self.assertAlmostEqual(e2_trim.length, 1, 5) - self.assertVectorAlmostEquals( - e2_trim.position_at(0), Vector(10, 0, 0).rotate(Axis.Z, 45), 5 - ) - - e3 = Edge.make_spline( - [(0, 10, 0), (-4, 5, 2), (0, 0, 0)], tangents=[(-1, 0), (1, 0)] - ) - e3_trim = e3.trim_to_length(0, 7) - self.assertAlmostEqual(e3_trim.length, 7, 5) - - a4 = Axis((0, 0, 0), (1, 1, 1)) - e4_trim = Edge(a4).trim_to_length(0.5, 2) - self.assertAlmostEqual(e4_trim.length, 2, 5) - - def test_bezier(self): - with self.assertRaises(ValueError): - Edge.make_bezier((1, 1)) - cntl_pnts = [(1, 2, 3)] * 30 - with self.assertRaises(ValueError): - Edge.make_bezier(*cntl_pnts) - with self.assertRaises(ValueError): - Edge.make_bezier((0, 0, 0), (1, 1, 1), weights=[1.0]) - - bezier = Edge.make_bezier((0, 0), (0, 1), (1, 1), (1, 0)) - bbox = bezier.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (0, 0, 0), 5) - self.assertVectorAlmostEquals(bbox.max, (1, 0.75, 0), 5) - - def test_mid_way(self): - mid = Edge.make_mid_way( - Edge.make_line((0, 0), (0, 1)), Edge.make_line((1, 0), (1, 1)), 0.25 - ) - self.assertVectorAlmostEquals(mid.position_at(0), (0.25, 0, 0), 5) - self.assertVectorAlmostEquals(mid.position_at(1), (0.25, 1, 0), 5) - - def test_distribute_locations2(self): - with self.assertRaises(ValueError): - Edge.make_circle(1).distribute_locations(1) - - locs = Edge.make_circle(1).distribute_locations(5, positions_only=True) - for i, loc in enumerate(locs): - self.assertVectorAlmostEquals( - loc.position, - Vector(1, 0, 0).rotate(Axis.Z, i * 90).to_tuple(), - 5, - ) - self.assertVectorAlmostEquals(loc.orientation, (0, 0, 0), 5) - - def test_find_tangent(self): - circle = Edge.make_circle(1) - parm = circle.find_tangent(135)[0] - self.assertVectorAlmostEquals( - circle @ parm, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 - ) - line = Edge.make_line((0, 0), (1, 1)) - parm = line.find_tangent(45)[0] - self.assertAlmostEqual(parm, 0, 5) - parm = line.find_tangent(0) - self.assertEqual(len(parm), 0) - - def test_param_at_point(self): - u = Edge.make_circle(1).param_at_point((0, 1)) - self.assertAlmostEqual(u, 0.25, 5) - - u = 0.3 - edge = Edge.make_line((0, 0), (34, 56)) - pnt = edge.position_at(u) - self.assertAlmostEqual(edge.param_at_point(pnt), u, 5) - - ca = CenterArc((0, 0), 1, -200, 220).edge() - for u in [0.3, 1.0]: - pnt = ca.position_at(u) - self.assertAlmostEqual(ca.param_at_point(pnt), u, 5) - - ea = EllipticalCenterArc((15, 0), 10, 5, start_angle=90, end_angle=270).edge() - for u in [0.3, 0.9]: - pnt = ea.position_at(u) - self.assertAlmostEqual(ea.param_at_point(pnt), u, 5) - - with self.assertRaises(ValueError): - edge.param_at_point((-1, 1)) - - def test_conical_helix(self): - helix = Edge.make_helix(1, 4, 1, normal=(-1, 0, 0), angle=10, lefthand=True) - self.assertAlmostEqual(helix.bounding_box().min.X, -4, 5) - - def test_reverse(self): - e1 = Edge.make_line((0, 0), (1, 1)) - self.assertVectorAlmostEquals(e1 @ 0.1, (0.1, 0.1, 0), 5) - self.assertVectorAlmostEquals(e1.reversed() @ 0.1, (0.9, 0.9, 0), 5) - - e2 = Edge.make_circle(1, start_angle=0, end_angle=180) - e2r = e2.reversed() - self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) - - def test_init(self): - with self.assertRaises(TypeError): - Edge(direction=(1, 0, 0)) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py deleted file mode 100644 index 45f8da5..0000000 --- a/tests/test_direct_api/test_face.py +++ /dev/null @@ -1,459 +0,0 @@ -""" -build123d direct api tests - -name: test_face.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import os -import platform -import random -import unittest - -from build123d.build_common import Locations -from build123d.build_enums import Align, CenterOf, GeomType -from build123d.build_line import BuildLine -from build123d.build_part import BuildPart -from build123d.build_sketch import BuildSketch -from build123d.exporters3d import export_stl -from build123d.geometry import Axis, Location, Plane, Pos, Vector -from build123d.importers import import_stl -from build123d.objects_curve import Polyline -from build123d.objects_part import Box, Cylinder -from build123d.objects_sketch import Rectangle, RegularPolygon -from build123d.operations_generic import fillet -from build123d.operations_part import extrude -from build123d.operations_sketch import make_face -from build123d.topology import Edge, Face, Solid, Wire -from tests.base_test import DirectApiTestCase - - -class TestFace(DirectApiTestCase): - def test_make_surface_from_curves(self): - bottom_edge = Edge.make_circle(radius=1, end_angle=90) - top_edge = Edge.make_circle(radius=1, plane=Plane((0, 0, 1)), end_angle=90) - curved = Face.make_surface_from_curves(bottom_edge, top_edge) - self.assertTrue(curved.is_valid()) - self.assertAlmostEqual(curved.area, math.pi / 2, 5) - self.assertVectorAlmostEquals( - curved.normal_at(), (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 - ) - - bottom_wire = Wire.make_circle(1) - top_wire = Wire.make_circle(1, Plane((0, 0, 1))) - curved = Face.make_surface_from_curves(bottom_wire, top_wire) - self.assertTrue(curved.is_valid()) - self.assertAlmostEqual(curved.area, 2 * math.pi, 5) - - def test_center(self): - test_face = Face(Wire.make_polygon([(0, 0), (1, 0), (1, 1), (0, 0)])) - self.assertVectorAlmostEquals( - test_face.center(CenterOf.MASS), (2 / 3, 1 / 3, 0), 1 - ) - self.assertVectorAlmostEquals( - test_face.center(CenterOf.BOUNDING_BOX), - (0.5, 0.5, 0), - 5, - ) - - def test_face_volume(self): - rect = Face.make_rect(1, 1) - self.assertAlmostEqual(rect.volume, 0, 5) - - def test_chamfer_2d(self): - test_face = Face.make_rect(10, 10) - test_face = test_face.chamfer_2d( - distance=1, distance2=2, vertices=test_face.vertices() - ) - self.assertAlmostEqual(test_face.area, 100 - 4 * 0.5 * 1 * 2) - - def test_chamfer_2d_reference(self): - test_face = Face.make_rect(10, 10) - edge = test_face.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - test_face = test_face.chamfer_2d( - distance=1, distance2=2, vertices=[vertex], edge=edge - ) - self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 9) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 8) - - def test_chamfer_2d_reference_inverted(self): - test_face = Face.make_rect(10, 10) - edge = test_face.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - test_face = test_face.chamfer_2d( - distance=2, distance2=1, vertices=[vertex], edge=edge - ) - self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 8) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 9) - - def test_chamfer_2d_error_checking(self): - with self.assertRaises(ValueError): - test_face = Face.make_rect(10, 10) - edge = test_face.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - other_edge = test_face.edges().sort_by(Axis.Y)[-1] - test_face = test_face.chamfer_2d( - distance=1, distance2=2, vertices=[vertex], edge=other_edge - ) - - def test_make_rect(self): - test_face = Face.make_plane() - self.assertVectorAlmostEquals(test_face.normal_at(), (0, 0, 1), 5) - - def test_length_width(self): - test_face = Face.make_rect(8, 10, Plane.XZ) - self.assertAlmostEqual(test_face.length, 8, 5) - self.assertAlmostEqual(test_face.width, 10, 5) - - def test_geometry(self): - box = Solid.make_box(1, 1, 2) - self.assertEqual(box.faces().sort_by(Axis.Z).last.geometry, "SQUARE") - self.assertEqual(box.faces().sort_by(Axis.Y).last.geometry, "RECTANGLE") - with BuildPart() as test: - with BuildSketch(): - RegularPolygon(1, 3) - extrude(amount=1) - self.assertEqual(test.faces().sort_by(Axis.Z).last.geometry, "POLYGON") - - def test_is_planar(self): - self.assertTrue(Face.make_rect(1, 1).is_planar) - self.assertFalse( - Solid.make_cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0].is_planar - ) - # Some of these faces have geom_type BSPLINE but are planar - mount = Solid.make_loft( - [ - Rectangle((1 + 16 + 4), 20, align=(Align.MIN, Align.CENTER)).wire(), - Pos(1, 0, 4) - * Rectangle(16, 20, align=(Align.MIN, Align.CENTER)).wire(), - ], - ) - self.assertTrue(all(f.is_planar for f in mount.faces())) - - def test_negate(self): - square = Face.make_rect(1, 1) - self.assertVectorAlmostEquals(square.normal_at(), (0, 0, 1), 5) - flipped_square = -square - self.assertVectorAlmostEquals(flipped_square.normal_at(), (0, 0, -1), 5) - - def test_offset(self): - bbox = Face.make_rect(2, 2, Plane.XY).offset(5).bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, 5), 5) - self.assertVectorAlmostEquals(bbox.max, (1, 1, 5), 5) - - def test_make_from_wires(self): - outer = Wire.make_circle(10) - inners = [ - Wire.make_circle(1).locate(Location((-2, 2, 0))), - Wire.make_circle(1).locate(Location((2, 2, 0))), - ] - happy = Face(outer, inners) - self.assertAlmostEqual(happy.area, math.pi * (10**2 - 2), 5) - - outer = Edge.make_circle(10, end_angle=180).to_wire() - with self.assertRaises(ValueError): - Face(outer, inners) - with self.assertRaises(ValueError): - Face(Wire.make_circle(10, Plane.XZ), inners) - - outer = Wire.make_circle(10) - inners = [ - Wire.make_circle(1).locate(Location((-2, 2, 0))), - Edge.make_circle(1, end_angle=180).to_wire().locate(Location((2, 2, 0))), - ] - with self.assertRaises(ValueError): - Face(outer, inners) - - def test_sew_faces(self): - patches = [ - Face.make_rect(1, 1, Plane((x, y, z))) - for x in range(2) - for y in range(2) - for z in range(3) - ] - random.shuffle(patches) - sheets = Face.sew_faces(patches) - self.assertEqual(len(sheets), 3) - self.assertEqual(len(sheets[0]), 4) - self.assertTrue(isinstance(sheets[0][0], Face)) - - def test_surface_from_array_of_points(self): - pnts = [ - [ - Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) - for x in range(11) - ] - for y in range(11) - ] - surface = Face.make_surface_from_array_of_points(pnts) - bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (0, 0, -1), 3) - self.assertVectorAlmostEquals(bbox.max, (10, 10, 2), 2) - - def test_bezier_surface(self): - points = [ - [ - (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) - for x in range(-1, 2) - ] - for y in range(-1, 2) - ] - surface = Face.make_bezier_surface(points) - bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, 0), 3) - self.assertVectorAlmostEquals(bbox.max, (+1, +1, +1), 1) - self.assertLess(bbox.max.Z, 1.0) - - weights = [ - [2 if x == 0 or y == 0 else 1 for x in range(-1, 2)] for y in range(-1, 2) - ] - surface = Face.make_bezier_surface(points, weights) - bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, 0), 3) - self.assertGreater(bbox.max.Z, 1.0) - - too_many_points = [ - [ - (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) - for x in range(-1, 27) - ] - for y in range(-1, 27) - ] - - with self.assertRaises(ValueError): - Face.make_bezier_surface([[(0, 0)]]) - with self.assertRaises(ValueError): - Face.make_bezier_surface(points, [[1, 1], [1, 1]]) - with self.assertRaises(ValueError): - Face.make_bezier_surface(too_many_points) - - def test_thicken(self): - pnts = [ - [ - Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) - for x in range(11) - ] - for y in range(11) - ] - surface = Face.make_surface_from_array_of_points(pnts) - solid = Solid.thicken(surface, 1) - self.assertAlmostEqual(solid.volume, 101.59, 2) - - square = Face.make_rect(10, 10) - bbox = Solid.thicken(square, 1, normal_override=(0, 0, -1)).bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-5, -5, -1), 5) - self.assertVectorAlmostEquals(bbox.max, (5, 5, 0), 5) - - def test_make_holes(self): - radius = 10 - circumference = 2 * math.pi * radius - hex_diagonal = 4 * (circumference / 10) / 3 - cylinder = Solid.make_cylinder(radius, hex_diagonal * 5) - cylinder_wall: Face = cylinder.faces().filter_by(GeomType.PLANE, reverse=True)[ - 0 - ] - with BuildSketch(Plane.XZ.offset(radius)) as hex: - with Locations((0, hex_diagonal)): - RegularPolygon( - hex_diagonal * 0.4, 6, align=(Align.CENTER, Align.CENTER) - ) - hex_wire_vertical: Wire = hex.sketch.faces()[0].outer_wire() - - projected_wire: Wire = hex_wire_vertical.project_to_shape( - target_object=cylinder, center=(0, 0, hex_wire_vertical.center().Z) - )[0] - projected_wires = [ - projected_wire.rotate(Axis.Z, -90 + i * 360 / 10).translate( - (0, 0, (j + (i % 2) / 2) * hex_diagonal) - ) - for i in range(5) - for j in range(4 - i % 2) - ] - cylinder_walls_with_holes = cylinder_wall.make_holes(projected_wires) - self.assertTrue(cylinder_walls_with_holes.is_valid()) - self.assertLess(cylinder_walls_with_holes.area, cylinder_wall.area) - - def test_is_inside(self): - square = Face.make_rect(10, 10) - self.assertTrue(square.is_inside((1, 1))) - self.assertFalse(square.is_inside((20, 1))) - - def test_import_stl(self): - torus = Solid.make_torus(10, 1) - # exporter = Mesher() - # exporter.add_shape(torus) - # exporter.write("test_torus.stl") - export_stl(torus, "test_torus.stl") - imported_torus = import_stl("test_torus.stl") - # The torus from stl is tessellated therefore the areas will only be close - self.assertAlmostEqual(imported_torus.area, torus.area, 0) - os.remove("test_torus.stl") - - def test_is_coplanar(self): - square = Face.make_rect(1, 1, plane=Plane.XZ) - self.assertTrue(square.is_coplanar(Plane.XZ)) - self.assertTrue((-square).is_coplanar(Plane.XZ)) - self.assertFalse(square.is_coplanar(Plane.XY)) - surface: Face = Solid.make_sphere(1).faces()[0] - self.assertFalse(surface.is_coplanar(Plane.XY)) - - def test_center_location(self): - square = Face.make_rect(1, 1, plane=Plane.XZ) - cl = square.center_location - self.assertVectorAlmostEquals(cl.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(Plane(cl).z_dir, Plane.XZ.z_dir, 5) - - def test_position_at(self): - square = Face.make_rect(2, 2, plane=Plane.XZ.offset(1)) - p = square.position_at(0.25, 0.75) - self.assertVectorAlmostEquals(p, (-0.5, -1.0, 0.5), 5) - - def test_location_at(self): - bottom = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.Z)[0] - loc = bottom.location_at(0.5, 0.5) - self.assertVectorAlmostEquals(loc.position, (0.5, 1, 0), 5) - self.assertVectorAlmostEquals(loc.orientation, (-180, 0, -180), 5) - - front = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.X)[0] - loc = front.location_at(0.5, 0.5, x_dir=(0, 0, 1)) - self.assertVectorAlmostEquals(loc.position, (0.0, 1.0, 1.5), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, -90, 0), 5) - - def test_make_surface(self): - corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] - net_exterior = Wire( - [ - Edge.make_line(corners[3], corners[1]), - Edge.make_line(corners[1], corners[0]), - Edge.make_line(corners[0], corners[2]), - Edge.make_three_point_arc( - corners[2], - (corners[2] + corners[3]) / 2 - Vector(0, 0, 3), - corners[3], - ), - ] - ) - surface = Face.make_surface( - net_exterior, - surface_points=[Vector(0, 0, -5)], - ) - hole_flat = Wire.make_circle(10) - hole = hole_flat.project_to_shape(surface, (0, 0, -1))[0] - surface = Face.make_surface( - exterior=net_exterior, - surface_points=[Vector(0, 0, -5)], - interior_wires=[hole], - ) - self.assertTrue(surface.is_valid()) - self.assertEqual(surface.geom_type, GeomType.BSPLINE) - bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-50.5, -24.5, -5.113393280136395), 5) - self.assertVectorAlmostEquals(bbox.max, (50.5, 24.5, 0), 5) - - # With no surface point - surface = Face.make_surface(net_exterior) - bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-50.5, -24.5, -3), 5) - self.assertVectorAlmostEquals(bbox.max, (50.5, 24.5, 0), 5) - - # Exterior Edge - surface = Face.make_surface([Edge.make_circle(50)], surface_points=[(0, 0, -5)]) - bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-50, -50, -5), 5) - self.assertVectorAlmostEquals(bbox.max, (50, 50, 0), 5) - - def test_make_surface_error_checking(self): - with self.assertRaises(ValueError): - Face.make_surface(Edge.make_line((0, 0), (1, 0))) - - with self.assertRaises(RuntimeError): - Face.make_surface([Edge.make_line((0, 0), (1, 0))]) - - if platform.system() != "Darwin": - with self.assertRaises(RuntimeError): - Face.make_surface( - [Edge.make_circle(50)], surface_points=[(0, 0, -50), (0, 0, 50)] - ) - - with self.assertRaises(RuntimeError): - Face.make_surface( - [Edge.make_circle(50)], - interior_wires=[Wire.make_circle(5, Plane.XZ)], - ) - - def test_sweep(self): - edge = Edge.make_line((1, 0), (2, 0)) - path = Wire.make_circle(1) - circle_with_hole = Face.sweep(edge, path) - self.assertTrue(isinstance(circle_with_hole, Face)) - self.assertAlmostEqual(circle_with_hole.area, math.pi * (2**2 - 1**1), 5) - with self.assertRaises(ValueError): - Face.sweep(edge, Polyline((0, 0), (0.1, 0), (0.2, 0.1))) - - def test_to_arcs(self): - with BuildSketch() as bs: - with BuildLine() as bl: - Polyline((0, 0), (1, 0), (1.5, 0.5), (2, 0), (2, 1), (0, 1), (0, 0)) - fillet(bl.vertices(), radius=0.1) - make_face() - smooth = bs.faces()[0] - fragmented = smooth.to_arcs() - self.assertLess(len(smooth.edges()), len(fragmented.edges())) - - def test_outer_wire(self): - face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() - self.assertAlmostEqual(face.outer_wire().length, 4, 5) - - def test_wire(self): - face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() - with self.assertWarns(UserWarning): - outer = face.wire() - self.assertAlmostEqual(outer.length, 4, 5) - - def test_constructor(self): - with self.assertRaises(ValueError): - Face(bob="fred") - - def test_normal_at(self): - face = Face.make_rect(1, 1) - self.assertVectorAlmostEquals(face.normal_at(0, 0), (0, 0, 1), 5) - self.assertVectorAlmostEquals( - face.normal_at(face.position_at(0, 0)), (0, 0, 1), 5 - ) - with self.assertRaises(ValueError): - face.normal_at(0) - with self.assertRaises(ValueError): - face.normal_at(center=(0, 0)) - face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] - self.assertVectorAlmostEquals(face.normal_at(0, 1), (1, 0, 0), 5) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_functions.py b/tests/test_direct_api/test_functions.py deleted file mode 100644 index 3f2bdf2..0000000 --- a/tests/test_direct_api/test_functions.py +++ /dev/null @@ -1,107 +0,0 @@ -""" -build123d direct api tests - -name: test_functions.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import unittest - -from build123d.geometry import Plane, Vector -from build123d.objects_part import Box -from build123d.topology import ( - Compound, - Face, - Solid, - edges_to_wires, - polar, - new_edges, - delta, - unwrap_topods_compound, -) - - -class TestFunctions(unittest.TestCase): - def test_edges_to_wires(self): - square_edges = Face.make_rect(1, 1).edges() - rectangle_edges = Face.make_rect(2, 1, Plane((5, 0))).edges() - wires = edges_to_wires(square_edges + rectangle_edges) - self.assertEqual(len(wires), 2) - self.assertAlmostEqual(wires[0].length, 4, 5) - self.assertAlmostEqual(wires[1].length, 6, 5) - - def test_polar(self): - pnt = polar(1, 30) - self.assertAlmostEqual(pnt[0], math.sqrt(3) / 2, 5) - self.assertAlmostEqual(pnt[1], 0.5, 5) - - def test_new_edges(self): - c = Solid.make_cylinder(1, 5) - s = Solid.make_sphere(2) - s_minus_c = s - c - seams = new_edges(c, s, combined=s_minus_c) - self.assertEqual(len(seams), 1) - self.assertAlmostEqual(seams[0].radius, 1, 5) - - def test_delta(self): - cyl = Solid.make_cylinder(1, 5) - sph = Solid.make_sphere(2) - con = Solid.make_cone(2, 1, 2) - plug = delta([cyl, sph, con], [sph, con]) - self.assertEqual(len(plug), 1) - self.assertEqual(plug[0], cyl) - - def test_parse_intersect_args(self): - - with self.assertRaises(TypeError): - Vector(1, 1, 1) & ("x", "y", "z") - - def test_unwrap_topods_compound(self): - # Complex Compound - b1 = Box(1, 1, 1).solid() - b2 = Box(2, 2, 2).solid() - c1 = Compound([b1, b2]) - c2 = Compound([b1, c1]) - c3 = Compound([c2]) - c4 = Compound([c3]) - self.assertEqual(c4.wrapped.NbChildren(), 1) - c5 = Compound(unwrap_topods_compound(c4.wrapped, False)) - self.assertEqual(c5.wrapped.NbChildren(), 2) - - # unwrap fully - c0 = Compound([b1]) - c1 = Compound([c0]) - result = Compound.cast(unwrap_topods_compound(c1.wrapped, True)) - self.assertTrue(isinstance(result, Solid)) - - # unwrap not fully - result = Compound.cast(unwrap_topods_compound(c1.wrapped, False)) - self.assertTrue(isinstance(result, Compound)) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_group_by.py b/tests/test_direct_api/test_group_by.py deleted file mode 100644 index 6d0ed3f..0000000 --- a/tests/test_direct_api/test_group_by.py +++ /dev/null @@ -1,71 +0,0 @@ -""" -build123d direct api tests - -name: test_group_by.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import pprint -import unittest - -from build123d.geometry import Axis -from build123d.topology import Solid - - -class TestGroupBy(unittest.TestCase): - - def setUp(self): - # Ensure the class variable is in its default state before each test - self.v = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) - - def test_str(self): - self.assertEqual( - str(self.v), - f"""[[Vertex(0.0, 0.0, 0.0), - Vertex(0.0, 1.0, 0.0), - Vertex(1.0, 0.0, 0.0), - Vertex(1.0, 1.0, 0.0)], - [Vertex(0.0, 0.0, 1.0), - Vertex(0.0, 1.0, 1.0), - Vertex(1.0, 0.0, 1.0), - Vertex(1.0, 1.0, 1.0)]]""", - ) - - def test_repr(self): - self.assertEqual( - repr(self.v), - "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", - ) - - def test_pp(self): - self.assertEqual( - pprint.pformat(self.v), - "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", - ) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_import_export.py b/tests/test_direct_api/test_import_export.py deleted file mode 100644 index 9dbabce..0000000 --- a/tests/test_direct_api/test_import_export.py +++ /dev/null @@ -1,70 +0,0 @@ -""" -build123d direct api tests - -name: test_import_export.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import os -import unittest - -from build123d.exporters3d import export_brep, export_step -from build123d.importers import import_brep, import_step, import_stl -from build123d.mesher import Mesher -from build123d.topology import Solid -from tests.base_test import DirectApiTestCase - - -class TestImportExport(DirectApiTestCase): - def test_import_export(self): - original_box = Solid.make_box(1, 1, 1) - export_step(original_box, "test_box.step") - step_box = import_step("test_box.step") - self.assertTrue(step_box.is_valid()) - self.assertAlmostEqual(step_box.volume, 1, 5) - export_brep(step_box, "test_box.brep") - brep_box = import_brep("test_box.brep") - self.assertTrue(brep_box.is_valid()) - self.assertAlmostEqual(brep_box.volume, 1, 5) - os.remove("test_box.step") - os.remove("test_box.brep") - with self.assertRaises(FileNotFoundError): - step_box = import_step("test_box.step") - - def test_import_stl(self): - # export solid - original_box = Solid.make_box(1, 2, 3) - exporter = Mesher() - exporter.add_shape(original_box) - exporter.write("test.stl") - - # import as face - stl_box = import_stl("test.stl") - self.assertVectorAlmostEquals(stl_box.position, (0, 0, 0), 5) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_jupyter.py b/tests/test_direct_api/test_jupyter.py deleted file mode 100644 index 870be3f..0000000 --- a/tests/test_direct_api/test_jupyter.py +++ /dev/null @@ -1,60 +0,0 @@ -""" -build123d direct api tests - -name: test_jupyter.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.geometry import Vector -from build123d.jupyter_tools import to_vtkpoly_string, display -from build123d.topology import Solid -from tests.base_test import DirectApiTestCase - - -class TestJupyter(DirectApiTestCase): - def test_repr_javascript(self): - shape = Solid.make_box(1, 1, 1) - - # Test no exception on rendering to js - js1 = shape._repr_javascript_() - - assert "function render" in js1 - - def test_display_error(self): - with self.assertRaises(AttributeError): - display(Vector()) - - with self.assertRaises(ValueError): - to_vtkpoly_string("invalid") - - with self.assertRaises(ValueError): - display("invalid") - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py deleted file mode 100644 index 662d28f..0000000 --- a/tests/test_direct_api/test_location.py +++ /dev/null @@ -1,392 +0,0 @@ -""" -build123d direct api tests - -name: test_location.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import copy -import json -import math -import os -import unittest -from random import uniform - -from OCP.gp import ( - gp_Ax1, - gp_Dir, - gp_EulerSequence, - gp_Pnt, - gp_Quaternion, - gp_Trsf, - gp_Vec, -) -from build123d.build_common import GridLocations -from build123d.build_enums import Extrinsic, Intrinsic -from build123d.geometry import Axis, Location, LocationEncoder, Plane, Pos, Vector -from build123d.topology import Edge, Solid, Vertex -from tests.base_test import DirectApiTestCase, RAD2DEG, AlwaysEqual - - -class TestLocation(DirectApiTestCase): - def test_location(self): - loc0 = Location() - T = loc0.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 0), 6) - angle = loc0.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG - self.assertAlmostEqual(0, angle) - - # Tuple - loc0 = Location((0, 0, 1)) - - T = loc0.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) - - # List - loc0 = Location([0, 0, 1]) - - T = loc0.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) - - # Vector - loc1 = Location(Vector(0, 0, 1)) - - T = loc1.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) - - # rotation + translation - loc2 = Location(Vector(0, 0, 1), Vector(0, 0, 1), 45) - - angle = loc2.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG - self.assertAlmostEqual(45, angle) - - # gp_Trsf - T = gp_Trsf() - T.SetTranslation(gp_Vec(0, 0, 1)) - loc3 = Location(T) - - self.assertEqual( - loc1.wrapped.Transformation().TranslationPart().Z(), - loc3.wrapped.Transformation().TranslationPart().Z(), - ) - - # Test creation from the OCP.gp.gp_Trsf object - loc4 = Location(gp_Trsf()) - self.assertTupleAlmostEquals(loc4.to_tuple()[0], (0, 0, 0), 7) - self.assertTupleAlmostEquals(loc4.to_tuple()[1], (0, 0, 0), 7) - - # Test creation from Plane and Vector - loc4 = Location(Plane.XY, (0, 0, 1)) - self.assertTupleAlmostEquals(loc4.to_tuple()[0], (0, 0, 1), 7) - self.assertTupleAlmostEquals(loc4.to_tuple()[1], (0, 0, 0), 7) - - # Test composition - loc4 = Location((0, 0, 0), Vector(0, 0, 1), 15) - - loc5 = loc1 * loc4 - loc6 = loc4 * loc4 - loc7 = loc4**2 - - T = loc5.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) - - angle5 = ( - loc5.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG - ) - self.assertAlmostEqual(15, angle5) - - angle6 = ( - loc6.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG - ) - self.assertAlmostEqual(30, angle6) - - angle7 = ( - loc7.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG - ) - self.assertAlmostEqual(30, angle7) - - # Test error handling on creation - with self.assertRaises(TypeError): - Location("xy_plane") - - # Test that the computed rotation matrix and intrinsic euler angles return the same - - about_x = uniform(-2 * math.pi, 2 * math.pi) - about_y = uniform(-2 * math.pi, 2 * math.pi) - about_z = uniform(-2 * math.pi, 2 * math.pi) - - rot_x = gp_Trsf() - rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), about_x) - rot_y = gp_Trsf() - rot_y.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), about_y) - rot_z = gp_Trsf() - rot_z.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), about_z) - loc1 = Location(rot_x * rot_y * rot_z) - - q = gp_Quaternion() - q.SetEulerAngles( - gp_EulerSequence.gp_Intrinsic_XYZ, - about_x, - about_y, - about_z, - ) - t = gp_Trsf() - t.SetRotationPart(q) - loc2 = Location(t) - - self.assertTupleAlmostEquals(loc1.to_tuple()[0], loc2.to_tuple()[0], 6) - self.assertTupleAlmostEquals(loc1.to_tuple()[1], loc2.to_tuple()[1], 6) - - loc1 = Location((1, 2), 34) - self.assertTupleAlmostEquals(loc1.to_tuple()[0], (1, 2, 0), 6) - self.assertTupleAlmostEquals(loc1.to_tuple()[1], (0, 0, 34), 6) - - rot_angles = (-115.00, 35.00, -135.00) - loc2 = Location((1, 2, 3), rot_angles) - self.assertTupleAlmostEquals(loc2.to_tuple()[0], (1, 2, 3), 6) - self.assertTupleAlmostEquals(loc2.to_tuple()[1], rot_angles, 6) - - loc3 = Location(loc2) - self.assertTupleAlmostEquals(loc3.to_tuple()[0], (1, 2, 3), 6) - self.assertTupleAlmostEquals(loc3.to_tuple()[1], rot_angles, 6) - - def test_location_parameters(self): - loc = Location((10, 20, 30)) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) - - loc = Location((10, 20, 30), (10, 20, 30)) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) - self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) - - loc = Location((10, 20, 30), (10, 20, 30), Intrinsic.XYZ) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) - self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) - - loc = Location((10, 20, 30), (30, 20, 10), Extrinsic.ZYX) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) - self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) - - with self.assertRaises(TypeError): - Location(x=10) - - with self.assertRaises(TypeError): - Location((10, 20, 30), (30, 20, 10), (10, 20, 30)) - - with self.assertRaises(TypeError): - Location(Intrinsic.XYZ) - - def test_location_repr_and_str(self): - self.assertEqual( - repr(Location()), "(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))" - ) - self.assertEqual( - str(Location()), - "Location: (position=(0.00, 0.00, 0.00), orientation=(-0.00, 0.00, -0.00))", - ) - loc = Location((1, 2, 3), (33, 45, 67)) - self.assertEqual( - str(loc), - "Location: (position=(1.00, 2.00, 3.00), orientation=(33.00, 45.00, 67.00))", - ) - - def test_location_inverted(self): - loc = Location(Plane.XZ) - self.assertVectorAlmostEquals(loc.inverse().orientation, (-90, 0, 0), 6) - - def test_set_position(self): - loc = Location(Plane.XZ) - loc.position = (1, 2, 3) - self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 6) - self.assertVectorAlmostEquals(loc.orientation, (90, 0, 0), 6) - - def test_set_orientation(self): - loc = Location((1, 2, 3), (90, 0, 0)) - loc.orientation = (-90, 0, 0) - self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 6) - self.assertVectorAlmostEquals(loc.orientation, (-90, 0, 0), 6) - - def test_copy(self): - loc1 = Location((1, 2, 3), (90, 45, 22.5)) - loc2 = copy.copy(loc1) - loc3 = copy.deepcopy(loc1) - self.assertVectorAlmostEquals(loc1.position, loc2.position.to_tuple(), 6) - self.assertVectorAlmostEquals(loc1.orientation, loc2.orientation.to_tuple(), 6) - self.assertVectorAlmostEquals(loc1.position, loc3.position.to_tuple(), 6) - self.assertVectorAlmostEquals(loc1.orientation, loc3.orientation.to_tuple(), 6) - - def test_to_axis(self): - axis = Location((1, 2, 3), (-90, 0, 0)).to_axis() - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 6) - self.assertVectorAlmostEquals(axis.direction, (0, 1, 0), 6) - - def test_equal(self): - loc = Location((1, 2, 3), (4, 5, 6)) - same = Location((1, 2, 3), (4, 5, 6)) - - self.assertEqual(loc, same) - self.assertEqual(loc, AlwaysEqual()) - - def test_not_equal(self): - loc = Location((1, 2, 3), (40, 50, 60)) - diff_position = Location((3, 2, 1), (40, 50, 60)) - diff_orientation = Location((1, 2, 3), (60, 50, 40)) - - self.assertNotEqual(loc, diff_position) - self.assertNotEqual(loc, diff_orientation) - self.assertNotEqual(loc, object()) - - def test_neg(self): - loc = Location((1, 2, 3), (0, 35, 127)) - n_loc = -loc - self.assertVectorAlmostEquals(n_loc.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(n_loc.orientation, (180, -35, -127), 5) - - def test_mult_iterable(self): - locs = Location((1, 2, 0)) * GridLocations(4, 4, 2, 1) - self.assertVectorAlmostEquals(locs[0].position, (-1, 2, 0), 5) - self.assertVectorAlmostEquals(locs[1].position, (3, 2, 0), 5) - - def test_as_json(self): - data_dict = { - "part1": { - "joint_one": Location((1, 2, 3), (4, 5, 6)), - "joint_two": Location((7, 8, 9), (10, 11, 12)), - }, - "part2": { - "joint_one": Location((13, 14, 15), (16, 17, 18)), - "joint_two": Location((19, 20, 21), (22, 23, 24)), - }, - } - - # Serializing json with custom Location encoder - json_object = json.dumps(data_dict, indent=4, cls=LocationEncoder) - - # Writing to sample.json - with open("sample.json", "w") as outfile: - outfile.write(json_object) - - # Reading from sample.json - with open("sample.json") as infile: - read_json = json.load(infile, object_hook=LocationEncoder.location_hook) - - # Validate locations - for key, value in read_json.items(): - for k, v in value.items(): - if key == "part1" and k == "joint_one": - self.assertVectorAlmostEquals(v.position, (1, 2, 3), 5) - elif key == "part1" and k == "joint_two": - self.assertVectorAlmostEquals(v.position, (7, 8, 9), 5) - elif key == "part2" and k == "joint_one": - self.assertVectorAlmostEquals(v.position, (13, 14, 15), 5) - elif key == "part2" and k == "joint_two": - self.assertVectorAlmostEquals(v.position, (19, 20, 21), 5) - else: - self.assertTrue(False) - os.remove("sample.json") - - def test_intersection(self): - e = Edge.make_line((0, 0, 0), (1, 1, 1)) - l0 = e.location_at(0) - l1 = e.location_at(1) - self.assertIsNone(l0 & l1) - self.assertEqual(l1 & l1, l1) - - i = l1 & Vector(1, 1, 1) - self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, (1, 1, 1), 5) - - i = l1 & Axis((0.5, 0.5, 0.5), (1, 1, 1)) - self.assertTrue(isinstance(i, Location)) - self.assertEqual(i, l1) - - p = Plane.XY.rotated((45, 0, 0)).shift_origin((1, 0, 0)) - l = Location((1, 0, 0), (1, 0, 0), 45) - i = l & p - self.assertTrue(isinstance(i, Location)) - self.assertVectorAlmostEquals(i.position, (1, 0, 0), 5) - self.assertVectorAlmostEquals(i.orientation, l.orientation, 5) - - b = Solid.make_box(1, 1, 1) - l = Location((0.5, 0.5, 0.5), (1, 0, 0), 45) - i = (l & b).vertex() - self.assertTrue(isinstance(i, Vertex)) - self.assertVectorAlmostEquals(Vector(i), (0.5, 0.5, 0.5), 5) - - e1 = Edge.make_line((0, -1), (2, 1)) - e2 = Edge.make_line((0, 1), (2, -1)) - e3 = Edge.make_line((0, 0), (2, 0)) - - i = e1.intersect(e2, e3) - self.assertTrue(isinstance(i, Vertex)) - self.assertVectorAlmostEquals(i, (1, 0, 0), 5) - - e4 = Edge.make_line((1, -1), (1, 1)) - e5 = Edge.make_line((2, -1), (2, 1)) - i = e3.intersect(e4, e5) - self.assertIsNone(i) - - self.assertIsNone(b.intersect(b.moved(Pos(X=10)))) - - # Look for common vertices - e1 = Edge.make_line((0, 0), (1, 0)) - e2 = Edge.make_line((1, 0), (1, 1)) - e3 = Edge.make_line((1, 0), (2, 0)) - i = e1.intersect(e2) - self.assertEqual(len(i.vertices()), 1) - self.assertEqual(tuple(i.vertex()), (1, 0, 0)) - i = e1.intersect(e3) - self.assertEqual(len(i.vertices()), 1) - self.assertEqual(tuple(i.vertex()), (1, 0, 0)) - - # Intersect with plane - e1 = Edge.make_line((0, 0), (2, 0)) - p1 = Plane.YZ.offset(1) - i = e1.intersect(p1) - self.assertEqual(len(i.vertices()), 1) - self.assertEqual(tuple(i.vertex()), (1, 0, 0)) - - e2 = Edge.make_line(p1.origin, p1.origin + 2 * p1.x_dir) - i = e2.intersect(p1) - self.assertEqual(len(i.vertices()), 2) - self.assertEqual(len(i.edges()), 1) - self.assertAlmostEqual(i.edge().length, 2, 5) - - with self.assertRaises(ValueError): - e1.intersect("line") - - def test_pos(self): - with self.assertRaises(TypeError): - Pos(0, "foo") - self.assertEqual(Pos(1, 2, 3).position, Vector(1, 2, 3)) - self.assertEqual(Pos((1, 2, 3)).position, Vector(1, 2, 3)) - self.assertEqual(Pos(v=(1, 2, 3)).position, Vector(1, 2, 3)) - self.assertEqual(Pos(X=1, Y=2, Z=3).position, Vector(1, 2, 3)) - self.assertEqual(Pos(Vector(1, 2, 3)).position, Vector(1, 2, 3)) - self.assertEqual(Pos(1, Y=2, Z=3).position, Vector(1, 2, 3)) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_matrix.py b/tests/test_direct_api/test_matrix.py deleted file mode 100644 index 23d9fbc..0000000 --- a/tests/test_direct_api/test_matrix.py +++ /dev/null @@ -1,197 +0,0 @@ -""" -build123d direct api tests - -name: test_matrix.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import copy -import math -import unittest - -from OCP.gp import gp_Ax1, gp_Dir, gp_Pnt, gp_Trsf -from build123d.geometry import Axis, Matrix, Vector -from tests.base_test import DirectApiTestCase, DEG2RAD - - -class TestMatrix(DirectApiTestCase): - def test_matrix_creation_and_access(self): - def matrix_vals(m): - return [[m[r, c] for c in range(4)] for r in range(4)] - - # default constructor creates a 4x4 identity matrix - m = Matrix() - identity = [ - [1.0, 0.0, 0.0, 0.0], - [0.0, 1.0, 0.0, 0.0], - [0.0, 0.0, 1.0, 0.0], - [0.0, 0.0, 0.0, 1.0], - ] - self.assertEqual(identity, matrix_vals(m)) - - vals4x4 = [ - [1.0, 0.0, 0.0, 1.0], - [0.0, 1.0, 0.0, 2.0], - [0.0, 0.0, 1.0, 3.0], - [0.0, 0.0, 0.0, 1.0], - ] - vals4x4_tuple = tuple(tuple(r) for r in vals4x4) - - # test constructor with 16-value input - m = Matrix(vals4x4) - self.assertEqual(vals4x4, matrix_vals(m)) - m = Matrix(vals4x4_tuple) - self.assertEqual(vals4x4, matrix_vals(m)) - - # test constructor with 12-value input (the last 4 are an implied - # [0,0,0,1]) - m = Matrix(vals4x4[:3]) - self.assertEqual(vals4x4, matrix_vals(m)) - m = Matrix(vals4x4_tuple[:3]) - self.assertEqual(vals4x4, matrix_vals(m)) - - # Test 16-value input with invalid values for the last 4 - invalid = [ - [1.0, 0.0, 0.0, 1.0], - [0.0, 1.0, 0.0, 2.0], - [0.0, 0.0, 1.0, 3.0], - [1.0, 2.0, 3.0, 4.0], - ] - with self.assertRaises(ValueError): - Matrix(invalid) - # Test input with invalid type - with self.assertRaises(TypeError): - Matrix("invalid") - # Test input with invalid size / nested types - with self.assertRaises(TypeError): - Matrix([[1, 2, 3, 4], [1, 2, 3], [1, 2, 3, 4]]) - with self.assertRaises(TypeError): - Matrix([1, 2, 3]) - - # Invalid sub-type - with self.assertRaises(TypeError): - Matrix([[1, 2, 3, 4], "abc", [1, 2, 3, 4]]) - - # test out-of-bounds access - m = Matrix() - with self.assertRaises(IndexError): - m[0, 4] - with self.assertRaises(IndexError): - m[4, 0] - with self.assertRaises(IndexError): - m["ab"] - - # test __repr__ methods - m = Matrix(vals4x4) - mRepr = "Matrix([[1.0, 0.0, 0.0, 1.0],\n [0.0, 1.0, 0.0, 2.0],\n [0.0, 0.0, 1.0, 3.0],\n [0.0, 0.0, 0.0, 1.0]])" - self.assertEqual(repr(m), mRepr) - self.assertEqual(str(eval(repr(m))), mRepr) - - def test_matrix_functionality(self): - # Test rotate methods - def matrix_almost_equal(m, target_matrix): - for r, row in enumerate(target_matrix): - for c, target_value in enumerate(row): - self.assertAlmostEqual(m[r, c], target_value) - - root_3_over_2 = math.sqrt(3) / 2 - m_rotate_x_30 = [ - [1, 0, 0, 0], - [0, root_3_over_2, -1 / 2, 0], - [0, 1 / 2, root_3_over_2, 0], - [0, 0, 0, 1], - ] - mx = Matrix() - mx.rotate(Axis.X, 30 * DEG2RAD) - matrix_almost_equal(mx, m_rotate_x_30) - - m_rotate_y_30 = [ - [root_3_over_2, 0, 1 / 2, 0], - [0, 1, 0, 0], - [-1 / 2, 0, root_3_over_2, 0], - [0, 0, 0, 1], - ] - my = Matrix() - my.rotate(Axis.Y, 30 * DEG2RAD) - matrix_almost_equal(my, m_rotate_y_30) - - m_rotate_z_30 = [ - [root_3_over_2, -1 / 2, 0, 0], - [1 / 2, root_3_over_2, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1], - ] - mz = Matrix() - mz.rotate(Axis.Z, 30 * DEG2RAD) - matrix_almost_equal(mz, m_rotate_z_30) - - # Test matrix multiply vector - v = Vector(1, 0, 0) - self.assertVectorAlmostEquals(mz.multiply(v), (root_3_over_2, 1 / 2, 0), 7) - - # Test matrix multiply matrix - m_rotate_xy_30 = [ - [root_3_over_2, 0, 1 / 2, 0], - [1 / 4, root_3_over_2, -root_3_over_2 / 2, 0], - [-root_3_over_2 / 2, 1 / 2, 3 / 4, 0], - [0, 0, 0, 1], - ] - mxy = mx.multiply(my) - matrix_almost_equal(mxy, m_rotate_xy_30) - - # Test matrix inverse - vals4x4 = [[1, 2, 3, 4], [5, 1, 6, 7], [8, 9, 1, 10], [0, 0, 0, 1]] - vals4x4_invert = [ - [-53 / 144, 25 / 144, 1 / 16, -53 / 144], - [43 / 144, -23 / 144, 1 / 16, -101 / 144], - [37 / 144, 7 / 144, -1 / 16, -107 / 144], - [0, 0, 0, 1], - ] - m = Matrix(vals4x4).inverse() - matrix_almost_equal(m, vals4x4_invert) - - # Test matrix created from transfer function - rot_x = gp_Trsf() - θ = math.pi - rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), θ) - m = Matrix(rot_x) - rot_x_matrix = [ - [1, 0, 0, 0], - [0, math.cos(θ), -math.sin(θ), 0], - [0, math.sin(θ), math.cos(θ), 0], - [0, 0, 0, 1], - ] - matrix_almost_equal(m, rot_x_matrix) - - # Test copy - m2 = copy.copy(m) - matrix_almost_equal(m2, rot_x_matrix) - m3 = copy.deepcopy(m) - matrix_almost_equal(m3, rot_x_matrix) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py deleted file mode 100644 index 63589e4..0000000 --- a/tests/test_direct_api/test_mixin1_d.py +++ /dev/null @@ -1,321 +0,0 @@ -""" -build123d direct api tests - -name: test_mixin1_d.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import unittest - -from build123d.build_enums import CenterOf, GeomType, PositionMode, Side, SortBy -from build123d.geometry import Axis, Location, Plane, Vector -from build123d.objects_part import Box, Cylinder -from build123d.topology import Compound, Edge, Face, Wire -from tests.base_test import DirectApiTestCase - - -class TestMixin1D(DirectApiTestCase): - """Test the add in methods""" - - def test_position_at(self): - self.assertVectorAlmostEquals( - Edge.make_line((0, 0, 0), (1, 1, 1)).position_at(0.5), - (0.5, 0.5, 0.5), - 5, - ) - # Not sure what PARAMETER mode returns - but it's in the ballpark - point = ( - Edge.make_line((0, 0, 0), (1, 1, 1)) - .position_at(0.5, position_mode=PositionMode.PARAMETER) - .to_tuple() - ) - self.assertTrue(all([0.0 < v < 1.0 for v in point])) - - wire = Wire([Edge.make_line((0, 0, 0), (10, 0, 0))]) - self.assertVectorAlmostEquals(wire.position_at(0.3), (3, 0, 0), 5) - self.assertVectorAlmostEquals( - wire.position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 - ) - self.assertVectorAlmostEquals(wire.edge().position_at(0.3), (3, 0, 0), 5) - self.assertVectorAlmostEquals( - wire.edge().position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 - ) - - circle_wire = Wire( - [ - Edge.make_circle(1, start_angle=0, end_angle=180), - Edge.make_circle(1, start_angle=180, end_angle=360), - ] - ) - p1 = circle_wire.position_at(math.pi, position_mode=PositionMode.LENGTH) - p2 = circle_wire.position_at(math.pi / circle_wire.length) - self.assertVectorAlmostEquals(p1, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p2, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p1, p2, 14) - - circle_edge = Edge.make_circle(1) - p3 = circle_edge.position_at(math.pi, position_mode=PositionMode.LENGTH) - p4 = circle_edge.position_at(math.pi / circle_edge.length) - self.assertVectorAlmostEquals(p3, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p4, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p3, p4, 14) - - circle = Wire( - [ - Edge.make_circle(2, start_angle=0, end_angle=180), - Edge.make_circle(2, start_angle=180, end_angle=360), - ] - ) - self.assertVectorAlmostEquals( - circle.position_at(0.5), - (-2, 0, 0), - 5, - ) - self.assertVectorAlmostEquals( - circle.position_at(2 * math.pi, position_mode=PositionMode.LENGTH), - (-2, 0, 0), - 5, - ) - - def test_positions(self): - e = Edge.make_line((0, 0, 0), (1, 1, 1)) - distances = [i / 4 for i in range(3)] - pts = e.positions(distances) - for i, position in enumerate(pts): - self.assertVectorAlmostEquals(position, (i / 4, i / 4, i / 4), 5) - - def test_tangent_at(self): - self.assertVectorAlmostEquals( - Edge.make_circle(1, start_angle=0, end_angle=90).tangent_at(1.0), - (-1, 0, 0), - 5, - ) - tangent = ( - Edge.make_circle(1, start_angle=0, end_angle=90) - .tangent_at(0.0, position_mode=PositionMode.PARAMETER) - .to_tuple() - ) - self.assertTrue(all([0.0 <= v <= 1.0 for v in tangent])) - - self.assertVectorAlmostEquals( - Edge.make_circle(1, start_angle=0, end_angle=180).tangent_at( - math.pi / 2, position_mode=PositionMode.LENGTH - ), - (-1, 0, 0), - 5, - ) - - def test_tangent_at_point(self): - circle = Wire( - [ - Edge.make_circle(1, start_angle=0, end_angle=180), - Edge.make_circle(1, start_angle=180, end_angle=360), - ] - ) - pnt_on_circle = Vector(math.cos(math.pi / 4), math.sin(math.pi / 4)) - tan = circle.tangent_at(pnt_on_circle) - self.assertVectorAlmostEquals(tan, (-math.sqrt(2) / 2, math.sqrt(2) / 2), 5) - - def test_tangent_at_by_length(self): - circle = Edge.make_circle(1) - tan = circle.tangent_at(circle.length * 0.5, position_mode=PositionMode.LENGTH) - self.assertVectorAlmostEquals(tan, (0, -1), 5) - - def test_tangent_at_error(self): - with self.assertRaises(ValueError): - Edge.make_circle(1).tangent_at("start") - - def test_normal(self): - self.assertVectorAlmostEquals( - Edge.make_circle( - 1, Plane(origin=(0, 0, 0), z_dir=(1, 0, 0)), start_angle=0, end_angle=60 - ).normal(), - (1, 0, 0), - 5, - ) - self.assertVectorAlmostEquals( - Edge.make_ellipse( - 1, - 0.5, - Plane(origin=(0, 0, 0), z_dir=(1, 1, 0)), - start_angle=0, - end_angle=90, - ).normal(), - (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), - 5, - ) - self.assertVectorAlmostEquals( - Edge.make_spline( - [ - (1, 0), - (math.sqrt(2) / 2, math.sqrt(2) / 2), - (0, 1), - ], - tangents=((0, 1, 0), (-1, 0, 0)), - ).normal(), - (0, 0, 1), - 5, - ) - with self.assertRaises(ValueError): - Edge.make_line((0, 0, 0), (1, 1, 1)).normal() - - def test_center(self): - c = Edge.make_circle(1, start_angle=0, end_angle=180) - self.assertVectorAlmostEquals(c.center(), (0, 1, 0), 5) - self.assertVectorAlmostEquals( - c.center(CenterOf.MASS), - (0, 0.6366197723675814, 0), - 5, - ) - self.assertVectorAlmostEquals(c.center(CenterOf.BOUNDING_BOX), (0, 0.5, 0), 5) - - def test_location_at(self): - loc = Edge.make_circle(1).location_at(0.25) - self.assertVectorAlmostEquals(loc.position, (0, 1, 0), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, -90, -90), 5) - - loc = Edge.make_circle(1).location_at( - math.pi / 2, position_mode=PositionMode.LENGTH - ) - self.assertVectorAlmostEquals(loc.position, (0, 1, 0), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, -90, -90), 5) - - def test_locations(self): - locs = Edge.make_circle(1).locations([i / 4 for i in range(4)]) - self.assertVectorAlmostEquals(locs[0].position, (1, 0, 0), 5) - self.assertVectorAlmostEquals(locs[0].orientation, (-90, 0, -180), 5) - self.assertVectorAlmostEquals(locs[1].position, (0, 1, 0), 5) - self.assertVectorAlmostEquals(locs[1].orientation, (0, -90, -90), 5) - self.assertVectorAlmostEquals(locs[2].position, (-1, 0, 0), 5) - self.assertVectorAlmostEquals(locs[2].orientation, (90, 0, 0), 5) - self.assertVectorAlmostEquals(locs[3].position, (0, -1, 0), 5) - self.assertVectorAlmostEquals(locs[3].orientation, (0, 90, 90), 5) - - def test_project(self): - target = Face.make_rect(10, 10, Plane.XY.rotated((0, 45, 0))) - circle = Edge.make_circle(1).locate(Location((0, 0, 10))) - ellipse: Wire = circle.project(target, (0, 0, -1)) - bbox = ellipse.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, -1), 5) - self.assertVectorAlmostEquals(bbox.max, (1, 1, 1), 5) - - def test_project2(self): - target = Cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] - square = Wire.make_rect(1, 1, Plane.YZ).locate(Location((10, 0, 0))) - projections: list[Wire] = square.project( - target, direction=(-1, 0, 0), closest=False - ) - self.assertEqual(len(projections), 2) - - def test_is_forward(self): - plate = Box(10, 10, 1) - Cylinder(1, 1) - hole_edges = plate.edges().filter_by(GeomType.CIRCLE) - self.assertTrue(hole_edges.sort_by(Axis.Z)[-1].is_forward) - self.assertFalse(hole_edges.sort_by(Axis.Z)[0].is_forward) - - def test_offset_2d(self): - base_wire = Wire.make_polygon([(0, 0), (1, 0), (1, 1)], close=False) - corner = base_wire.vertices().group_by(Axis.Y)[0].sort_by(Axis.X)[-1] - base_wire = base_wire.fillet_2d(0.4, [corner]) - offset_wire = base_wire.offset_2d(0.1, side=Side.LEFT) - self.assertTrue(offset_wire.is_closed) - self.assertEqual(len(offset_wire.edges().filter_by(GeomType.LINE)), 6) - self.assertEqual(len(offset_wire.edges().filter_by(GeomType.CIRCLE)), 2) - offset_wire_right = base_wire.offset_2d(0.1, side=Side.RIGHT) - self.assertAlmostEqual( - offset_wire_right.edges() - .filter_by(GeomType.CIRCLE) - .sort_by(SortBy.RADIUS)[-1] - .radius, - 0.5, - 4, - ) - h_perimeter = Compound.make_text("h", font_size=10).wire() - with self.assertRaises(RuntimeError): - h_perimeter.offset_2d(-1) - - # Test for returned Edge - can't find a way to do this - # base_edge = Edge.make_circle(10, start_angle=40, end_angle=50) - # self.assertTrue(isinstance(offset_edge, Edge)) - # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) - # self.assertTrue(offset_edge.geom_type == GeomType.CIRCLE) - # self.assertAlmostEqual(offset_edge.radius, 12, 5) - # base_edge = Edge.make_line((0, 1), (1, 10)) - # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) - # self.assertTrue(isinstance(offset_edge, Edge)) - # self.assertTrue(offset_edge.geom_type == GeomType.LINE) - # self.assertAlmostEqual(offset_edge.position_at(0).X, 3) - - def test_common_plane(self): - # Straight and circular lines - l = Edge.make_line((0, 0, 0), (5, 0, 0)) - c = Edge.make_circle(2, Plane.XZ, -90, 90) - common = l.common_plane(c) - self.assertAlmostEqual(common.z_dir.X, 0, 5) - self.assertAlmostEqual(abs(common.z_dir.Y), 1, 5) # the direction isn't known - self.assertAlmostEqual(common.z_dir.Z, 0, 5) - - # Co-axial straight lines - l1 = Edge.make_line((0, 0), (1, 1)) - l2 = Edge.make_line((0.25, 0.25), (0.75, 0.75)) - common = l1.common_plane(l2) - # the z_dir isn't know - self.assertAlmostEqual(common.x_dir.Z, 0, 5) - - # Parallel lines - l1 = Edge.make_line((0, 0), (1, 0)) - l2 = Edge.make_line((0, 1), (1, 1)) - common = l1.common_plane(l2) - self.assertAlmostEqual(common.z_dir.X, 0, 5) - self.assertAlmostEqual(common.z_dir.Y, 0, 5) - self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known - - # Many lines - common = Edge.common_plane(*Wire.make_rect(10, 10).edges()) - self.assertAlmostEqual(common.z_dir.X, 0, 5) - self.assertAlmostEqual(common.z_dir.Y, 0, 5) - self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known - - # Wire and Edges - c = Wire.make_circle(1, Plane.YZ) - lines = Wire.make_rect(2, 2, Plane.YZ).edges() - common = c.common_plane(*lines) - self.assertAlmostEqual(abs(common.z_dir.X), 1, 5) # the direction isn't known - self.assertAlmostEqual(common.z_dir.Y, 0, 5) - self.assertAlmostEqual(common.z_dir.Z, 0, 5) - - def test_edge_volume(self): - edge = Edge.make_line((0, 0), (1, 1)) - self.assertAlmostEqual(edge.volume, 0, 5) - - def test_wire_volume(self): - wire = Wire.make_rect(1, 1) - self.assertAlmostEqual(wire.volume, 0, 5) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_mixin3_d.py b/tests/test_direct_api/test_mixin3_d.py deleted file mode 100644 index 100c680..0000000 --- a/tests/test_direct_api/test_mixin3_d.py +++ /dev/null @@ -1,157 +0,0 @@ -""" -build123d direct api tests - -name: test_mixin3_d.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest -from unittest.mock import patch - -from build123d.build_enums import CenterOf, Kind -from build123d.geometry import Axis, Plane -from build123d.topology import Face, Shape, Solid -from tests.base_test import DirectApiTestCase - - -class TestMixin3D(DirectApiTestCase): - """Test that 3D add ins""" - - def test_chamfer(self): - box = Solid.make_box(1, 1, 1) - chamfer_box = box.chamfer(0.1, None, box.edges().sort_by(Axis.Z)[-1:]) - self.assertAlmostEqual(chamfer_box.volume, 1 - 0.005, 5) - - def test_chamfer_asym_length(self): - box = Solid.make_box(1, 1, 1) - chamfer_box = box.chamfer(0.1, 0.2, box.edges().sort_by(Axis.Z)[-1:]) - self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) - - def test_chamfer_asym_length_with_face(self): - box = Solid.make_box(1, 1, 1) - face = box.faces().sort_by(Axis.Z)[0] - edge = [face.edges().sort_by(Axis.Y)[0]] - chamfer_box = box.chamfer(0.1, 0.2, edge, face=face) - self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) - - def test_chamfer_too_high_length(self): - box = Solid.make_box(1, 1, 1) - face = box.faces - self.assertRaises( - ValueError, box.chamfer, 2, None, box.edges().sort_by(Axis.Z)[-1:] - ) - - def test_chamfer_edge_not_part_of_face(self): - box = Solid.make_box(1, 1, 1) - edge = box.edges().sort_by(Axis.Z)[-1:] - face = box.faces().sort_by(Axis.Z)[0] - self.assertRaises(ValueError, box.chamfer, 0.1, None, edge, face=face) - - @patch.object(Shape, "is_valid", return_value=False) - def test_chamfer_invalid_shape_raises_error(self, mock_is_valid): - box = Solid.make_box(1, 1, 1) - - # Assert that ValueError is raised - with self.assertRaises(ValueError) as chamfer_context: - max = box.chamfer(0.1, None, box.edges()) - - # Check the error message - self.assertEqual( - str(chamfer_context.exception), - "Failed creating a chamfer, try a smaller length value(s)", - ) - - # Verify is_valid was called - mock_is_valid.assert_called_once() - - def test_hollow(self): - shell_box = Solid.make_box(1, 1, 1).hollow([], thickness=-0.1) - self.assertAlmostEqual(shell_box.volume, 1 - 0.8**3, 5) - - shell_box = Solid.make_box(1, 1, 1) - shell_box = shell_box.hollow( - shell_box.faces().filter_by(Axis.Z), thickness=0.1, kind=Kind.INTERSECTION - ) - self.assertAlmostEqual(shell_box.volume, 1 * 1.2**2 - 1**3, 5) - - shell_box = Solid.make_box(1, 1, 1).hollow( - [], thickness=0.1, kind=Kind.INTERSECTION - ) - self.assertAlmostEqual(shell_box.volume, 1.2**3 - 1**3, 5) - - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).hollow([], thickness=0.1, kind=Kind.TANGENT) - - def test_is_inside(self): - self.assertTrue(Solid.make_box(1, 1, 1).is_inside((0.5, 0.5, 0.5))) - - def test_dprism(self): - # face - f = Face.make_rect(0.5, 0.5) - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [f], additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) - - # face with depth - f = Face.make_rect(0.5, 0.5) - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [f], depth=0.5, thru_all=False, additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) - - # face until - f = Face.make_rect(0.5, 0.5) - limit = Face.make_rect(1, 1, Plane((0, 0, 0.5))) - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [f], up_to_face=limit, thru_all=False, additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) - - # wire - w = Face.make_rect(0.5, 0.5).outer_wire() - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [w], additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) - - def test_center(self): - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).center(CenterOf.GEOMETRY) - - self.assertVectorAlmostEquals( - Solid.make_box(1, 1, 1).center(CenterOf.BOUNDING_BOX), - (0.5, 0.5, 0.5), - 5, - ) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_plane.py b/tests/test_direct_api/test_plane.py deleted file mode 100644 index f88664f..0000000 --- a/tests/test_direct_api/test_plane.py +++ /dev/null @@ -1,504 +0,0 @@ -""" -build123d direct api tests - -name: test_plane.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import copy -import math -import random -import unittest - -from OCP.BRepGProp import BRepGProp -from OCP.GProp import GProp_GProps -from build123d.build_common import Locations -from build123d.build_enums import Align, GeomType, Mode -from build123d.build_part import BuildPart -from build123d.build_sketch import BuildSketch -from build123d.geometry import Axis, Location, Plane, Pos, Vector -from build123d.objects_part import Box, Cylinder -from build123d.objects_sketch import Circle, Rectangle -from build123d.operations_generic import fillet, add -from build123d.operations_part import extrude -from build123d.topology import Edge, Face, Solid, Vertex -from tests.base_test import DirectApiTestCase, AlwaysEqual - - -class TestPlane(DirectApiTestCase): - """Plane with class properties""" - - def test_class_properties(self): - """Validate - Name x_dir y_dir z_dir - ======= ====== ====== ====== - XY +x +y +z - YZ +y +z +x - ZX +z +x +y - XZ +x +z -y - YX +y +x -z - ZY +z +y -x - front +x +z -y - back -x +z +y - left -y +z -x - right +y +z +x - top +x +y +z - bottom +x -y -z - isometric +x+y -x+y+z +x+y-z - """ - planes = [ - (Plane.XY, (1, 0, 0), (0, 0, 1)), - (Plane.YZ, (0, 1, 0), (1, 0, 0)), - (Plane.ZX, (0, 0, 1), (0, 1, 0)), - (Plane.XZ, (1, 0, 0), (0, -1, 0)), - (Plane.YX, (0, 1, 0), (0, 0, -1)), - (Plane.ZY, (0, 0, 1), (-1, 0, 0)), - (Plane.front, (1, 0, 0), (0, -1, 0)), - (Plane.back, (-1, 0, 0), (0, 1, 0)), - (Plane.left, (0, -1, 0), (-1, 0, 0)), - (Plane.right, (0, 1, 0), (1, 0, 0)), - (Plane.top, (1, 0, 0), (0, 0, 1)), - (Plane.bottom, (1, 0, 0), (0, 0, -1)), - ( - Plane.isometric, - (1 / 2**0.5, 1 / 2**0.5, 0), - (1 / 3**0.5, -1 / 3**0.5, 1 / 3**0.5), - ), - ] - for plane, x_dir, z_dir in planes: - self.assertVectorAlmostEquals(plane.x_dir, x_dir, 5) - self.assertVectorAlmostEquals(plane.z_dir, z_dir, 5) - - def test_plane_init(self): - # from origin - o = (0, 0, 0) - x = (1, 0, 0) - y = (0, 1, 0) - z = (0, 0, 1) - planes = [ - Plane(o), - Plane(o, x), - Plane(o, x, z), - Plane(o, x, z_dir=z), - Plane(o, x_dir=x, z_dir=z), - Plane(o, x_dir=x), - Plane(o, z_dir=z), - Plane(origin=o, x_dir=x, z_dir=z), - Plane(origin=o, x_dir=x), - Plane(origin=o, z_dir=z), - ] - for p in planes: - self.assertVectorAlmostEquals(p.origin, o, 6) - self.assertVectorAlmostEquals(p.x_dir, x, 6) - self.assertVectorAlmostEquals(p.y_dir, y, 6) - self.assertVectorAlmostEquals(p.z_dir, z, 6) - with self.assertRaises(TypeError): - Plane() - with self.assertRaises(TypeError): - Plane(o, z_dir="up") - - # rotated location around z - loc = Location((0, 0, 0), (0, 0, 45)) - p_from_loc = Plane(loc) - p_from_named_loc = Plane(location=loc) - for p in [p_from_loc, p_from_named_loc]: - self.assertVectorAlmostEquals(p.origin, (0, 0, 0), 6) - self.assertVectorAlmostEquals( - p.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals( - p.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals(p.z_dir, (0, 0, 1), 6) - self.assertVectorAlmostEquals(loc.position, p.location.position, 6) - self.assertVectorAlmostEquals(loc.orientation, p.location.orientation, 6) - - # rotated location around x and origin <> (0,0,0) - loc = Location((0, 2, -1), (45, 0, 0)) - p = Plane(loc) - self.assertVectorAlmostEquals(p.origin, (0, 2, -1), 6) - self.assertVectorAlmostEquals(p.x_dir, (1, 0, 0), 6) - self.assertVectorAlmostEquals( - p.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals( - p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals(loc.position, p.location.position, 6) - self.assertVectorAlmostEquals(loc.orientation, p.location.orientation, 6) - - # from a face - f = Face.make_rect(1, 2).located(Location((1, 2, 3), (45, 0, 45))) - p_from_face = Plane(f) - p_from_named_face = Plane(face=f) - plane_from_gp_pln = Plane(gp_pln=p_from_face.wrapped) - p_deep_copy = copy.deepcopy(p_from_face) - for p in [p_from_face, p_from_named_face, plane_from_gp_pln, p_deep_copy]: - self.assertVectorAlmostEquals(p.origin, (1, 2, 3), 6) - self.assertVectorAlmostEquals(p.x_dir, (math.sqrt(2) / 2, 0.5, 0.5), 6) - self.assertVectorAlmostEquals(p.y_dir, (-math.sqrt(2) / 2, 0.5, 0.5), 6) - self.assertVectorAlmostEquals( - p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals(f.location.position, p.location.position, 6) - self.assertVectorAlmostEquals( - f.location.orientation, p.location.orientation, 6 - ) - - # from a face with x_dir - f = Face.make_rect(1, 2) - x = (1, 1) - y = (-1, 1) - planes = [ - Plane(f, x), - Plane(f, x_dir=x), - Plane(face=f, x_dir=x), - ] - for p in planes: - self.assertVectorAlmostEquals(p.origin, (0, 0, 0), 6) - self.assertVectorAlmostEquals(p.x_dir, Vector(x).normalized(), 6) - self.assertVectorAlmostEquals(p.y_dir, Vector(y).normalized(), 6) - self.assertVectorAlmostEquals(p.z_dir, (0, 0, 1), 6) - - with self.assertRaises(TypeError): - Plane(Edge.make_line((0, 0), (0, 1))) - - # can be instantiated from planar faces of surface types other than Geom_Plane - # this loft creates the trapezoid faces of type Geom_BSplineSurface - lofted_solid = Solid.make_loft( - [ - Rectangle(3, 1).wire(), - Pos(0, 0, 1) * Rectangle(1, 1).wire(), - ] - ) - - expected = [ - # Trapezoid face, negative y coordinate - ( - Axis.X.direction, # plane x_dir - Axis.Z.direction, # plane y_dir - -Axis.Y.direction, # plane z_dir - ), - # Trapezoid face, positive y coordinate - ( - -Axis.X.direction, - Axis.Z.direction, - Axis.Y.direction, - ), - ] - # assert properties of the trapezoid faces - for i, f in enumerate(lofted_solid.faces() | Plane.XZ > Axis.Y): - p = Plane(f) - f_props = GProp_GProps() - BRepGProp.SurfaceProperties_s(f.wrapped, f_props) - self.assertVectorAlmostEquals(p.origin, f_props.CentreOfMass(), 6) - self.assertVectorAlmostEquals(p.x_dir, expected[i][0], 6) - self.assertVectorAlmostEquals(p.y_dir, expected[i][1], 6) - self.assertVectorAlmostEquals(p.z_dir, expected[i][2], 6) - - def test_plane_neg(self): - p = Plane( - origin=(1, 2, 3), - x_dir=Vector(1, 2, 3).normalized(), - z_dir=Vector(4, 5, 6).normalized(), - ) - p2 = -p - self.assertVectorAlmostEquals(p2.origin, p.origin, 6) - self.assertVectorAlmostEquals(p2.x_dir, p.x_dir, 6) - self.assertVectorAlmostEquals(p2.z_dir, -p.z_dir, 6) - self.assertVectorAlmostEquals( - p2.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6 - ) - p3 = p.reverse() - self.assertVectorAlmostEquals(p3.origin, p.origin, 6) - self.assertVectorAlmostEquals(p3.x_dir, p.x_dir, 6) - self.assertVectorAlmostEquals(p3.z_dir, -p.z_dir, 6) - self.assertVectorAlmostEquals( - p3.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6 - ) - - def test_plane_mul(self): - p = Plane(origin=(1, 2, 3), x_dir=(1, 0, 0), z_dir=(0, 0, 1)) - p2 = p * Location((1, 2, -1), (0, 0, 45)) - self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) - self.assertVectorAlmostEquals( - p2.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals( - p2.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals(p2.z_dir, (0, 0, 1), 6) - - p2 = p * Location((1, 2, -1), (0, 45, 0)) - self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) - self.assertVectorAlmostEquals( - p2.x_dir, (math.sqrt(2) / 2, 0, -math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals(p2.y_dir, (0, 1, 0), 6) - self.assertVectorAlmostEquals( - p2.z_dir, (math.sqrt(2) / 2, 0, math.sqrt(2) / 2), 6 - ) - - p2 = p * Location((1, 2, -1), (45, 0, 0)) - self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) - self.assertVectorAlmostEquals(p2.x_dir, (1, 0, 0), 6) - self.assertVectorAlmostEquals( - p2.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals( - p2.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - with self.assertRaises(TypeError): - p2 * Vector(1, 1, 1) - - def test_plane_methods(self): - # Test error checking - p = Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 0)) - with self.assertRaises(ValueError): - p.to_local_coords("box") - - # Test translation to local coordinates - local_box = p.to_local_coords(Solid.make_box(1, 1, 1)) - local_box_vertices = [(v.X, v.Y, v.Z) for v in local_box.vertices()] - target_vertices = [ - (0, -1, 0), - (0, 0, 0), - (0, -1, 1), - (0, 0, 1), - (1, -1, 0), - (1, 0, 0), - (1, -1, 1), - (1, 0, 1), - ] - for i, target_point in enumerate(target_vertices): - self.assertTupleAlmostEquals(target_point, local_box_vertices[i], 7) - - def test_localize_vertex(self): - vertex = Vertex(random.random(), random.random(), random.random()) - self.assertTupleAlmostEquals( - Plane.YZ.to_local_coords(vertex).to_tuple(), - Plane.YZ.to_local_coords(Vector(vertex)).to_tuple(), - 5, - ) - - def test_repr(self): - self.assertEqual( - repr(Plane.XY), - "Plane(o=(0.00, 0.00, 0.00), x=(1.00, 0.00, 0.00), z=(0.00, 0.00, 1.00))", - ) - - def test_shift_origin_axis(self): - cyl = Cylinder(1, 2, align=Align.MIN) - top = cyl.faces().sort_by(Axis.Z)[-1] - pln = Plane(top).shift_origin(Axis.Z) - with BuildPart() as p: - add(cyl) - with BuildSketch(pln): - with Locations((1, 1)): - Circle(0.5) - extrude(amount=-2, mode=Mode.SUBTRACT) - self.assertAlmostEqual(p.part.volume, math.pi * (1**2 - 0.5**2) * 2, 5) - - def test_shift_origin_vertex(self): - box = Box(1, 1, 1, align=Align.MIN) - front = box.faces().sort_by(Axis.X)[-1] - pln = Plane(front).shift_origin( - front.vertices().group_by(Axis.Z)[-1].sort_by(Axis.Y)[-1] - ) - with BuildPart() as p: - add(box) - with BuildSketch(pln): - with Locations((-0.5, 0.5)): - Circle(0.5) - extrude(amount=-1, mode=Mode.SUBTRACT) - self.assertAlmostEqual(p.part.volume, 1**3 - math.pi * (0.5**2) * 1, 5) - - def test_shift_origin_vector(self): - with BuildPart() as p: - Box(4, 4, 2) - b = fillet(p.edges().filter_by(Axis.Z), 0.5) - top = p.faces().sort_by(Axis.Z)[-1] - ref = ( - top.edges() - .filter_by(GeomType.CIRCLE) - .group_by(Axis.X)[-1] - .sort_by(Axis.Y)[0] - .arc_center - ) - pln = Plane(top, x_dir=(0, 1, 0)).shift_origin(ref) - with BuildSketch(pln): - with Locations((0.5, 0.5)): - Rectangle(2, 2, align=Align.MIN) - extrude(amount=-1, mode=Mode.SUBTRACT) - self.assertAlmostEqual(p.part.volume, b.volume - 2**2 * 1, 5) - - def test_shift_origin_error(self): - with self.assertRaises(ValueError): - Plane.XY.shift_origin(Vertex(1, 1, 1)) - - with self.assertRaises(ValueError): - Plane.XY.shift_origin((1, 1, 1)) - - with self.assertRaises(ValueError): - Plane.XY.shift_origin(Axis((0, 0, 1), (0, 1, 0))) - - with self.assertRaises(TypeError): - Plane.XY.shift_origin(Edge.make_line((0, 0), (1, 1))) - - def test_move(self): - pln = Plane.XY.move(Location((1, 2, 3))) - self.assertVectorAlmostEquals(pln.origin, (1, 2, 3), 5) - - def test_rotated(self): - rotated_plane = Plane.XY.rotated((45, 0, 0)) - self.assertVectorAlmostEquals(rotated_plane.x_dir, (1, 0, 0), 5) - self.assertVectorAlmostEquals( - rotated_plane.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 5 - ) - - def test_invalid_plane(self): - # Test plane creation error handling - with self.assertRaises(ValueError): - Plane(origin=(0, 0, 0), x_dir=(0, 0, 0), z_dir=(0, 1, 1)) - with self.assertRaises(ValueError): - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 0)) - - def test_plane_equal(self): - # default orientation - self.assertEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - ) - # moved origin - self.assertEqual( - Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - ) - # moved x-axis - self.assertEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), - ) - # moved z-axis - self.assertEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), - ) - # __eq__ cooperation - self.assertEqual(Plane.XY, AlwaysEqual()) - - def test_plane_not_equal(self): - # type difference - for value in [None, 0, 1, "abc"]: - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), value - ) - # origin difference - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - ) - # x-axis difference - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), - ) - # z-axis difference - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), - ) - - def test_to_location(self): - loc = Plane(origin=(1, 2, 3), x_dir=(0, 1, 0), z_dir=(0, 0, 1)).location - self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, 0, 90), 5) - - def test_intersect(self): - self.assertVectorAlmostEquals( - Plane.XY.intersect(Axis((1, 2, 3), (0, 0, -1))), (1, 2, 0), 5 - ) - self.assertIsNone(Plane.XY.intersect(Axis((1, 2, 3), (0, 1, 0)))) - - self.assertEqual(Plane.XY.intersect(Plane.XZ), Axis.X) - - self.assertIsNone(Plane.XY.intersect(Plane.XY.offset(1))) - - with self.assertRaises(ValueError): - Plane.XY.intersect("Plane.XZ") - - with self.assertRaises(ValueError): - Plane.XY.intersect(pln=Plane.XZ) - - def test_from_non_planar_face(self): - flat = Face.make_rect(1, 1) - pln = Plane(flat) - self.assertTrue(isinstance(pln, Plane)) - cyl = ( - Solid.make_cylinder(1, 4).faces().filter_by(GeomType.PLANE, reverse=True)[0] - ) - with self.assertRaises(ValueError): - pln = Plane(cyl) - - def test_plane_intersect(self): - section = Plane.XY.intersect(Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5))) - self.assertEqual(len(section.solids()), 0) - self.assertEqual(len(section.faces()), 1) - self.assertAlmostEqual(section.face().area, 2) - - section = Plane.XY & Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5)) - self.assertEqual(len(section.solids()), 0) - self.assertEqual(len(section.faces()), 1) - self.assertAlmostEqual(section.face().area, 2) - - self.assertEqual(Plane.XY & Plane.XZ, Axis.X) - # x_axis_as_edge = Plane.XY & Plane.XZ - # common = (x_axis_as_edge.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() - # self.assertAlmostEqual(common.length, 1, 5) - - i = Plane.XY & Vector(1, 2) - self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, (1, 2, 0), 5) - - a = Axis((0, 0, 0), (1, 1, 0)) - i = Plane.XY & a - self.assertTrue(isinstance(i, Axis)) - self.assertEqual(i, a) - - a = Axis((1, 2, -1), (0, 0, 1)) - i = Plane.XY & a - self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, Vector(1, 2, 0), 5) - - def test_plane_origin_setter(self): - pln = Plane.XY - pln.origin = (1, 2, 3) - ocp_origin = Vector(pln.wrapped.Location()) - self.assertVectorAlmostEquals(ocp_origin, (1, 2, 3), 5) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_projection.py b/tests/test_direct_api/test_projection.py deleted file mode 100644 index 62b23d4..0000000 --- a/tests/test_direct_api/test_projection.py +++ /dev/null @@ -1,106 +0,0 @@ -""" -build123d direct api tests - -name: test_projection.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.build_enums import Align -from build123d.geometry import Axis, Plane, Pos, Vector -from build123d.objects_part import Box -from build123d.topology import Compound, Edge, Solid, Wire -from tests.base_test import DirectApiTestCase - - -class TestProjection(DirectApiTestCase): - def test_flat_projection(self): - sphere = Solid.make_sphere(50) - projection_direction = Vector(0, -1, 0) - planar_text_faces = ( - Compound.make_text("Flat", 30, align=(Align.CENTER, Align.CENTER)) - .rotate(Axis.X, 90) - .faces() - ) - projected_text_faces = [ - f.project_to_shape(sphere, projection_direction)[0] - for f in planar_text_faces - ] - self.assertEqual(len(projected_text_faces), 4) - - def test_multiple_output_wires(self): - target = Box(10, 10, 4) - Pos((0, 0, 2)) * Box(5, 5, 2) - circle = Wire.make_circle(3, Plane.XY.offset(10)) - projection = circle.project_to_shape(target, (0, 0, -1)) - bbox = projection[0].bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-3, -3, 1), 2) - self.assertVectorAlmostEquals(bbox.max, (3, 3, 2), 2) - bbox = projection[1].bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-3, -3, -2), 2) - self.assertVectorAlmostEquals(bbox.max, (3, 3, -2), 2) - - def test_text_projection(self): - sphere = Solid.make_sphere(50) - arch_path = ( - sphere.cut( - Solid.make_cylinder( - 80, 100, Plane(origin=(-50, 0, -70), z_dir=(1, 0, 0)) - ) - ) - .edges() - .sort_by(Axis.Z)[0] - ) - - projected_text = sphere.project_faces( - faces=Compound.make_text("dog", font_size=14), - path=arch_path, - start=0.01, # avoid a character spanning the sphere edge - ) - self.assertEqual(len(projected_text.solids()), 0) - self.assertEqual(len(projected_text.faces()), 3) - - def test_error_handling(self): - sphere = Solid.make_sphere(50) - circle = Wire.make_circle(1) - with self.assertRaises(ValueError): - circle.project_to_shape(sphere, center=None, direction=None)[0] - - def test_project_edge(self): - projection = Edge.make_circle(1, Plane.XY.offset(-5)).project_to_shape( - Solid.make_box(1, 1, 1), (0, 0, 1) - ) - self.assertVectorAlmostEquals(projection[0].position_at(1), (1, 0, 0), 5) - self.assertVectorAlmostEquals(projection[0].position_at(0), (0, 1, 0), 5) - self.assertVectorAlmostEquals(projection[0].arc_center, (0, 0, 0), 5) - - def test_to_axis(self): - with self.assertRaises(ValueError): - Edge.make_circle(1, end_angle=30).to_axis() - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_rotation.py b/tests/test_direct_api/test_rotation.py deleted file mode 100644 index 3efd378..0000000 --- a/tests/test_direct_api/test_rotation.py +++ /dev/null @@ -1,61 +0,0 @@ -""" -build123d direct api tests - -name: test_rotation.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.build_enums import Extrinsic, Intrinsic -from build123d.geometry import Rotation -from tests.base_test import DirectApiTestCase - - -class TestRotation(DirectApiTestCase): - def test_rotation_parameters(self): - r = Rotation(10, 20, 30) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - r = Rotation(10, 20, Z=30) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - r = Rotation(10, 20, Z=30, ordering=Intrinsic.XYZ) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - r = Rotation(10, Y=20, Z=30) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - r = Rotation((10, 20, 30)) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - r = Rotation(10, 20, 30, Intrinsic.XYZ) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - r = Rotation((30, 20, 10), Extrinsic.ZYX) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - r = Rotation((30, 20, 10), ordering=Extrinsic.ZYX) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) - with self.assertRaises(TypeError): - Rotation(x=10) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py deleted file mode 100644 index 1907473..0000000 --- a/tests/test_direct_api/test_shape.py +++ /dev/null @@ -1,615 +0,0 @@ -""" -build123d direct api tests - -name: test_shape.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest -from random import uniform -from unittest.mock import patch - -from build123d.build_enums import CenterOf, Keep -from build123d.geometry import ( - Axis, - Color, - Location, - Matrix, - Plane, - Pos, - Rotation, - Vector, -) -from build123d.objects_part import Box, Cylinder -from build123d.objects_sketch import Circle -from build123d.operations_part import extrude -from build123d.topology import ( - Compound, - Edge, - Face, - Shape, - ShapeList, - Shell, - Solid, - Vertex, - Wire, -) -from tests.base_test import DirectApiTestCase, AlwaysEqual - - -class TestShape(DirectApiTestCase): - """Misc Shape tests""" - - def test_mirror(self): - box_bb = Solid.make_box(1, 1, 1).mirror(Plane.XZ).bounding_box() - self.assertAlmostEqual(box_bb.min.X, 0, 5) - self.assertAlmostEqual(box_bb.max.X, 1, 5) - self.assertAlmostEqual(box_bb.min.Y, -1, 5) - self.assertAlmostEqual(box_bb.max.Y, 0, 5) - - box_bb = Solid.make_box(1, 1, 1).mirror().bounding_box() - self.assertAlmostEqual(box_bb.min.Z, -1, 5) - self.assertAlmostEqual(box_bb.max.Z, 0, 5) - - def test_compute_mass(self): - with self.assertRaises(NotImplementedError): - Shape.compute_mass(Vertex()) - - def test_combined_center(self): - objs = [Solid.make_box(1, 1, 1, Plane((x, 0, 0))) for x in [-2, 1]] - self.assertVectorAlmostEquals( - Shape.combined_center(objs, center_of=CenterOf.MASS), - (0, 0.5, 0.5), - 5, - ) - - objs = [Solid.make_sphere(1, Plane((x, 0, 0))) for x in [-2, 1]] - self.assertVectorAlmostEquals( - Shape.combined_center(objs, center_of=CenterOf.BOUNDING_BOX), - (-0.5, 0, 0), - 5, - ) - with self.assertRaises(ValueError): - Shape.combined_center(objs, center_of=CenterOf.GEOMETRY) - - def test_shape_type(self): - self.assertEqual(Vertex().shape_type(), "Vertex") - - def test_scale(self): - self.assertAlmostEqual(Solid.make_box(1, 1, 1).scale(2).volume, 2**3, 5) - - def test_fuse(self): - box1 = Solid.make_box(1, 1, 1) - box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) - combined = box1.fuse(box2, glue=True) - self.assertTrue(combined.is_valid()) - self.assertAlmostEqual(combined.volume, 2, 5) - fuzzy = box1.fuse(box2, tol=1e-6) - self.assertTrue(fuzzy.is_valid()) - self.assertAlmostEqual(fuzzy.volume, 2, 5) - - def test_faces_intersected_by_axis(self): - box = Solid.make_box(1, 1, 1, Plane((0, 0, 1))) - intersected_faces = box.faces_intersected_by_axis(Axis.Z) - self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[0] in intersected_faces) - self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[-1] in intersected_faces) - - def test_split(self): - shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) - split_shape = shape.split(Plane.XY, keep=Keep.BOTTOM) - self.assertTrue(isinstance(split_shape, list)) - self.assertEqual(len(split_shape), 2) - self.assertAlmostEqual(split_shape[0].volume + split_shape[1].volume, 0.25, 5) - split_shape = shape.split(Plane.XY, keep=Keep.TOP) - self.assertEqual(len(split_shape.solids()), 1) - self.assertTrue(isinstance(split_shape, Solid)) - self.assertAlmostEqual(split_shape.volume, 0.5, 5) - - s = Solid.make_cone(1, 0.5, 2, Plane.YZ.offset(10)) - tool = Solid.make_sphere(11).rotate(Axis.Z, 90).face() - s2 = s.split(tool, keep=Keep.TOP) - self.assertLess(s2.volume, s.volume) - self.assertGreater(s2.volume, 0.0) - - def test_split_by_non_planar_face(self): - box = Solid.make_box(1, 1, 1) - tool = Circle(1).wire() - tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) - top, bottom = box.split(tool_shell, keep=Keep.BOTH) - - self.assertFalse(top is None) - self.assertFalse(bottom is None) - self.assertGreater(top.volume, bottom.volume) - - def test_split_by_shell(self): - box = Solid.make_box(5, 5, 1) - tool = Wire.make_rect(4, 4) - tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) - split = box.split(tool_shell, keep=Keep.TOP) - inner_vol = 2 * 2 - outer_vol = 5 * 5 - self.assertAlmostEqual(split.volume, outer_vol - inner_vol) - - def test_split_keep_all(self): - shape = Box(1, 1, 1) - split_shape = shape.split(Plane.XY, keep=Keep.ALL) - self.assertTrue(isinstance(split_shape, ShapeList)) - self.assertEqual(len(split_shape), 2) - - def test_split_edge_by_shell(self): - edge = Edge.make_line((-5, 0, 0), (5, 0, 0)) - tool = Wire.make_rect(4, 4) - tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) - top = edge.split(tool_shell, keep=Keep.TOP) - self.assertEqual(len(top), 2) - self.assertAlmostEqual(top[0].length, 3, 5) - - def test_split_return_none(self): - shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) - split_shape = shape.split(Plane.XY, keep=Keep.INSIDE) - self.assertIsNone(split_shape) - - def test_split_by_perimeter(self): - # Test 0 - extract a spherical cap - target0 = Solid.make_sphere(10).rotate(Axis.Z, 90) - circle = Plane.YZ.offset(15) * Circle(5).face() - circle_projected = circle.project_to_shape(target0, (-1, 0, 0))[0] - circle_outerwire = circle_projected.edge() - inside0, outside0 = target0.split_by_perimeter(circle_outerwire, Keep.BOTH) - self.assertLess(inside0.area, outside0.area) - - # Test 1 - extract ring of a sphere - ring = Pos(Z=15) * (Circle(5) - Circle(3)).face() - ring_projected = ring.project_to_shape(target0, (0, 0, -1))[0] - ring_outerwire = ring_projected.outer_wire() - inside1, outside1 = target0.split_by_perimeter(ring_outerwire, Keep.BOTH) - if isinstance(inside1, list): - inside1 = Compound(inside1) - if isinstance(outside1, list): - outside1 = Compound(outside1) - self.assertLess(inside1.area, outside1.area) - self.assertEqual(len(outside1.faces()), 2) - - # Test 2 - extract multiple faces - target2 = Box(1, 10, 10) - square = Face.make_rect(3, 3, Plane((12, 0, 0), z_dir=(1, 0, 0))) - square_projected = square.project_to_shape(target2, (-1, 0, 0))[0] - outside2 = target2.split_by_perimeter( - square_projected.outer_wire(), Keep.OUTSIDE - ) - self.assertTrue(isinstance(outside2, Shell)) - inside2 = target2.split_by_perimeter(square_projected.outer_wire(), Keep.INSIDE) - self.assertTrue(isinstance(inside2, Face)) - - # Test 4 - invalid inputs - with self.assertRaises(ValueError): - _, _ = target2.split_by_perimeter(Edge.make_line((0, 0), (1, 0)), Keep.BOTH) - - with self.assertRaises(ValueError): - _, _ = target2.split_by_perimeter(Edge.make_circle(1), Keep.TOP) - - def test_distance(self): - sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) - sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) - self.assertAlmostEqual(sphere1.distance(sphere2), 8, 5) - - def test_distances(self): - sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) - sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) - sphere3 = Solid.make_sphere(1, Plane((-5, 0, 5))) - distances = [8, 3] - for i, distance in enumerate(sphere1.distances(sphere2, sphere3)): - self.assertAlmostEqual(distances[i], distance, 5) - - def test_max_fillet(self): - test_solids = [Solid.make_box(10, 8, 2), Solid.make_cone(5, 3, 8)] - max_values = [0.96, 3.84] - for i, test_object in enumerate(test_solids): - with self.subTest("solids" + str(i)): - max = test_object.max_fillet(test_object.edges()) - self.assertAlmostEqual(max, max_values[i], 2) - with self.assertRaises(RuntimeError): - test_solids[0].max_fillet( - test_solids[0].edges(), tolerance=1e-6, max_iterations=1 - ) - with self.assertRaises(ValueError): - box = Solid.make_box(1, 1, 1) - box.fillet(0.75, box.edges()) - # invalid_object = box.fillet(0.75, box.edges()) - # invalid_object.max_fillet(invalid_object.edges()) - - @patch.object(Shape, "is_valid", return_value=False) - def test_max_fillet_invalid_shape_raises_error(self, mock_is_valid): - box = Solid.make_box(1, 1, 1) - - # Assert that ValueError is raised - with self.assertRaises(ValueError) as max_fillet_context: - max = box.max_fillet(box.edges()) - - # Check the error message - self.assertEqual(str(max_fillet_context.exception), "Invalid Shape") - - # Verify is_valid was called - mock_is_valid.assert_called_once() - - def test_locate_bb(self): - bounding_box = Solid.make_cone(1, 2, 1).bounding_box() - relocated_bounding_box = Plane.XZ.from_local_coords(bounding_box) - self.assertAlmostEqual(relocated_bounding_box.min.X, -2, 5) - self.assertAlmostEqual(relocated_bounding_box.max.X, 2, 5) - self.assertAlmostEqual(relocated_bounding_box.min.Y, 0, 5) - self.assertAlmostEqual(relocated_bounding_box.max.Y, -1, 5) - self.assertAlmostEqual(relocated_bounding_box.min.Z, -2, 5) - self.assertAlmostEqual(relocated_bounding_box.max.Z, 2, 5) - - def test_is_equal(self): - box = Solid.make_box(1, 1, 1) - self.assertTrue(box.is_equal(box)) - - def test_equal(self): - box = Solid.make_box(1, 1, 1) - self.assertEqual(box, box) - self.assertEqual(box, AlwaysEqual()) - - def test_not_equal(self): - box = Solid.make_box(1, 1, 1) - diff = Solid.make_box(1, 2, 3) - self.assertNotEqual(box, diff) - self.assertNotEqual(box, object()) - - def test_tessellate(self): - box123 = Solid.make_box(1, 2, 3) - verts, triangles = box123.tessellate(1e-6) - self.assertEqual(len(verts), 24) - self.assertEqual(len(triangles), 12) - - def test_transformed(self): - """Validate that transformed works the same as changing location""" - rotation = (uniform(0, 360), uniform(0, 360), uniform(0, 360)) - offset = (uniform(0, 50), uniform(0, 50), uniform(0, 50)) - shape = Solid.make_box(1, 1, 1).transformed(rotation, offset) - predicted_location = Location(offset) * Rotation(*rotation) - located_shape = Solid.make_box(1, 1, 1).locate(predicted_location) - intersect = shape.intersect(located_shape) - self.assertAlmostEqual(intersect.volume, 1, 5) - - def test_position_and_orientation(self): - box = Solid.make_box(1, 1, 1).locate(Location((1, 2, 3), (10, 20, 30))) - self.assertVectorAlmostEquals(box.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(box.orientation, (10, 20, 30), 5) - - def test_distance_to_with_closest_points(self): - s0 = Solid.make_sphere(1).locate(Location((0, 2.1, 0))) - s1 = Solid.make_sphere(1) - distance, pnt0, pnt1 = s0.distance_to_with_closest_points(s1) - self.assertAlmostEqual(distance, 0.1, 5) - self.assertVectorAlmostEquals(pnt0, (0, 1.1, 0), 5) - self.assertVectorAlmostEquals(pnt1, (0, 1, 0), 5) - - def test_closest_points(self): - c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) - c1 = Edge.make_circle(1) - closest = c0.closest_points(c1) - self.assertVectorAlmostEquals(closest[0], c0.position_at(0.75).to_tuple(), 5) - self.assertVectorAlmostEquals(closest[1], c1.position_at(0.25).to_tuple(), 5) - - def test_distance_to(self): - c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) - c1 = Edge.make_circle(1) - distance = c0.distance_to(c1) - self.assertAlmostEqual(distance, 0.1, 5) - - def test_intersection(self): - box = Solid.make_box(1, 1, 1) - intersections = ( - box.intersect(Axis((0.5, 0.5, 4), (0, 0, -1))).vertices().sort_by(Axis.Z) - ) - self.assertVectorAlmostEquals(intersections[0], (0.5, 0.5, 0), 5) - self.assertVectorAlmostEquals(intersections[1], (0.5, 0.5, 1), 5) - - def test_clean_error(self): - """Note that this test is here to alert build123d to changes in bad OCCT clean behavior - with spheres or hemispheres. The extra edge in a sphere seems to be the cause of this. - """ - sphere = Solid.make_sphere(1) - divider = Solid.make_box(0.1, 3, 3, Plane(origin=(-0.05, -1.5, -1.5))) - positive_half, negative_half = (s.clean() for s in sphere.cut(divider).solids()) - self.assertGreater(abs(positive_half.volume - negative_half.volume), 0, 1) - - def test_clean_empty(self): - obj = Solid() - self.assertIs(obj, obj.clean()) - - def test_relocate(self): - box = Solid.make_box(10, 10, 10).move(Location((20, -5, -5))) - cylinder = Solid.make_cylinder(2, 50).move(Location((0, 0, 0), (0, 90, 0))) - - box_with_hole = box.cut(cylinder) - box_with_hole.relocate(box.location) - - self.assertEqual(box.location, box_with_hole.location) - - bbox1 = box.bounding_box() - bbox2 = box_with_hole.bounding_box() - self.assertVectorAlmostEquals(bbox1.min, bbox2.min, 5) - self.assertVectorAlmostEquals(bbox1.max, bbox2.max, 5) - - def test_project_to_viewport(self): - # Basic test - box = Solid.make_box(10, 10, 10) - visible, hidden = box.project_to_viewport((-20, 20, 20)) - self.assertEqual(len(visible), 9) - self.assertEqual(len(hidden), 3) - - # Contour edges - cyl = Solid.make_cylinder(2, 10) - visible, hidden = cyl.project_to_viewport((-20, 20, 20)) - # Note that some edges are broken into two - self.assertEqual(len(visible), 6) - self.assertEqual(len(hidden), 2) - - # Hidden contour edges - hole = box - cyl - visible, hidden = hole.project_to_viewport((-20, 20, 20)) - self.assertEqual(len(visible), 13) - self.assertEqual(len(hidden), 6) - - # Outline edges - sphere = Solid.make_sphere(5) - visible, hidden = sphere.project_to_viewport((-20, 20, 20)) - self.assertEqual(len(visible), 1) - self.assertEqual(len(hidden), 0) - - def test_vertex(self): - v = Edge.make_circle(1).vertex() - self.assertTrue(isinstance(v, Vertex)) - with self.assertWarns(UserWarning): - Wire.make_rect(1, 1).vertex() - - def test_edge(self): - e = Edge.make_circle(1).edge() - self.assertTrue(isinstance(e, Edge)) - with self.assertWarns(UserWarning): - Wire.make_rect(1, 1).edge() - - def test_wire(self): - w = Wire.make_circle(1).wire() - self.assertTrue(isinstance(w, Wire)) - with self.assertWarns(UserWarning): - Solid.make_box(1, 1, 1).wire() - - def test_compound(self): - c = Compound.make_text("hello", 10) - self.assertTrue(isinstance(c, Compound)) - c2 = Compound.make_text("world", 10) - with self.assertWarns(UserWarning): - Compound(children=[c, c2]).compound() - - def test_face(self): - f = Face.make_rect(1, 1) - self.assertTrue(isinstance(f, Face)) - with self.assertWarns(UserWarning): - Solid.make_box(1, 1, 1).face() - - def test_shell(self): - s = Solid.make_sphere(1).shell() - self.assertTrue(isinstance(s, Shell)) - with self.assertWarns(UserWarning): - extrude(Compound.make_text("two", 10), amount=5).shell() - - def test_solid(self): - s = Solid.make_sphere(1).solid() - self.assertTrue(isinstance(s, Solid)) - with self.assertWarns(UserWarning): - Compound(Solid.make_sphere(1).split(Plane.XY, keep=Keep.BOTH)).solid() - - def test_manifold(self): - self.assertTrue(Solid.make_box(1, 1, 1).is_manifold) - self.assertTrue(Solid.make_box(1, 1, 1).shell().is_manifold) - self.assertFalse( - Solid.make_box(1, 1, 1) - .shell() - .cut(Solid.make_box(0.5, 0.5, 0.5)) - .is_manifold - ) - self.assertTrue( - Compound( - children=[Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)] - ).is_manifold - ) - - def test_inherit_color(self): - # Create some objects and assign colors to them - b = Box(1, 1, 1).locate(Pos(2, 2, 0)) - b.color = Color("blue") # Blue - c = Cylinder(1, 1).locate(Pos(-2, 2, 0)) - a = Compound(children=[b, c]) - a.color = Color(0, 1, 0) - # Check that assigned colors stay and iheritance works - self.assertTupleAlmostEquals(tuple(a.color), (0, 1, 0, 1), 5) - self.assertTupleAlmostEquals(tuple(b.color), (0, 0, 1, 1), 5) - - def test_ocp_section(self): - # Vertex - verts, edges = Vertex(1, 2, 0)._ocp_section(Vertex(1, 2, 0)) - self.assertListEqual(verts, []) # ? - self.assertListEqual(edges, []) - - verts, edges = Vertex(1, 2, 0)._ocp_section(Edge.make_line((0, 0), (2, 4))) - self.assertListEqual(verts, []) # ? - self.assertListEqual(edges, []) - - verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_rect(5, 5)) - self.assertTupleAlmostEquals(tuple(verts[0]), (1, 2, 0), 5) - self.assertListEqual(edges, []) - - verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_plane(Plane.XY)) - self.assertTupleAlmostEquals(tuple(verts[0]), (1, 2, 0), 5) - self.assertListEqual(edges, []) - - # spline = Spline((-10, 10, -10), (-10, -5, -5), (20, 0, 5)) - # cylinder = Pos(Z=-10) * extrude(Circle(5), 20) - # cylinder2 = (Rot((0, 90, 0)) * cylinder).face() - # pln = Plane.XY - # box1 = Box(10, 10, 10, align=(Align.CENTER, Align.CENTER, Align.MIN)) - # box2 = Pos(Z=-10) * box1 - - # # vertices, edges = ocp_section(spline, Face.make_rect(1e6, 1e6, pln)) - # vertices1, edges1 = spline.ocp_section(Face.make_plane(pln)) - # print(vertices1, edges1) - - # vertices2, edges2 = cylinder.ocp_section(Face.make_plane(pln)) - # print(vertices2, edges2) - - # vertices3, edges3 = cylinder2.ocp_section(Face.make_plane(pln)) - # print(vertices3, edges3) - - # # vertices4, edges4 = cylinder2.ocp_section(cylinder) - - # vertices5, edges5 = box1.ocp_section(Face.make_plane(pln)) - # print(vertices5, edges5) - - # vertices6, edges6 = box1.ocp_section(box2.faces().sort_by(Axis.Z)[-1]) - - def test_copy_attributes_to(self): - box = Box(1, 1, 1) - box2 = Box(10, 10, 10) - box.label = "box" - box.color = Color("Red") - box.children = [Box(1, 1, 1), Box(2, 2, 2)] - box.topo_parent = box2 - - blank = Compound() - box.copy_attributes_to(blank) - self.assertEqual(blank.label, "box") - self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.color, Color("Red")))) - self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.children, box.children))) - self.assertEqual(blank.topo_parent, box2) - - def test_empty_shape(self): - empty = Solid() - box = Solid.make_box(1, 1, 1) - self.assertIsNone(empty.location) - self.assertIsNone(empty.position) - self.assertIsNone(empty.orientation) - self.assertFalse(empty.is_manifold) - with self.assertRaises(ValueError): - empty.geom_type - self.assertIs(empty, empty.fix()) - self.assertEqual(hash(empty), 0) - self.assertFalse(empty.is_same(Solid())) - self.assertFalse(empty.is_equal(Solid())) - self.assertTrue(empty.is_valid()) - empty_bbox = empty.bounding_box() - self.assertEqual(tuple(empty_bbox.size), (0, 0, 0)) - self.assertIs(empty, empty.mirror(Plane.XY)) - self.assertEqual(Shape.compute_mass(empty), 0) - self.assertEqual(empty.entities("Face"), []) - self.assertEqual(empty.area, 0) - self.assertIs(empty, empty.rotate(Axis.Z, 90)) - translate_matrix = [ - [1.0, 0.0, 0.0, 1.0], - [0.0, 1.0, 0.0, 2.0], - [0.0, 0.0, 1.0, 3.0], - [0.0, 0.0, 0.0, 1.0], - ] - self.assertIs(empty, empty.transform_shape(Matrix(translate_matrix))) - self.assertIs(empty, empty.transform_geometry(Matrix(translate_matrix))) - with self.assertRaises(ValueError): - empty.locate(Location()) - empty_loc = Location() - empty_loc.wrapped = None - with self.assertRaises(ValueError): - box.locate(empty_loc) - with self.assertRaises(ValueError): - empty.located(Location()) - with self.assertRaises(ValueError): - box.located(empty_loc) - with self.assertRaises(ValueError): - empty.move(Location()) - with self.assertRaises(ValueError): - box.move(empty_loc) - with self.assertRaises(ValueError): - empty.moved(Location()) - with self.assertRaises(ValueError): - box.moved(empty_loc) - with self.assertRaises(ValueError): - empty.relocate(Location()) - with self.assertRaises(ValueError): - box.relocate(empty_loc) - with self.assertRaises(ValueError): - empty.distance_to(Vector(1, 1, 1)) - with self.assertRaises(ValueError): - empty.distance_to_with_closest_points(Vector(1, 1, 1)) - with self.assertRaises(ValueError): - empty.distance_to(Vector(1, 1, 1)) - with self.assertRaises(ValueError): - box.intersect(empty_loc) - self.assertEqual(empty._ocp_section(Vertex(1, 1, 1)), ([], [])) - self.assertEqual(empty.faces_intersected_by_axis(Axis.Z), ShapeList()) - with self.assertRaises(ValueError): - empty.split_by_perimeter(Circle(1).wire()) - with self.assertRaises(ValueError): - empty.distance(Vertex(1, 1, 1)) - with self.assertRaises(ValueError): - list(empty.distances(Vertex(0, 0, 0), Vertex(1, 1, 1))) - with self.assertRaises(ValueError): - list(box.distances(empty, Vertex(1, 1, 1))) - with self.assertRaises(ValueError): - empty.mesh(0.001) - with self.assertRaises(ValueError): - empty.tessellate(0.001) - with self.assertRaises(ValueError): - empty.to_splines() - empty_axis = Axis((0, 0, 0), (1, 0, 0)) - empty_axis.wrapped = None - with self.assertRaises(ValueError): - box.vertices().group_by(empty_axis) - empty_wire = Wire() - with self.assertRaises(ValueError): - box.vertices().group_by(empty_wire) - with self.assertRaises(ValueError): - box.vertices().sort_by(empty_axis) - with self.assertRaises(ValueError): - box.vertices().sort_by(empty_wire) - - def test_empty_selectors(self): - self.assertEqual(Vertex(1, 1, 1).edges(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).wires(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).faces(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).shells(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).solids(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).compounds(), ShapeList()) - self.assertIsNone(Vertex(1, 1, 1).edge()) - self.assertIsNone(Vertex(1, 1, 1).wire()) - self.assertIsNone(Vertex(1, 1, 1).face()) - self.assertIsNone(Vertex(1, 1, 1).shell()) - self.assertIsNone(Vertex(1, 1, 1).solid()) - self.assertIsNone(Vertex(1, 1, 1).compound()) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py deleted file mode 100644 index 3ceb5fa..0000000 --- a/tests/test_direct_api/test_shape_list.py +++ /dev/null @@ -1,364 +0,0 @@ -""" -build123d direct api tests - -name: test_shape_list.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import io -import math -import re -import unittest - -from IPython.lib import pretty -from build123d.build_common import GridLocations, PolarLocations -from build123d.build_enums import GeomType, SortBy -from build123d.build_part import BuildPart -from build123d.geometry import Axis, Plane -from build123d.objects_part import Box, Cylinder -from build123d.objects_sketch import RegularPolygon -from build123d.topology import ( - Compound, - Edge, - Face, - ShapeList, - Shell, - Solid, - Vertex, - Wire, -) -from tests.base_test import DirectApiTestCase, AlwaysEqual - - -class TestShapeList(DirectApiTestCase): - """Test ShapeList functionality""" - - def assertDunderStrEqual(self, actual: str, expected_lines: list[str]): - actual_lines = actual.splitlines() - self.assertEqual(len(actual_lines), len(expected_lines)) - for actual_line, expected_line in zip(actual_lines, expected_lines): - start, end = re.split(r"at 0x[0-9a-f]+", expected_line, 2, re.I) - self.assertTrue(actual_line.startswith(start)) - self.assertTrue(actual_line.endswith(end)) - - def assertDunderReprEqual(self, actual: str, expected: str): - splitter = r"at 0x[0-9a-f]+" - actual_split_list = re.split(splitter, actual, 0, re.I) - expected_split_list = re.split(splitter, expected, 0, re.I) - for actual_split, expected_split in zip(actual_split_list, expected_split_list): - self.assertEqual(actual_split, expected_split) - - def test_sort_by(self): - faces = Solid.make_box(1, 2, 3).faces() < SortBy.AREA - self.assertAlmostEqual(faces[-1].area, 2, 5) - - def test_filter_by_geomtype(self): - non_planar_faces = ( - Solid.make_cylinder(1, 1).faces().filter_by(GeomType.PLANE, reverse=True) - ) - self.assertEqual(len(non_planar_faces), 1) - self.assertAlmostEqual(non_planar_faces[0].area, 2 * math.pi, 5) - - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).faces().filter_by("True") - - def test_filter_by_axis(self): - box = Solid.make_box(1, 1, 1) - self.assertEqual(len(box.faces().filter_by(Axis.X)), 2) - self.assertEqual(len(box.edges().filter_by(Axis.X)), 4) - self.assertEqual(len(box.vertices().filter_by(Axis.X)), 0) - - def test_filter_by_callable_predicate(self): - boxes = [Solid.make_box(1, 1, 1) for _ in range(3)] - boxes[0].label = "A" - boxes[1].label = "A" - boxes[2].label = "B" - shapelist = ShapeList(boxes) - - self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "A")), 2) - self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "B")), 1) - - def test_first_last(self): - vertices = ( - Solid.make_box(1, 1, 1).vertices().sort_by(Axis((0, 0, 0), (1, 1, 1))) - ) - self.assertVectorAlmostEquals(vertices.last, (1, 1, 1), 5) - self.assertVectorAlmostEquals(vertices.first, (0, 0, 0), 5) - - def test_group_by(self): - vertices = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) - self.assertEqual(len(vertices[0]), 4) - - edges = Solid.make_box(1, 1, 1).edges().group_by(SortBy.LENGTH) - self.assertEqual(len(edges[0]), 12) - - edges = ( - Solid.make_cone(2, 1, 2) - .edges() - .filter_by(GeomType.CIRCLE) - .group_by(SortBy.RADIUS) - ) - self.assertEqual(len(edges[0]), 1) - - edges = (Solid.make_cone(2, 1, 2).edges() | GeomType.CIRCLE) << SortBy.RADIUS - self.assertAlmostEqual(edges[0].length, 2 * math.pi, 5) - - vertices = Solid.make_box(1, 1, 1).vertices().group_by(SortBy.DISTANCE) - self.assertVectorAlmostEquals(vertices[-1][0], (1, 1, 1), 5) - - box = Solid.make_box(1, 1, 2) - self.assertEqual(len(box.faces().group_by(SortBy.AREA)[0]), 2) - self.assertEqual(len(box.faces().group_by(SortBy.AREA)[1]), 4) - - line = Edge.make_line((0, 0, 0), (1, 1, 2)) - vertices_by_line = box.vertices().group_by(line) - self.assertEqual(len(vertices_by_line[0]), 1) - self.assertEqual(len(vertices_by_line[1]), 2) - self.assertEqual(len(vertices_by_line[2]), 1) - self.assertEqual(len(vertices_by_line[3]), 1) - self.assertEqual(len(vertices_by_line[4]), 2) - self.assertEqual(len(vertices_by_line[5]), 1) - self.assertVectorAlmostEquals(vertices_by_line[0][0], (0, 0, 0), 5) - self.assertVectorAlmostEquals(vertices_by_line[-1][0], (1, 1, 2), 5) - - with BuildPart() as boxes: - with GridLocations(10, 10, 3, 3): - Box(1, 1, 1) - with PolarLocations(100, 10): - Box(1, 1, 2) - self.assertEqual(len(boxes.solids().group_by(SortBy.VOLUME)[-1]), 10) - self.assertEqual(len((boxes.solids()) << SortBy.VOLUME), 9) - - with self.assertRaises(ValueError): - boxes.solids().group_by("AREA") - - def test_group_by_callable_predicate(self): - boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] - boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] - for box in boxesA: - box.label = "A" - for box in boxesB: - box.label = "B" - boxNoLabel = Solid.make_box(1, 1, 1) - - shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) - result = shapelist.group_by(lambda shape: shape.label) - - self.assertEqual([len(group) for group in result], [1, 3, 2]) - - def test_group_by_retrieve_groups(self): - boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] - boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] - for box in boxesA: - box.label = "A" - for box in boxesB: - box.label = "B" - boxNoLabel = Solid.make_box(1, 1, 1) - - shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) - result = shapelist.group_by(lambda shape: shape.label) - - self.assertEqual(len(result.group("")), 1) - self.assertEqual(len(result.group("A")), 3) - self.assertEqual(len(result.group("B")), 2) - self.assertEqual(result.group(""), result[0]) - self.assertEqual(result.group("A"), result[1]) - self.assertEqual(result.group("B"), result[2]) - self.assertEqual(result.group_for(boxesA[0]), result.group_for(boxesA[0])) - self.assertNotEqual(result.group_for(boxesA[0]), result.group_for(boxesB[0])) - with self.assertRaises(KeyError): - result.group("C") - - def test_group_by_str_repr(self): - nonagon = RegularPolygon(5, 9) - - expected = [ - "[[],", - " [,", - " ],", - " [,", - " ],", - " [,", - " ],", - " [,", - " ]]", - ] - self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) - - expected_repr = ( - "[[]," - " [," - " ]," - " [," - " ]," - " [," - " ]," - " [," - " ]]" - ) - self.assertDunderReprEqual( - repr(nonagon.edges().group_by(Axis.X)), expected_repr - ) - - f = io.StringIO() - p = pretty.PrettyPrinter(f) - nonagon.edges().group_by(Axis.X)._repr_pretty_(p, cycle=True) - self.assertEqual(f.getvalue(), "(...)") - - def test_distance(self): - with BuildPart() as box: - Box(1, 2, 3) - obj = (-0.2, 0.1, 0.5) - edges = box.edges().sort_by_distance(obj) - distances = [Vertex(*obj).distance_to(edge) for edge in edges] - self.assertTrue( - all([distances[i] >= distances[i - 1] for i in range(1, len(edges))]) - ) - - def test_distance_reverse(self): - with BuildPart() as box: - Box(1, 2, 3) - obj = (-0.2, 0.1, 0.5) - edges = box.edges().sort_by_distance(obj, reverse=True) - distances = [Vertex(*obj).distance_to(edge) for edge in edges] - self.assertTrue( - all([distances[i] <= distances[i - 1] for i in range(1, len(edges))]) - ) - - def test_distance_equal(self): - with BuildPart() as box: - Box(1, 1, 1) - self.assertEqual(len(box.edges().sort_by_distance((0, 0, 0))), 12) - - def test_vertices(self): - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - self.assertEqual(len(sl.vertices()), 8) - - def test_vertex(self): - sl = ShapeList([Edge.make_circle(1)]) - self.assertTupleAlmostEquals(sl.vertex().to_tuple(), (1, 0, 0), 5) - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - with self.assertWarns(UserWarning): - sl.vertex() - self.assertEqual(len(Edge().vertices()), 0) - - def test_edges(self): - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - self.assertEqual(len(sl.edges()), 8) - self.assertEqual(len(Edge().edges()), 0) - - def test_edge(self): - sl = ShapeList([Edge.make_circle(1)]) - self.assertAlmostEqual(sl.edge().length, 2 * 1 * math.pi, 5) - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - with self.assertWarns(UserWarning): - sl.edge() - - def test_wires(self): - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - self.assertEqual(len(sl.wires()), 2) - self.assertEqual(len(Wire().wires()), 0) - - def test_wire(self): - sl = ShapeList([Wire.make_circle(1)]) - self.assertAlmostEqual(sl.wire().length, 2 * 1 * math.pi, 5) - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - with self.assertWarns(UserWarning): - sl.wire() - - def test_faces(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - self.assertEqual(len(sl.faces()), 9) - self.assertEqual(len(Face().faces()), 0) - - def test_face(self): - sl = ShapeList( - [Vertex(1, 1, 1), Edge.make_line((0, 0), (1, 1)), Face.make_rect(2, 1)] - ) - self.assertAlmostEqual(sl.face().area, 2 * 1, 5) - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.face() - - def test_shells(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - self.assertEqual(len(sl.shells()), 2) - self.assertEqual(len(Shell().shells()), 0) - - def test_shell(self): - sl = ShapeList([Vertex(1, 1, 1), Solid.make_box(1, 1, 1)]) - self.assertAlmostEqual(sl.shell().area, 6 * 1 * 1, 5) - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.shell() - - def test_solids(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - self.assertEqual(len(sl.solids()), 2) - self.assertEqual(len(Solid().solids()), 0) - - def test_solid(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.solid() - sl = ShapeList([Solid.make_box(1, 2, 3), Vertex(1, 1, 1)]) - self.assertAlmostEqual(sl.solid().volume, 1 * 2 * 3, 5) - - def test_compounds(self): - sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) - self.assertEqual(len(sl.compounds()), 2) - self.assertEqual(len(Compound().compounds()), 0) - - def test_compound(self): - sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.compound() - sl = ShapeList([Box(1, 2, 3), Vertex(1, 1, 1)]) - self.assertAlmostEqual(sl.compound().volume, 1 * 2 * 3, 5) - - def test_equal(self): - box = Box(1, 1, 1) - cyl = Cylinder(1, 1) - sl = ShapeList([box, cyl]) - same = ShapeList([cyl, box]) - self.assertEqual(sl, same) - self.assertEqual(sl, AlwaysEqual()) - - def test_not_equal(self): - sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) - diff = ShapeList([Box(1, 1, 1), Box(1, 2, 3)]) - self.assertNotEqual(sl, diff) - self.assertNotEqual(sl, object()) - - def test_center(self): - self.assertEqual(tuple(ShapeList().center()), (0, 0, 0)) - self.assertEqual( - tuple(ShapeList(Vertex(i, 0, 0) for i in range(3)).center()), (1, 0, 0) - ) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_shells.py b/tests/test_direct_api/test_shells.py deleted file mode 100644 index d1f3480..0000000 --- a/tests/test_direct_api/test_shells.py +++ /dev/null @@ -1,118 +0,0 @@ -""" -build123d direct api tests - -name: test_shells.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import unittest - -from build123d.geometry import Plane, Rot, Vector -from build123d.objects_curve import JernArc, Polyline, Spline -from build123d.objects_sketch import Circle -from build123d.operations_generic import sweep -from build123d.topology import Shell, Solid, Wire -from tests.base_test import DirectApiTestCase - - -class TestShells(DirectApiTestCase): - def test_shell_init(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - self.assertTrue(box_shell.is_valid()) - - def test_center(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - self.assertVectorAlmostEquals(box_shell.center(), (0.5, 0.5, 0.5), 5) - - def test_manifold_shell_volume(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - self.assertAlmostEqual(box_shell.volume, 1, 5) - - def test_nonmanifold_shell_volume(self): - box_faces = Solid.make_box(1, 1, 1).faces() - nm_shell = Shell(box_faces) - nm_shell -= nm_shell.faces()[0] - self.assertAlmostEqual(nm_shell.volume, 0, 5) - - def test_constructor(self): - with self.assertRaises(TypeError): - Shell(foo="bar") - - x_section = Rot(90) * Spline((0, -5), (-3, -2), (-2, 0), (-3, 2), (0, 5)) - surface = sweep(x_section, Circle(5).wire()) - single_face = Shell(surface.face()) - self.assertTrue(single_face.is_valid()) - single_face = Shell(surface.faces()) - self.assertTrue(single_face.is_valid()) - - def test_sweep(self): - path_c1 = JernArc((0, 0), (-1, 0), 1, 180) - path_e = path_c1.edge() - path_c2 = JernArc((0, 0), (-1, 0), 1, 180) + JernArc((0, 0), (1, 0), 2, -90) - path_w = path_c2.wire() - section_e = Circle(0.5).edge() - section_c2 = Polyline((0, 0), (0.1, 0), (0.2, 0.1)) - section_w = section_c2.wire() - - sweep_e_w = Shell.sweep((path_w ^ 0) * section_e, path_w) - sweep_w_e = Shell.sweep((path_e ^ 0) * section_w, path_e) - sweep_w_w = Shell.sweep((path_w ^ 0) * section_w, path_w) - sweep_c2_c1 = Shell.sweep((path_c1 ^ 0) * section_c2, path_c1) - sweep_c2_c2 = Shell.sweep((path_c2 ^ 0) * section_c2, path_c2) - - self.assertEqual(len(sweep_e_w.faces()), 2) - self.assertEqual(len(sweep_w_e.faces()), 2) - self.assertEqual(len(sweep_c2_c1.faces()), 2) - self.assertEqual(len(sweep_w_w.faces()), 3) # 3 with clean, 4 without - self.assertEqual(len(sweep_c2_c2.faces()), 3) # 3 with clean, 4 without - - def test_make_loft(self): - r = 3 - h = 2 - loft = Shell.make_loft( - [Wire.make_circle(r, Plane((0, 0, h))), Wire.make_circle(r)] - ) - self.assertEqual(loft.volume, 0, "A shell has no volume") - cylinder_area = 2 * math.pi * r * h - self.assertAlmostEqual(loft.area, cylinder_area) - - def test_thicken(self): - rect = Wire.make_rect(10, 5) - shell: Shell = Shell.extrude(rect, Vector(0, 0, 3)) - thick = Solid.thicken(shell, 1) - - self.assertEqual(isinstance(thick, Solid), True) - inner_vol = 3 * 10 * 5 - outer_vol = 3 * 12 * 7 - self.assertAlmostEqual(thick.volume, outer_vol - inner_vol) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_skip_clean.py b/tests/test_direct_api/test_skip_clean.py deleted file mode 100644 index a39aeef..0000000 --- a/tests/test_direct_api/test_skip_clean.py +++ /dev/null @@ -1,70 +0,0 @@ -""" -build123d direct api tests - -name: test_skip_clean.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.topology import SkipClean - - -class TestSkipClean(unittest.TestCase): - def setUp(self): - # Ensure the class variable is in its default state before each test - SkipClean.clean = True - - def test_context_manager_sets_clean_false(self): - # Verify `clean` is initially True - self.assertTrue(SkipClean.clean) - - # Use the context manager - with SkipClean(): - # Within the context, `clean` should be False - self.assertFalse(SkipClean.clean) - - # After exiting the context, `clean` should revert to True - self.assertTrue(SkipClean.clean) - - def test_exception_handling_does_not_affect_clean(self): - # Verify `clean` is initially True - self.assertTrue(SkipClean.clean) - - # Use the context manager and raise an exception - try: - with SkipClean(): - self.assertFalse(SkipClean.clean) - raise ValueError("Test exception") - except ValueError: - pass - - # Ensure `clean` is restored to True after an exception - self.assertTrue(SkipClean.clean) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_solid.py b/tests/test_direct_api/test_solid.py deleted file mode 100644 index fad617a..0000000 --- a/tests/test_direct_api/test_solid.py +++ /dev/null @@ -1,245 +0,0 @@ -""" -build123d direct api tests - -name: test_solid.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import unittest - -from build123d.build_enums import GeomType, Kind, Until -from build123d.geometry import Axis, Location, Plane, Pos, Vector -from build123d.objects_curve import Spline -from build123d.objects_sketch import Circle, Rectangle -from build123d.topology import Compound, Edge, Face, Shell, Solid, Vertex, Wire -from tests.base_test import DirectApiTestCase - - -class TestSolid(DirectApiTestCase): - def test_make_solid(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - box = Solid(box_shell) - self.assertAlmostEqual(box.area, 6, 5) - self.assertAlmostEqual(box.volume, 1, 5) - self.assertTrue(box.is_valid()) - - def test_extrude(self): - v = Edge.extrude(Vertex(1, 1, 1), (0, 0, 1)) - self.assertAlmostEqual(v.length, 1, 5) - - e = Face.extrude(Edge.make_line((2, 1), (2, 0)), (0, 0, 1)) - self.assertAlmostEqual(e.area, 1, 5) - - w = Shell.extrude( - Wire([Edge.make_line((1, 1), (0, 2)), Edge.make_line((1, 1), (1, 0))]), - (0, 0, 1), - ) - self.assertAlmostEqual(w.area, 1 + math.sqrt(2), 5) - - f = Solid.extrude(Face.make_rect(1, 1), (0, 0, 1)) - self.assertAlmostEqual(f.volume, 1, 5) - - s = Compound.extrude( - Shell( - Solid.make_box(1, 1, 1) - .locate(Location((-2, 1, 0))) - .faces() - .sort_by(Axis((0, 0, 0), (1, 1, 1)))[-2:] - ), - (0.1, 0.1, 0.1), - ) - self.assertAlmostEqual(s.volume, 0.2, 5) - - with self.assertRaises(ValueError): - Solid.extrude(Solid.make_box(1, 1, 1), (0, 0, 1)) - - def test_extrude_taper(self): - a = 1 - rect = Face.make_rect(a, a) - flipped = -rect - for direction in [Vector(0, 0, 2), Vector(0, 0, -2)]: - for taper in [10, -10]: - offset_amt = -direction.length * math.tan(math.radians(taper)) - for face in [rect, flipped]: - with self.subTest( - f"{direction=}, {taper=}, flipped={face==flipped}" - ): - taper_solid = Solid.extrude_taper(face, direction, taper) - # V = 1/3 × h × (a² + b² + ab) - h = Vector(direction).length - b = a + 2 * offset_amt - v = h * (a**2 + b**2 + a * b) / 3 - self.assertAlmostEqual(taper_solid.volume, v, 5) - bbox = taper_solid.bounding_box() - size = max(1, b) / 2 - if direction.Z > 0: - self.assertVectorAlmostEquals( - bbox.min, (-size, -size, 0), 1 - ) - self.assertVectorAlmostEquals(bbox.max, (size, size, h), 1) - else: - self.assertVectorAlmostEquals( - bbox.min, (-size, -size, -h), 1 - ) - self.assertVectorAlmostEquals(bbox.max, (size, size, 0), 1) - - def test_extrude_taper_with_hole(self): - rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) - direction = Vector(0, 0, 0.5) - taper = 10 - taper_solid = Solid.extrude_taper(rect_hole, direction, taper) - offset_amt = -direction.length * math.tan(math.radians(taper)) - hole = taper_solid.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] - self.assertAlmostEqual(hole.radius, 0.25 - offset_amt, 5) - - def test_extrude_taper_with_hole_flipped(self): - rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) - direction = Vector(0, 0, 1) - taper = 10 - taper_solid_t = Solid.extrude_taper(rect_hole, direction, taper, True) - taper_solid_f = Solid.extrude_taper(rect_hole, direction, taper, False) - hole_t = taper_solid_t.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] - hole_f = taper_solid_f.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] - self.assertGreater(hole_t.radius, hole_f.radius) - - def test_extrude_taper_oblique(self): - rect = Face.make_rect(2, 1) - rect_hole = rect.make_holes([Wire.make_circle(0.25)]) - o_rect_hole = rect_hole.moved(Location((0, 0, 0), (1, 0.1, 0), 77)) - taper0 = Solid.extrude_taper(rect_hole, (0, 0, 1), 5) - taper1 = Solid.extrude_taper(o_rect_hole, o_rect_hole.normal_at(), 5) - self.assertAlmostEqual(taper0.volume, taper1.volume, 5) - - def test_extrude_linear_with_rotation(self): - # Face - base = Face.make_rect(1, 1) - twist = Solid.extrude_linear_with_rotation( - base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 - ) - self.assertAlmostEqual(twist.volume, 1, 5) - top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) - bottom = twist.faces().sort_by(Axis.Z)[0] - self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) - # Wire - base = Wire.make_rect(1, 1) - twist = Solid.extrude_linear_with_rotation( - base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 - ) - self.assertAlmostEqual(twist.volume, 1, 5) - top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) - bottom = twist.faces().sort_by(Axis.Z)[0] - self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) - - def test_make_loft(self): - loft = Solid.make_loft( - [Wire.make_rect(2, 2), Wire.make_circle(1, Plane((0, 0, 1)))] - ) - self.assertAlmostEqual(loft.volume, (4 + math.pi) / 2, 1) - - with self.assertRaises(ValueError): - Solid.make_loft([Wire.make_rect(1, 1)]) - - def test_make_loft_with_vertices(self): - loft = Solid.make_loft( - [Vertex(0, 0, -1), Wire.make_rect(1, 1.5), Vertex(0, 0, 1)], True - ) - self.assertAlmostEqual(loft.volume, 1, 5) - - with self.assertRaises(ValueError): - Solid.make_loft( - [Wire.make_rect(1, 1), Vertex(0, 0, 1), Wire.make_rect(1, 1)] - ) - - with self.assertRaises(ValueError): - Solid.make_loft([Vertex(0, 0, 1), Vertex(0, 0, 2)]) - - with self.assertRaises(ValueError): - Solid.make_loft( - [ - Vertex(0, 0, 1), - Wire.make_rect(1, 1), - Vertex(0, 0, 2), - Vertex(0, 0, 3), - ] - ) - - def test_extrude_until(self): - square = Face.make_rect(1, 1) - box = Solid.make_box(4, 4, 1, Plane((-2, -2, 3))) - extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.LAST) - self.assertAlmostEqual(extrusion.volume, 4, 5) - - square = Face.make_rect(1, 1) - box = Solid.make_box(4, 4, 1, Plane((-2, -2, -3))) - extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.PREVIOUS) - self.assertAlmostEqual(extrusion.volume, 2, 5) - - def test_sweep(self): - path = Edge.make_spline([(0, 0), (3, 5), (7, -2)]) - section = Wire.make_circle(1, Plane(path @ 0, z_dir=path % 0)) - area = Face(section).area - swept = Solid.sweep(section, path) - self.assertAlmostEqual(swept.volume, path.length * area, 0) - - def test_hollow_sweep(self): - path = Edge.make_line((0, 0, 0), (0, 0, 5)) - section = (Rectangle(1, 1) - Rectangle(0.1, 0.1)).faces()[0] - swept = Solid.sweep(section, path) - self.assertAlmostEqual(swept.volume, 5 * (1 - 0.1**2), 5) - - def test_sweep_multi(self): - f0 = Face.make_rect(1, 1) - f1 = Pos(X=10) * Circle(1).face() - path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (0, 0, -1))) - binormal = Edge.make_line((0, 1), (10, 1)) - swept = Solid.sweep_multi([f0, f1], path, is_frenet=True, binormal=binormal) - self.assertAlmostEqual(swept.volume, 23.78, 2) - - path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (1, 0, 0))) - swept = Solid.sweep_multi( - [f0, f1], path, is_frenet=True, binormal=Vector(5, 0, 1) - ) - self.assertAlmostEqual(swept.volume, 20.75, 2) - - def test_constructor(self): - with self.assertRaises(TypeError): - Solid(foo="bar") - - def test_offset_3d(self): - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).offset_3d(None, 0.1, kind=Kind.TANGENT) - - def test_revolve(self): - r = Solid.revolve( - Face.make_rect(1, 1, Plane((10, 0, 0))).wire(), 180, axis=Axis.Y - ) - self.assertEqual(len(r.faces()), 6) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_v_t_k_poly_data.py b/tests/test_direct_api/test_v_t_k_poly_data.py deleted file mode 100644 index 344e957..0000000 --- a/tests/test_direct_api/test_v_t_k_poly_data.py +++ /dev/null @@ -1,89 +0,0 @@ -""" -build123d direct api tests - -name: test_v_t_k_poly_data.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.topology import Solid -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkTriangleFilter - - -class TestVTKPolyData(unittest.TestCase): - def setUp(self): - # Create a simple test object (e.g., a cylinder) - self.object_under_test = Solid.make_cylinder(1, 2) - - def test_to_vtk_poly_data(self): - # Generate VTK data - vtk_data = self.object_under_test.to_vtk_poly_data( - tolerance=0.1, angular_tolerance=0.2, normals=True - ) - - # Verify the result is of type vtkPolyData - self.assertIsInstance(vtk_data, vtkPolyData) - - # Further verification can include: - # - Checking the number of points, polygons, or cells - self.assertGreater( - vtk_data.GetNumberOfPoints(), 0, "VTK data should have points." - ) - self.assertGreater( - vtk_data.GetNumberOfCells(), 0, "VTK data should have cells." - ) - - # Optionally, compare the output with a known reference object - # (if available) by exporting or analyzing the VTK data - known_filter = vtkTriangleFilter() - known_filter.SetInputData(vtk_data) - known_filter.Update() - known_output = known_filter.GetOutput() - - self.assertEqual( - vtk_data.GetNumberOfPoints(), - known_output.GetNumberOfPoints(), - "Number of points in VTK data does not match the expected output.", - ) - self.assertEqual( - vtk_data.GetNumberOfCells(), - known_output.GetNumberOfCells(), - "Number of cells in VTK data does not match the expected output.", - ) - - def test_empty_shape(self): - # Test handling of empty shape - empty_object = Solid() # Create an empty object - with self.assertRaises(ValueError) as context: - empty_object.to_vtk_poly_data() - - self.assertEqual(str(context.exception), "Cannot convert an empty shape") - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_vector.py b/tests/test_direct_api/test_vector.py deleted file mode 100644 index 9c635d7..0000000 --- a/tests/test_direct_api/test_vector.py +++ /dev/null @@ -1,287 +0,0 @@ -""" -build123d direct api tests - -name: test_vector.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import copy -import math -import unittest - -from OCP.gp import gp_Vec, gp_XYZ -from build123d.geometry import Axis, Location, Plane, Pos, Vector -from build123d.topology import Solid, Vertex -from tests.base_test import DirectApiTestCase, DEG2RAD, AlwaysEqual - - -class TestVector(DirectApiTestCase): - """Test the Vector methods""" - - def test_vector_constructors(self): - v1 = Vector(1, 2, 3) - v2 = Vector((1, 2, 3)) - v3 = Vector(gp_Vec(1, 2, 3)) - v4 = Vector([1, 2, 3]) - v5 = Vector(gp_XYZ(1, 2, 3)) - v5b = Vector(X=1, Y=2, Z=3) - v5c = Vector(v=gp_XYZ(1, 2, 3)) - - for v in [v1, v2, v3, v4, v5, v5b, v5c]: - self.assertVectorAlmostEquals(v, (1, 2, 3), 4) - - v6 = Vector((1, 2)) - v7 = Vector([1, 2]) - v8 = Vector(1, 2) - v8b = Vector(X=1, Y=2) - - for v in [v6, v7, v8, v8b]: - self.assertVectorAlmostEquals(v, (1, 2, 0), 4) - - v9 = Vector() - self.assertVectorAlmostEquals(v9, (0, 0, 0), 4) - - v9.X = 1.0 - v9.Y = 2.0 - v9.Z = 3.0 - self.assertVectorAlmostEquals(v9, (1, 2, 3), 4) - self.assertVectorAlmostEquals(Vector(1, 2, 3, 4), (1, 2, 3), 4) - - v10 = Vector(1) - v11 = Vector((1,)) - v12 = Vector([1]) - v13 = Vector(X=1) - for v in [v10, v11, v12, v13]: - self.assertVectorAlmostEquals(v, (1, 0, 0), 4) - - vertex = Vertex(0, 0, 0).moved(Pos(0, 0, 10)) - self.assertVectorAlmostEquals(Vector(vertex), (0, 0, 10), 4) - - with self.assertRaises(TypeError): - Vector("vector") - with self.assertRaises(ValueError): - Vector(x=1) - - def test_vector_rotate(self): - """Validate vector rotate methods""" - vector_x = Vector(1, 0, 1).rotate(Axis.X, 45) - vector_y = Vector(1, 2, 1).rotate(Axis.Y, 45) - vector_z = Vector(-1, -1, 3).rotate(Axis.Z, 45) - self.assertVectorAlmostEquals( - vector_x, (1, -math.sqrt(2) / 2, math.sqrt(2) / 2), 7 - ) - self.assertVectorAlmostEquals(vector_y, (math.sqrt(2), 2, 0), 7) - self.assertVectorAlmostEquals(vector_z, (0, -math.sqrt(2), 3), 7) - - def test_get_signed_angle(self): - """Verify getSignedAngle calculations with and without a provided normal""" - a = math.pi / 3 - v1 = Vector(1, 0, 0) - v2 = Vector(math.cos(a), -math.sin(a), 0) - d1 = v1.get_signed_angle(v2) - d2 = v1.get_signed_angle(v2, Vector(0, 0, 1)) - self.assertAlmostEqual(d1, a * 180 / math.pi) - self.assertAlmostEqual(d2, -a * 180 / math.pi) - - def test_center(self): - v = Vector(1, 1, 1) - self.assertAlmostEqual(v, v.center()) - - def test_dot(self): - v1 = Vector(2, 2, 2) - v2 = Vector(1, -1, 1) - self.assertEqual(2.0, v1.dot(v2)) - - def test_vector_add(self): - result = Vector(1, 2, 0) + Vector(0, 0, 3) - self.assertVectorAlmostEquals(result, (1.0, 2.0, 3.0), 3) - - def test_vector_operators(self): - result = Vector(1, 1, 1) + Vector(2, 2, 2) - self.assertEqual(Vector(3, 3, 3), result) - - result = Vector(1, 2, 3) - Vector(3, 2, 1) - self.assertEqual(Vector(-2, 0, 2), result) - - result = Vector(1, 2, 3) * 2 - self.assertEqual(Vector(2, 4, 6), result) - - result = 3 * Vector(1, 2, 3) - self.assertEqual(Vector(3, 6, 9), result) - - result = Vector(2, 4, 6) / 2 - self.assertEqual(Vector(1, 2, 3), result) - - self.assertEqual(Vector(-1, -1, -1), -Vector(1, 1, 1)) - - self.assertEqual(0, abs(Vector(0, 0, 0))) - self.assertEqual(1, abs(Vector(1, 0, 0))) - self.assertEqual((1 + 4 + 9) ** 0.5, abs(Vector(1, 2, 3))) - - def test_vector_equals(self): - a = Vector(1, 2, 3) - b = Vector(1, 2, 3) - c = Vector(1, 2, 3.000001) - self.assertEqual(a, b) - self.assertEqual(a, c) - self.assertEqual(a, AlwaysEqual()) - - def test_vector_not_equal(self): - a = Vector(1, 2, 3) - b = Vector(3, 2, 1) - self.assertNotEqual(a, b) - self.assertNotEqual(a, object()) - - def test_vector_distance(self): - """ - Test line distance from plane. - """ - v = Vector(1, 2, 3) - - self.assertAlmostEqual(1, v.signed_distance_from_plane(Plane.YZ)) - self.assertAlmostEqual(2, v.signed_distance_from_plane(Plane.ZX)) - self.assertAlmostEqual(3, v.signed_distance_from_plane(Plane.XY)) - self.assertAlmostEqual(-1, v.signed_distance_from_plane(Plane.ZY)) - self.assertAlmostEqual(-2, v.signed_distance_from_plane(Plane.XZ)) - self.assertAlmostEqual(-3, v.signed_distance_from_plane(Plane.YX)) - - self.assertAlmostEqual(1, v.distance_to_plane(Plane.YZ)) - self.assertAlmostEqual(2, v.distance_to_plane(Plane.ZX)) - self.assertAlmostEqual(3, v.distance_to_plane(Plane.XY)) - self.assertAlmostEqual(1, v.distance_to_plane(Plane.ZY)) - self.assertAlmostEqual(2, v.distance_to_plane(Plane.XZ)) - self.assertAlmostEqual(3, v.distance_to_plane(Plane.YX)) - - def test_vector_project(self): - """ - Test line projection and plane projection methods of Vector - """ - decimal_places = 9 - - z_dir = Vector(1, 2, 3) - base = Vector(5, 7, 9) - x_dir = Vector(1, 0, 0) - - # test passing Plane object - point = Vector(10, 11, 12).project_to_plane(Plane(base, x_dir, z_dir)) - self.assertVectorAlmostEquals(point, (59 / 7, 55 / 7, 51 / 7), decimal_places) - - # test line projection - vec = Vector(10, 10, 10) - line = Vector(3, 4, 5) - angle = vec.get_angle(line) * DEG2RAD - - vecLineProjection = vec.project_to_line(line) - - self.assertVectorAlmostEquals( - vecLineProjection.normalized(), - line.normalized(), - decimal_places, - ) - self.assertAlmostEqual( - vec.length * math.cos(angle), vecLineProjection.length, decimal_places - ) - - def test_vector_not_implemented(self): - pass - - def test_vector_special_methods(self): - self.assertEqual(repr(Vector(1, 2, 3)), "Vector(1, 2, 3)") - self.assertEqual(str(Vector(1, 2, 3)), "Vector(1, 2, 3)") - self.assertEqual( - str(Vector(9.99999999999999, -23.649999999999995, -7.37188088351e-15)), - "Vector(10, -23.65, 0)", - ) - - def test_vector_iter(self): - self.assertEqual(sum([v for v in Vector(1, 2, 3)]), 6) - - def test_reverse(self): - self.assertVectorAlmostEquals(Vector(1, 2, 3).reverse(), (-1, -2, -3), 7) - - def test_copy(self): - v2 = copy.copy(Vector(1, 2, 3)) - v3 = copy.deepcopy(Vector(1, 2, 3)) - self.assertVectorAlmostEquals(v2, (1, 2, 3), 7) - self.assertVectorAlmostEquals(v3, (1, 2, 3), 7) - - def test_radd(self): - vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9)] - vector_sum = sum(vectors) - self.assertVectorAlmostEquals(vector_sum, (12, 15, 18), 5) - - def test_hash(self): - vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9), Vector(1, 2, 3)] - unique_vectors = list(set(vectors)) - self.assertEqual(len(vectors), 4) - self.assertEqual(len(unique_vectors), 3) - - def test_vector_transform(self): - a = Vector(1, 2, 3) - pxy = Plane.XY - pxy_o1 = Plane.XY.offset(1) - self.assertEqual(a.transform(pxy.forward_transform, is_direction=False), a) - self.assertEqual( - a.transform(pxy.forward_transform, is_direction=True), a.normalized() - ) - self.assertEqual( - a.transform(pxy_o1.forward_transform, is_direction=False), Vector(1, 2, 2) - ) - self.assertEqual( - a.transform(pxy_o1.forward_transform, is_direction=True), a.normalized() - ) - self.assertEqual( - a.transform(pxy_o1.reverse_transform, is_direction=False), Vector(1, 2, 4) - ) - self.assertEqual( - a.transform(pxy_o1.reverse_transform, is_direction=True), a.normalized() - ) - - def test_intersect(self): - v1 = Vector(1, 2, 3) - self.assertVectorAlmostEquals(v1 & Vector(1, 2, 3), (1, 2, 3), 5) - self.assertIsNone(v1 & Vector(0, 0, 0)) - - self.assertVectorAlmostEquals(v1 & Location((1, 2, 3)), (1, 2, 3), 5) - self.assertIsNone(v1 & Location()) - - self.assertVectorAlmostEquals(v1 & Axis((1, 2, 3), (1, 0, 0)), (1, 2, 3), 5) - self.assertIsNone(v1 & Axis.X) - - self.assertVectorAlmostEquals(v1 & Plane((1, 2, 3)), (1, 2, 3), 5) - self.assertIsNone(v1 & Plane.XY) - - self.assertVectorAlmostEquals( - (v1 & Solid.make_box(2, 4, 5)).vertex(), (1, 2, 3), 5 - ) - self.assertIsNone(v1.intersect(Solid.make_box(0.5, 0.5, 0.5))) - self.assertIsNone( - Vertex(-10, -10, -10).intersect(Solid.make_box(0.5, 0.5, 0.5)) - ) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_vector_like.py b/tests/test_direct_api/test_vector_like.py deleted file mode 100644 index 5e4d083..0000000 --- a/tests/test_direct_api/test_vector_like.py +++ /dev/null @@ -1,58 +0,0 @@ -""" -build123d direct api tests - -name: test_vector_like.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.geometry import Axis, Vector -from build123d.topology import Vertex -from tests.base_test import DirectApiTestCase - - -class TestVectorLike(DirectApiTestCase): - """Test typedef""" - - def test_axis_from_vertex(self): - axis = Axis(Vertex(1, 2, 3), Vertex(0, 0, 1)) - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) - - def test_axis_from_vector(self): - axis = Axis(Vector(1, 2, 3), Vector(0, 0, 1)) - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) - - def test_axis_from_tuple(self): - axis = Axis((1, 2, 3), (0, 0, 1)) - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_vertex.py b/tests/test_direct_api/test_vertex.py deleted file mode 100644 index 550ba07..0000000 --- a/tests/test_direct_api/test_vertex.py +++ /dev/null @@ -1,111 +0,0 @@ -""" -build123d direct api tests - -name: test_vertex.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import unittest - -from build123d.geometry import Axis, Vector -from build123d.topology import Vertex -from tests.base_test import DirectApiTestCase - - -class TestVertex(DirectApiTestCase): - """Test the extensions to the cadquery Vertex class""" - - def test_basic_vertex(self): - v = Vertex() - self.assertEqual(0, v.X) - - v = Vertex(1, 1, 1) - self.assertEqual(1, v.X) - self.assertEqual(Vector, type(v.center())) - - self.assertVectorAlmostEquals(Vector(Vertex(Vector(1, 2, 3))), (1, 2, 3), 7) - self.assertVectorAlmostEquals(Vector(Vertex((4, 5, 6))), (4, 5, 6), 7) - self.assertVectorAlmostEquals(Vector(Vertex((7,))), (7, 0, 0), 7) - self.assertVectorAlmostEquals(Vector(Vertex((8, 9))), (8, 9, 0), 7) - - def test_vertex_volume(self): - v = Vertex(1, 1, 1) - self.assertAlmostEqual(v.volume, 0, 5) - - def test_vertex_add(self): - test_vertex = Vertex(0, 0, 0) - self.assertVectorAlmostEquals( - Vector(test_vertex + (100, -40, 10)), (100, -40, 10), 7 - ) - self.assertVectorAlmostEquals( - Vector(test_vertex + Vector(100, -40, 10)), (100, -40, 10), 7 - ) - self.assertVectorAlmostEquals( - Vector(test_vertex + Vertex(100, -40, 10)), - (100, -40, 10), - 7, - ) - with self.assertRaises(TypeError): - test_vertex + [1, 2, 3] - - def test_vertex_sub(self): - test_vertex = Vertex(0, 0, 0) - self.assertVectorAlmostEquals( - Vector(test_vertex - (100, -40, 10)), (-100, 40, -10), 7 - ) - self.assertVectorAlmostEquals( - Vector(test_vertex - Vector(100, -40, 10)), (-100, 40, -10), 7 - ) - self.assertVectorAlmostEquals( - Vector(test_vertex - Vertex(100, -40, 10)), - (-100, 40, -10), - 7, - ) - with self.assertRaises(TypeError): - test_vertex - [1, 2, 3] - - def test_vertex_str(self): - self.assertEqual(str(Vertex(0, 0, 0)), "Vertex(0.0, 0.0, 0.0)") - - def test_vertex_to_vector(self): - self.assertIsInstance(Vector(Vertex(0, 0, 0)), Vector) - self.assertVectorAlmostEquals(Vector(Vertex(0, 0, 0)), (0.0, 0.0, 0.0), 7) - - def test_vertex_init_error(self): - with self.assertRaises(TypeError): - Vertex(Axis.Z) - with self.assertRaises(ValueError): - Vertex(x=1) - with self.assertRaises(TypeError): - Vertex((Axis.X, Axis.Y, Axis.Z)) - - def test_no_intersect(self): - with self.assertRaises(NotImplementedError): - Vertex(1, 2, 3) & Vertex(5, 6, 7) - - -if __name__ == "__main__": - import unittest - - unittest.main() diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py deleted file mode 100644 index 7737bf4..0000000 --- a/tests/test_direct_api/test_wire.py +++ /dev/null @@ -1,223 +0,0 @@ -""" -build123d direct api tests - -name: test_wire.py -by: Gumyr -date: January 21, 2025 - -desc: - This python module contains tests for the build123d project. - -license: - - Copyright 2025 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -""" - -import math -import random -import unittest - -from build123d.build_enums import Side -from build123d.geometry import Axis, Color, Location -from build123d.objects_curve import Polyline, Spline -from build123d.objects_sketch import Circle, Rectangle, RegularPolygon -from build123d.topology import Edge, Face, Wire -from tests.base_test import DirectApiTestCase - - -class TestWire(DirectApiTestCase): - def test_ellipse_arc(self): - full_ellipse = Wire.make_ellipse(2, 1) - half_ellipse = Wire.make_ellipse( - 2, 1, start_angle=0, end_angle=180, closed=True - ) - self.assertAlmostEqual(full_ellipse.area / 2, half_ellipse.area, 5) - - def test_stitch(self): - half_ellipse1 = Wire.make_ellipse( - 2, 1, start_angle=0, end_angle=180, closed=False - ) - half_ellipse2 = Wire.make_ellipse( - 2, 1, start_angle=180, end_angle=360, closed=False - ) - ellipse = half_ellipse1.stitch(half_ellipse2) - self.assertEqual(len(ellipse.wires()), 1) - - def test_fillet_2d(self): - square = Wire.make_rect(1, 1) - squaroid = square.fillet_2d(0.1, square.vertices()) - self.assertAlmostEqual( - squaroid.length, 4 * (1 - 2 * 0.1) + 2 * math.pi * 0.1, 5 - ) - - def test_chamfer_2d(self): - square = Wire.make_rect(1, 1) - squaroid = square.chamfer_2d(0.1, 0.1, square.vertices()) - self.assertAlmostEqual( - squaroid.length, 4 * (1 - 2 * 0.1 + 0.1 * math.sqrt(2)), 5 - ) - - def test_chamfer_2d_edge(self): - square = Wire.make_rect(1, 1) - edge = square.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - square = square.chamfer_2d( - distance=0.1, distance2=0.2, vertices=[vertex], edge=edge - ) - self.assertAlmostEqual(square.edges().sort_by(Axis.Y)[0].length, 0.9) - - def test_make_convex_hull(self): - # overlapping_edges = [ - # Edge.make_circle(10, end_angle=60), - # Edge.make_circle(10, start_angle=30, end_angle=90), - # Edge.make_line((-10, 10), (10, -10)), - # ] - # with self.assertRaises(ValueError): - # Wire.make_convex_hull(overlapping_edges) - - adjoining_edges = [ - Edge.make_circle(10, end_angle=45), - Edge.make_circle(10, start_angle=315, end_angle=360), - Edge.make_line((-10, 10), (-10, -10)), - ] - hull_wire = Wire.make_convex_hull(adjoining_edges) - self.assertAlmostEqual(Face(hull_wire).area, 319.9612, 4) - - # def test_fix_degenerate_edges(self): - # # Can't find a way to create one - # edge0 = Edge.make_line((0, 0, 0), (1, 0, 0)) - # edge1 = Edge.make_line(edge0 @ 0, edge0 @ 0 + Vector(0, 1, 0)) - # edge1a = edge1.trim(0, 1e-7) - # edge1b = edge1.trim(1e-7, 1.0) - # edge2 = Edge.make_line(edge1 @ 1, edge1 @ 1 + Vector(1, 1, 0)) - # wire = Wire([edge0, edge1a, edge1b, edge2]) - # fixed_wire = wire.fix_degenerate_edges(1e-6) - # self.assertEqual(len(fixed_wire.edges()), 2) - - def test_trim(self): - e0 = Edge.make_line((0, 0), (1, 0)) - e1 = Edge.make_line((2, 0), (1, 0)) - e2 = Edge.make_line((2, 0), (3, 0)) - w1 = Wire([e0, e1, e2]) - t1 = w1.trim(0.2, 0.9).move(Location((0, 0.1, 0))) - self.assertAlmostEqual(t1.length, 2.1, 5) - - e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) - # Three edges are created 0->0.5->0.75->1.0 - o = e.offset_2d(10, side=Side.RIGHT, closed=False) - t2 = o.trim(0.1, 0.9) - self.assertAlmostEqual(t2.length, o.length * 0.8, 5) - - t3 = o.trim(0.5, 1.0) - self.assertAlmostEqual(t3.length, o.length * 0.5, 5) - - t4 = o.trim(0.5, 0.75) - self.assertAlmostEqual(t4.length, o.length * 0.25, 5) - - with self.assertRaises(ValueError): - o.trim(0.75, 0.25) - spline = Spline( - (0, 0, 0), - (0, 10, 0), - tangents=((0, 0, 1), (0, 0, -1)), - tangent_scalars=(2, 2), - ) - half = spline.trim(0.5, 1) - self.assertVectorAlmostEquals(spline @ 0.5, half @ 0, 4) - self.assertVectorAlmostEquals(spline @ 1, half @ 1, 4) - - w = Rectangle(3, 1).wire() - t5 = w.trim(0, 0.5) - self.assertAlmostEqual(t5.length, 4, 5) - t6 = w.trim(0.5, 1) - self.assertAlmostEqual(t6.length, 4, 5) - - p = RegularPolygon(10, 20).wire() - t7 = p.trim(0.1, 0.2) - self.assertAlmostEqual(p.length * 0.1, t7.length, 5) - - c = Circle(10).wire() - t8 = c.trim(0.4, 0.9) - self.assertAlmostEqual(c.length * 0.5, t8.length, 5) - - def test_param_at_point(self): - e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) - # Three edges are created 0->0.5->0.75->1.0 - o = e.offset_2d(10, side=Side.RIGHT, closed=False) - - e0 = Edge.make_line((0, 0), (1, 0)) - e1 = Edge.make_line((2, 0), (1, 0)) - e2 = Edge.make_line((2, 0), (3, 0)) - w1 = Wire([e0, e1, e2]) - for wire in [o, w1]: - u_value = random.random() - position = wire.position_at(u_value) - self.assertAlmostEqual(wire.param_at_point(position), u_value, 4) - - with self.assertRaises(ValueError): - o.param_at_point((-1, 1)) - - with self.assertRaises(ValueError): - w1.param_at_point((20, 20, 20)) - - def test_order_edges(self): - w1 = Wire( - [ - Edge.make_line((0, 0), (1, 0)), - Edge.make_line((1, 1), (1, 0)), - Edge.make_line((0, 1), (1, 1)), - ] - ) - ordered_edges = w1.order_edges() - self.assertFalse(all(e.is_forward for e in w1.edges())) - self.assertTrue(all(e.is_forward for e in ordered_edges)) - self.assertVectorAlmostEquals(ordered_edges[0] @ 0, (0, 0, 0), 5) - self.assertVectorAlmostEquals(ordered_edges[1] @ 0, (1, 0, 0), 5) - self.assertVectorAlmostEquals(ordered_edges[2] @ 0, (1, 1, 0), 5) - - def test_constructor(self): - e0 = Edge.make_line((0, 0), (1, 0)) - e1 = Edge.make_line((1, 0), (1, 1)) - w0 = Wire.make_circle(1) - w1 = Wire(e0) - self.assertTrue(w1.is_valid()) - w2 = Wire([e0]) - self.assertAlmostEqual(w2.length, 1, 5) - self.assertTrue(w2.is_valid()) - w3 = Wire([e0, e1]) - self.assertTrue(w3.is_valid()) - self.assertAlmostEqual(w3.length, 2, 5) - w4 = Wire(w0.wrapped) - self.assertTrue(w4.is_valid()) - w5 = Wire(obj=w0.wrapped) - self.assertTrue(w5.is_valid()) - w6 = Wire(obj=w0.wrapped, label="w6", color=Color("red")) - self.assertTrue(w6.is_valid()) - self.assertEqual(w6.label, "w6") - self.assertTupleAlmostEquals(tuple(w6.color), (1.0, 0.0, 0.0, 1.0), 5) - w7 = Wire(w6) - self.assertTrue(w7.is_valid()) - c0 = Polyline((0, 0), (1, 0), (1, 1)) - w8 = Wire(c0) - self.assertTrue(w8.is_valid()) - with self.assertRaises(ValueError): - Wire(bob="fred") - - -if __name__ == "__main__": - import unittest - - unittest.main() From 589cbcbd6870a9a37248fd8c3e02619be7508fb0 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 22 Jan 2025 15:17:52 -0500 Subject: [PATCH 153/518] Removed unnecessary custom test class and methods. Script to split test_direct_api.py --- tests/test_direct_api.py | 948 ++++++++++++++---------------- tools/refactor_test_direct_api.py | 346 +++++++++++ 2 files changed, 787 insertions(+), 507 deletions(-) create mode 100644 tools/refactor_test_direct_api.py diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py index 4dcbfaf..52d8ac8 100644 --- a/tests/test_direct_api.py +++ b/tests/test_direct_api.py @@ -5,6 +5,7 @@ from io import StringIO import itertools import json import math +import numpy as np import os import platform import pprint @@ -104,9 +105,6 @@ from build123d.topology import ( ) from build123d.jupyter_tools import display -DEG2RAD = math.pi / 180 -RAD2DEG = 180 / math.pi - # Always equal to any other object, to test that __eq__ cooperation is working class AlwaysEqual: @@ -114,28 +112,6 @@ class AlwaysEqual: return True -class DirectApiTestCase(unittest.TestCase): - def assertTupleAlmostEquals( - self, - first: tuple[float, ...], - second: tuple[float, ...], - places: int, - msg: Optional[str] = None, - ): - """Check Tuples""" - self.assertEqual(len(second), len(first)) - for i, j in zip(second, first): - self.assertAlmostEqual(i, j, places, msg=msg) - - def assertVectorAlmostEquals( - self, first: Vector, second: VectorLike, places: int, msg: Optional[str] = None - ): - second_vector = Vector(second) - self.assertAlmostEqual(first.X, second_vector.X, places, msg=msg) - self.assertAlmostEqual(first.Y, second_vector.Y, places, msg=msg) - self.assertAlmostEqual(first.Z, second_vector.Z, places, msg=msg) - - class TestAssembly(unittest.TestCase): @staticmethod def create_test_assembly() -> Compound: @@ -225,29 +201,29 @@ class TestAssembly(unittest.TestCase): self.assertTrue(overlap) -class TestAxis(DirectApiTestCase): +class TestAxis(unittest.TestCase): """Test the Axis class""" def test_axis_init(self): test_axis = Axis((1, 2, 3), (0, 0, 1)) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) test_axis = Axis((1, 2, 3), direction=(0, 0, 1)) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) test_axis = Axis(origin=(1, 2, 3), direction=(0, 0, 1)) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) test_axis = Axis(Edge.make_line((1, 2, 3), (1, 2, 4))) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) test_axis = Axis(edge=Edge.make_line((1, 2, 3), (1, 2, 4))) - self.assertVectorAlmostEquals(test_axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) with self.assertRaises(ValueError): Axis("one", "up") @@ -257,8 +233,8 @@ class TestAxis(DirectApiTestCase): def test_axis_from_occt(self): occt_axis = gp_Ax1(gp_Pnt(1, 1, 1), gp_Dir(0, 1, 0)) test_axis = Axis(occt_axis) - self.assertVectorAlmostEquals(test_axis.position, (1, 1, 1), 5) - self.assertVectorAlmostEquals(test_axis.direction, (0, 1, 0), 5) + self.assertAlmostEqual(test_axis.position, (1, 1, 1), 5) + self.assertAlmostEqual(test_axis.direction, (0, 1, 0), 5) def test_axis_repr_and_str(self): self.assertEqual(repr(Axis.X), "((0.0, 0.0, 0.0),(1.0, 0.0, 0.0))") @@ -266,29 +242,29 @@ class TestAxis(DirectApiTestCase): def test_axis_copy(self): x_copy = copy.copy(Axis.X) - self.assertVectorAlmostEquals(x_copy.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_copy.direction, (1, 0, 0), 5) + self.assertAlmostEqual(x_copy.position, (0, 0, 0), 5) + self.assertAlmostEqual(x_copy.direction, (1, 0, 0), 5) x_copy = copy.deepcopy(Axis.X) - self.assertVectorAlmostEquals(x_copy.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_copy.direction, (1, 0, 0), 5) + self.assertAlmostEqual(x_copy.position, (0, 0, 0), 5) + self.assertAlmostEqual(x_copy.direction, (1, 0, 0), 5) def test_axis_to_location(self): # TODO: Verify this is correct x_location = Axis.X.location self.assertTrue(isinstance(x_location, Location)) - self.assertVectorAlmostEquals(x_location.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_location.orientation, (0, 90, 180), 5) + self.assertAlmostEqual(x_location.position, (0, 0, 0), 5) + self.assertAlmostEqual(x_location.orientation, (0, 90, 180), 5) def test_axis_located(self): y_axis = Axis.Z.located(Location((0, 0, 1), (-90, 0, 0))) - self.assertVectorAlmostEquals(y_axis.position, (0, 0, 1), 5) - self.assertVectorAlmostEquals(y_axis.direction, (0, 1, 0), 5) + self.assertAlmostEqual(y_axis.position, (0, 0, 1), 5) + self.assertAlmostEqual(y_axis.direction, (0, 1, 0), 5) def test_axis_to_plane(self): x_plane = Axis.X.to_plane() self.assertTrue(isinstance(x_plane, Plane)) - self.assertVectorAlmostEquals(x_plane.origin, (0, 0, 0), 5) - self.assertVectorAlmostEquals(x_plane.z_dir, (1, 0, 0), 5) + self.assertAlmostEqual(x_plane.origin, (0, 0, 0), 5) + self.assertAlmostEqual(x_plane.z_dir, (1, 0, 0), 5) def test_axis_is_coaxial(self): self.assertTrue(Axis.X.is_coaxial(Axis((0, 0, 0), (1, 0, 0)))) @@ -314,11 +290,11 @@ class TestAxis(DirectApiTestCase): ) def test_axis_reverse(self): - self.assertVectorAlmostEquals(Axis.X.reverse().direction, (-1, 0, 0), 5) + self.assertAlmostEqual(Axis.X.reverse().direction, (-1, 0, 0), 5) def test_axis_reverse_op(self): axis = -Axis.X - self.assertVectorAlmostEquals(axis.direction, (-1, 0, 0), 5) + self.assertAlmostEqual(axis.direction, (-1, 0, 0), 5) def test_axis_as_edge(self): edge = Edge(Axis.X) @@ -334,34 +310,34 @@ class TestAxis(DirectApiTestCase): self.assertAlmostEqual(common.length, 1, 5) intersection = Axis.X & Axis((1, 0, 0), (0, 1, 0)) - self.assertVectorAlmostEquals(intersection, (1, 0, 0), 5) + self.assertAlmostEqual(intersection, (1, 0, 0), 5) i = Axis.X & Axis((1, 0, 0), (1, 0, 0)) self.assertEqual(i, Axis.X) intersection = Axis((1, 2, 3), (0, 0, 1)) & Plane.XY - self.assertTupleAlmostEquals(intersection.to_tuple(), (1, 2, 0), 5) + self.assertAlmostEqual(intersection.to_tuple(), (1, 2, 0), 5) arc = Edge.make_circle(20, start_angle=0, end_angle=180) ax0 = Axis((-20, 30, 0), (4, -3, 0)) intersections = arc.intersect(ax0).vertices().sort_by(Axis.X) - self.assertTupleAlmostEquals(tuple(intersections[0]), (-5.6, 19.2, 0), 5) - self.assertTupleAlmostEquals(tuple(intersections[1]), (20, 0, 0), 5) + np.testing.assert_allclose(tuple(intersections[0]), (-5.6, 19.2, 0), 1e-5) + np.testing.assert_allclose(tuple(intersections[1]), (20, 0, 0), 1e-5) intersections = ax0.intersect(arc).vertices().sort_by(Axis.X) - self.assertTupleAlmostEquals(tuple(intersections[0]), (-5.6, 19.2, 0), 5) - self.assertTupleAlmostEquals(tuple(intersections[1]), (20, 0, 0), 5) + np.testing.assert_allclose(tuple(intersections[0]), (-5.6, 19.2, 0), 1e-5) + np.testing.assert_allclose(tuple(intersections[1]), (20, 0, 0), 1e-5) i = Axis((0, 0, 1), (1, 1, 1)) & Vector(0.5, 0.5, 1.5) self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, (0.5, 0.5, 1.5), 5) + self.assertAlmostEqual(i, (0.5, 0.5, 1.5), 5) self.assertIsNone(Axis.Y & Vector(2, 0, 0)) l = Edge.make_line((0, 0, 1), (0, 0, 2)) ^ 1 i: Location = Axis.Z & l self.assertTrue(isinstance(i, Location)) - self.assertVectorAlmostEquals(i.position, l.position, 5) - self.assertVectorAlmostEquals(i.orientation, l.orientation, 5) + self.assertAlmostEqual(i.position, l.position, 5) + self.assertAlmostEqual(i.orientation, l.orientation, 5) self.assertIsNone(Axis.Z & Edge.make_line((0, 0, 1), (1, 0, 0)).location_at(1)) self.assertIsNone(Axis.Z & Edge.make_line((1, 0, 1), (1, 0, 2)).location_at(1)) @@ -373,10 +349,10 @@ class TestAxis(DirectApiTestCase): # intersections = Axis((0, 0, 5), (1, 0, 0)) & non_planar # self.assertTrue(len(intersections.vertices(), 2)) - # self.assertTupleAlmostEquals( + # np.testing.assert_allclose( # intersection.vertices()[0].to_tuple(), (-1, 0, 5), 5 # ) - # self.assertTupleAlmostEquals( + # np.testing.assert_allclose( # intersection.vertices()[1].to_tuple(), (1, 0, 5), 5 # ) @@ -392,7 +368,7 @@ class TestAxis(DirectApiTestCase): self.assertNotEqual(Axis.X, random_obj) -class TestBoundBox(DirectApiTestCase): +class TestBoundBox(unittest.TestCase): def test_basic_bounding_box(self): v = Vertex(1, 1, 1) v2 = Vertex(2, 2, 2) @@ -409,13 +385,13 @@ class TestBoundBox(DirectApiTestCase): bb2 = v0.bounding_box().add(v.bounding_box()) bb3 = bb1.add(bb2) - self.assertVectorAlmostEquals(bb3.size, (2, 2, 2), 7) + self.assertAlmostEqual(bb3.size, (2, 2, 2), 7) bb3 = bb2.add((3, 3, 3)) - self.assertVectorAlmostEquals(bb3.size, (3, 3, 3), 7) + self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) bb3 = bb2.add(Vector(3, 3, 3)) - self.assertVectorAlmostEquals(bb3.size, (3, 3, 3), 7) + self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) # Test 2D bounding boxes bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) @@ -430,7 +406,7 @@ class TestBoundBox(DirectApiTestCase): # Test creation of a bounding box from a shape - note the low accuracy comparison # as the box is a little larger than the shape bb1 = BoundBox.from_topo_ds(Solid.make_cylinder(1, 1).wrapped, optimal=False) - self.assertVectorAlmostEquals(bb1.size, (2, 2, 1), 1) + self.assertAlmostEqual(bb1.size, (2, 2, 1), 1) bb2 = BoundBox.from_topo_ds( Solid.make_cylinder(0.5, 0.5).translate((0, 0, 0.1)).wrapped, optimal=False @@ -444,7 +420,7 @@ class TestBoundBox(DirectApiTestCase): ) def test_center_of_boundbox(self): - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Solid.make_box(1, 1, 1).bounding_box().center(), (0.5, 0.5, 0.5), 5, @@ -455,18 +431,18 @@ class TestBoundBox(DirectApiTestCase): def test_clean_boundbox(self): s = Solid.make_sphere(3) - self.assertVectorAlmostEquals(s.bounding_box().size, (6, 6, 6), 5) + self.assertAlmostEqual(s.bounding_box().size, (6, 6, 6), 5) s.mesh(1e-3) - self.assertVectorAlmostEquals(s.bounding_box().size, (6, 6, 6), 5) + self.assertAlmostEqual(s.bounding_box().size, (6, 6, 6), 5) # def test_to_solid(self): # bbox = Solid.make_sphere(1).bounding_box() - # self.assertVectorAlmostEquals(bbox.min, (-1, -1, -1), 5) - # self.assertVectorAlmostEquals(bbox.max, (1, 1, 1), 5) + # self.assertAlmostEqual(bbox.min, (-1, -1, -1), 5) + # self.assertAlmostEqual(bbox.max, (1, 1, 1), 5) # self.assertAlmostEqual(bbox.to_solid().volume, 2**3, 5) -class TestCadObjects(DirectApiTestCase): +class TestCadObjects(unittest.TestCase): def _make_circle(self): circle = gp_Circ(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 2.0) return Edge.cast(BRepBuilderAPI_MakeEdge(circle).Edge()) @@ -478,19 +454,19 @@ class TestCadObjects(DirectApiTestCase): def test_edge_wrapper_center(self): e = self._make_circle() - self.assertVectorAlmostEquals(e.center(CenterOf.MASS), (1.0, 2.0, 3.0), 3) + self.assertAlmostEqual(e.center(CenterOf.MASS), (1.0, 2.0, 3.0), 3) def test_edge_wrapper_ellipse_center(self): e = self._make_ellipse() w = Wire([e]) - self.assertVectorAlmostEquals(Face(w).center(), (1.0, 2.0, 3.0), 3) + self.assertAlmostEqual(Face(w).center(), (1.0, 2.0, 3.0), 3) def test_edge_wrapper_make_circle(self): halfCircleEdge = Edge.make_circle(radius=10, start_angle=0, end_angle=180) - # self.assertVectorAlmostEquals((0.0, 5.0, 0.0), halfCircleEdge.centerOfBoundBox(0.0001),3) - self.assertVectorAlmostEquals(halfCircleEdge.start_point(), (10.0, 0.0, 0.0), 3) - self.assertVectorAlmostEquals(halfCircleEdge.end_point(), (-10.0, 0.0, 0.0), 3) + # np.testing.assert_allclose((0.0, 5.0, 0.0), halfCircleEdge.centerOfBoundBox(0.0001),1e-3) + self.assertAlmostEqual(halfCircleEdge.start_point(), (10.0, 0.0, 0.0), 3) + self.assertAlmostEqual(halfCircleEdge.end_point(), (-10.0, 0.0, 0.0), 3) def test_edge_wrapper_make_tangent_arc(self): tangent_arc = Edge.make_tangent_arc( @@ -498,11 +474,11 @@ class TestCadObjects(DirectApiTestCase): Vector(0, 1), # tangent at start of arc is in the +y direction Vector(2, 1), # arc cureturn_values 180 degrees and ends at 2, 1 ) - self.assertVectorAlmostEquals(tangent_arc.start_point(), (1, 1, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.end_point(), (2, 1, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.tangent_at(0), (0, 1, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.tangent_at(0.5), (1, 0, 0), 3) - self.assertVectorAlmostEquals(tangent_arc.tangent_at(1), (0, -1, 0), 3) + self.assertAlmostEqual(tangent_arc.start_point(), (1, 1, 0), 3) + self.assertAlmostEqual(tangent_arc.end_point(), (2, 1, 0), 3) + self.assertAlmostEqual(tangent_arc.tangent_at(0), (0, 1, 0), 3) + self.assertAlmostEqual(tangent_arc.tangent_at(0.5), (1, 0, 0), 3) + self.assertAlmostEqual(tangent_arc.tangent_at(1), (0, -1, 0), 3) def test_edge_wrapper_make_ellipse1(self): # Check x_radius > y_radius @@ -517,17 +493,17 @@ class TestCadObjects(DirectApiTestCase): ) start = ( - x_radius * math.cos(angle1 * DEG2RAD), - y_radius * math.sin(angle1 * DEG2RAD), + x_radius * math.cos(math.radians(angle1)), + y_radius * math.sin(math.radians(angle1)), 0.0, ) end = ( - x_radius * math.cos(angle2 * DEG2RAD), - y_radius * math.sin(angle2 * DEG2RAD), + x_radius * math.cos(math.radians(angle2)), + y_radius * math.sin(math.radians(angle2)), 0.0, ) - self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) - self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) + self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) + self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) def test_edge_wrapper_make_ellipse2(self): # Check x_radius < y_radius @@ -542,17 +518,17 @@ class TestCadObjects(DirectApiTestCase): ) start = ( - x_radius * math.cos(angle1 * DEG2RAD), - y_radius * math.sin(angle1 * DEG2RAD), + x_radius * math.cos(math.radians(angle1)), + y_radius * math.sin(math.radians(angle1)), 0.0, ) end = ( - x_radius * math.cos(angle2 * DEG2RAD), - y_radius * math.sin(angle2 * DEG2RAD), + x_radius * math.cos(math.radians(angle2)), + y_radius * math.sin(math.radians(angle2)), 0.0, ) - self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) - self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) + self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) + self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) def test_edge_wrapper_make_circle_with_ellipse(self): # Check x_radius == y_radius @@ -567,22 +543,22 @@ class TestCadObjects(DirectApiTestCase): ) start = ( - x_radius * math.cos(angle1 * DEG2RAD), - y_radius * math.sin(angle1 * DEG2RAD), + x_radius * math.cos(math.radians(angle1)), + y_radius * math.sin(math.radians(angle1)), 0.0, ) end = ( - x_radius * math.cos(angle2 * DEG2RAD), - y_radius * math.sin(angle2 * DEG2RAD), + x_radius * math.cos(math.radians(angle2)), + y_radius * math.sin(math.radians(angle2)), 0.0, ) - self.assertVectorAlmostEquals(arcEllipseEdge.start_point(), start, 3) - self.assertVectorAlmostEquals(arcEllipseEdge.end_point(), end, 3) + self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) + self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) def test_face_wrapper_make_rect(self): mplane = Face.make_rect(10, 10) - self.assertVectorAlmostEquals(mplane.normal_at(), (0.0, 0.0, 1.0), 3) + self.assertAlmostEqual(mplane.normal_at(), (0.0, 0.0, 1.0), 3) # def testCompoundcenter(self): # """ @@ -609,13 +585,13 @@ class TestCadObjects(DirectApiTestCase): # ) # self.assertEqual(4, len(s.val().solids())) - # self.assertVectorAlmostEquals((0.0, 0.0, 0.25), s.val().center, 3) + # np.testing.assert_allclose((0.0, 0.0, 0.25), s.val().center, 1e-3) def test_translate(self): e = Edge.make_circle(2, Plane((1, 2, 3))) e2 = e.translate(Vector(0, 0, 1)) - self.assertVectorAlmostEquals(e2.center(CenterOf.MASS), (1.0, 2.0, 4.0), 3) + self.assertAlmostEqual(e2.center(CenterOf.MASS), (1.0, 2.0, 4.0), 3) def test_vertices(self): e = Edge.cast(BRepBuilderAPI_MakeEdge(gp_Pnt(0, 0, 0), gp_Pnt(1, 1, 0)).Edge()) @@ -724,22 +700,22 @@ class TestCleanMethod(unittest.TestCase): self.assertIs(result, self.solid) # Ensure it returns the same object -class TestColor(DirectApiTestCase): +class TestColor(unittest.TestCase): def test_name1(self): c = Color("blue") - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) def test_name2(self): c = Color("blue", alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) def test_name3(self): c = Color("blue", 0.5) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) def test_rgb0(self): c = Color(0.0, 1.0, 0.0) - self.assertTupleAlmostEquals(tuple(c), (0, 1, 0, 1), 5) + np.testing.assert_allclose(tuple(c), (0, 1, 0, 1), 1e-5) def test_rgba1(self): c = Color(1.0, 1.0, 0.0, 0.5) @@ -750,11 +726,11 @@ class TestColor(DirectApiTestCase): def test_rgba2(self): c = Color(1.0, 1.0, 0.0, alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (1, 1, 0, 0.5), 5) + np.testing.assert_allclose(tuple(c), (1, 1, 0, 0.5), 1e-5) def test_rgba3(self): c = Color(red=0.1, green=0.2, blue=0.3, alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.5), 5) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.5), 1e-5) def test_bad_color_name(self): with self.assertRaises(ValueError): @@ -762,37 +738,37 @@ class TestColor(DirectApiTestCase): def test_to_tuple(self): c = Color("blue", alpha=0.5) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 0.5), 5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) def test_hex(self): c = Color(0x996692) - self.assertTupleAlmostEquals( + np.testing.assert_allclose( tuple(c), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), 5 ) c = Color(0x006692, 0x80) - self.assertTupleAlmostEquals( + np.testing.assert_allclose( tuple(c), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), 5 ) c = Color(0x006692, alpha=0x80) - self.assertTupleAlmostEquals(tuple(c), (0, 102 / 255, 146 / 255, 128 / 255), 5) + np.testing.assert_allclose(tuple(c), (0, 102 / 255, 146 / 255, 128 / 255), 1e-5) c = Color(color_code=0x996692, alpha=0xCC) - self.assertTupleAlmostEquals( + np.testing.assert_allclose( tuple(c), (153 / 255, 102 / 255, 146 / 255, 204 / 255), 5 ) c = Color(0.0, 0.0, 1.0, 1.0) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) c = Color(0, 0, 1, 1) - self.assertTupleAlmostEquals(tuple(c), (0, 0, 1, 1), 5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) def test_copy(self): c = Color(0.1, 0.2, 0.3, alpha=0.4) c_copy = copy.copy(c) - self.assertTupleAlmostEquals(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), 5) + np.testing.assert_allclose(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), 1e-5) def test_str_repr(self): c = Color(1, 0, 0) @@ -801,18 +777,18 @@ class TestColor(DirectApiTestCase): def test_tuple(self): c = Color((0.1,)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 1.0, 1.0, 1.0), 5) + np.testing.assert_allclose(tuple(c), (0.1, 1.0, 1.0, 1.0), 1e-5) c = Color((0.1, 0.2)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 1.0, 1.0), 5) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 1.0, 1.0), 1e-5) c = Color((0.1, 0.2, 0.3)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 1.0), 5) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 1.0), 1e-5) c = Color((0.1, 0.2, 0.3, 0.4)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.4), 5) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) c = Color(color_tuple=(0.1, 0.2, 0.3, 0.4)) - self.assertTupleAlmostEquals(tuple(c), (0.1, 0.2, 0.3, 0.4), 5) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) -class TestCompound(DirectApiTestCase): +class TestCompound(unittest.TestCase): def test_make_text(self): arc = Edge.make_three_point_arc((-50, 0, 0), (0, 20, 0), (50, 0, 0)) text = Compound.make_text("test", 10, text_path=arc) @@ -856,8 +832,8 @@ class TestCompound(DirectApiTestCase): Solid.make_box(1, 1, 1).locate(Location((8.5, -0.5, -0.5))), ] ) - self.assertVectorAlmostEquals(test_compound.center(CenterOf.MASS), (1, 0, 0), 5) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(test_compound.center(CenterOf.MASS), (1, 0, 0), 5) + self.assertAlmostEqual( test_compound.center(CenterOf.BOUNDING_BOX), (4.25, 0, 0), 5 ) with self.assertRaises(ValueError): @@ -933,7 +909,7 @@ class TestCompound(DirectApiTestCase): self.assertEqual(b1.get_top_level_shapes()[0], b1) -class TestEdge(DirectApiTestCase): +class TestEdge(unittest.TestCase): def test_close(self): self.assertAlmostEqual( Edge.make_circle(1, end_angle=180).close().length, math.pi + 2, 5 @@ -942,13 +918,13 @@ class TestEdge(DirectApiTestCase): def test_make_half_circle(self): half_circle = Edge.make_circle(radius=1, start_angle=0, end_angle=180) - self.assertVectorAlmostEquals(half_circle.start_point(), (1, 0, 0), 3) - self.assertVectorAlmostEquals(half_circle.end_point(), (-1, 0, 0), 3) + self.assertAlmostEqual(half_circle.start_point(), (1, 0, 0), 3) + self.assertAlmostEqual(half_circle.end_point(), (-1, 0, 0), 3) def test_make_half_circle2(self): half_circle = Edge.make_circle(radius=1, start_angle=270, end_angle=90) - self.assertVectorAlmostEquals(half_circle.start_point(), (0, -1, 0), 3) - self.assertVectorAlmostEquals(half_circle.end_point(), (0, 1, 0), 3) + self.assertAlmostEqual(half_circle.start_point(), (0, -1, 0), 3) + self.assertAlmostEqual(half_circle.end_point(), (0, 1, 0), 3) def test_make_clockwise_half_circle(self): half_circle = Edge.make_circle( @@ -957,8 +933,8 @@ class TestEdge(DirectApiTestCase): end_angle=0, angular_direction=AngularDirection.CLOCKWISE, ) - self.assertVectorAlmostEquals(half_circle.end_point(), (1, 0, 0), 3) - self.assertVectorAlmostEquals(half_circle.start_point(), (-1, 0, 0), 3) + self.assertAlmostEqual(half_circle.end_point(), (1, 0, 0), 3) + self.assertAlmostEqual(half_circle.start_point(), (-1, 0, 0), 3) def test_make_clockwise_half_circle2(self): half_circle = Edge.make_circle( @@ -967,11 +943,11 @@ class TestEdge(DirectApiTestCase): end_angle=-90, angular_direction=AngularDirection.CLOCKWISE, ) - self.assertVectorAlmostEquals(half_circle.start_point(), (0, 1, 0), 3) - self.assertVectorAlmostEquals(half_circle.end_point(), (0, -1, 0), 3) + self.assertAlmostEqual(half_circle.start_point(), (0, 1, 0), 3) + self.assertAlmostEqual(half_circle.end_point(), (0, -1, 0), 3) def test_arc_center(self): - self.assertVectorAlmostEquals(Edge.make_ellipse(2, 1).arc_center, (0, 0, 0), 5) + self.assertAlmostEqual(Edge.make_ellipse(2, 1).arc_center, (0, 0, 0), 5) with self.assertRaises(ValueError): Edge.make_line((0, 0, 0), (0, 0, 1)).arc_center @@ -979,7 +955,7 @@ class TestEdge(DirectApiTestCase): spline = Edge.make_spline( points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 0.4, 1.0] ) - self.assertVectorAlmostEquals(spline.end_point(), (2, 0, 0), 5) + self.assertAlmostEqual(spline.end_point(), (2, 0, 0), 5) with self.assertRaises(ValueError): Edge.make_spline( points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 1.0] @@ -991,28 +967,28 @@ class TestEdge(DirectApiTestCase): def test_spline_approx(self): spline = Edge.make_spline_approx([(0, 0), (1, 1), (2, 1), (3, 0)]) - self.assertVectorAlmostEquals(spline.end_point(), (3, 0, 0), 5) + self.assertAlmostEqual(spline.end_point(), (3, 0, 0), 5) spline = Edge.make_spline_approx( [(0, 0), (1, 1), (2, 1), (3, 0)], smoothing=(1.0, 5.0, 10.0) ) - self.assertVectorAlmostEquals(spline.end_point(), (3, 0, 0), 5) + self.assertAlmostEqual(spline.end_point(), (3, 0, 0), 5) def test_distribute_locations(self): line = Edge.make_line((0, 0, 0), (10, 0, 0)) locs = line.distribute_locations(3) for i, x in enumerate([0, 5, 10]): - self.assertVectorAlmostEquals(locs[i].position, (x, 0, 0), 5) - self.assertVectorAlmostEquals(locs[0].orientation, (0, 90, 180), 5) + self.assertAlmostEqual(locs[i].position, (x, 0, 0), 5) + self.assertAlmostEqual(locs[0].orientation, (0, 90, 180), 5) locs = line.distribute_locations(3, positions_only=True) for i, x in enumerate([0, 5, 10]): - self.assertVectorAlmostEquals(locs[i].position, (x, 0, 0), 5) - self.assertVectorAlmostEquals(locs[0].orientation, (0, 0, 0), 5) + self.assertAlmostEqual(locs[i].position, (x, 0, 0), 5) + self.assertAlmostEqual(locs[0].orientation, (0, 0, 0), 5) def test_to_wire(self): edge = Edge.make_line((0, 0, 0), (1, 1, 1)) for end in [0, 1]: - self.assertVectorAlmostEquals( + self.assertAlmostEqual( edge.position_at(end), edge.to_wire().position_at(end), 5, @@ -1024,7 +1000,7 @@ class TestEdge(DirectApiTestCase): Edge.make_ellipse(1, 0.5, plane=Plane((1, 2, 3)), end_angle=30), ] for edge in edges: - self.assertVectorAlmostEquals(edge.arc_center, (1, 2, 3), 5) + self.assertAlmostEqual(edge.arc_center, (1, 2, 3), 5) with self.assertRaises(ValueError): Edge.make_line((0, 0), (1, 1)).arc_center @@ -1033,7 +1009,7 @@ class TestEdge(DirectApiTestCase): line = Edge.make_line((0, -2), (0, 2)) crosses = circle.find_intersection_points(line) for target, actual in zip([(0, 1, 0), (0, -1, 0)], crosses): - self.assertVectorAlmostEquals(actual, target, 5) + self.assertAlmostEqual(actual, target, 5) with self.assertRaises(ValueError): circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) @@ -1041,14 +1017,14 @@ class TestEdge(DirectApiTestCase): circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) self_intersect = Edge.make_spline([(-3, 2), (3, -2), (4, 0), (3, 2), (-3, -2)]) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( self_intersect.find_intersection_points()[0], (-2.6861636507066047, 0, 0), 5, ) line = Edge.make_line((1, -2), (1, 2)) crosses = line.find_intersection_points(Axis.X) - self.assertVectorAlmostEquals(crosses[0], (1, 0, 0), 5) + self.assertAlmostEqual(crosses[0], (1, 0, 0), 5) with self.assertRaises(ValueError): line.find_intersection_points(Plane.YZ) @@ -1069,12 +1045,8 @@ class TestEdge(DirectApiTestCase): def test_trim(self): line = Edge.make_line((-2, 0), (2, 0)) - self.assertVectorAlmostEquals( - line.trim(0.25, 0.75).position_at(0), (-1, 0, 0), 5 - ) - self.assertVectorAlmostEquals( - line.trim(0.25, 0.75).position_at(1), (1, 0, 0), 5 - ) + self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(0), (-1, 0, 0), 5) + self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(1), (1, 0, 0), 5) with self.assertRaises(ValueError): line.trim(0.75, 0.25) @@ -1087,7 +1059,7 @@ class TestEdge(DirectApiTestCase): e2 = Edge.make_circle(10, start_angle=0, end_angle=90) e2_trim = e2.trim_to_length(0.5, 1) self.assertAlmostEqual(e2_trim.length, 1, 5) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( e2_trim.position_at(0), Vector(10, 0, 0).rotate(Axis.Z, 45), 5 ) @@ -1112,15 +1084,15 @@ class TestEdge(DirectApiTestCase): bezier = Edge.make_bezier((0, 0), (0, 1), (1, 1), (1, 0)) bbox = bezier.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (0, 0, 0), 5) - self.assertVectorAlmostEquals(bbox.max, (1, 0.75, 0), 5) + self.assertAlmostEqual(bbox.min, (0, 0, 0), 5) + self.assertAlmostEqual(bbox.max, (1, 0.75, 0), 5) def test_mid_way(self): mid = Edge.make_mid_way( Edge.make_line((0, 0), (0, 1)), Edge.make_line((1, 0), (1, 1)), 0.25 ) - self.assertVectorAlmostEquals(mid.position_at(0), (0.25, 0, 0), 5) - self.assertVectorAlmostEquals(mid.position_at(1), (0.25, 1, 0), 5) + self.assertAlmostEqual(mid.position_at(0), (0.25, 0, 0), 5) + self.assertAlmostEqual(mid.position_at(1), (0.25, 1, 0), 5) def test_distribute_locations2(self): with self.assertRaises(ValueError): @@ -1128,17 +1100,17 @@ class TestEdge(DirectApiTestCase): locs = Edge.make_circle(1).distribute_locations(5, positions_only=True) for i, loc in enumerate(locs): - self.assertVectorAlmostEquals( + self.assertAlmostEqual( loc.position, Vector(1, 0, 0).rotate(Axis.Z, i * 90).to_tuple(), 5, ) - self.assertVectorAlmostEquals(loc.orientation, (0, 0, 0), 5) + self.assertAlmostEqual(loc.orientation, (0, 0, 0), 5) def test_find_tangent(self): circle = Edge.make_circle(1) parm = circle.find_tangent(135)[0] - self.assertVectorAlmostEquals( + self.assertAlmostEqual( circle @ parm, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 ) line = Edge.make_line((0, 0), (1, 1)) @@ -1175,8 +1147,8 @@ class TestEdge(DirectApiTestCase): def test_reverse(self): e1 = Edge.make_line((0, 0), (1, 1)) - self.assertVectorAlmostEquals(e1 @ 0.1, (0.1, 0.1, 0), 5) - self.assertVectorAlmostEquals(e1.reversed() @ 0.1, (0.9, 0.9, 0), 5) + self.assertAlmostEqual(e1 @ 0.1, (0.1, 0.1, 0), 5) + self.assertAlmostEqual(e1.reversed() @ 0.1, (0.9, 0.9, 0), 5) e2 = Edge.make_circle(1, start_angle=0, end_angle=180) e2r = e2.reversed() @@ -1187,14 +1159,14 @@ class TestEdge(DirectApiTestCase): Edge(direction=(1, 0, 0)) -class TestFace(DirectApiTestCase): +class TestFace(unittest.TestCase): def test_make_surface_from_curves(self): bottom_edge = Edge.make_circle(radius=1, end_angle=90) top_edge = Edge.make_circle(radius=1, plane=Plane((0, 0, 1)), end_angle=90) curved = Face.make_surface_from_curves(bottom_edge, top_edge) self.assertTrue(curved.is_valid()) self.assertAlmostEqual(curved.area, math.pi / 2, 5) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( curved.normal_at(), (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 ) @@ -1206,10 +1178,8 @@ class TestFace(DirectApiTestCase): def test_center(self): test_face = Face(Wire.make_polygon([(0, 0), (1, 0), (1, 1), (0, 0)])) - self.assertVectorAlmostEquals( - test_face.center(CenterOf.MASS), (2 / 3, 1 / 3, 0), 1 - ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(test_face.center(CenterOf.MASS), (2 / 3, 1 / 3, 0), 1) + self.assertAlmostEqual( test_face.center(CenterOf.BOUNDING_BOX), (0.5, 0.5, 0), 5, @@ -1260,7 +1230,7 @@ class TestFace(DirectApiTestCase): def test_make_rect(self): test_face = Face.make_plane() - self.assertVectorAlmostEquals(test_face.normal_at(), (0, 0, 1), 5) + self.assertAlmostEqual(test_face.normal_at(), (0, 0, 1), 5) def test_length_width(self): test_face = Face.make_rect(8, 10, Plane.XZ) @@ -1294,14 +1264,14 @@ class TestFace(DirectApiTestCase): def test_negate(self): square = Face.make_rect(1, 1) - self.assertVectorAlmostEquals(square.normal_at(), (0, 0, 1), 5) + self.assertAlmostEqual(square.normal_at(), (0, 0, 1), 5) flipped_square = -square - self.assertVectorAlmostEquals(flipped_square.normal_at(), (0, 0, -1), 5) + self.assertAlmostEqual(flipped_square.normal_at(), (0, 0, -1), 5) def test_offset(self): bbox = Face.make_rect(2, 2, Plane.XY).offset(5).bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, 5), 5) - self.assertVectorAlmostEquals(bbox.max, (1, 1, 5), 5) + self.assertAlmostEqual(bbox.min, (-1, -1, 5), 5) + self.assertAlmostEqual(bbox.max, (1, 1, 5), 5) def test_make_from_wires(self): outer = Wire.make_circle(10) @@ -1349,8 +1319,8 @@ class TestFace(DirectApiTestCase): ] surface = Face.make_surface_from_array_of_points(pnts) bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (0, 0, -1), 3) - self.assertVectorAlmostEquals(bbox.max, (10, 10, 2), 2) + self.assertAlmostEqual(bbox.min, (0, 0, -1), 3) + self.assertAlmostEqual(bbox.max, (10, 10, 2), 2) def test_bezier_surface(self): points = [ @@ -1362,8 +1332,8 @@ class TestFace(DirectApiTestCase): ] surface = Face.make_bezier_surface(points) bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, 0), 3) - self.assertVectorAlmostEquals(bbox.max, (+1, +1, +1), 1) + self.assertAlmostEqual(bbox.min, (-1, -1, 0), 3) + self.assertAlmostEqual(bbox.max, (+1, +1, +1), 1) self.assertLess(bbox.max.Z, 1.0) weights = [ @@ -1371,7 +1341,7 @@ class TestFace(DirectApiTestCase): ] surface = Face.make_bezier_surface(points, weights) bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, 0), 3) + self.assertAlmostEqual(bbox.min, (-1, -1, 0), 3) self.assertGreater(bbox.max.Z, 1.0) too_many_points = [ @@ -1403,8 +1373,8 @@ class TestFace(DirectApiTestCase): square = Face.make_rect(10, 10) bbox = Solid.thicken(square, 1, normal_override=(0, 0, -1)).bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-5, -5, -1), 5) - self.assertVectorAlmostEquals(bbox.max, (5, 5, 0), 5) + self.assertAlmostEqual(bbox.min, (-5, -5, -1), 5) + self.assertAlmostEqual(bbox.max, (5, 5, 0), 5) def test_make_holes(self): radius = 10 @@ -1462,24 +1432,24 @@ class TestFace(DirectApiTestCase): def test_center_location(self): square = Face.make_rect(1, 1, plane=Plane.XZ) cl = square.center_location - self.assertVectorAlmostEquals(cl.position, (0, 0, 0), 5) - self.assertVectorAlmostEquals(Plane(cl).z_dir, Plane.XZ.z_dir, 5) + self.assertAlmostEqual(cl.position, (0, 0, 0), 5) + self.assertAlmostEqual(Plane(cl).z_dir, Plane.XZ.z_dir, 5) def test_position_at(self): square = Face.make_rect(2, 2, plane=Plane.XZ.offset(1)) p = square.position_at(0.25, 0.75) - self.assertVectorAlmostEquals(p, (-0.5, -1.0, 0.5), 5) + self.assertAlmostEqual(p, (-0.5, -1.0, 0.5), 5) def test_location_at(self): bottom = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.Z)[0] loc = bottom.location_at(0.5, 0.5) - self.assertVectorAlmostEquals(loc.position, (0.5, 1, 0), 5) - self.assertVectorAlmostEquals(loc.orientation, (-180, 0, -180), 5) + self.assertAlmostEqual(loc.position, (0.5, 1, 0), 5) + self.assertAlmostEqual(loc.orientation, (-180, 0, -180), 5) front = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.X)[0] loc = front.location_at(0.5, 0.5, x_dir=(0, 0, 1)) - self.assertVectorAlmostEquals(loc.position, (0.0, 1.0, 1.5), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, -90, 0), 5) + self.assertAlmostEqual(loc.position, (0.0, 1.0, 1.5), 5) + self.assertAlmostEqual(loc.orientation, (0, -90, 0), 5) def test_make_surface(self): corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] @@ -1509,20 +1479,20 @@ class TestFace(DirectApiTestCase): self.assertTrue(surface.is_valid()) self.assertEqual(surface.geom_type, GeomType.BSPLINE) bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-50.5, -24.5, -5.113393280136395), 5) - self.assertVectorAlmostEquals(bbox.max, (50.5, 24.5, 0), 5) + self.assertAlmostEqual(bbox.min, (-50.5, -24.5, -5.113393280136395), 5) + self.assertAlmostEqual(bbox.max, (50.5, 24.5, 0), 5) # With no surface point surface = Face.make_surface(net_exterior) bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-50.5, -24.5, -3), 5) - self.assertVectorAlmostEquals(bbox.max, (50.5, 24.5, 0), 5) + self.assertAlmostEqual(bbox.min, (-50.5, -24.5, -3), 5) + self.assertAlmostEqual(bbox.max, (50.5, 24.5, 0), 5) # Exterior Edge surface = Face.make_surface([Edge.make_circle(50)], surface_points=[(0, 0, -5)]) bbox = surface.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-50, -50, -5), 5) - self.assertVectorAlmostEquals(bbox.max, (50, 50, 0), 5) + self.assertAlmostEqual(bbox.min, (-50, -50, -5), 5) + self.assertAlmostEqual(bbox.max, (50, 50, 0), 5) def test_make_surface_error_checking(self): with self.assertRaises(ValueError): @@ -1578,16 +1548,14 @@ class TestFace(DirectApiTestCase): def test_normal_at(self): face = Face.make_rect(1, 1) - self.assertVectorAlmostEquals(face.normal_at(0, 0), (0, 0, 1), 5) - self.assertVectorAlmostEquals( - face.normal_at(face.position_at(0, 0)), (0, 0, 1), 5 - ) + self.assertAlmostEqual(face.normal_at(0, 0), (0, 0, 1), 5) + self.assertAlmostEqual(face.normal_at(face.position_at(0, 0)), (0, 0, 1), 5) with self.assertRaises(ValueError): face.normal_at(0) with self.assertRaises(ValueError): face.normal_at(center=(0, 0)) face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] - self.assertVectorAlmostEquals(face.normal_at(0, 1), (1, 0, 0), 5) + self.assertAlmostEqual(face.normal_at(0, 1), (1, 0, 0), 5) class TestFunctions(unittest.TestCase): @@ -1680,7 +1648,7 @@ class TestGroupBy(unittest.TestCase): ) -class TestImportExport(DirectApiTestCase): +class TestImportExport(unittest.TestCase): def test_import_export(self): original_box = Solid.make_box(1, 1, 1) export_step(original_box, "test_box.step") @@ -1705,10 +1673,10 @@ class TestImportExport(DirectApiTestCase): # import as face stl_box = import_stl("test.stl") - self.assertVectorAlmostEquals(stl_box.position, (0, 0, 0), 5) + self.assertAlmostEqual(stl_box.position, (0, 0, 0), 5) -class TestJupyter(DirectApiTestCase): +class TestJupyter(unittest.TestCase): def test_repr_javascript(self): shape = Solid.make_box(1, 1, 1) @@ -1728,36 +1696,40 @@ class TestJupyter(DirectApiTestCase): display("invalid") -class TestLocation(DirectApiTestCase): +class TestLocation(unittest.TestCase): def test_location(self): loc0 = Location() T = loc0.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 0), 6) - angle = loc0.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 0), 1e-6) + angle = math.degrees( + loc0.wrapped.Transformation().GetRotation().GetRotationAngle() + ) self.assertAlmostEqual(0, angle) # Tuple loc0 = Location((0, 0, 1)) T = loc0.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) # List loc0 = Location([0, 0, 1]) T = loc0.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) # Vector loc1 = Location(Vector(0, 0, 1)) T = loc1.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) # rotation + translation loc2 = Location(Vector(0, 0, 1), Vector(0, 0, 1), 45) - angle = loc2.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + angle = math.degrees( + loc2.wrapped.Transformation().GetRotation().GetRotationAngle() + ) self.assertAlmostEqual(45, angle) # gp_Trsf @@ -1772,13 +1744,13 @@ class TestLocation(DirectApiTestCase): # Test creation from the OCP.gp.gp_Trsf object loc4 = Location(gp_Trsf()) - self.assertTupleAlmostEquals(loc4.to_tuple()[0], (0, 0, 0), 7) - self.assertTupleAlmostEquals(loc4.to_tuple()[1], (0, 0, 0), 7) + np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 0), 1e-7) + np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) # Test creation from Plane and Vector loc4 = Location(Plane.XY, (0, 0, 1)) - self.assertTupleAlmostEquals(loc4.to_tuple()[0], (0, 0, 1), 7) - self.assertTupleAlmostEquals(loc4.to_tuple()[1], (0, 0, 0), 7) + np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 1), 1e-7) + np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) # Test composition loc4 = Location((0, 0, 0), Vector(0, 0, 1), 15) @@ -1788,20 +1760,20 @@ class TestLocation(DirectApiTestCase): loc7 = loc4**2 T = loc5.wrapped.Transformation().TranslationPart() - self.assertTupleAlmostEquals((T.X(), T.Y(), T.Z()), (0, 0, 1), 6) + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) - angle5 = ( - loc5.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + angle5 = math.degrees( + loc5.wrapped.Transformation().GetRotation().GetRotationAngle() ) self.assertAlmostEqual(15, angle5) - angle6 = ( - loc6.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + angle6 = math.degrees( + loc6.wrapped.Transformation().GetRotation().GetRotationAngle() ) self.assertAlmostEqual(30, angle6) - angle7 = ( - loc7.wrapped.Transformation().GetRotation().GetRotationAngle() * RAD2DEG + angle7 = math.degrees( + loc7.wrapped.Transformation().GetRotation().GetRotationAngle() ) self.assertAlmostEqual(30, angle7) @@ -1834,37 +1806,37 @@ class TestLocation(DirectApiTestCase): t.SetRotationPart(q) loc2 = Location(t) - self.assertTupleAlmostEquals(loc1.to_tuple()[0], loc2.to_tuple()[0], 6) - self.assertTupleAlmostEquals(loc1.to_tuple()[1], loc2.to_tuple()[1], 6) + np.testing.assert_allclose(loc1.to_tuple()[0], loc2.to_tuple()[0], 1e-6) + np.testing.assert_allclose(loc1.to_tuple()[1], loc2.to_tuple()[1], 1e-6) loc1 = Location((1, 2), 34) - self.assertTupleAlmostEquals(loc1.to_tuple()[0], (1, 2, 0), 6) - self.assertTupleAlmostEquals(loc1.to_tuple()[1], (0, 0, 34), 6) + np.testing.assert_allclose(loc1.to_tuple()[0], (1, 2, 0), 1e-6) + np.testing.assert_allclose(loc1.to_tuple()[1], (0, 0, 34), 1e-6) rot_angles = (-115.00, 35.00, -135.00) loc2 = Location((1, 2, 3), rot_angles) - self.assertTupleAlmostEquals(loc2.to_tuple()[0], (1, 2, 3), 6) - self.assertTupleAlmostEquals(loc2.to_tuple()[1], rot_angles, 6) + np.testing.assert_allclose(loc2.to_tuple()[0], (1, 2, 3), 1e-6) + np.testing.assert_allclose(loc2.to_tuple()[1], rot_angles, 1e-6) loc3 = Location(loc2) - self.assertTupleAlmostEquals(loc3.to_tuple()[0], (1, 2, 3), 6) - self.assertTupleAlmostEquals(loc3.to_tuple()[1], rot_angles, 6) + np.testing.assert_allclose(loc3.to_tuple()[0], (1, 2, 3), 1e-6) + np.testing.assert_allclose(loc3.to_tuple()[1], rot_angles, 1e-6) def test_location_parameters(self): loc = Location((10, 20, 30)) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) loc = Location((10, 20, 30), (10, 20, 30)) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) - self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) loc = Location((10, 20, 30), (10, 20, 30), Intrinsic.XYZ) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) - self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) loc = Location((10, 20, 30), (30, 20, 10), Extrinsic.ZYX) - self.assertVectorAlmostEquals(loc.position, (10, 20, 30), 5) - self.assertVectorAlmostEquals(loc.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) with self.assertRaises(TypeError): Location(x=10) @@ -1891,33 +1863,33 @@ class TestLocation(DirectApiTestCase): def test_location_inverted(self): loc = Location(Plane.XZ) - self.assertVectorAlmostEquals(loc.inverse().orientation, (-90, 0, 0), 6) + self.assertAlmostEqual(loc.inverse().orientation, (-90, 0, 0), 6) def test_set_position(self): loc = Location(Plane.XZ) loc.position = (1, 2, 3) - self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 6) - self.assertVectorAlmostEquals(loc.orientation, (90, 0, 0), 6) + self.assertAlmostEqual(loc.position, (1, 2, 3), 6) + self.assertAlmostEqual(loc.orientation, (90, 0, 0), 6) def test_set_orientation(self): loc = Location((1, 2, 3), (90, 0, 0)) loc.orientation = (-90, 0, 0) - self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 6) - self.assertVectorAlmostEquals(loc.orientation, (-90, 0, 0), 6) + self.assertAlmostEqual(loc.position, (1, 2, 3), 6) + self.assertAlmostEqual(loc.orientation, (-90, 0, 0), 6) def test_copy(self): loc1 = Location((1, 2, 3), (90, 45, 22.5)) loc2 = copy.copy(loc1) loc3 = copy.deepcopy(loc1) - self.assertVectorAlmostEquals(loc1.position, loc2.position.to_tuple(), 6) - self.assertVectorAlmostEquals(loc1.orientation, loc2.orientation.to_tuple(), 6) - self.assertVectorAlmostEquals(loc1.position, loc3.position.to_tuple(), 6) - self.assertVectorAlmostEquals(loc1.orientation, loc3.orientation.to_tuple(), 6) + self.assertAlmostEqual(loc1.position, loc2.position.to_tuple(), 6) + self.assertAlmostEqual(loc1.orientation, loc2.orientation.to_tuple(), 6) + self.assertAlmostEqual(loc1.position, loc3.position.to_tuple(), 6) + self.assertAlmostEqual(loc1.orientation, loc3.orientation.to_tuple(), 6) def test_to_axis(self): axis = Location((1, 2, 3), (-90, 0, 0)).to_axis() - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 6) - self.assertVectorAlmostEquals(axis.direction, (0, 1, 0), 6) + self.assertAlmostEqual(axis.position, (1, 2, 3), 6) + self.assertAlmostEqual(axis.direction, (0, 1, 0), 6) def test_equal(self): loc = Location((1, 2, 3), (4, 5, 6)) @@ -1938,13 +1910,13 @@ class TestLocation(DirectApiTestCase): def test_neg(self): loc = Location((1, 2, 3), (0, 35, 127)) n_loc = -loc - self.assertVectorAlmostEquals(n_loc.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(n_loc.orientation, (180, -35, -127), 5) + self.assertAlmostEqual(n_loc.position, (1, 2, 3), 5) + self.assertAlmostEqual(n_loc.orientation, (180, -35, -127), 5) def test_mult_iterable(self): locs = Location((1, 2, 0)) * GridLocations(4, 4, 2, 1) - self.assertVectorAlmostEquals(locs[0].position, (-1, 2, 0), 5) - self.assertVectorAlmostEquals(locs[1].position, (3, 2, 0), 5) + self.assertAlmostEqual(locs[0].position, (-1, 2, 0), 5) + self.assertAlmostEqual(locs[1].position, (3, 2, 0), 5) def test_as_json(self): data_dict = { @@ -1973,13 +1945,13 @@ class TestLocation(DirectApiTestCase): for key, value in read_json.items(): for k, v in value.items(): if key == "part1" and k == "joint_one": - self.assertVectorAlmostEquals(v.position, (1, 2, 3), 5) + self.assertAlmostEqual(v.position, (1, 2, 3), 5) elif key == "part1" and k == "joint_two": - self.assertVectorAlmostEquals(v.position, (7, 8, 9), 5) + self.assertAlmostEqual(v.position, (7, 8, 9), 5) elif key == "part2" and k == "joint_one": - self.assertVectorAlmostEquals(v.position, (13, 14, 15), 5) + self.assertAlmostEqual(v.position, (13, 14, 15), 5) elif key == "part2" and k == "joint_two": - self.assertVectorAlmostEquals(v.position, (19, 20, 21), 5) + self.assertAlmostEqual(v.position, (19, 20, 21), 5) else: self.assertTrue(False) os.remove("sample.json") @@ -1993,7 +1965,7 @@ class TestLocation(DirectApiTestCase): i = l1 & Vector(1, 1, 1) self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, (1, 1, 1), 5) + self.assertAlmostEqual(i, (1, 1, 1), 5) i = l1 & Axis((0.5, 0.5, 0.5), (1, 1, 1)) self.assertTrue(isinstance(i, Location)) @@ -2003,14 +1975,14 @@ class TestLocation(DirectApiTestCase): l = Location((1, 0, 0), (1, 0, 0), 45) i = l & p self.assertTrue(isinstance(i, Location)) - self.assertVectorAlmostEquals(i.position, (1, 0, 0), 5) - self.assertVectorAlmostEquals(i.orientation, l.orientation, 5) + self.assertAlmostEqual(i.position, (1, 0, 0), 5) + self.assertAlmostEqual(i.orientation, l.orientation, 5) b = Solid.make_box(1, 1, 1) l = Location((0.5, 0.5, 0.5), (1, 0, 0), 45) i = (l & b).vertex() self.assertTrue(isinstance(i, Vertex)) - self.assertVectorAlmostEquals(Vector(i), (0.5, 0.5, 0.5), 5) + self.assertAlmostEqual(Vector(i), (0.5, 0.5, 0.5), 5) e1 = Edge.make_line((0, -1), (2, 1)) e2 = Edge.make_line((0, 1), (2, -1)) @@ -2018,7 +1990,7 @@ class TestLocation(DirectApiTestCase): i = e1.intersect(e2, e3) self.assertTrue(isinstance(i, Vertex)) - self.assertVectorAlmostEquals(i, (1, 0, 0), 5) + self.assertAlmostEqual(Vector(i), (1, 0, 0), 5) e4 = Edge.make_line((1, -1), (1, 1)) e5 = Edge.make_line((2, -1), (2, 1)) @@ -2065,7 +2037,7 @@ class TestLocation(DirectApiTestCase): self.assertEqual(Pos(1, Y=2, Z=3).position, Vector(1, 2, 3)) -class TestMatrix(DirectApiTestCase): +class TestMatrix(unittest.TestCase): def test_matrix_creation_and_access(self): def matrix_vals(m): return [[m[r, c] for c in range(4)] for r in range(4)] @@ -2153,7 +2125,7 @@ class TestMatrix(DirectApiTestCase): [0, 0, 0, 1], ] mx = Matrix() - mx.rotate(Axis.X, 30 * DEG2RAD) + mx.rotate(Axis.X, math.radians(30)) matrix_almost_equal(mx, m_rotate_x_30) m_rotate_y_30 = [ @@ -2163,7 +2135,7 @@ class TestMatrix(DirectApiTestCase): [0, 0, 0, 1], ] my = Matrix() - my.rotate(Axis.Y, 30 * DEG2RAD) + my.rotate(Axis.Y, math.radians(30)) matrix_almost_equal(my, m_rotate_y_30) m_rotate_z_30 = [ @@ -2173,12 +2145,12 @@ class TestMatrix(DirectApiTestCase): [0, 0, 0, 1], ] mz = Matrix() - mz.rotate(Axis.Z, 30 * DEG2RAD) + mz.rotate(Axis.Z, math.radians(30)) matrix_almost_equal(mz, m_rotate_z_30) # Test matrix multiply vector v = Vector(1, 0, 0) - self.assertVectorAlmostEquals(mz.multiply(v), (root_3_over_2, 1 / 2, 0), 7) + self.assertAlmostEqual(mz.multiply(v), (root_3_over_2, 1 / 2, 0), 7) # Test matrix multiply matrix m_rotate_xy_30 = [ @@ -2221,11 +2193,11 @@ class TestMatrix(DirectApiTestCase): matrix_almost_equal(m3, rot_x_matrix) -class TestMixin1D(DirectApiTestCase): +class TestMixin1D(unittest.TestCase): """Test the add in methods""" def test_position_at(self): - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Edge.make_line((0, 0, 0), (1, 1, 1)).position_at(0.5), (0.5, 0.5, 0.5), 5, @@ -2239,12 +2211,12 @@ class TestMixin1D(DirectApiTestCase): self.assertTrue(all([0.0 < v < 1.0 for v in point])) wire = Wire([Edge.make_line((0, 0, 0), (10, 0, 0))]) - self.assertVectorAlmostEquals(wire.position_at(0.3), (3, 0, 0), 5) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(wire.position_at(0.3), (3, 0, 0), 5) + self.assertAlmostEqual( wire.position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 ) - self.assertVectorAlmostEquals(wire.edge().position_at(0.3), (3, 0, 0), 5) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(wire.edge().position_at(0.3), (3, 0, 0), 5) + self.assertAlmostEqual( wire.edge().position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 ) @@ -2256,16 +2228,16 @@ class TestMixin1D(DirectApiTestCase): ) p1 = circle_wire.position_at(math.pi, position_mode=PositionMode.LENGTH) p2 = circle_wire.position_at(math.pi / circle_wire.length) - self.assertVectorAlmostEquals(p1, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p2, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p1, p2, 14) + self.assertAlmostEqual(p1, (-1, 0, 0), 14) + self.assertAlmostEqual(p2, (-1, 0, 0), 14) + self.assertAlmostEqual(p1, p2, 14) circle_edge = Edge.make_circle(1) p3 = circle_edge.position_at(math.pi, position_mode=PositionMode.LENGTH) p4 = circle_edge.position_at(math.pi / circle_edge.length) - self.assertVectorAlmostEquals(p3, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p4, (-1, 0, 0), 14) - self.assertVectorAlmostEquals(p3, p4, 14) + self.assertAlmostEqual(p3, (-1, 0, 0), 14) + self.assertAlmostEqual(p4, (-1, 0, 0), 14) + self.assertAlmostEqual(p3, p4, 14) circle = Wire( [ @@ -2273,12 +2245,12 @@ class TestMixin1D(DirectApiTestCase): Edge.make_circle(2, start_angle=180, end_angle=360), ] ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( circle.position_at(0.5), (-2, 0, 0), 5, ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( circle.position_at(2 * math.pi, position_mode=PositionMode.LENGTH), (-2, 0, 0), 5, @@ -2289,10 +2261,10 @@ class TestMixin1D(DirectApiTestCase): distances = [i / 4 for i in range(3)] pts = e.positions(distances) for i, position in enumerate(pts): - self.assertVectorAlmostEquals(position, (i / 4, i / 4, i / 4), 5) + self.assertAlmostEqual(position, (i / 4, i / 4, i / 4), 5) def test_tangent_at(self): - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Edge.make_circle(1, start_angle=0, end_angle=90).tangent_at(1.0), (-1, 0, 0), 5, @@ -2304,7 +2276,7 @@ class TestMixin1D(DirectApiTestCase): ) self.assertTrue(all([0.0 <= v <= 1.0 for v in tangent])) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Edge.make_circle(1, start_angle=0, end_angle=180).tangent_at( math.pi / 2, position_mode=PositionMode.LENGTH ), @@ -2321,26 +2293,26 @@ class TestMixin1D(DirectApiTestCase): ) pnt_on_circle = Vector(math.cos(math.pi / 4), math.sin(math.pi / 4)) tan = circle.tangent_at(pnt_on_circle) - self.assertVectorAlmostEquals(tan, (-math.sqrt(2) / 2, math.sqrt(2) / 2), 5) + self.assertAlmostEqual(tan, (-math.sqrt(2) / 2, math.sqrt(2) / 2), 5) def test_tangent_at_by_length(self): circle = Edge.make_circle(1) tan = circle.tangent_at(circle.length * 0.5, position_mode=PositionMode.LENGTH) - self.assertVectorAlmostEquals(tan, (0, -1), 5) + self.assertAlmostEqual(tan, (0, -1), 5) def test_tangent_at_error(self): with self.assertRaises(ValueError): Edge.make_circle(1).tangent_at("start") def test_normal(self): - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Edge.make_circle( 1, Plane(origin=(0, 0, 0), z_dir=(1, 0, 0)), start_angle=0, end_angle=60 ).normal(), (1, 0, 0), 5, ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Edge.make_ellipse( 1, 0.5, @@ -2351,7 +2323,7 @@ class TestMixin1D(DirectApiTestCase): (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5, ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Edge.make_spline( [ (1, 0), @@ -2368,43 +2340,43 @@ class TestMixin1D(DirectApiTestCase): def test_center(self): c = Edge.make_circle(1, start_angle=0, end_angle=180) - self.assertVectorAlmostEquals(c.center(), (0, 1, 0), 5) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(c.center(), (0, 1, 0), 5) + self.assertAlmostEqual( c.center(CenterOf.MASS), (0, 0.6366197723675814, 0), 5, ) - self.assertVectorAlmostEquals(c.center(CenterOf.BOUNDING_BOX), (0, 0.5, 0), 5) + self.assertAlmostEqual(c.center(CenterOf.BOUNDING_BOX), (0, 0.5, 0), 5) def test_location_at(self): loc = Edge.make_circle(1).location_at(0.25) - self.assertVectorAlmostEquals(loc.position, (0, 1, 0), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, -90, -90), 5) + self.assertAlmostEqual(loc.position, (0, 1, 0), 5) + self.assertAlmostEqual(loc.orientation, (0, -90, -90), 5) loc = Edge.make_circle(1).location_at( math.pi / 2, position_mode=PositionMode.LENGTH ) - self.assertVectorAlmostEquals(loc.position, (0, 1, 0), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, -90, -90), 5) + self.assertAlmostEqual(loc.position, (0, 1, 0), 5) + self.assertAlmostEqual(loc.orientation, (0, -90, -90), 5) def test_locations(self): locs = Edge.make_circle(1).locations([i / 4 for i in range(4)]) - self.assertVectorAlmostEquals(locs[0].position, (1, 0, 0), 5) - self.assertVectorAlmostEquals(locs[0].orientation, (-90, 0, -180), 5) - self.assertVectorAlmostEquals(locs[1].position, (0, 1, 0), 5) - self.assertVectorAlmostEquals(locs[1].orientation, (0, -90, -90), 5) - self.assertVectorAlmostEquals(locs[2].position, (-1, 0, 0), 5) - self.assertVectorAlmostEquals(locs[2].orientation, (90, 0, 0), 5) - self.assertVectorAlmostEquals(locs[3].position, (0, -1, 0), 5) - self.assertVectorAlmostEquals(locs[3].orientation, (0, 90, 90), 5) + self.assertAlmostEqual(locs[0].position, (1, 0, 0), 5) + self.assertAlmostEqual(locs[0].orientation, (-90, 0, -180), 5) + self.assertAlmostEqual(locs[1].position, (0, 1, 0), 5) + self.assertAlmostEqual(locs[1].orientation, (0, -90, -90), 5) + self.assertAlmostEqual(locs[2].position, (-1, 0, 0), 5) + self.assertAlmostEqual(locs[2].orientation, (90, 0, 0), 5) + self.assertAlmostEqual(locs[3].position, (0, -1, 0), 5) + self.assertAlmostEqual(locs[3].orientation, (0, 90, 90), 5) def test_project(self): target = Face.make_rect(10, 10, Plane.XY.rotated((0, 45, 0))) circle = Edge.make_circle(1).locate(Location((0, 0, 10))) ellipse: Wire = circle.project(target, (0, 0, -1)) bbox = ellipse.bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-1, -1, -1), 5) - self.assertVectorAlmostEquals(bbox.max, (1, 1, 1), 5) + self.assertAlmostEqual(bbox.min, (-1, -1, -1), 5) + self.assertAlmostEqual(bbox.max, (1, 1, 1), 5) def test_project2(self): target = Cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] @@ -2500,7 +2472,7 @@ class TestMixin1D(DirectApiTestCase): self.assertAlmostEqual(wire.volume, 0, 5) -class TestMixin3D(DirectApiTestCase): +class TestMixin3D(unittest.TestCase): """Test that 3D add ins""" def test_chamfer(self): @@ -2609,14 +2581,14 @@ class TestMixin3D(DirectApiTestCase): with self.assertRaises(ValueError): Solid.make_box(1, 1, 1).center(CenterOf.GEOMETRY) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Solid.make_box(1, 1, 1).center(CenterOf.BOUNDING_BOX), (0.5, 0.5, 0.5), 5, ) -class TestPlane(DirectApiTestCase): +class TestPlane(unittest.TestCase): """Plane with class properties""" def test_class_properties(self): @@ -2657,8 +2629,8 @@ class TestPlane(DirectApiTestCase): ), ] for plane, x_dir, z_dir in planes: - self.assertVectorAlmostEquals(plane.x_dir, x_dir, 5) - self.assertVectorAlmostEquals(plane.z_dir, z_dir, 5) + self.assertAlmostEqual(plane.x_dir, x_dir, 5) + self.assertAlmostEqual(plane.z_dir, z_dir, 5) def test_plane_init(self): # from origin @@ -2679,10 +2651,10 @@ class TestPlane(DirectApiTestCase): Plane(origin=o, z_dir=z), ] for p in planes: - self.assertVectorAlmostEquals(p.origin, o, 6) - self.assertVectorAlmostEquals(p.x_dir, x, 6) - self.assertVectorAlmostEquals(p.y_dir, y, 6) - self.assertVectorAlmostEquals(p.z_dir, z, 6) + self.assertAlmostEqual(p.origin, o, 6) + self.assertAlmostEqual(p.x_dir, x, 6) + self.assertAlmostEqual(p.y_dir, y, 6) + self.assertAlmostEqual(p.z_dir, z, 6) with self.assertRaises(TypeError): Plane() with self.assertRaises(TypeError): @@ -2693,30 +2665,22 @@ class TestPlane(DirectApiTestCase): p_from_loc = Plane(loc) p_from_named_loc = Plane(location=loc) for p in [p_from_loc, p_from_named_loc]: - self.assertVectorAlmostEquals(p.origin, (0, 0, 0), 6) - self.assertVectorAlmostEquals( - p.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals( - p.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals(p.z_dir, (0, 0, 1), 6) - self.assertVectorAlmostEquals(loc.position, p.location.position, 6) - self.assertVectorAlmostEquals(loc.orientation, p.location.orientation, 6) + self.assertAlmostEqual(p.origin, (0, 0, 0), 6) + self.assertAlmostEqual(p.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p.z_dir, (0, 0, 1), 6) + self.assertAlmostEqual(loc.position, p.location.position, 6) + self.assertAlmostEqual(loc.orientation, p.location.orientation, 6) # rotated location around x and origin <> (0,0,0) loc = Location((0, 2, -1), (45, 0, 0)) p = Plane(loc) - self.assertVectorAlmostEquals(p.origin, (0, 2, -1), 6) - self.assertVectorAlmostEquals(p.x_dir, (1, 0, 0), 6) - self.assertVectorAlmostEquals( - p.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals( - p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals(loc.position, p.location.position, 6) - self.assertVectorAlmostEquals(loc.orientation, p.location.orientation, 6) + self.assertAlmostEqual(p.origin, (0, 2, -1), 6) + self.assertAlmostEqual(p.x_dir, (1, 0, 0), 6) + self.assertAlmostEqual(p.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(loc.position, p.location.position, 6) + self.assertAlmostEqual(loc.orientation, p.location.orientation, 6) # from a face f = Face.make_rect(1, 2).located(Location((1, 2, 3), (45, 0, 45))) @@ -2725,16 +2689,12 @@ class TestPlane(DirectApiTestCase): plane_from_gp_pln = Plane(gp_pln=p_from_face.wrapped) p_deep_copy = copy.deepcopy(p_from_face) for p in [p_from_face, p_from_named_face, plane_from_gp_pln, p_deep_copy]: - self.assertVectorAlmostEquals(p.origin, (1, 2, 3), 6) - self.assertVectorAlmostEquals(p.x_dir, (math.sqrt(2) / 2, 0.5, 0.5), 6) - self.assertVectorAlmostEquals(p.y_dir, (-math.sqrt(2) / 2, 0.5, 0.5), 6) - self.assertVectorAlmostEquals( - p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals(f.location.position, p.location.position, 6) - self.assertVectorAlmostEquals( - f.location.orientation, p.location.orientation, 6 - ) + self.assertAlmostEqual(p.origin, (1, 2, 3), 6) + self.assertAlmostEqual(p.x_dir, (math.sqrt(2) / 2, 0.5, 0.5), 6) + self.assertAlmostEqual(p.y_dir, (-math.sqrt(2) / 2, 0.5, 0.5), 6) + self.assertAlmostEqual(p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(f.location.position, p.location.position, 6) + self.assertAlmostEqual(f.location.orientation, p.location.orientation, 6) # from a face with x_dir f = Face.make_rect(1, 2) @@ -2746,10 +2706,10 @@ class TestPlane(DirectApiTestCase): Plane(face=f, x_dir=x), ] for p in planes: - self.assertVectorAlmostEquals(p.origin, (0, 0, 0), 6) - self.assertVectorAlmostEquals(p.x_dir, Vector(x).normalized(), 6) - self.assertVectorAlmostEquals(p.y_dir, Vector(y).normalized(), 6) - self.assertVectorAlmostEquals(p.z_dir, (0, 0, 1), 6) + self.assertAlmostEqual(p.origin, (0, 0, 0), 6) + self.assertAlmostEqual(p.x_dir, Vector(x).normalized(), 6) + self.assertAlmostEqual(p.y_dir, Vector(y).normalized(), 6) + self.assertAlmostEqual(p.z_dir, (0, 0, 1), 6) with self.assertRaises(TypeError): Plane(Edge.make_line((0, 0), (0, 1))) @@ -2782,10 +2742,10 @@ class TestPlane(DirectApiTestCase): p = Plane(f) f_props = GProp_GProps() BRepGProp.SurfaceProperties_s(f.wrapped, f_props) - self.assertVectorAlmostEquals(p.origin, f_props.CentreOfMass(), 6) - self.assertVectorAlmostEquals(p.x_dir, expected[i][0], 6) - self.assertVectorAlmostEquals(p.y_dir, expected[i][1], 6) - self.assertVectorAlmostEquals(p.z_dir, expected[i][2], 6) + self.assertAlmostEqual(p.origin, Vector(f_props.CentreOfMass()), 6) + self.assertAlmostEqual(p.x_dir, expected[i][0], 6) + self.assertAlmostEqual(p.y_dir, expected[i][1], 6) + self.assertAlmostEqual(p.z_dir, expected[i][2], 6) def test_plane_neg(self): p = Plane( @@ -2794,51 +2754,35 @@ class TestPlane(DirectApiTestCase): z_dir=Vector(4, 5, 6).normalized(), ) p2 = -p - self.assertVectorAlmostEquals(p2.origin, p.origin, 6) - self.assertVectorAlmostEquals(p2.x_dir, p.x_dir, 6) - self.assertVectorAlmostEquals(p2.z_dir, -p.z_dir, 6) - self.assertVectorAlmostEquals( - p2.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6 - ) + self.assertAlmostEqual(p2.origin, p.origin, 6) + self.assertAlmostEqual(p2.x_dir, p.x_dir, 6) + self.assertAlmostEqual(p2.z_dir, -p.z_dir, 6) + self.assertAlmostEqual(p2.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6) p3 = p.reverse() - self.assertVectorAlmostEquals(p3.origin, p.origin, 6) - self.assertVectorAlmostEquals(p3.x_dir, p.x_dir, 6) - self.assertVectorAlmostEquals(p3.z_dir, -p.z_dir, 6) - self.assertVectorAlmostEquals( - p3.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6 - ) + self.assertAlmostEqual(p3.origin, p.origin, 6) + self.assertAlmostEqual(p3.x_dir, p.x_dir, 6) + self.assertAlmostEqual(p3.z_dir, -p.z_dir, 6) + self.assertAlmostEqual(p3.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6) def test_plane_mul(self): p = Plane(origin=(1, 2, 3), x_dir=(1, 0, 0), z_dir=(0, 0, 1)) p2 = p * Location((1, 2, -1), (0, 0, 45)) - self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) - self.assertVectorAlmostEquals( - p2.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals( - p2.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6 - ) - self.assertVectorAlmostEquals(p2.z_dir, (0, 0, 1), 6) + self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) + self.assertAlmostEqual(p2.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p2.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p2.z_dir, (0, 0, 1), 6) p2 = p * Location((1, 2, -1), (0, 45, 0)) - self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) - self.assertVectorAlmostEquals( - p2.x_dir, (math.sqrt(2) / 2, 0, -math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals(p2.y_dir, (0, 1, 0), 6) - self.assertVectorAlmostEquals( - p2.z_dir, (math.sqrt(2) / 2, 0, math.sqrt(2) / 2), 6 - ) + self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) + self.assertAlmostEqual(p2.x_dir, (math.sqrt(2) / 2, 0, -math.sqrt(2) / 2), 6) + self.assertAlmostEqual(p2.y_dir, (0, 1, 0), 6) + self.assertAlmostEqual(p2.z_dir, (math.sqrt(2) / 2, 0, math.sqrt(2) / 2), 6) p2 = p * Location((1, 2, -1), (45, 0, 0)) - self.assertVectorAlmostEquals(p2.origin, (2, 4, 2), 6) - self.assertVectorAlmostEquals(p2.x_dir, (1, 0, 0), 6) - self.assertVectorAlmostEquals( - p2.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) - self.assertVectorAlmostEquals( - p2.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6 - ) + self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) + self.assertAlmostEqual(p2.x_dir, (1, 0, 0), 6) + self.assertAlmostEqual(p2.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(p2.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) with self.assertRaises(TypeError): p2 * Vector(1, 1, 1) @@ -2862,11 +2806,11 @@ class TestPlane(DirectApiTestCase): (1, 0, 1), ] for i, target_point in enumerate(target_vertices): - self.assertTupleAlmostEquals(target_point, local_box_vertices[i], 7) + np.testing.assert_allclose(target_point, local_box_vertices[i], 1e-7) def test_localize_vertex(self): vertex = Vertex(random.random(), random.random(), random.random()) - self.assertTupleAlmostEquals( + np.testing.assert_allclose( Plane.YZ.to_local_coords(vertex).to_tuple(), Plane.YZ.to_local_coords(Vector(vertex)).to_tuple(), 5, @@ -2938,12 +2882,12 @@ class TestPlane(DirectApiTestCase): def test_move(self): pln = Plane.XY.move(Location((1, 2, 3))) - self.assertVectorAlmostEquals(pln.origin, (1, 2, 3), 5) + self.assertAlmostEqual(pln.origin, (1, 2, 3), 5) def test_rotated(self): rotated_plane = Plane.XY.rotated((45, 0, 0)) - self.assertVectorAlmostEquals(rotated_plane.x_dir, (1, 0, 0), 5) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(rotated_plane.x_dir, (1, 0, 0), 5) + self.assertAlmostEqual( rotated_plane.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 5 ) @@ -3002,11 +2946,11 @@ class TestPlane(DirectApiTestCase): def test_to_location(self): loc = Plane(origin=(1, 2, 3), x_dir=(0, 1, 0), z_dir=(0, 0, 1)).location - self.assertVectorAlmostEquals(loc.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(loc.orientation, (0, 0, 90), 5) + self.assertAlmostEqual(loc.position, (1, 2, 3), 5) + self.assertAlmostEqual(loc.orientation, (0, 0, 90), 5) def test_intersect(self): - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Plane.XY.intersect(Axis((1, 2, 3), (0, 0, -1))), (1, 2, 0), 5 ) self.assertIsNone(Plane.XY.intersect(Axis((1, 2, 3), (0, 1, 0)))) @@ -3049,7 +2993,7 @@ class TestPlane(DirectApiTestCase): i = Plane.XY & Vector(1, 2) self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, (1, 2, 0), 5) + self.assertAlmostEqual(i, (1, 2, 0), 5) a = Axis((0, 0, 0), (1, 1, 0)) i = Plane.XY & a @@ -3059,16 +3003,16 @@ class TestPlane(DirectApiTestCase): a = Axis((1, 2, -1), (0, 0, 1)) i = Plane.XY & a self.assertTrue(isinstance(i, Vector)) - self.assertVectorAlmostEquals(i, Vector(1, 2, 0), 5) + self.assertAlmostEqual(i, Vector(1, 2, 0), 5) def test_plane_origin_setter(self): pln = Plane.XY pln.origin = (1, 2, 3) ocp_origin = Vector(pln.wrapped.Location()) - self.assertVectorAlmostEquals(ocp_origin, (1, 2, 3), 5) + self.assertAlmostEqual(ocp_origin, (1, 2, 3), 5) -class TestProjection(DirectApiTestCase): +class TestProjection(unittest.TestCase): def test_flat_projection(self): sphere = Solid.make_sphere(50) projection_direction = Vector(0, -1, 0) @@ -3088,11 +3032,11 @@ class TestProjection(DirectApiTestCase): circle = Wire.make_circle(3, Plane.XY.offset(10)) projection = circle.project_to_shape(target, (0, 0, -1)) bbox = projection[0].bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-3, -3, 1), 2) - self.assertVectorAlmostEquals(bbox.max, (3, 3, 2), 2) + self.assertAlmostEqual(bbox.min, (-3, -3, 1), 2) + self.assertAlmostEqual(bbox.max, (3, 3, 2), 2) bbox = projection[1].bounding_box() - self.assertVectorAlmostEquals(bbox.min, (-3, -3, -2), 2) - self.assertVectorAlmostEquals(bbox.max, (3, 3, -2), 2) + self.assertAlmostEqual(bbox.min, (-3, -3, -2), 2) + self.assertAlmostEqual(bbox.max, (3, 3, -2), 2) def test_text_projection(self): sphere = Solid.make_sphere(50) @@ -3124,38 +3068,38 @@ class TestProjection(DirectApiTestCase): projection = Edge.make_circle(1, Plane.XY.offset(-5)).project_to_shape( Solid.make_box(1, 1, 1), (0, 0, 1) ) - self.assertVectorAlmostEquals(projection[0].position_at(1), (1, 0, 0), 5) - self.assertVectorAlmostEquals(projection[0].position_at(0), (0, 1, 0), 5) - self.assertVectorAlmostEquals(projection[0].arc_center, (0, 0, 0), 5) + self.assertAlmostEqual(projection[0].position_at(1), (1, 0, 0), 5) + self.assertAlmostEqual(projection[0].position_at(0), (0, 1, 0), 5) + self.assertAlmostEqual(projection[0].arc_center, (0, 0, 0), 5) def test_to_axis(self): with self.assertRaises(ValueError): Edge.make_circle(1, end_angle=30).to_axis() -class TestRotation(DirectApiTestCase): +class TestRotation(unittest.TestCase): def test_rotation_parameters(self): r = Rotation(10, 20, 30) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) r = Rotation(10, 20, Z=30) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) r = Rotation(10, 20, Z=30, ordering=Intrinsic.XYZ) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) r = Rotation(10, Y=20, Z=30) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) r = Rotation((10, 20, 30)) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) r = Rotation(10, 20, 30, Intrinsic.XYZ) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) r = Rotation((30, 20, 10), Extrinsic.ZYX) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) r = Rotation((30, 20, 10), ordering=Extrinsic.ZYX) - self.assertVectorAlmostEquals(r.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) with self.assertRaises(TypeError): Rotation(x=10) -class TestShape(DirectApiTestCase): +class TestShape(unittest.TestCase): """Misc Shape tests""" def test_mirror(self): @@ -3175,14 +3119,14 @@ class TestShape(DirectApiTestCase): def test_combined_center(self): objs = [Solid.make_box(1, 1, 1, Plane((x, 0, 0))) for x in [-2, 1]] - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Shape.combined_center(objs, center_of=CenterOf.MASS), (0, 0.5, 0.5), 5, ) objs = [Solid.make_sphere(1, Plane((x, 0, 0))) for x in [-2, 1]] - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Shape.combined_center(objs, center_of=CenterOf.BOUNDING_BOX), (-0.5, 0, 0), 5, @@ -3393,23 +3337,23 @@ class TestShape(DirectApiTestCase): def test_position_and_orientation(self): box = Solid.make_box(1, 1, 1).locate(Location((1, 2, 3), (10, 20, 30))) - self.assertVectorAlmostEquals(box.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(box.orientation, (10, 20, 30), 5) + self.assertAlmostEqual(box.position, (1, 2, 3), 5) + self.assertAlmostEqual(box.orientation, (10, 20, 30), 5) def test_distance_to_with_closest_points(self): s0 = Solid.make_sphere(1).locate(Location((0, 2.1, 0))) s1 = Solid.make_sphere(1) distance, pnt0, pnt1 = s0.distance_to_with_closest_points(s1) self.assertAlmostEqual(distance, 0.1, 5) - self.assertVectorAlmostEquals(pnt0, (0, 1.1, 0), 5) - self.assertVectorAlmostEquals(pnt1, (0, 1, 0), 5) + self.assertAlmostEqual(pnt0, (0, 1.1, 0), 5) + self.assertAlmostEqual(pnt1, (0, 1, 0), 5) def test_closest_points(self): c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) c1 = Edge.make_circle(1) closest = c0.closest_points(c1) - self.assertVectorAlmostEquals(closest[0], c0.position_at(0.75).to_tuple(), 5) - self.assertVectorAlmostEquals(closest[1], c1.position_at(0.25).to_tuple(), 5) + self.assertAlmostEqual(closest[0], c0.position_at(0.75).to_tuple(), 5) + self.assertAlmostEqual(closest[1], c1.position_at(0.25).to_tuple(), 5) def test_distance_to(self): c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) @@ -3422,8 +3366,8 @@ class TestShape(DirectApiTestCase): intersections = ( box.intersect(Axis((0.5, 0.5, 4), (0, 0, -1))).vertices().sort_by(Axis.Z) ) - self.assertVectorAlmostEquals(intersections[0], (0.5, 0.5, 0), 5) - self.assertVectorAlmostEquals(intersections[1], (0.5, 0.5, 1), 5) + self.assertAlmostEqual(Vector(intersections[0]), (0.5, 0.5, 0), 5) + self.assertAlmostEqual(Vector(intersections[1]), (0.5, 0.5, 1), 5) def test_clean_error(self): """Note that this test is here to alert build123d to changes in bad OCCT clean behavior @@ -3449,8 +3393,8 @@ class TestShape(DirectApiTestCase): bbox1 = box.bounding_box() bbox2 = box_with_hole.bounding_box() - self.assertVectorAlmostEquals(bbox1.min, bbox2.min, 5) - self.assertVectorAlmostEquals(bbox1.max, bbox2.max, 5) + self.assertAlmostEqual(bbox1.min, bbox2.min, 5) + self.assertAlmostEqual(bbox1.max, bbox2.max, 5) def test_project_to_viewport(self): # Basic test @@ -3544,8 +3488,8 @@ class TestShape(DirectApiTestCase): a = Compound(children=[b, c]) a.color = Color(0, 1, 0) # Check that assigned colors stay and iheritance works - self.assertTupleAlmostEquals(tuple(a.color), (0, 1, 0, 1), 5) - self.assertTupleAlmostEquals(tuple(b.color), (0, 0, 1, 1), 5) + np.testing.assert_allclose(tuple(a.color), (0, 1, 0, 1), 1e-5) + np.testing.assert_allclose(tuple(b.color), (0, 0, 1, 1), 1e-5) def test_ocp_section(self): # Vertex @@ -3558,11 +3502,11 @@ class TestShape(DirectApiTestCase): self.assertListEqual(edges, []) verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_rect(5, 5)) - self.assertTupleAlmostEquals(tuple(verts[0]), (1, 2, 0), 5) + np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) self.assertListEqual(edges, []) verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_plane(Plane.XY)) - self.assertTupleAlmostEquals(tuple(verts[0]), (1, 2, 0), 5) + np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) self.assertListEqual(edges, []) # spline = Spline((-10, 10, -10), (-10, -5, -5), (20, 0, 5)) @@ -3706,7 +3650,7 @@ class TestShape(DirectApiTestCase): self.assertIsNone(Vertex(1, 1, 1).compound()) -class TestShapeList(DirectApiTestCase): +class TestShapeList(unittest.TestCase): """Test ShapeList functionality""" def assertDunderStrEqual(self, actual: str, expected_lines: list[str]): @@ -3758,8 +3702,8 @@ class TestShapeList(DirectApiTestCase): vertices = ( Solid.make_box(1, 1, 1).vertices().sort_by(Axis((0, 0, 0), (1, 1, 1))) ) - self.assertVectorAlmostEquals(vertices.last, (1, 1, 1), 5) - self.assertVectorAlmostEquals(vertices.first, (0, 0, 0), 5) + self.assertAlmostEqual(Vector(vertices.last), (1, 1, 1), 5) + self.assertAlmostEqual(Vector(vertices.first), (0, 0, 0), 5) def test_group_by(self): vertices = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) @@ -3780,7 +3724,7 @@ class TestShapeList(DirectApiTestCase): self.assertAlmostEqual(edges[0].length, 2 * math.pi, 5) vertices = Solid.make_box(1, 1, 1).vertices().group_by(SortBy.DISTANCE) - self.assertVectorAlmostEquals(vertices[-1][0], (1, 1, 1), 5) + self.assertAlmostEqual(Vector(vertices[-1][0]), (1, 1, 1), 5) box = Solid.make_box(1, 1, 2) self.assertEqual(len(box.faces().group_by(SortBy.AREA)[0]), 2) @@ -3794,8 +3738,8 @@ class TestShapeList(DirectApiTestCase): self.assertEqual(len(vertices_by_line[3]), 1) self.assertEqual(len(vertices_by_line[4]), 2) self.assertEqual(len(vertices_by_line[5]), 1) - self.assertVectorAlmostEquals(vertices_by_line[0][0], (0, 0, 0), 5) - self.assertVectorAlmostEquals(vertices_by_line[-1][0], (1, 1, 2), 5) + self.assertAlmostEqual(Vector(vertices_by_line[0][0]), (0, 0, 0), 5) + self.assertAlmostEqual(Vector(vertices_by_line[-1][0]), (1, 1, 2), 5) with BuildPart() as boxes: with GridLocations(10, 10, 3, 3): @@ -3912,7 +3856,7 @@ class TestShapeList(DirectApiTestCase): def test_vertex(self): sl = ShapeList([Edge.make_circle(1)]) - self.assertTupleAlmostEquals(sl.vertex().to_tuple(), (1, 0, 0), 5) + np.testing.assert_allclose(sl.vertex().to_tuple(), (1, 0, 0), 1e-5) sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) with self.assertWarns(UserWarning): sl.vertex() @@ -4013,7 +3957,7 @@ class TestShapeList(DirectApiTestCase): ) -class TestShells(DirectApiTestCase): +class TestShells(unittest.TestCase): def test_shell_init(self): box_faces = Solid.make_box(1, 1, 1).faces() box_shell = Shell(box_faces) @@ -4022,7 +3966,7 @@ class TestShells(DirectApiTestCase): def test_center(self): box_faces = Solid.make_box(1, 1, 1).faces() box_shell = Shell(box_faces) - self.assertVectorAlmostEquals(box_shell.center(), (0.5, 0.5, 0.5), 5) + self.assertAlmostEqual(box_shell.center(), (0.5, 0.5, 0.5), 5) def test_manifold_shell_volume(self): box_faces = Solid.make_box(1, 1, 1).faces() @@ -4088,7 +4032,7 @@ class TestShells(DirectApiTestCase): self.assertAlmostEqual(thick.volume, outer_vol - inner_vol) -class TestSolid(DirectApiTestCase): +class TestSolid(unittest.TestCase): def test_make_solid(self): box_faces = Solid.make_box(1, 1, 1).faces() box_shell = Shell(box_faces) @@ -4147,15 +4091,11 @@ class TestSolid(DirectApiTestCase): bbox = taper_solid.bounding_box() size = max(1, b) / 2 if direction.Z > 0: - self.assertVectorAlmostEquals( - bbox.min, (-size, -size, 0), 1 - ) - self.assertVectorAlmostEquals(bbox.max, (size, size, h), 1) + self.assertAlmostEqual(bbox.min, (-size, -size, 0), 1) + self.assertAlmostEqual(bbox.max, (size, size, h), 1) else: - self.assertVectorAlmostEquals( - bbox.min, (-size, -size, -h), 1 - ) - self.assertVectorAlmostEquals(bbox.max, (size, size, 0), 1) + self.assertAlmostEqual(bbox.min, (-size, -size, -h), 1) + self.assertAlmostEqual(bbox.max, (size, size, 0), 1) def test_extrude_taper_with_hole(self): rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) @@ -4323,7 +4263,7 @@ class TestSkipClean(unittest.TestCase): self.assertTrue(SkipClean.clean) -class TestVector(DirectApiTestCase): +class TestVector(unittest.TestCase): """Test the Vector methods""" def test_vector_constructors(self): @@ -4336,7 +4276,7 @@ class TestVector(DirectApiTestCase): v5c = Vector(v=gp_XYZ(1, 2, 3)) for v in [v1, v2, v3, v4, v5, v5b, v5c]: - self.assertVectorAlmostEquals(v, (1, 2, 3), 4) + self.assertAlmostEqual(v, (1, 2, 3), 4) v6 = Vector((1, 2)) v7 = Vector([1, 2]) @@ -4344,26 +4284,26 @@ class TestVector(DirectApiTestCase): v8b = Vector(X=1, Y=2) for v in [v6, v7, v8, v8b]: - self.assertVectorAlmostEquals(v, (1, 2, 0), 4) + self.assertAlmostEqual(v, (1, 2, 0), 4) v9 = Vector() - self.assertVectorAlmostEquals(v9, (0, 0, 0), 4) + self.assertAlmostEqual(v9, (0, 0, 0), 4) v9.X = 1.0 v9.Y = 2.0 v9.Z = 3.0 - self.assertVectorAlmostEquals(v9, (1, 2, 3), 4) - self.assertVectorAlmostEquals(Vector(1, 2, 3, 4), (1, 2, 3), 4) + self.assertAlmostEqual(v9, (1, 2, 3), 4) + self.assertAlmostEqual(Vector(1, 2, 3, 4), (1, 2, 3), 4) v10 = Vector(1) v11 = Vector((1,)) v12 = Vector([1]) v13 = Vector(X=1) for v in [v10, v11, v12, v13]: - self.assertVectorAlmostEquals(v, (1, 0, 0), 4) + self.assertAlmostEqual(v, (1, 0, 0), 4) vertex = Vertex(0, 0, 0).moved(Pos(0, 0, 10)) - self.assertVectorAlmostEquals(Vector(vertex), (0, 0, 10), 4) + self.assertAlmostEqual(Vector(vertex), (0, 0, 10), 4) with self.assertRaises(TypeError): Vector("vector") @@ -4375,11 +4315,9 @@ class TestVector(DirectApiTestCase): vector_x = Vector(1, 0, 1).rotate(Axis.X, 45) vector_y = Vector(1, 2, 1).rotate(Axis.Y, 45) vector_z = Vector(-1, -1, 3).rotate(Axis.Z, 45) - self.assertVectorAlmostEquals( - vector_x, (1, -math.sqrt(2) / 2, math.sqrt(2) / 2), 7 - ) - self.assertVectorAlmostEquals(vector_y, (math.sqrt(2), 2, 0), 7) - self.assertVectorAlmostEquals(vector_z, (0, -math.sqrt(2), 3), 7) + self.assertAlmostEqual(vector_x, (1, -math.sqrt(2) / 2, math.sqrt(2) / 2), 7) + self.assertAlmostEqual(vector_y, (math.sqrt(2), 2, 0), 7) + self.assertAlmostEqual(vector_z, (0, -math.sqrt(2), 3), 7) def test_get_signed_angle(self): """Verify getSignedAngle calculations with and without a provided normal""" @@ -4402,7 +4340,7 @@ class TestVector(DirectApiTestCase): def test_vector_add(self): result = Vector(1, 2, 0) + Vector(0, 0, 3) - self.assertVectorAlmostEquals(result, (1.0, 2.0, 3.0), 3) + self.assertAlmostEqual(result, (1.0, 2.0, 3.0), 3) def test_vector_operators(self): result = Vector(1, 1, 1) + Vector(2, 2, 2) @@ -4472,16 +4410,16 @@ class TestVector(DirectApiTestCase): # test passing Plane object point = Vector(10, 11, 12).project_to_plane(Plane(base, x_dir, z_dir)) - self.assertVectorAlmostEquals(point, (59 / 7, 55 / 7, 51 / 7), decimal_places) + self.assertAlmostEqual(point, (59 / 7, 55 / 7, 51 / 7), decimal_places) # test line projection vec = Vector(10, 10, 10) line = Vector(3, 4, 5) - angle = vec.get_angle(line) * DEG2RAD + angle = math.radians(vec.get_angle(line)) vecLineProjection = vec.project_to_line(line) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( vecLineProjection.normalized(), line.normalized(), decimal_places, @@ -4505,18 +4443,18 @@ class TestVector(DirectApiTestCase): self.assertEqual(sum([v for v in Vector(1, 2, 3)]), 6) def test_reverse(self): - self.assertVectorAlmostEquals(Vector(1, 2, 3).reverse(), (-1, -2, -3), 7) + self.assertAlmostEqual(Vector(1, 2, 3).reverse(), (-1, -2, -3), 7) def test_copy(self): v2 = copy.copy(Vector(1, 2, 3)) v3 = copy.deepcopy(Vector(1, 2, 3)) - self.assertVectorAlmostEquals(v2, (1, 2, 3), 7) - self.assertVectorAlmostEquals(v3, (1, 2, 3), 7) + self.assertAlmostEqual(v2, (1, 2, 3), 7) + self.assertAlmostEqual(v3, (1, 2, 3), 7) def test_radd(self): vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9)] vector_sum = sum(vectors) - self.assertVectorAlmostEquals(vector_sum, (12, 15, 18), 5) + self.assertAlmostEqual(vector_sum, (12, 15, 18), 5) def test_hash(self): vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9), Vector(1, 2, 3)] @@ -4547,20 +4485,20 @@ class TestVector(DirectApiTestCase): def test_intersect(self): v1 = Vector(1, 2, 3) - self.assertVectorAlmostEquals(v1 & Vector(1, 2, 3), (1, 2, 3), 5) + self.assertAlmostEqual(v1 & Vector(1, 2, 3), (1, 2, 3), 5) self.assertIsNone(v1 & Vector(0, 0, 0)) - self.assertVectorAlmostEquals(v1 & Location((1, 2, 3)), (1, 2, 3), 5) + self.assertAlmostEqual(v1 & Location((1, 2, 3)), (1, 2, 3), 5) self.assertIsNone(v1 & Location()) - self.assertVectorAlmostEquals(v1 & Axis((1, 2, 3), (1, 0, 0)), (1, 2, 3), 5) + self.assertAlmostEqual(v1 & Axis((1, 2, 3), (1, 0, 0)), (1, 2, 3), 5) self.assertIsNone(v1 & Axis.X) - self.assertVectorAlmostEquals(v1 & Plane((1, 2, 3)), (1, 2, 3), 5) + self.assertAlmostEqual(v1 & Plane((1, 2, 3)), (1, 2, 3), 5) self.assertIsNone(v1 & Plane.XY) - self.assertVectorAlmostEquals( - (v1 & Solid.make_box(2, 4, 5)).vertex(), (1, 2, 3), 5 + self.assertAlmostEqual( + Vector((v1 & Solid.make_box(2, 4, 5)).vertex()), (1, 2, 3), 5 ) self.assertIsNone(v1.intersect(Solid.make_box(0.5, 0.5, 0.5))) self.assertIsNone( @@ -4568,26 +4506,26 @@ class TestVector(DirectApiTestCase): ) -class TestVectorLike(DirectApiTestCase): +class TestVectorLike(unittest.TestCase): """Test typedef""" def test_axis_from_vertex(self): axis = Axis(Vertex(1, 2, 3), Vertex(0, 0, 1)) - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) def test_axis_from_vector(self): axis = Axis(Vector(1, 2, 3), Vector(0, 0, 1)) - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) def test_axis_from_tuple(self): axis = Axis((1, 2, 3), (0, 0, 1)) - self.assertVectorAlmostEquals(axis.position, (1, 2, 3), 5) - self.assertVectorAlmostEquals(axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) -class TestVertex(DirectApiTestCase): +class TestVertex(unittest.TestCase): """Test the extensions to the cadquery Vertex class""" def test_basic_vertex(self): @@ -4598,10 +4536,10 @@ class TestVertex(DirectApiTestCase): self.assertEqual(1, v.X) self.assertEqual(Vector, type(v.center())) - self.assertVectorAlmostEquals(Vector(Vertex(Vector(1, 2, 3))), (1, 2, 3), 7) - self.assertVectorAlmostEquals(Vector(Vertex((4, 5, 6))), (4, 5, 6), 7) - self.assertVectorAlmostEquals(Vector(Vertex((7,))), (7, 0, 0), 7) - self.assertVectorAlmostEquals(Vector(Vertex((8, 9))), (8, 9, 0), 7) + self.assertAlmostEqual(Vector(Vertex(Vector(1, 2, 3))), (1, 2, 3), 7) + self.assertAlmostEqual(Vector(Vertex((4, 5, 6))), (4, 5, 6), 7) + self.assertAlmostEqual(Vector(Vertex((7,))), (7, 0, 0), 7) + self.assertAlmostEqual(Vector(Vertex((8, 9))), (8, 9, 0), 7) def test_vertex_volume(self): v = Vertex(1, 1, 1) @@ -4609,13 +4547,11 @@ class TestVertex(DirectApiTestCase): def test_vertex_add(self): test_vertex = Vertex(0, 0, 0) - self.assertVectorAlmostEquals( - Vector(test_vertex + (100, -40, 10)), (100, -40, 10), 7 - ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(Vector(test_vertex + (100, -40, 10)), (100, -40, 10), 7) + self.assertAlmostEqual( Vector(test_vertex + Vector(100, -40, 10)), (100, -40, 10), 7 ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Vector(test_vertex + Vertex(100, -40, 10)), (100, -40, 10), 7, @@ -4625,13 +4561,11 @@ class TestVertex(DirectApiTestCase): def test_vertex_sub(self): test_vertex = Vertex(0, 0, 0) - self.assertVectorAlmostEquals( - Vector(test_vertex - (100, -40, 10)), (-100, 40, -10), 7 - ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual(Vector(test_vertex - (100, -40, 10)), (-100, 40, -10), 7) + self.assertAlmostEqual( Vector(test_vertex - Vector(100, -40, 10)), (-100, 40, -10), 7 ) - self.assertVectorAlmostEquals( + self.assertAlmostEqual( Vector(test_vertex - Vertex(100, -40, 10)), (-100, 40, -10), 7, @@ -4644,7 +4578,7 @@ class TestVertex(DirectApiTestCase): def test_vertex_to_vector(self): self.assertIsInstance(Vector(Vertex(0, 0, 0)), Vector) - self.assertVectorAlmostEquals(Vector(Vertex(0, 0, 0)), (0.0, 0.0, 0.0), 7) + self.assertAlmostEqual(Vector(Vertex(0, 0, 0)), (0.0, 0.0, 0.0), 7) def test_vertex_init_error(self): with self.assertRaises(TypeError): @@ -4709,7 +4643,7 @@ class TestVTKPolyData(unittest.TestCase): self.assertEqual(str(context.exception), "Cannot convert an empty shape") -class TestWire(DirectApiTestCase): +class TestWire(unittest.TestCase): def test_ellipse_arc(self): full_ellipse = Wire.make_ellipse(2, 1) half_ellipse = Wire.make_ellipse( @@ -4807,8 +4741,8 @@ class TestWire(DirectApiTestCase): tangent_scalars=(2, 2), ) half = spline.trim(0.5, 1) - self.assertVectorAlmostEquals(spline @ 0.5, half @ 0, 4) - self.assertVectorAlmostEquals(spline @ 1, half @ 1, 4) + self.assertAlmostEqual(spline @ 0.5, half @ 0, 4) + self.assertAlmostEqual(spline @ 1, half @ 1, 4) w = Rectangle(3, 1).wire() t5 = w.trim(0, 0.5) @@ -4855,9 +4789,9 @@ class TestWire(DirectApiTestCase): ordered_edges = w1.order_edges() self.assertFalse(all(e.is_forward for e in w1.edges())) self.assertTrue(all(e.is_forward for e in ordered_edges)) - self.assertVectorAlmostEquals(ordered_edges[0] @ 0, (0, 0, 0), 5) - self.assertVectorAlmostEquals(ordered_edges[1] @ 0, (1, 0, 0), 5) - self.assertVectorAlmostEquals(ordered_edges[2] @ 0, (1, 1, 0), 5) + self.assertAlmostEqual(ordered_edges[0] @ 0, (0, 0, 0), 5) + self.assertAlmostEqual(ordered_edges[1] @ 0, (1, 0, 0), 5) + self.assertAlmostEqual(ordered_edges[2] @ 0, (1, 1, 0), 5) def test_constructor(self): e0 = Edge.make_line((0, 0), (1, 0)) @@ -4878,7 +4812,7 @@ class TestWire(DirectApiTestCase): w6 = Wire(obj=w0.wrapped, label="w6", color=Color("red")) self.assertTrue(w6.is_valid()) self.assertEqual(w6.label, "w6") - self.assertTupleAlmostEquals(tuple(w6.color), (1.0, 0.0, 0.0, 1.0), 5) + np.testing.assert_allclose(tuple(w6.color), (1.0, 0.0, 0.0, 1.0), 1e-5) w7 = Wire(w6) self.assertTrue(w7.is_valid()) c0 = Polyline((0, 0), (1, 0), (1, 1)) diff --git a/tools/refactor_test_direct_api.py b/tools/refactor_test_direct_api.py new file mode 100644 index 0000000..be201e9 --- /dev/null +++ b/tools/refactor_test_direct_api.py @@ -0,0 +1,346 @@ +""" + +name: refactor_test_direct_api.py +by: Gumyr +date: January 22, 2025 + +Description: + This script automates the process of splitting a large test file into smaller, + more manageable test files based on class definitions. Each generated test file + includes necessary imports, an optional header with project and license information, + and the appropriate class definitions. Additionally, the script dynamically injects + shared utilities like the `AlwaysEqual` class only into files where they are needed. + +Features: + - Splits a large test file into separate files by test class. + - Adds a standardized header with project details and an Apache 2.0 license. + - Dynamically includes shared utilities like `AlwaysEqual` where required. + - Supports `unittest` compatibility by adding a `unittest.main()` block for direct execution. + - Ensures imports are cleaned and Python syntax is upgraded to modern standards using + `rope` and `pyupgrade`. + +Usage: + Run the script with the input file and output directory as arguments: + python refactor_test_direct_api.py + +Dependencies: + - libcst: For parsing and analyzing the test file structure. + - rope: For organizing and pruning unused imports. + - pyupgrade: For upgrading Python syntax to the latest standards. + +License: + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +from pathlib import Path +import libcst as cst +from libcst.metadata import PositionProvider, MetadataWrapper +import os +from rope.base.project import Project +from rope.refactor.importutils import ImportOrganizer +import subprocess +from datetime import datetime + + +class TestFileSplitter(cst.CSTVisitor): + METADATA_DEPENDENCIES = (PositionProvider,) + + def __init__(self, module_content, output_dir): + self.module_content = module_content + self.output_dir = output_dir + self.current_class = None + self.current_class_code = [] + self.global_imports = [] + + def visit_Import(self, node: cst.Import): + # Capture global import statements + self.global_imports.append(self._extract_code(node)) + + def visit_ImportFrom(self, node: cst.ImportFrom): + # Capture global import statements + self.global_imports.append(self._extract_code(node)) + + def visit_ClassDef(self, node: cst.ClassDef): + if self.current_class: + # Write the previous class to a file + self._write_class_file() + + # Start collecting for the new class + self.current_class = node.name.value + + # Get the start and end positions of the node + position = self.get_metadata(PositionProvider, node) + start = self._calculate_offset(position.start.line, position.start.column) + end = self._calculate_offset(position.end.line, position.end.column) + + # Extract the source code for the class + class_code = self.module_content[start:end] + self.current_class_code = [class_code] + + def leave_Module(self, original_node: cst.Module): + # Write the last class to a file + if self.current_class: + self._write_class_file() + + def _write_class_file(self): + """ + Write the current class to a file, including a header, ensuring no redundant 'test_' prefix, + and make the file executable when run directly. + """ + # Determine the file name by converting the class name to snake_case + snake_case_name = self._convert_to_snake_case(self.current_class) + + # Avoid redundant 'test_' prefix if it already exists + if snake_case_name.startswith("test_"): + filename = f"{snake_case_name}.py" + else: + filename = f"test_{snake_case_name}.py" + + filepath = os.path.join(self.output_dir, filename) + + # Generate the header with the current date and year + current_date = datetime.now().strftime("%B %d, %Y") + current_year = datetime.now().year + header = f''' +""" +build123d direct api tests + +name: {filename} +by: Gumyr +date: {current_date} + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright {current_year} Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" +''' + # Define imports for base class and shared utilities + base_class_import = "from ..base_test import AlwaysEqual" + + # Add the main block to run tests + main_block = """ +if __name__ == "__main__": + unittest.main() +""" + + # Write the header, imports, class definition, and main block + with open(filepath, "w") as f: + # Combine all parts into the file + f.write(header + "\n\n") + f.write("\n".join(self.global_imports) + "\n\n") + f.write(base_class_import + "\n\n") + f.write("\n".join(self.current_class_code) + "\n\n") + f.write(main_block) + + # Prune unused imports and upgrade the code + self._prune_unused_imports(filepath) + + def _write_class_file(self): + """ + Write the current class to a file, including a header, ensuring no redundant 'test_' prefix, + and dynamically inject the AlwaysEqual class if used. + """ + # Determine the file name by converting the class name to snake_case + snake_case_name = self._convert_to_snake_case(self.current_class) + + # Avoid redundant 'test_' prefix if it already exists + if snake_case_name.startswith("test_"): + filename = f"{snake_case_name}.py" + else: + filename = f"test_{snake_case_name}.py" + + filepath = os.path.join(self.output_dir, filename) + + # Check if the current class code references AlwaysEqual + needs_always_equal = ( + any("AlwaysEqual" in line for line in self.current_class_code) + and not filename == "test_always_equal.py" + ) + + # Generate the header with the current date and year + current_date = datetime.now().strftime("%B %d, %Y") + current_year = datetime.now().year + header = f''' +""" +build123d imports + +name: {filename} +by: Gumyr +date: {current_date} + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright {current_year} Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" +''' + + # Define the AlwaysEqual class if needed + always_equal_definition = ( + """ +# Always equal to any other object, to test that __eq__ cooperation is working +class AlwaysEqual: + def __eq__(self, other): + return True +""" + if needs_always_equal + else "" + ) + + # Add the main block to run tests + main_block = """ +if __name__ == "__main__": + unittest.main() +""" + + # Write the header, AlwaysEqual (if needed), imports, class definition, and main block + with open(filepath, "w") as f: + # Combine all parts into the file + f.write(header + "\n\n") + f.write(always_equal_definition + "\n\n") + f.write("\n".join(self.global_imports) + "\n\n") + f.write("\n".join(self.current_class_code) + "\n\n") + f.write(main_block) + + # Prune unused imports and upgrade the code + self._prune_unused_imports(filepath) + + def _convert_to_snake_case(self, name: str) -> str: + """ + Convert a PascalCase or camelCase name to snake_case. + """ + import re + + name = re.sub(r"(? str: + """ + Extract the source code of a given node using PositionProvider. + """ + position = self.get_metadata(PositionProvider, node) + start = self._calculate_offset(position.start.line, position.start.column) + end = self._calculate_offset(position.end.line, position.end.column) + return self.module_content[start:end] + + def _calculate_offset(self, line: int, column: int) -> int: + """ + Calculate the byte offset in the source content based on line and column numbers. + """ + lines = self.module_content.splitlines(keepends=True) + offset = sum(len(lines[i]) for i in range(line - 1)) + column + return offset + + def _prune_unused_imports(self, filepath): + """ + Wrapper for remove_unused_imports to clean unused imports in a file and upgrade the code. + """ + # Initialize the Rope project + project = Project(self.output_dir) + + # Use the shared function to remove unused imports + remove_unused_imports(Path(filepath), project) + + # Run pyupgrade on the file to modernize the Python syntax + print(f"Upgrading Python syntax in {filepath} with pyupgrade...") + subprocess.run(["pyupgrade", "--py310-plus", str(filepath)]) + + +def remove_unused_imports(file_path: Path, project: Project) -> None: + """Remove unused imports from a Python file using Rope. + + Args: + file_path: Path to the Python file to clean imports + project: Rope project instance to refresh and use for cleaning + """ + # Get the relative file path from the project root + relative_path = file_path.relative_to(project.address) + + # Refresh the project to recognize new files + project.validate() + + # Get the resource (file) to work on + resource = project.get_resource(str(relative_path)) + + # Create import organizer + import_organizer = ImportOrganizer(project) + + # Get and apply the changes + changes = import_organizer.organize_imports(resource) + if changes: + changes.do() + print(f"Cleaned imports in {file_path}") + subprocess.run(["black", str(file_path)]) + else: + print(f"No unused imports found in {file_path}") + + +def split_test_file(input_file, output_dir): + # Ensure the output directory exists + os.makedirs(output_dir, exist_ok=True) + + # Read the input file + with open(input_file, "r") as f: + content = f.read() + + # Parse the file and wrap it with metadata + module = cst.parse_module(content) + wrapper = MetadataWrapper(module) + + # Process the file + splitter = TestFileSplitter(module_content=content, output_dir=output_dir) + wrapper.visit(splitter) + + +# Define paths +script_dir = Path(__file__).parent +test_direct_api_file = script_dir / ".." / "tests" / "test_direct_api.py" +output_dir = script_dir / ".." / "tests" / "test_direct_api" +test_direct_api_file = test_direct_api_file.resolve() +output_dir = output_dir.resolve() + +split_test_file(test_direct_api_file, output_dir) From e126c502b1f8de3565a37a416d11a117b736f7e5 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 22 Jan 2025 15:23:56 -0500 Subject: [PATCH 154/518] Adding separate direct api tests --- tests/test_direct_api/test_always_equal.py | 38 ++ tests/test_direct_api/test_assembly.py | 125 ++++ tests/test_direct_api/test_axis.py | 212 ++++++ tests/test_direct_api/test_bound_box.py | 104 +++ tests/test_direct_api/test_cad_objects.py | 264 ++++++++ tests/test_direct_api/test_clean_method.py | 70 ++ tests/test_direct_api/test_color.py | 125 ++++ tests/test_direct_api/test_compound.py | 162 +++++ .../test_direct_api_test_case.py | 60 ++ tests/test_direct_api/test_edge.py | 289 ++++++++ tests/test_direct_api/test_face.py | 452 +++++++++++++ tests/test_direct_api/test_functions.py | 105 +++ tests/test_direct_api/test_group_by.py | 69 ++ tests/test_direct_api/test_import_export.py | 67 ++ tests/test_direct_api/test_jupyter.py | 57 ++ tests/test_direct_api/test_location.py | 400 +++++++++++ tests/test_direct_api/test_matrix.py | 194 ++++++ tests/test_direct_api/test_mixin1_d.py | 318 +++++++++ tests/test_direct_api/test_mixin3_d.py | 154 +++++ tests/test_direct_api/test_plane.py | 480 ++++++++++++++ tests/test_direct_api/test_projection.py | 103 +++ tests/test_direct_api/test_rotation.py | 58 ++ tests/test_direct_api/test_shape.py | 619 ++++++++++++++++++ tests/test_direct_api/test_shape_list.py | 368 +++++++++++ tests/test_direct_api/test_shells.py | 115 ++++ tests/test_direct_api/test_skip_clean.py | 68 ++ tests/test_direct_api/test_solid.py | 238 +++++++ tests/test_direct_api/test_vector.py | 288 ++++++++ tests/test_direct_api/test_vector_like.py | 55 ++ tests/test_direct_api/test_vertex.py | 104 +++ tests/test_direct_api/test_vtk_poly_data.py | 87 +++ tests/test_direct_api/test_wire.py | 221 +++++++ 32 files changed, 6069 insertions(+) create mode 100644 tests/test_direct_api/test_always_equal.py create mode 100644 tests/test_direct_api/test_assembly.py create mode 100644 tests/test_direct_api/test_axis.py create mode 100644 tests/test_direct_api/test_bound_box.py create mode 100644 tests/test_direct_api/test_cad_objects.py create mode 100644 tests/test_direct_api/test_clean_method.py create mode 100644 tests/test_direct_api/test_color.py create mode 100644 tests/test_direct_api/test_compound.py create mode 100644 tests/test_direct_api/test_direct_api_test_case.py create mode 100644 tests/test_direct_api/test_edge.py create mode 100644 tests/test_direct_api/test_face.py create mode 100644 tests/test_direct_api/test_functions.py create mode 100644 tests/test_direct_api/test_group_by.py create mode 100644 tests/test_direct_api/test_import_export.py create mode 100644 tests/test_direct_api/test_jupyter.py create mode 100644 tests/test_direct_api/test_location.py create mode 100644 tests/test_direct_api/test_matrix.py create mode 100644 tests/test_direct_api/test_mixin1_d.py create mode 100644 tests/test_direct_api/test_mixin3_d.py create mode 100644 tests/test_direct_api/test_plane.py create mode 100644 tests/test_direct_api/test_projection.py create mode 100644 tests/test_direct_api/test_rotation.py create mode 100644 tests/test_direct_api/test_shape.py create mode 100644 tests/test_direct_api/test_shape_list.py create mode 100644 tests/test_direct_api/test_shells.py create mode 100644 tests/test_direct_api/test_skip_clean.py create mode 100644 tests/test_direct_api/test_solid.py create mode 100644 tests/test_direct_api/test_vector.py create mode 100644 tests/test_direct_api/test_vector_like.py create mode 100644 tests/test_direct_api/test_vertex.py create mode 100644 tests/test_direct_api/test_vtk_poly_data.py create mode 100644 tests/test_direct_api/test_wire.py diff --git a/tests/test_direct_api/test_always_equal.py b/tests/test_direct_api/test_always_equal.py new file mode 100644 index 0000000..ded5c9b --- /dev/null +++ b/tests/test_direct_api/test_always_equal.py @@ -0,0 +1,38 @@ +""" +build123d imports + +name: test_always_equal.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_assembly.py b/tests/test_direct_api/test_assembly.py new file mode 100644 index 0000000..7ac43be --- /dev/null +++ b/tests/test_direct_api/test_assembly.py @@ -0,0 +1,125 @@ +""" +build123d imports + +name: test_assembly.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import re +import unittest + +from build123d.topology import Compound, Solid + + +class TestAssembly(unittest.TestCase): + @staticmethod + def create_test_assembly() -> Compound: + box = Solid.make_box(1, 1, 1) + box.orientation = (45, 45, 0) + box.label = "box" + sphere = Solid.make_sphere(1) + sphere.label = "sphere" + sphere.position = (1, 2, 3) + assembly = Compound(label="assembly", children=[box]) + sphere.parent = assembly + return assembly + + def assertTopoEqual(self, actual_topo: str, expected_topo_lines: list[str]): + actual_topo_lines = actual_topo.splitlines() + self.assertEqual(len(actual_topo_lines), len(expected_topo_lines)) + for actual_line, expected_line in zip(actual_topo_lines, expected_topo_lines): + start, end = re.split(r"at 0x[0-9a-f]+,", expected_line, 2, re.I) + self.assertTrue(actual_line.startswith(start)) + self.assertTrue(actual_line.endswith(end)) + + def test_attributes(self): + box = Solid.make_box(1, 1, 1) + box.label = "box" + sphere = Solid.make_sphere(1) + sphere.label = "sphere" + assembly = Compound(label="assembly", children=[box]) + sphere.parent = assembly + + self.assertEqual(len(box.children), 0) + self.assertEqual(box.label, "box") + self.assertEqual(box.parent, assembly) + self.assertEqual(sphere.parent, assembly) + self.assertEqual(len(assembly.children), 2) + + def test_show_topology_compound(self): + assembly = TestAssembly.create_test_assembly() + expected = [ + "assembly Compound at 0x7fced0fd1b50, Location(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))", + "├── box Solid at 0x7fced102d3a0, Location(p=(0.00, 0.00, 0.00), o=(45.00, 45.00, -0.00))", + "└── sphere Solid at 0x7fced0fd1f10, Location(p=(1.00, 2.00, 3.00), o=(-0.00, 0.00, -0.00))", + ] + self.assertTopoEqual(assembly.show_topology("Solid"), expected) + + def test_show_topology_shape_location(self): + assembly = TestAssembly.create_test_assembly() + expected = [ + "Solid at 0x7f3754501530, Position(1.0, 2.0, 3.0)", + "└── Shell at 0x7f3754501a70, Position(1.0, 2.0, 3.0)", + " └── Face at 0x7f3754501030, Position(1.0, 2.0, 3.0)", + ] + self.assertTopoEqual( + assembly.children[1].show_topology("Face", show_center=False), expected + ) + + def test_show_topology_shape(self): + assembly = TestAssembly.create_test_assembly() + expected = [ + "Solid at 0x7f6279043ab0, Center(1.0, 2.0, 3.0)", + "└── Shell at 0x7f62790438f0, Center(1.0, 2.0, 3.0)", + " └── Face at 0x7f62790439f0, Center(1.0, 2.0, 3.0)", + ] + self.assertTopoEqual(assembly.children[1].show_topology("Face"), expected) + + def test_remove_child(self): + assembly = TestAssembly.create_test_assembly() + self.assertEqual(len(assembly.children), 2) + assembly.children = list(assembly.children)[1:] + self.assertEqual(len(assembly.children), 1) + + def test_do_children_intersect(self): + ( + overlap, + pair, + distance, + ) = TestAssembly.create_test_assembly().do_children_intersect() + self.assertFalse(overlap) + box = Solid.make_box(1, 1, 1) + box.orientation = (45, 45, 0) + box.label = "box" + sphere = Solid.make_sphere(1) + sphere.label = "sphere" + sphere.position = (0, 0, 0) + assembly = Compound(label="assembly", children=[box]) + sphere.parent = assembly + overlap, pair, distance = assembly.do_children_intersect() + self.assertTrue(overlap) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py new file mode 100644 index 0000000..658e273 --- /dev/null +++ b/tests/test_direct_api/test_axis.py @@ -0,0 +1,212 @@ +""" +build123d imports + +name: test_axis.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# Always equal to any other object, to test that __eq__ cooperation is working +import copy +import unittest + +import numpy as np +from OCP.gp import gp_Ax1, gp_Dir, gp_Pnt +from build123d.geometry import Axis, Location, Plane, Vector +from build123d.topology import Edge + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +class TestAxis(unittest.TestCase): + """Test the Axis class""" + + def test_axis_init(self): + test_axis = Axis((1, 2, 3), (0, 0, 1)) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis((1, 2, 3), direction=(0, 0, 1)) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis(origin=(1, 2, 3), direction=(0, 0, 1)) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis(Edge.make_line((1, 2, 3), (1, 2, 4))) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) + + test_axis = Axis(edge=Edge.make_line((1, 2, 3), (1, 2, 4))) + self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) + + with self.assertRaises(ValueError): + Axis("one", "up") + with self.assertRaises(ValueError): + Axis(one="up") + + def test_axis_from_occt(self): + occt_axis = gp_Ax1(gp_Pnt(1, 1, 1), gp_Dir(0, 1, 0)) + test_axis = Axis(occt_axis) + self.assertAlmostEqual(test_axis.position, (1, 1, 1), 5) + self.assertAlmostEqual(test_axis.direction, (0, 1, 0), 5) + + def test_axis_repr_and_str(self): + self.assertEqual(repr(Axis.X), "((0.0, 0.0, 0.0),(1.0, 0.0, 0.0))") + self.assertEqual(str(Axis.Y), "Axis: ((0.0, 0.0, 0.0),(0.0, 1.0, 0.0))") + + def test_axis_copy(self): + x_copy = copy.copy(Axis.X) + self.assertAlmostEqual(x_copy.position, (0, 0, 0), 5) + self.assertAlmostEqual(x_copy.direction, (1, 0, 0), 5) + x_copy = copy.deepcopy(Axis.X) + self.assertAlmostEqual(x_copy.position, (0, 0, 0), 5) + self.assertAlmostEqual(x_copy.direction, (1, 0, 0), 5) + + def test_axis_to_location(self): + # TODO: Verify this is correct + x_location = Axis.X.location + self.assertTrue(isinstance(x_location, Location)) + self.assertAlmostEqual(x_location.position, (0, 0, 0), 5) + self.assertAlmostEqual(x_location.orientation, (0, 90, 180), 5) + + def test_axis_located(self): + y_axis = Axis.Z.located(Location((0, 0, 1), (-90, 0, 0))) + self.assertAlmostEqual(y_axis.position, (0, 0, 1), 5) + self.assertAlmostEqual(y_axis.direction, (0, 1, 0), 5) + + def test_axis_to_plane(self): + x_plane = Axis.X.to_plane() + self.assertTrue(isinstance(x_plane, Plane)) + self.assertAlmostEqual(x_plane.origin, (0, 0, 0), 5) + self.assertAlmostEqual(x_plane.z_dir, (1, 0, 0), 5) + + def test_axis_is_coaxial(self): + self.assertTrue(Axis.X.is_coaxial(Axis((0, 0, 0), (1, 0, 0)))) + self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 1), (1, 0, 0)))) + self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 0), (0, 1, 0)))) + + def test_axis_is_normal(self): + self.assertTrue(Axis.X.is_normal(Axis.Y)) + self.assertFalse(Axis.X.is_normal(Axis.X)) + + def test_axis_is_opposite(self): + self.assertTrue(Axis.X.is_opposite(Axis((1, 1, 1), (-1, 0, 0)))) + self.assertFalse(Axis.X.is_opposite(Axis.X)) + + def test_axis_is_parallel(self): + self.assertTrue(Axis.X.is_parallel(Axis((1, 1, 1), (1, 0, 0)))) + self.assertFalse(Axis.X.is_parallel(Axis.Y)) + + def test_axis_angle_between(self): + self.assertAlmostEqual(Axis.X.angle_between(Axis.Y), 90, 5) + self.assertAlmostEqual( + Axis.X.angle_between(Axis((1, 1, 1), (-1, 0, 0))), 180, 5 + ) + + def test_axis_reverse(self): + self.assertAlmostEqual(Axis.X.reverse().direction, (-1, 0, 0), 5) + + def test_axis_reverse_op(self): + axis = -Axis.X + self.assertAlmostEqual(axis.direction, (-1, 0, 0), 5) + + def test_axis_as_edge(self): + edge = Edge(Axis.X) + self.assertTrue(isinstance(edge, Edge)) + common = (edge & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() + self.assertAlmostEqual(common.length, 1, 5) + + def test_axis_intersect(self): + common = (Axis.X.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() + self.assertAlmostEqual(common.length, 1, 5) + + common = (Axis.X & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() + self.assertAlmostEqual(common.length, 1, 5) + + intersection = Axis.X & Axis((1, 0, 0), (0, 1, 0)) + self.assertAlmostEqual(intersection, (1, 0, 0), 5) + + i = Axis.X & Axis((1, 0, 0), (1, 0, 0)) + self.assertEqual(i, Axis.X) + + intersection = Axis((1, 2, 3), (0, 0, 1)) & Plane.XY + self.assertAlmostEqual(intersection.to_tuple(), (1, 2, 0), 5) + + arc = Edge.make_circle(20, start_angle=0, end_angle=180) + ax0 = Axis((-20, 30, 0), (4, -3, 0)) + intersections = arc.intersect(ax0).vertices().sort_by(Axis.X) + np.testing.assert_allclose(tuple(intersections[0]), (-5.6, 19.2, 0), 1e-5) + np.testing.assert_allclose(tuple(intersections[1]), (20, 0, 0), 1e-5) + + intersections = ax0.intersect(arc).vertices().sort_by(Axis.X) + np.testing.assert_allclose(tuple(intersections[0]), (-5.6, 19.2, 0), 1e-5) + np.testing.assert_allclose(tuple(intersections[1]), (20, 0, 0), 1e-5) + + i = Axis((0, 0, 1), (1, 1, 1)) & Vector(0.5, 0.5, 1.5) + self.assertTrue(isinstance(i, Vector)) + self.assertAlmostEqual(i, (0.5, 0.5, 1.5), 5) + self.assertIsNone(Axis.Y & Vector(2, 0, 0)) + + l = Edge.make_line((0, 0, 1), (0, 0, 2)) ^ 1 + i: Location = Axis.Z & l + self.assertTrue(isinstance(i, Location)) + self.assertAlmostEqual(i.position, l.position, 5) + self.assertAlmostEqual(i.orientation, l.orientation, 5) + + self.assertIsNone(Axis.Z & Edge.make_line((0, 0, 1), (1, 0, 0)).location_at(1)) + self.assertIsNone(Axis.Z & Edge.make_line((1, 0, 1), (1, 0, 2)).location_at(1)) + + # TODO: uncomment when generalized edge to surface intersections are complete + # non_planar = ( + # Solid.make_cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True) + # ) + # intersections = Axis((0, 0, 5), (1, 0, 0)) & non_planar + + # self.assertTrue(len(intersections.vertices(), 2)) + # np.testing.assert_allclose( + # intersection.vertices()[0].to_tuple(), (-1, 0, 5), 5 + # ) + # np.testing.assert_allclose( + # intersection.vertices()[1].to_tuple(), (1, 0, 5), 5 + # ) + + def test_axis_equal(self): + self.assertEqual(Axis.X, Axis.X) + self.assertEqual(Axis.Y, Axis.Y) + self.assertEqual(Axis.Z, Axis.Z) + self.assertEqual(Axis.X, AlwaysEqual()) + + def test_axis_not_equal(self): + self.assertNotEqual(Axis.X, Axis.Y) + random_obj = object() + self.assertNotEqual(Axis.X, random_obj) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_bound_box.py b/tests/test_direct_api/test_bound_box.py new file mode 100644 index 0000000..de4ebee --- /dev/null +++ b/tests/test_direct_api/test_bound_box.py @@ -0,0 +1,104 @@ +""" +build123d imports + +name: test_bound_box.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import BoundBox, Vector +from build123d.topology import Solid, Vertex + + +class TestBoundBox(unittest.TestCase): + def test_basic_bounding_box(self): + v = Vertex(1, 1, 1) + v2 = Vertex(2, 2, 2) + self.assertEqual(BoundBox, type(v.bounding_box())) + self.assertEqual(BoundBox, type(v2.bounding_box())) + + bb1 = v.bounding_box().add(v2.bounding_box()) + + # OCC uses some approximations + self.assertAlmostEqual(bb1.size.X, 1.0, 1) + + # Test adding to an existing bounding box + v0 = Vertex(0, 0, 0) + bb2 = v0.bounding_box().add(v.bounding_box()) + + bb3 = bb1.add(bb2) + self.assertAlmostEqual(bb3.size, (2, 2, 2), 7) + + bb3 = bb2.add((3, 3, 3)) + self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) + + bb3 = bb2.add(Vector(3, 3, 3)) + self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) + + # Test 2D bounding boxes + bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) + bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box()) + bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box()) + # Test that bb2 contains bb1 + self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2)) + self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1)) + # Test that neither bounding box contains the other + self.assertIsNone(BoundBox.find_outside_box_2d(bb1, bb3)) + + # Test creation of a bounding box from a shape - note the low accuracy comparison + # as the box is a little larger than the shape + bb1 = BoundBox.from_topo_ds(Solid.make_cylinder(1, 1).wrapped, optimal=False) + self.assertAlmostEqual(bb1.size, (2, 2, 1), 1) + + bb2 = BoundBox.from_topo_ds( + Solid.make_cylinder(0.5, 0.5).translate((0, 0, 0.1)).wrapped, optimal=False + ) + self.assertTrue(bb2.is_inside(bb1)) + + def test_bounding_box_repr(self): + bb = Solid.make_box(1, 1, 1).bounding_box() + self.assertEqual( + repr(bb), "bbox: 0.0 <= x <= 1.0, 0.0 <= y <= 1.0, 0.0 <= z <= 1.0" + ) + + def test_center_of_boundbox(self): + self.assertAlmostEqual( + Solid.make_box(1, 1, 1).bounding_box().center(), + (0.5, 0.5, 0.5), + 5, + ) + + def test_combined_center_of_boundbox(self): + pass + + def test_clean_boundbox(self): + s = Solid.make_sphere(3) + self.assertAlmostEqual(s.bounding_box().size, (6, 6, 6), 5) + s.mesh(1e-3) + self.assertAlmostEqual(s.bounding_box().size, (6, 6, 6), 5) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_cad_objects.py b/tests/test_direct_api/test_cad_objects.py new file mode 100644 index 0000000..ce36057 --- /dev/null +++ b/tests/test_direct_api/test_cad_objects.py @@ -0,0 +1,264 @@ +""" +build123d imports + +name: test_cad_objects.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge +from OCP.gp import gp, gp_Ax2, gp_Circ, gp_Elips, gp_Pnt +from build123d.build_enums import CenterOf +from build123d.geometry import Plane, Vector +from build123d.topology import Edge, Face, Wire + + +class TestCadObjects(unittest.TestCase): + def _make_circle(self): + circle = gp_Circ(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 2.0) + return Edge.cast(BRepBuilderAPI_MakeEdge(circle).Edge()) + + def _make_ellipse(self): + ellipse = gp_Elips(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 4.0, 2.0) + return Edge.cast(BRepBuilderAPI_MakeEdge(ellipse).Edge()) + + def test_edge_wrapper_center(self): + e = self._make_circle() + + self.assertAlmostEqual(e.center(CenterOf.MASS), (1.0, 2.0, 3.0), 3) + + def test_edge_wrapper_ellipse_center(self): + e = self._make_ellipse() + w = Wire([e]) + self.assertAlmostEqual(Face(w).center(), (1.0, 2.0, 3.0), 3) + + def test_edge_wrapper_make_circle(self): + halfCircleEdge = Edge.make_circle(radius=10, start_angle=0, end_angle=180) + + # np.testing.assert_allclose((0.0, 5.0, 0.0), halfCircleEdge.centerOfBoundBox(0.0001),1e-3) + self.assertAlmostEqual(halfCircleEdge.start_point(), (10.0, 0.0, 0.0), 3) + self.assertAlmostEqual(halfCircleEdge.end_point(), (-10.0, 0.0, 0.0), 3) + + def test_edge_wrapper_make_tangent_arc(self): + tangent_arc = Edge.make_tangent_arc( + Vector(1, 1), # starts at 1, 1 + Vector(0, 1), # tangent at start of arc is in the +y direction + Vector(2, 1), # arc cureturn_values 180 degrees and ends at 2, 1 + ) + self.assertAlmostEqual(tangent_arc.start_point(), (1, 1, 0), 3) + self.assertAlmostEqual(tangent_arc.end_point(), (2, 1, 0), 3) + self.assertAlmostEqual(tangent_arc.tangent_at(0), (0, 1, 0), 3) + self.assertAlmostEqual(tangent_arc.tangent_at(0.5), (1, 0, 0), 3) + self.assertAlmostEqual(tangent_arc.tangent_at(1), (0, -1, 0), 3) + + def test_edge_wrapper_make_ellipse1(self): + # Check x_radius > y_radius + x_radius, y_radius = 20, 10 + angle1, angle2 = -75.0, 90.0 + arcEllipseEdge = Edge.make_ellipse( + x_radius=x_radius, + y_radius=y_radius, + plane=Plane.XY, + start_angle=angle1, + end_angle=angle2, + ) + + start = ( + x_radius * math.cos(math.radians(angle1)), + y_radius * math.sin(math.radians(angle1)), + 0.0, + ) + end = ( + x_radius * math.cos(math.radians(angle2)), + y_radius * math.sin(math.radians(angle2)), + 0.0, + ) + self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) + self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) + + def test_edge_wrapper_make_ellipse2(self): + # Check x_radius < y_radius + x_radius, y_radius = 10, 20 + angle1, angle2 = 0.0, 45.0 + arcEllipseEdge = Edge.make_ellipse( + x_radius=x_radius, + y_radius=y_radius, + plane=Plane.XY, + start_angle=angle1, + end_angle=angle2, + ) + + start = ( + x_radius * math.cos(math.radians(angle1)), + y_radius * math.sin(math.radians(angle1)), + 0.0, + ) + end = ( + x_radius * math.cos(math.radians(angle2)), + y_radius * math.sin(math.radians(angle2)), + 0.0, + ) + self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) + self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) + + def test_edge_wrapper_make_circle_with_ellipse(self): + # Check x_radius == y_radius + x_radius, y_radius = 20, 20 + angle1, angle2 = 15.0, 60.0 + arcEllipseEdge = Edge.make_ellipse( + x_radius=x_radius, + y_radius=y_radius, + plane=Plane.XY, + start_angle=angle1, + end_angle=angle2, + ) + + start = ( + x_radius * math.cos(math.radians(angle1)), + y_radius * math.sin(math.radians(angle1)), + 0.0, + ) + end = ( + x_radius * math.cos(math.radians(angle2)), + y_radius * math.sin(math.radians(angle2)), + 0.0, + ) + self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) + self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) + + def test_face_wrapper_make_rect(self): + mplane = Face.make_rect(10, 10) + + self.assertAlmostEqual(mplane.normal_at(), (0.0, 0.0, 1.0), 3) + + # def testCompoundcenter(self): + # """ + # Tests whether or not a proper weighted center can be found for a compound + # """ + + # def cylinders(self, radius, height): + + # c = Solid.make_cylinder(radius, height, Vector()) + + # # Combine all the cylinders into a single compound + # r = self.eachpoint(lambda loc: c.located(loc), True).combinesolids() + + # return r + + # Workplane.cyl = cylinders + + # # Now test. here we want weird workplane to see if the objects are transformed right + # s = ( + # Workplane("XY") + # .rect(2.0, 3.0, for_construction=true) + # .vertices() + # .cyl(0.25, 0.5) + # ) + + # self.assertEqual(4, len(s.val().solids())) + # np.testing.assert_allclose((0.0, 0.0, 0.25), s.val().center, 1e-3) + + def test_translate(self): + e = Edge.make_circle(2, Plane((1, 2, 3))) + e2 = e.translate(Vector(0, 0, 1)) + + self.assertAlmostEqual(e2.center(CenterOf.MASS), (1.0, 2.0, 4.0), 3) + + def test_vertices(self): + e = Edge.cast(BRepBuilderAPI_MakeEdge(gp_Pnt(0, 0, 0), gp_Pnt(1, 1, 0)).Edge()) + self.assertEqual(2, len(e.vertices())) + + def test_edge_wrapper_radius(self): + # get a radius from a simple circle + e0 = Edge.make_circle(2.4) + self.assertAlmostEqual(e0.radius, 2.4) + + # radius of an arc + e1 = Edge.make_circle( + 1.8, Plane(origin=(5, 6, 7), z_dir=(1, 1, 1)), start_angle=20, end_angle=30 + ) + self.assertAlmostEqual(e1.radius, 1.8) + + # test value errors + e2 = Edge.make_ellipse(10, 20) + with self.assertRaises(ValueError): + e2.radius + + # radius from a wire + w0 = Wire.make_circle(10, Plane(origin=(1, 2, 3), z_dir=(-1, 0, 1))) + self.assertAlmostEqual(w0.radius, 10) + + # radius from a wire with multiple edges + rad = 2.3 + plane = Plane(origin=(7, 8, 0), z_dir=(1, 0.5, 0.1)) + w1 = Wire( + [ + Edge.make_circle(rad, plane, 0, 10), + Edge.make_circle(rad, plane, 10, 25), + Edge.make_circle(rad, plane, 25, 230), + ] + ) + self.assertAlmostEqual(w1.radius, rad) + + # test value error from wire + w2 = Wire.make_polygon( + [ + Vector(-1, 0, 0), + Vector(0, 1, 0), + Vector(1, -1, 0), + ] + ) + with self.assertRaises(ValueError): + w2.radius + + # (I think) the radius of a wire is the radius of it's first edge. + # Since this is stated in the docstring better make sure. + no_rad = Wire( + [ + Edge.make_line(Vector(0, 0, 0), Vector(0, 1, 0)), + Edge.make_circle(1.0, start_angle=90, end_angle=270), + ] + ) + with self.assertRaises(ValueError): + no_rad.radius + yes_rad = Wire( + [ + Edge.make_circle(1.0, start_angle=90, end_angle=270), + Edge.make_line(Vector(0, -1, 0), Vector(0, 1, 0)), + ] + ) + self.assertAlmostEqual(yes_rad.radius, 1.0) + many_rad = Wire( + [ + Edge.make_circle(1.0, start_angle=0, end_angle=180), + Edge.make_circle(3.0, Plane((2, 0, 0)), start_angle=180, end_angle=359), + ] + ) + self.assertAlmostEqual(many_rad.radius, 1.0) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_clean_method.py b/tests/test_direct_api/test_clean_method.py new file mode 100644 index 0000000..04bedcf --- /dev/null +++ b/tests/test_direct_api/test_clean_method.py @@ -0,0 +1,70 @@ +""" +build123d imports + +name: test_clean_method.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from unittest.mock import patch, MagicMock + +from build123d.topology import Solid + + +class TestCleanMethod(unittest.TestCase): + def setUp(self): + # Create a mock object + self.solid = Solid() + self.solid.wrapped = MagicMock() # Simulate a valid `wrapped` object + + @patch("build123d.topology.shape_core.ShapeUpgrade_UnifySameDomain") + def test_clean_warning_on_exception(self, mock_shape_upgrade): + # Mock the upgrader + mock_upgrader = mock_shape_upgrade.return_value + mock_upgrader.Build.side_effect = Exception("Mocked Build failure") + + # Capture warnings + with self.assertWarns(Warning) as warn_context: + self.solid.clean() + + # Assert the warning message + self.assertIn("Unable to clean", str(warn_context.warning)) + + # Verify the upgrader was constructed with the correct arguments + mock_shape_upgrade.assert_called_once_with(self.solid.wrapped, True, True, True) + + # Verify the Build method was called + mock_upgrader.Build.assert_called_once() + + def test_clean_with_none_wrapped(self): + # Set `wrapped` to None to simulate the error condition + self.solid.wrapped = None + + # Call clean and ensure it returns self + result = self.solid.clean() + self.assertIs(result, self.solid) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py new file mode 100644 index 0000000..6bd6b8f --- /dev/null +++ b/tests/test_direct_api/test_color.py @@ -0,0 +1,125 @@ +""" +build123d imports + +name: test_color.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import unittest + +import numpy as np +from build123d.geometry import Color + + +class TestColor(unittest.TestCase): + def test_name1(self): + c = Color("blue") + np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) + + def test_name2(self): + c = Color("blue", alpha=0.5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) + + def test_name3(self): + c = Color("blue", 0.5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) + + def test_rgb0(self): + c = Color(0.0, 1.0, 0.0) + np.testing.assert_allclose(tuple(c), (0, 1, 0, 1), 1e-5) + + def test_rgba1(self): + c = Color(1.0, 1.0, 0.0, 0.5) + self.assertEqual(c.wrapped.GetRGB().Red(), 1.0) + self.assertEqual(c.wrapped.GetRGB().Green(), 1.0) + self.assertEqual(c.wrapped.GetRGB().Blue(), 0.0) + self.assertEqual(c.wrapped.Alpha(), 0.5) + + def test_rgba2(self): + c = Color(1.0, 1.0, 0.0, alpha=0.5) + np.testing.assert_allclose(tuple(c), (1, 1, 0, 0.5), 1e-5) + + def test_rgba3(self): + c = Color(red=0.1, green=0.2, blue=0.3, alpha=0.5) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.5), 1e-5) + + def test_bad_color_name(self): + with self.assertRaises(ValueError): + Color("build123d") + + def test_to_tuple(self): + c = Color("blue", alpha=0.5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) + + def test_hex(self): + c = Color(0x996692) + np.testing.assert_allclose( + tuple(c), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), 5 + ) + + c = Color(0x006692, 0x80) + np.testing.assert_allclose( + tuple(c), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), 5 + ) + + c = Color(0x006692, alpha=0x80) + np.testing.assert_allclose(tuple(c), (0, 102 / 255, 146 / 255, 128 / 255), 1e-5) + + c = Color(color_code=0x996692, alpha=0xCC) + np.testing.assert_allclose( + tuple(c), (153 / 255, 102 / 255, 146 / 255, 204 / 255), 5 + ) + + c = Color(0.0, 0.0, 1.0, 1.0) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) + + c = Color(0, 0, 1, 1) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) + + def test_copy(self): + c = Color(0.1, 0.2, 0.3, alpha=0.4) + c_copy = copy.copy(c) + np.testing.assert_allclose(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), 1e-5) + + def test_str_repr(self): + c = Color(1, 0, 0) + self.assertEqual(str(c), "Color: (1.0, 0.0, 0.0, 1.0) ~ RED") + self.assertEqual(repr(c), "Color(1.0, 0.0, 0.0, 1.0)") + + def test_tuple(self): + c = Color((0.1,)) + np.testing.assert_allclose(tuple(c), (0.1, 1.0, 1.0, 1.0), 1e-5) + c = Color((0.1, 0.2)) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 1.0, 1.0), 1e-5) + c = Color((0.1, 0.2, 0.3)) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 1.0), 1e-5) + c = Color((0.1, 0.2, 0.3, 0.4)) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) + c = Color(color_tuple=(0.1, 0.2, 0.3, 0.4)) + np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_compound.py b/tests/test_direct_api/test_compound.py new file mode 100644 index 0000000..e4eb6f2 --- /dev/null +++ b/tests/test_direct_api/test_compound.py @@ -0,0 +1,162 @@ +""" +build123d imports + +name: test_compound.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import itertools +import unittest + +from build123d.build_common import GridLocations, PolarLocations +from build123d.build_enums import Align, CenterOf +from build123d.geometry import Location, Plane +from build123d.objects_part import Box +from build123d.objects_sketch import Circle +from build123d.topology import Compound, Edge, Face, ShapeList, Solid, Sketch + + +class TestCompound(unittest.TestCase): + def test_make_text(self): + arc = Edge.make_three_point_arc((-50, 0, 0), (0, 20, 0), (50, 0, 0)) + text = Compound.make_text("test", 10, text_path=arc) + self.assertEqual(len(text.faces()), 4) + text = Compound.make_text( + "test", 10, align=(Align.MAX, Align.MAX), text_path=arc + ) + self.assertEqual(len(text.faces()), 4) + + def test_fuse(self): + box1 = Solid.make_box(1, 1, 1) + box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) + combined = Compound([box1]).fuse(box2, glue=True) + self.assertTrue(combined.is_valid()) + self.assertAlmostEqual(combined.volume, 2, 5) + fuzzy = Compound([box1]).fuse(box2, tol=1e-6) + self.assertTrue(fuzzy.is_valid()) + self.assertAlmostEqual(fuzzy.volume, 2, 5) + + def test_remove(self): + box1 = Solid.make_box(1, 1, 1) + box2 = Solid.make_box(1, 1, 1, Plane((2, 0, 0))) + combined = Compound([box1, box2]) + self.assertTrue(len(combined._remove(box2).solids()), 1) + + def test_repr(self): + simple = Compound([Solid.make_box(1, 1, 1)]) + simple_str = repr(simple).split("0x")[0] + repr(simple).split(", ")[1] + self.assertEqual(simple_str, "Compound at label()") + + assembly = Compound([Solid.make_box(1, 1, 1)]) + assembly.children = [Solid.make_box(1, 1, 1)] + assembly.label = "test" + assembly_str = repr(assembly).split("0x")[0] + repr(assembly).split(", l")[1] + self.assertEqual(assembly_str, "Compound at abel(test), #children(1)") + + def test_center(self): + test_compound = Compound( + [ + Solid.make_box(2, 2, 2).locate(Location((-1, -1, -1))), + Solid.make_box(1, 1, 1).locate(Location((8.5, -0.5, -0.5))), + ] + ) + self.assertAlmostEqual(test_compound.center(CenterOf.MASS), (1, 0, 0), 5) + self.assertAlmostEqual( + test_compound.center(CenterOf.BOUNDING_BOX), (4.25, 0, 0), 5 + ) + with self.assertRaises(ValueError): + test_compound.center(CenterOf.GEOMETRY) + + def test_triad(self): + triad = Compound.make_triad(10) + bbox = triad.bounding_box() + self.assertGreater(bbox.min.X, -10 / 8) + self.assertLess(bbox.min.X, 0) + self.assertGreater(bbox.min.Y, -10 / 8) + self.assertLess(bbox.min.Y, 0) + self.assertGreater(bbox.min.Y, -10 / 8) + self.assertAlmostEqual(bbox.min.Z, 0, 4) + self.assertLess(bbox.size.Z, 12.5) + self.assertEqual(triad.volume, 0) + + def test_volume(self): + e = Edge.make_line((0, 0), (1, 1)) + self.assertAlmostEqual(e.volume, 0, 5) + + f = Face.make_rect(1, 1) + self.assertAlmostEqual(f.volume, 0, 5) + + b = Solid.make_box(1, 1, 1) + self.assertAlmostEqual(b.volume, 1, 5) + + bb = Box(1, 1, 1) + self.assertAlmostEqual(bb.volume, 1, 5) + + c = Compound(children=[e, f, b, bb, b.translate((0, 5, 0))]) + self.assertAlmostEqual(c.volume, 3, 5) + # N.B. b and bb overlap but still add to Compound volume + + def test_constructor(self): + with self.assertRaises(TypeError): + Compound(foo="bar") + + def test_len(self): + self.assertEqual(len(Compound()), 0) + skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) + self.assertEqual(len(skt), 4) + + def test_iteration(self): + skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) + for c1, c2 in itertools.combinations(skt, 2): + self.assertGreaterEqual((c1.position - c2.position).length, 10) + + def test_unwrap(self): + skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) + skt2 = Compound(children=[skt]) + self.assertEqual(len(skt2), 1) + skt3 = skt2.unwrap(fully=False) + self.assertEqual(len(skt3), 4) + + comp1 = Compound().unwrap() + self.assertEqual(len(comp1), 0) + comp2 = Compound(children=[Face.make_rect(1, 1)]) + comp3 = Compound(children=[comp2]) + self.assertEqual(len(comp3), 1) + self.assertTrue(isinstance(next(iter(comp3)), Compound)) + comp4 = comp3.unwrap(fully=True) + self.assertTrue(isinstance(comp4, Face)) + + def test_get_top_level_shapes(self): + base_shapes = Compound(children=PolarLocations(15, 20) * Box(4, 4, 4)) + fls = base_shapes.get_top_level_shapes() + self.assertTrue(isinstance(fls, ShapeList)) + self.assertEqual(len(fls), 20) + self.assertTrue(all(isinstance(s, Solid) for s in fls)) + + b1 = Box(1, 1, 1).solid() + self.assertEqual(b1.get_top_level_shapes()[0], b1) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_direct_api_test_case.py b/tests/test_direct_api/test_direct_api_test_case.py new file mode 100644 index 0000000..a165857 --- /dev/null +++ b/tests/test_direct_api/test_direct_api_test_case.py @@ -0,0 +1,60 @@ +""" +build123d direct api tests + +name: test_direct_api_test_case.py +by: Gumyr +date: January 21, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from typing import Optional + +from build123d.geometry import Vector, VectorLike + + +class DirectApiTestCase(unittest.TestCase): + def assertTupleAlmostEquals( + self, + first: tuple[float, ...], + second: tuple[float, ...], + places: int, + msg: str | None = None, + ): + """Check Tuples""" + self.assertEqual(len(second), len(first)) + for i, j in zip(second, first): + self.assertAlmostEqual(i, j, places, msg=msg) + + def assertVectorAlmostEquals( + self, first: Vector, second: VectorLike, places: int, msg: str | None = None + ): + second_vector = Vector(second) + self.assertAlmostEqual(first.X, second_vector.X, places, msg=msg) + self.assertAlmostEqual(first.Y, second_vector.Y, places, msg=msg) + self.assertAlmostEqual(first.Z, second_vector.Z, places, msg=msg) + + +if __name__ == "__main__": + import unittest + + unittest.main() diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py new file mode 100644 index 0000000..3589ec0 --- /dev/null +++ b/tests/test_direct_api/test_edge.py @@ -0,0 +1,289 @@ +""" +build123d imports + +name: test_edge.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.build_enums import AngularDirection +from build123d.geometry import Axis, Plane, Vector +from build123d.objects_curve import CenterArc, EllipticalCenterArc +from build123d.topology import Edge + + +class TestEdge(unittest.TestCase): + def test_close(self): + self.assertAlmostEqual( + Edge.make_circle(1, end_angle=180).close().length, math.pi + 2, 5 + ) + self.assertAlmostEqual(Edge.make_circle(1).close().length, 2 * math.pi, 5) + + def test_make_half_circle(self): + half_circle = Edge.make_circle(radius=1, start_angle=0, end_angle=180) + self.assertAlmostEqual(half_circle.start_point(), (1, 0, 0), 3) + self.assertAlmostEqual(half_circle.end_point(), (-1, 0, 0), 3) + + def test_make_half_circle2(self): + half_circle = Edge.make_circle(radius=1, start_angle=270, end_angle=90) + self.assertAlmostEqual(half_circle.start_point(), (0, -1, 0), 3) + self.assertAlmostEqual(half_circle.end_point(), (0, 1, 0), 3) + + def test_make_clockwise_half_circle(self): + half_circle = Edge.make_circle( + radius=1, + start_angle=180, + end_angle=0, + angular_direction=AngularDirection.CLOCKWISE, + ) + self.assertAlmostEqual(half_circle.end_point(), (1, 0, 0), 3) + self.assertAlmostEqual(half_circle.start_point(), (-1, 0, 0), 3) + + def test_make_clockwise_half_circle2(self): + half_circle = Edge.make_circle( + radius=1, + start_angle=90, + end_angle=-90, + angular_direction=AngularDirection.CLOCKWISE, + ) + self.assertAlmostEqual(half_circle.start_point(), (0, 1, 0), 3) + self.assertAlmostEqual(half_circle.end_point(), (0, -1, 0), 3) + + def test_arc_center(self): + self.assertAlmostEqual(Edge.make_ellipse(2, 1).arc_center, (0, 0, 0), 5) + with self.assertRaises(ValueError): + Edge.make_line((0, 0, 0), (0, 0, 1)).arc_center + + def test_spline_with_parameters(self): + spline = Edge.make_spline( + points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 0.4, 1.0] + ) + self.assertAlmostEqual(spline.end_point(), (2, 0, 0), 5) + with self.assertRaises(ValueError): + Edge.make_spline( + points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 1.0] + ) + with self.assertRaises(ValueError): + Edge.make_spline( + points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], tangents=[(1, 1, 0)] + ) + + def test_spline_approx(self): + spline = Edge.make_spline_approx([(0, 0), (1, 1), (2, 1), (3, 0)]) + self.assertAlmostEqual(spline.end_point(), (3, 0, 0), 5) + spline = Edge.make_spline_approx( + [(0, 0), (1, 1), (2, 1), (3, 0)], smoothing=(1.0, 5.0, 10.0) + ) + self.assertAlmostEqual(spline.end_point(), (3, 0, 0), 5) + + def test_distribute_locations(self): + line = Edge.make_line((0, 0, 0), (10, 0, 0)) + locs = line.distribute_locations(3) + for i, x in enumerate([0, 5, 10]): + self.assertAlmostEqual(locs[i].position, (x, 0, 0), 5) + self.assertAlmostEqual(locs[0].orientation, (0, 90, 180), 5) + + locs = line.distribute_locations(3, positions_only=True) + for i, x in enumerate([0, 5, 10]): + self.assertAlmostEqual(locs[i].position, (x, 0, 0), 5) + self.assertAlmostEqual(locs[0].orientation, (0, 0, 0), 5) + + def test_to_wire(self): + edge = Edge.make_line((0, 0, 0), (1, 1, 1)) + for end in [0, 1]: + self.assertAlmostEqual( + edge.position_at(end), + edge.to_wire().position_at(end), + 5, + ) + + def test_arc_center2(self): + edges = [ + Edge.make_circle(1, plane=Plane((1, 2, 3)), end_angle=30), + Edge.make_ellipse(1, 0.5, plane=Plane((1, 2, 3)), end_angle=30), + ] + for edge in edges: + self.assertAlmostEqual(edge.arc_center, (1, 2, 3), 5) + with self.assertRaises(ValueError): + Edge.make_line((0, 0), (1, 1)).arc_center + + def test_find_intersection_points(self): + circle = Edge.make_circle(1) + line = Edge.make_line((0, -2), (0, 2)) + crosses = circle.find_intersection_points(line) + for target, actual in zip([(0, 1, 0), (0, -1, 0)], crosses): + self.assertAlmostEqual(actual, target, 5) + + with self.assertRaises(ValueError): + circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) + with self.assertRaises(ValueError): + circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) + + self_intersect = Edge.make_spline([(-3, 2), (3, -2), (4, 0), (3, 2), (-3, -2)]) + self.assertAlmostEqual( + self_intersect.find_intersection_points()[0], + (-2.6861636507066047, 0, 0), + 5, + ) + line = Edge.make_line((1, -2), (1, 2)) + crosses = line.find_intersection_points(Axis.X) + self.assertAlmostEqual(crosses[0], (1, 0, 0), 5) + + with self.assertRaises(ValueError): + line.find_intersection_points(Plane.YZ) + + # def test_intersections_tolerance(self): + + # Multiple operands not currently supported + + # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) + # l1 = Edge.make_line((1, 0), (2, 0)) + # i1 = l1.intersect(*r1) + + # r2 = Rectangle(2, 2).edges() + # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) + # i2 = l2.intersect(*r2) + + # self.assertEqual(len(i1.vertices()), len(i2.vertices())) + + def test_trim(self): + line = Edge.make_line((-2, 0), (2, 0)) + self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(0), (-1, 0, 0), 5) + self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(1), (1, 0, 0), 5) + with self.assertRaises(ValueError): + line.trim(0.75, 0.25) + + def test_trim_to_length(self): + + e1 = Edge.make_line((0, 0), (10, 10)) + e1_trim = e1.trim_to_length(0.0, 10) + self.assertAlmostEqual(e1_trim.length, 10, 5) + + e2 = Edge.make_circle(10, start_angle=0, end_angle=90) + e2_trim = e2.trim_to_length(0.5, 1) + self.assertAlmostEqual(e2_trim.length, 1, 5) + self.assertAlmostEqual( + e2_trim.position_at(0), Vector(10, 0, 0).rotate(Axis.Z, 45), 5 + ) + + e3 = Edge.make_spline( + [(0, 10, 0), (-4, 5, 2), (0, 0, 0)], tangents=[(-1, 0), (1, 0)] + ) + e3_trim = e3.trim_to_length(0, 7) + self.assertAlmostEqual(e3_trim.length, 7, 5) + + a4 = Axis((0, 0, 0), (1, 1, 1)) + e4_trim = Edge(a4).trim_to_length(0.5, 2) + self.assertAlmostEqual(e4_trim.length, 2, 5) + + def test_bezier(self): + with self.assertRaises(ValueError): + Edge.make_bezier((1, 1)) + cntl_pnts = [(1, 2, 3)] * 30 + with self.assertRaises(ValueError): + Edge.make_bezier(*cntl_pnts) + with self.assertRaises(ValueError): + Edge.make_bezier((0, 0, 0), (1, 1, 1), weights=[1.0]) + + bezier = Edge.make_bezier((0, 0), (0, 1), (1, 1), (1, 0)) + bbox = bezier.bounding_box() + self.assertAlmostEqual(bbox.min, (0, 0, 0), 5) + self.assertAlmostEqual(bbox.max, (1, 0.75, 0), 5) + + def test_mid_way(self): + mid = Edge.make_mid_way( + Edge.make_line((0, 0), (0, 1)), Edge.make_line((1, 0), (1, 1)), 0.25 + ) + self.assertAlmostEqual(mid.position_at(0), (0.25, 0, 0), 5) + self.assertAlmostEqual(mid.position_at(1), (0.25, 1, 0), 5) + + def test_distribute_locations2(self): + with self.assertRaises(ValueError): + Edge.make_circle(1).distribute_locations(1) + + locs = Edge.make_circle(1).distribute_locations(5, positions_only=True) + for i, loc in enumerate(locs): + self.assertAlmostEqual( + loc.position, + Vector(1, 0, 0).rotate(Axis.Z, i * 90).to_tuple(), + 5, + ) + self.assertAlmostEqual(loc.orientation, (0, 0, 0), 5) + + def test_find_tangent(self): + circle = Edge.make_circle(1) + parm = circle.find_tangent(135)[0] + self.assertAlmostEqual( + circle @ parm, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 + ) + line = Edge.make_line((0, 0), (1, 1)) + parm = line.find_tangent(45)[0] + self.assertAlmostEqual(parm, 0, 5) + parm = line.find_tangent(0) + self.assertEqual(len(parm), 0) + + def test_param_at_point(self): + u = Edge.make_circle(1).param_at_point((0, 1)) + self.assertAlmostEqual(u, 0.25, 5) + + u = 0.3 + edge = Edge.make_line((0, 0), (34, 56)) + pnt = edge.position_at(u) + self.assertAlmostEqual(edge.param_at_point(pnt), u, 5) + + ca = CenterArc((0, 0), 1, -200, 220).edge() + for u in [0.3, 1.0]: + pnt = ca.position_at(u) + self.assertAlmostEqual(ca.param_at_point(pnt), u, 5) + + ea = EllipticalCenterArc((15, 0), 10, 5, start_angle=90, end_angle=270).edge() + for u in [0.3, 0.9]: + pnt = ea.position_at(u) + self.assertAlmostEqual(ea.param_at_point(pnt), u, 5) + + with self.assertRaises(ValueError): + edge.param_at_point((-1, 1)) + + def test_conical_helix(self): + helix = Edge.make_helix(1, 4, 1, normal=(-1, 0, 0), angle=10, lefthand=True) + self.assertAlmostEqual(helix.bounding_box().min.X, -4, 5) + + def test_reverse(self): + e1 = Edge.make_line((0, 0), (1, 1)) + self.assertAlmostEqual(e1 @ 0.1, (0.1, 0.1, 0), 5) + self.assertAlmostEqual(e1.reversed() @ 0.1, (0.9, 0.9, 0), 5) + + e2 = Edge.make_circle(1, start_angle=0, end_angle=180) + e2r = e2.reversed() + self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) + + def test_init(self): + with self.assertRaises(TypeError): + Edge(direction=(1, 0, 0)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py new file mode 100644 index 0000000..3092833 --- /dev/null +++ b/tests/test_direct_api/test_face.py @@ -0,0 +1,452 @@ +""" +build123d imports + +name: test_face.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import os +import platform +import random +import unittest + +from build123d.build_common import Locations +from build123d.build_enums import Align, CenterOf, GeomType +from build123d.build_line import BuildLine +from build123d.build_part import BuildPart +from build123d.build_sketch import BuildSketch +from build123d.exporters3d import export_stl +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.importers import import_stl +from build123d.objects_curve import Polyline +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import Rectangle, RegularPolygon +from build123d.operations_generic import fillet +from build123d.operations_part import extrude +from build123d.operations_sketch import make_face +from build123d.topology import Edge, Face, Solid, Wire + + +class TestFace(unittest.TestCase): + def test_make_surface_from_curves(self): + bottom_edge = Edge.make_circle(radius=1, end_angle=90) + top_edge = Edge.make_circle(radius=1, plane=Plane((0, 0, 1)), end_angle=90) + curved = Face.make_surface_from_curves(bottom_edge, top_edge) + self.assertTrue(curved.is_valid()) + self.assertAlmostEqual(curved.area, math.pi / 2, 5) + self.assertAlmostEqual( + curved.normal_at(), (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 + ) + + bottom_wire = Wire.make_circle(1) + top_wire = Wire.make_circle(1, Plane((0, 0, 1))) + curved = Face.make_surface_from_curves(bottom_wire, top_wire) + self.assertTrue(curved.is_valid()) + self.assertAlmostEqual(curved.area, 2 * math.pi, 5) + + def test_center(self): + test_face = Face(Wire.make_polygon([(0, 0), (1, 0), (1, 1), (0, 0)])) + self.assertAlmostEqual(test_face.center(CenterOf.MASS), (2 / 3, 1 / 3, 0), 1) + self.assertAlmostEqual( + test_face.center(CenterOf.BOUNDING_BOX), + (0.5, 0.5, 0), + 5, + ) + + def test_face_volume(self): + rect = Face.make_rect(1, 1) + self.assertAlmostEqual(rect.volume, 0, 5) + + def test_chamfer_2d(self): + test_face = Face.make_rect(10, 10) + test_face = test_face.chamfer_2d( + distance=1, distance2=2, vertices=test_face.vertices() + ) + self.assertAlmostEqual(test_face.area, 100 - 4 * 0.5 * 1 * 2) + + def test_chamfer_2d_reference(self): + test_face = Face.make_rect(10, 10) + edge = test_face.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + test_face = test_face.chamfer_2d( + distance=1, distance2=2, vertices=[vertex], edge=edge + ) + self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 9) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 8) + + def test_chamfer_2d_reference_inverted(self): + test_face = Face.make_rect(10, 10) + edge = test_face.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + test_face = test_face.chamfer_2d( + distance=2, distance2=1, vertices=[vertex], edge=edge + ) + self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 8) + self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 9) + + def test_chamfer_2d_error_checking(self): + with self.assertRaises(ValueError): + test_face = Face.make_rect(10, 10) + edge = test_face.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + other_edge = test_face.edges().sort_by(Axis.Y)[-1] + test_face = test_face.chamfer_2d( + distance=1, distance2=2, vertices=[vertex], edge=other_edge + ) + + def test_make_rect(self): + test_face = Face.make_plane() + self.assertAlmostEqual(test_face.normal_at(), (0, 0, 1), 5) + + def test_length_width(self): + test_face = Face.make_rect(8, 10, Plane.XZ) + self.assertAlmostEqual(test_face.length, 8, 5) + self.assertAlmostEqual(test_face.width, 10, 5) + + def test_geometry(self): + box = Solid.make_box(1, 1, 2) + self.assertEqual(box.faces().sort_by(Axis.Z).last.geometry, "SQUARE") + self.assertEqual(box.faces().sort_by(Axis.Y).last.geometry, "RECTANGLE") + with BuildPart() as test: + with BuildSketch(): + RegularPolygon(1, 3) + extrude(amount=1) + self.assertEqual(test.faces().sort_by(Axis.Z).last.geometry, "POLYGON") + + def test_is_planar(self): + self.assertTrue(Face.make_rect(1, 1).is_planar) + self.assertFalse( + Solid.make_cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0].is_planar + ) + # Some of these faces have geom_type BSPLINE but are planar + mount = Solid.make_loft( + [ + Rectangle((1 + 16 + 4), 20, align=(Align.MIN, Align.CENTER)).wire(), + Pos(1, 0, 4) + * Rectangle(16, 20, align=(Align.MIN, Align.CENTER)).wire(), + ], + ) + self.assertTrue(all(f.is_planar for f in mount.faces())) + + def test_negate(self): + square = Face.make_rect(1, 1) + self.assertAlmostEqual(square.normal_at(), (0, 0, 1), 5) + flipped_square = -square + self.assertAlmostEqual(flipped_square.normal_at(), (0, 0, -1), 5) + + def test_offset(self): + bbox = Face.make_rect(2, 2, Plane.XY).offset(5).bounding_box() + self.assertAlmostEqual(bbox.min, (-1, -1, 5), 5) + self.assertAlmostEqual(bbox.max, (1, 1, 5), 5) + + def test_make_from_wires(self): + outer = Wire.make_circle(10) + inners = [ + Wire.make_circle(1).locate(Location((-2, 2, 0))), + Wire.make_circle(1).locate(Location((2, 2, 0))), + ] + happy = Face(outer, inners) + self.assertAlmostEqual(happy.area, math.pi * (10**2 - 2), 5) + + outer = Edge.make_circle(10, end_angle=180).to_wire() + with self.assertRaises(ValueError): + Face(outer, inners) + with self.assertRaises(ValueError): + Face(Wire.make_circle(10, Plane.XZ), inners) + + outer = Wire.make_circle(10) + inners = [ + Wire.make_circle(1).locate(Location((-2, 2, 0))), + Edge.make_circle(1, end_angle=180).to_wire().locate(Location((2, 2, 0))), + ] + with self.assertRaises(ValueError): + Face(outer, inners) + + def test_sew_faces(self): + patches = [ + Face.make_rect(1, 1, Plane((x, y, z))) + for x in range(2) + for y in range(2) + for z in range(3) + ] + random.shuffle(patches) + sheets = Face.sew_faces(patches) + self.assertEqual(len(sheets), 3) + self.assertEqual(len(sheets[0]), 4) + self.assertTrue(isinstance(sheets[0][0], Face)) + + def test_surface_from_array_of_points(self): + pnts = [ + [ + Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) + for x in range(11) + ] + for y in range(11) + ] + surface = Face.make_surface_from_array_of_points(pnts) + bbox = surface.bounding_box() + self.assertAlmostEqual(bbox.min, (0, 0, -1), 3) + self.assertAlmostEqual(bbox.max, (10, 10, 2), 2) + + def test_bezier_surface(self): + points = [ + [ + (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) + for x in range(-1, 2) + ] + for y in range(-1, 2) + ] + surface = Face.make_bezier_surface(points) + bbox = surface.bounding_box() + self.assertAlmostEqual(bbox.min, (-1, -1, 0), 3) + self.assertAlmostEqual(bbox.max, (+1, +1, +1), 1) + self.assertLess(bbox.max.Z, 1.0) + + weights = [ + [2 if x == 0 or y == 0 else 1 for x in range(-1, 2)] for y in range(-1, 2) + ] + surface = Face.make_bezier_surface(points, weights) + bbox = surface.bounding_box() + self.assertAlmostEqual(bbox.min, (-1, -1, 0), 3) + self.assertGreater(bbox.max.Z, 1.0) + + too_many_points = [ + [ + (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) + for x in range(-1, 27) + ] + for y in range(-1, 27) + ] + + with self.assertRaises(ValueError): + Face.make_bezier_surface([[(0, 0)]]) + with self.assertRaises(ValueError): + Face.make_bezier_surface(points, [[1, 1], [1, 1]]) + with self.assertRaises(ValueError): + Face.make_bezier_surface(too_many_points) + + def test_thicken(self): + pnts = [ + [ + Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) + for x in range(11) + ] + for y in range(11) + ] + surface = Face.make_surface_from_array_of_points(pnts) + solid = Solid.thicken(surface, 1) + self.assertAlmostEqual(solid.volume, 101.59, 2) + + square = Face.make_rect(10, 10) + bbox = Solid.thicken(square, 1, normal_override=(0, 0, -1)).bounding_box() + self.assertAlmostEqual(bbox.min, (-5, -5, -1), 5) + self.assertAlmostEqual(bbox.max, (5, 5, 0), 5) + + def test_make_holes(self): + radius = 10 + circumference = 2 * math.pi * radius + hex_diagonal = 4 * (circumference / 10) / 3 + cylinder = Solid.make_cylinder(radius, hex_diagonal * 5) + cylinder_wall: Face = cylinder.faces().filter_by(GeomType.PLANE, reverse=True)[ + 0 + ] + with BuildSketch(Plane.XZ.offset(radius)) as hex: + with Locations((0, hex_diagonal)): + RegularPolygon( + hex_diagonal * 0.4, 6, align=(Align.CENTER, Align.CENTER) + ) + hex_wire_vertical: Wire = hex.sketch.faces()[0].outer_wire() + + projected_wire: Wire = hex_wire_vertical.project_to_shape( + target_object=cylinder, center=(0, 0, hex_wire_vertical.center().Z) + )[0] + projected_wires = [ + projected_wire.rotate(Axis.Z, -90 + i * 360 / 10).translate( + (0, 0, (j + (i % 2) / 2) * hex_diagonal) + ) + for i in range(5) + for j in range(4 - i % 2) + ] + cylinder_walls_with_holes = cylinder_wall.make_holes(projected_wires) + self.assertTrue(cylinder_walls_with_holes.is_valid()) + self.assertLess(cylinder_walls_with_holes.area, cylinder_wall.area) + + def test_is_inside(self): + square = Face.make_rect(10, 10) + self.assertTrue(square.is_inside((1, 1))) + self.assertFalse(square.is_inside((20, 1))) + + def test_import_stl(self): + torus = Solid.make_torus(10, 1) + # exporter = Mesher() + # exporter.add_shape(torus) + # exporter.write("test_torus.stl") + export_stl(torus, "test_torus.stl") + imported_torus = import_stl("test_torus.stl") + # The torus from stl is tessellated therefore the areas will only be close + self.assertAlmostEqual(imported_torus.area, torus.area, 0) + os.remove("test_torus.stl") + + def test_is_coplanar(self): + square = Face.make_rect(1, 1, plane=Plane.XZ) + self.assertTrue(square.is_coplanar(Plane.XZ)) + self.assertTrue((-square).is_coplanar(Plane.XZ)) + self.assertFalse(square.is_coplanar(Plane.XY)) + surface: Face = Solid.make_sphere(1).faces()[0] + self.assertFalse(surface.is_coplanar(Plane.XY)) + + def test_center_location(self): + square = Face.make_rect(1, 1, plane=Plane.XZ) + cl = square.center_location + self.assertAlmostEqual(cl.position, (0, 0, 0), 5) + self.assertAlmostEqual(Plane(cl).z_dir, Plane.XZ.z_dir, 5) + + def test_position_at(self): + square = Face.make_rect(2, 2, plane=Plane.XZ.offset(1)) + p = square.position_at(0.25, 0.75) + self.assertAlmostEqual(p, (-0.5, -1.0, 0.5), 5) + + def test_location_at(self): + bottom = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.Z)[0] + loc = bottom.location_at(0.5, 0.5) + self.assertAlmostEqual(loc.position, (0.5, 1, 0), 5) + self.assertAlmostEqual(loc.orientation, (-180, 0, -180), 5) + + front = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.X)[0] + loc = front.location_at(0.5, 0.5, x_dir=(0, 0, 1)) + self.assertAlmostEqual(loc.position, (0.0, 1.0, 1.5), 5) + self.assertAlmostEqual(loc.orientation, (0, -90, 0), 5) + + def test_make_surface(self): + corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] + net_exterior = Wire( + [ + Edge.make_line(corners[3], corners[1]), + Edge.make_line(corners[1], corners[0]), + Edge.make_line(corners[0], corners[2]), + Edge.make_three_point_arc( + corners[2], + (corners[2] + corners[3]) / 2 - Vector(0, 0, 3), + corners[3], + ), + ] + ) + surface = Face.make_surface( + net_exterior, + surface_points=[Vector(0, 0, -5)], + ) + hole_flat = Wire.make_circle(10) + hole = hole_flat.project_to_shape(surface, (0, 0, -1))[0] + surface = Face.make_surface( + exterior=net_exterior, + surface_points=[Vector(0, 0, -5)], + interior_wires=[hole], + ) + self.assertTrue(surface.is_valid()) + self.assertEqual(surface.geom_type, GeomType.BSPLINE) + bbox = surface.bounding_box() + self.assertAlmostEqual(bbox.min, (-50.5, -24.5, -5.113393280136395), 5) + self.assertAlmostEqual(bbox.max, (50.5, 24.5, 0), 5) + + # With no surface point + surface = Face.make_surface(net_exterior) + bbox = surface.bounding_box() + self.assertAlmostEqual(bbox.min, (-50.5, -24.5, -3), 5) + self.assertAlmostEqual(bbox.max, (50.5, 24.5, 0), 5) + + # Exterior Edge + surface = Face.make_surface([Edge.make_circle(50)], surface_points=[(0, 0, -5)]) + bbox = surface.bounding_box() + self.assertAlmostEqual(bbox.min, (-50, -50, -5), 5) + self.assertAlmostEqual(bbox.max, (50, 50, 0), 5) + + def test_make_surface_error_checking(self): + with self.assertRaises(ValueError): + Face.make_surface(Edge.make_line((0, 0), (1, 0))) + + with self.assertRaises(RuntimeError): + Face.make_surface([Edge.make_line((0, 0), (1, 0))]) + + if platform.system() != "Darwin": + with self.assertRaises(RuntimeError): + Face.make_surface( + [Edge.make_circle(50)], surface_points=[(0, 0, -50), (0, 0, 50)] + ) + + with self.assertRaises(RuntimeError): + Face.make_surface( + [Edge.make_circle(50)], + interior_wires=[Wire.make_circle(5, Plane.XZ)], + ) + + def test_sweep(self): + edge = Edge.make_line((1, 0), (2, 0)) + path = Wire.make_circle(1) + circle_with_hole = Face.sweep(edge, path) + self.assertTrue(isinstance(circle_with_hole, Face)) + self.assertAlmostEqual(circle_with_hole.area, math.pi * (2**2 - 1**1), 5) + with self.assertRaises(ValueError): + Face.sweep(edge, Polyline((0, 0), (0.1, 0), (0.2, 0.1))) + + def test_to_arcs(self): + with BuildSketch() as bs: + with BuildLine() as bl: + Polyline((0, 0), (1, 0), (1.5, 0.5), (2, 0), (2, 1), (0, 1), (0, 0)) + fillet(bl.vertices(), radius=0.1) + make_face() + smooth = bs.faces()[0] + fragmented = smooth.to_arcs() + self.assertLess(len(smooth.edges()), len(fragmented.edges())) + + def test_outer_wire(self): + face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() + self.assertAlmostEqual(face.outer_wire().length, 4, 5) + + def test_wire(self): + face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() + with self.assertWarns(UserWarning): + outer = face.wire() + self.assertAlmostEqual(outer.length, 4, 5) + + def test_constructor(self): + with self.assertRaises(ValueError): + Face(bob="fred") + + def test_normal_at(self): + face = Face.make_rect(1, 1) + self.assertAlmostEqual(face.normal_at(0, 0), (0, 0, 1), 5) + self.assertAlmostEqual(face.normal_at(face.position_at(0, 0)), (0, 0, 1), 5) + with self.assertRaises(ValueError): + face.normal_at(0) + with self.assertRaises(ValueError): + face.normal_at(center=(0, 0)) + face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] + self.assertAlmostEqual(face.normal_at(0, 1), (1, 0, 0), 5) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_functions.py b/tests/test_direct_api/test_functions.py new file mode 100644 index 0000000..a8d7002 --- /dev/null +++ b/tests/test_direct_api/test_functions.py @@ -0,0 +1,105 @@ +""" +build123d imports + +name: test_functions.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.geometry import Plane, Vector +from build123d.objects_part import Box +from build123d.topology import ( + Compound, + Face, + Solid, + edges_to_wires, + polar, + new_edges, + delta, + unwrap_topods_compound, +) + + +class TestFunctions(unittest.TestCase): + def test_edges_to_wires(self): + square_edges = Face.make_rect(1, 1).edges() + rectangle_edges = Face.make_rect(2, 1, Plane((5, 0))).edges() + wires = edges_to_wires(square_edges + rectangle_edges) + self.assertEqual(len(wires), 2) + self.assertAlmostEqual(wires[0].length, 4, 5) + self.assertAlmostEqual(wires[1].length, 6, 5) + + def test_polar(self): + pnt = polar(1, 30) + self.assertAlmostEqual(pnt[0], math.sqrt(3) / 2, 5) + self.assertAlmostEqual(pnt[1], 0.5, 5) + + def test_new_edges(self): + c = Solid.make_cylinder(1, 5) + s = Solid.make_sphere(2) + s_minus_c = s - c + seams = new_edges(c, s, combined=s_minus_c) + self.assertEqual(len(seams), 1) + self.assertAlmostEqual(seams[0].radius, 1, 5) + + def test_delta(self): + cyl = Solid.make_cylinder(1, 5) + sph = Solid.make_sphere(2) + con = Solid.make_cone(2, 1, 2) + plug = delta([cyl, sph, con], [sph, con]) + self.assertEqual(len(plug), 1) + self.assertEqual(plug[0], cyl) + + def test_parse_intersect_args(self): + + with self.assertRaises(TypeError): + Vector(1, 1, 1) & ("x", "y", "z") + + def test_unwrap_topods_compound(self): + # Complex Compound + b1 = Box(1, 1, 1).solid() + b2 = Box(2, 2, 2).solid() + c1 = Compound([b1, b2]) + c2 = Compound([b1, c1]) + c3 = Compound([c2]) + c4 = Compound([c3]) + self.assertEqual(c4.wrapped.NbChildren(), 1) + c5 = Compound(unwrap_topods_compound(c4.wrapped, False)) + self.assertEqual(c5.wrapped.NbChildren(), 2) + + # unwrap fully + c0 = Compound([b1]) + c1 = Compound([c0]) + result = Compound.cast(unwrap_topods_compound(c1.wrapped, True)) + self.assertTrue(isinstance(result, Solid)) + + # unwrap not fully + result = Compound.cast(unwrap_topods_compound(c1.wrapped, False)) + self.assertTrue(isinstance(result, Compound)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_group_by.py b/tests/test_direct_api/test_group_by.py new file mode 100644 index 0000000..2e024e8 --- /dev/null +++ b/tests/test_direct_api/test_group_by.py @@ -0,0 +1,69 @@ +""" +build123d imports + +name: test_group_by.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import pprint +import unittest + +from build123d.geometry import Axis +from build123d.topology import Solid + + +class TestGroupBy(unittest.TestCase): + + def setUp(self): + # Ensure the class variable is in its default state before each test + self.v = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) + + def test_str(self): + self.assertEqual( + str(self.v), + f"""[[Vertex(0.0, 0.0, 0.0), + Vertex(0.0, 1.0, 0.0), + Vertex(1.0, 0.0, 0.0), + Vertex(1.0, 1.0, 0.0)], + [Vertex(0.0, 0.0, 1.0), + Vertex(0.0, 1.0, 1.0), + Vertex(1.0, 0.0, 1.0), + Vertex(1.0, 1.0, 1.0)]]""", + ) + + def test_repr(self): + self.assertEqual( + repr(self.v), + "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", + ) + + def test_pp(self): + self.assertEqual( + pprint.pformat(self.v), + "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", + ) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_import_export.py b/tests/test_direct_api/test_import_export.py new file mode 100644 index 0000000..9b22dd5 --- /dev/null +++ b/tests/test_direct_api/test_import_export.py @@ -0,0 +1,67 @@ +""" +build123d imports + +name: test_import_export.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import os +import unittest + +from build123d.exporters3d import export_brep, export_step +from build123d.importers import import_brep, import_step, import_stl +from build123d.mesher import Mesher +from build123d.topology import Solid + + +class TestImportExport(unittest.TestCase): + def test_import_export(self): + original_box = Solid.make_box(1, 1, 1) + export_step(original_box, "test_box.step") + step_box = import_step("test_box.step") + self.assertTrue(step_box.is_valid()) + self.assertAlmostEqual(step_box.volume, 1, 5) + export_brep(step_box, "test_box.brep") + brep_box = import_brep("test_box.brep") + self.assertTrue(brep_box.is_valid()) + self.assertAlmostEqual(brep_box.volume, 1, 5) + os.remove("test_box.step") + os.remove("test_box.brep") + with self.assertRaises(FileNotFoundError): + step_box = import_step("test_box.step") + + def test_import_stl(self): + # export solid + original_box = Solid.make_box(1, 2, 3) + exporter = Mesher() + exporter.add_shape(original_box) + exporter.write("test.stl") + + # import as face + stl_box = import_stl("test.stl") + self.assertAlmostEqual(stl_box.position, (0, 0, 0), 5) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_jupyter.py b/tests/test_direct_api/test_jupyter.py new file mode 100644 index 0000000..51053a4 --- /dev/null +++ b/tests/test_direct_api/test_jupyter.py @@ -0,0 +1,57 @@ +""" +build123d imports + +name: test_jupyter.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import Vector +from build123d.jupyter_tools import to_vtkpoly_string, display +from build123d.topology import Solid + + +class TestJupyter(unittest.TestCase): + def test_repr_javascript(self): + shape = Solid.make_box(1, 1, 1) + + # Test no exception on rendering to js + js1 = shape._repr_javascript_() + + assert "function render" in js1 + + def test_display_error(self): + with self.assertRaises(AttributeError): + display(Vector()) + + with self.assertRaises(ValueError): + to_vtkpoly_string("invalid") + + with self.assertRaises(ValueError): + display("invalid") + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py new file mode 100644 index 0000000..95fd94c --- /dev/null +++ b/tests/test_direct_api/test_location.py @@ -0,0 +1,400 @@ +""" +build123d imports + +name: test_location.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# Always equal to any other object, to test that __eq__ cooperation is working +import copy +import json +import math +import os +import unittest +from random import uniform + +import numpy as np +from OCP.gp import ( + gp_Ax1, + gp_Dir, + gp_EulerSequence, + gp_Pnt, + gp_Quaternion, + gp_Trsf, + gp_Vec, +) +from build123d.build_common import GridLocations +from build123d.build_enums import Extrinsic, Intrinsic +from build123d.geometry import Axis, Location, LocationEncoder, Plane, Pos, Vector +from build123d.topology import Edge, Solid, Vertex + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +class TestLocation(unittest.TestCase): + def test_location(self): + loc0 = Location() + T = loc0.wrapped.Transformation().TranslationPart() + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 0), 1e-6) + angle = math.degrees( + loc0.wrapped.Transformation().GetRotation().GetRotationAngle() + ) + self.assertAlmostEqual(0, angle) + + # Tuple + loc0 = Location((0, 0, 1)) + + T = loc0.wrapped.Transformation().TranslationPart() + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + + # List + loc0 = Location([0, 0, 1]) + + T = loc0.wrapped.Transformation().TranslationPart() + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + + # Vector + loc1 = Location(Vector(0, 0, 1)) + + T = loc1.wrapped.Transformation().TranslationPart() + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + + # rotation + translation + loc2 = Location(Vector(0, 0, 1), Vector(0, 0, 1), 45) + + angle = math.degrees( + loc2.wrapped.Transformation().GetRotation().GetRotationAngle() + ) + self.assertAlmostEqual(45, angle) + + # gp_Trsf + T = gp_Trsf() + T.SetTranslation(gp_Vec(0, 0, 1)) + loc3 = Location(T) + + self.assertEqual( + loc1.wrapped.Transformation().TranslationPart().Z(), + loc3.wrapped.Transformation().TranslationPart().Z(), + ) + + # Test creation from the OCP.gp.gp_Trsf object + loc4 = Location(gp_Trsf()) + np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 0), 1e-7) + np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) + + # Test creation from Plane and Vector + loc4 = Location(Plane.XY, (0, 0, 1)) + np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 1), 1e-7) + np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) + + # Test composition + loc4 = Location((0, 0, 0), Vector(0, 0, 1), 15) + + loc5 = loc1 * loc4 + loc6 = loc4 * loc4 + loc7 = loc4**2 + + T = loc5.wrapped.Transformation().TranslationPart() + np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + + angle5 = math.degrees( + loc5.wrapped.Transformation().GetRotation().GetRotationAngle() + ) + self.assertAlmostEqual(15, angle5) + + angle6 = math.degrees( + loc6.wrapped.Transformation().GetRotation().GetRotationAngle() + ) + self.assertAlmostEqual(30, angle6) + + angle7 = math.degrees( + loc7.wrapped.Transformation().GetRotation().GetRotationAngle() + ) + self.assertAlmostEqual(30, angle7) + + # Test error handling on creation + with self.assertRaises(TypeError): + Location("xy_plane") + + # Test that the computed rotation matrix and intrinsic euler angles return the same + + about_x = uniform(-2 * math.pi, 2 * math.pi) + about_y = uniform(-2 * math.pi, 2 * math.pi) + about_z = uniform(-2 * math.pi, 2 * math.pi) + + rot_x = gp_Trsf() + rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), about_x) + rot_y = gp_Trsf() + rot_y.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), about_y) + rot_z = gp_Trsf() + rot_z.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), about_z) + loc1 = Location(rot_x * rot_y * rot_z) + + q = gp_Quaternion() + q.SetEulerAngles( + gp_EulerSequence.gp_Intrinsic_XYZ, + about_x, + about_y, + about_z, + ) + t = gp_Trsf() + t.SetRotationPart(q) + loc2 = Location(t) + + np.testing.assert_allclose(loc1.to_tuple()[0], loc2.to_tuple()[0], 1e-6) + np.testing.assert_allclose(loc1.to_tuple()[1], loc2.to_tuple()[1], 1e-6) + + loc1 = Location((1, 2), 34) + np.testing.assert_allclose(loc1.to_tuple()[0], (1, 2, 0), 1e-6) + np.testing.assert_allclose(loc1.to_tuple()[1], (0, 0, 34), 1e-6) + + rot_angles = (-115.00, 35.00, -135.00) + loc2 = Location((1, 2, 3), rot_angles) + np.testing.assert_allclose(loc2.to_tuple()[0], (1, 2, 3), 1e-6) + np.testing.assert_allclose(loc2.to_tuple()[1], rot_angles, 1e-6) + + loc3 = Location(loc2) + np.testing.assert_allclose(loc3.to_tuple()[0], (1, 2, 3), 1e-6) + np.testing.assert_allclose(loc3.to_tuple()[1], rot_angles, 1e-6) + + def test_location_parameters(self): + loc = Location((10, 20, 30)) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + + loc = Location((10, 20, 30), (10, 20, 30)) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) + + loc = Location((10, 20, 30), (10, 20, 30), Intrinsic.XYZ) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) + + loc = Location((10, 20, 30), (30, 20, 10), Extrinsic.ZYX) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) + + with self.assertRaises(TypeError): + Location(x=10) + + with self.assertRaises(TypeError): + Location((10, 20, 30), (30, 20, 10), (10, 20, 30)) + + with self.assertRaises(TypeError): + Location(Intrinsic.XYZ) + + def test_location_repr_and_str(self): + self.assertEqual( + repr(Location()), "(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))" + ) + self.assertEqual( + str(Location()), + "Location: (position=(0.00, 0.00, 0.00), orientation=(-0.00, 0.00, -0.00))", + ) + loc = Location((1, 2, 3), (33, 45, 67)) + self.assertEqual( + str(loc), + "Location: (position=(1.00, 2.00, 3.00), orientation=(33.00, 45.00, 67.00))", + ) + + def test_location_inverted(self): + loc = Location(Plane.XZ) + self.assertAlmostEqual(loc.inverse().orientation, (-90, 0, 0), 6) + + def test_set_position(self): + loc = Location(Plane.XZ) + loc.position = (1, 2, 3) + self.assertAlmostEqual(loc.position, (1, 2, 3), 6) + self.assertAlmostEqual(loc.orientation, (90, 0, 0), 6) + + def test_set_orientation(self): + loc = Location((1, 2, 3), (90, 0, 0)) + loc.orientation = (-90, 0, 0) + self.assertAlmostEqual(loc.position, (1, 2, 3), 6) + self.assertAlmostEqual(loc.orientation, (-90, 0, 0), 6) + + def test_copy(self): + loc1 = Location((1, 2, 3), (90, 45, 22.5)) + loc2 = copy.copy(loc1) + loc3 = copy.deepcopy(loc1) + self.assertAlmostEqual(loc1.position, loc2.position.to_tuple(), 6) + self.assertAlmostEqual(loc1.orientation, loc2.orientation.to_tuple(), 6) + self.assertAlmostEqual(loc1.position, loc3.position.to_tuple(), 6) + self.assertAlmostEqual(loc1.orientation, loc3.orientation.to_tuple(), 6) + + def test_to_axis(self): + axis = Location((1, 2, 3), (-90, 0, 0)).to_axis() + self.assertAlmostEqual(axis.position, (1, 2, 3), 6) + self.assertAlmostEqual(axis.direction, (0, 1, 0), 6) + + def test_equal(self): + loc = Location((1, 2, 3), (4, 5, 6)) + same = Location((1, 2, 3), (4, 5, 6)) + + self.assertEqual(loc, same) + self.assertEqual(loc, AlwaysEqual()) + + def test_not_equal(self): + loc = Location((1, 2, 3), (40, 50, 60)) + diff_position = Location((3, 2, 1), (40, 50, 60)) + diff_orientation = Location((1, 2, 3), (60, 50, 40)) + + self.assertNotEqual(loc, diff_position) + self.assertNotEqual(loc, diff_orientation) + self.assertNotEqual(loc, object()) + + def test_neg(self): + loc = Location((1, 2, 3), (0, 35, 127)) + n_loc = -loc + self.assertAlmostEqual(n_loc.position, (1, 2, 3), 5) + self.assertAlmostEqual(n_loc.orientation, (180, -35, -127), 5) + + def test_mult_iterable(self): + locs = Location((1, 2, 0)) * GridLocations(4, 4, 2, 1) + self.assertAlmostEqual(locs[0].position, (-1, 2, 0), 5) + self.assertAlmostEqual(locs[1].position, (3, 2, 0), 5) + + def test_as_json(self): + data_dict = { + "part1": { + "joint_one": Location((1, 2, 3), (4, 5, 6)), + "joint_two": Location((7, 8, 9), (10, 11, 12)), + }, + "part2": { + "joint_one": Location((13, 14, 15), (16, 17, 18)), + "joint_two": Location((19, 20, 21), (22, 23, 24)), + }, + } + + # Serializing json with custom Location encoder + json_object = json.dumps(data_dict, indent=4, cls=LocationEncoder) + + # Writing to sample.json + with open("sample.json", "w") as outfile: + outfile.write(json_object) + + # Reading from sample.json + with open("sample.json") as infile: + read_json = json.load(infile, object_hook=LocationEncoder.location_hook) + + # Validate locations + for key, value in read_json.items(): + for k, v in value.items(): + if key == "part1" and k == "joint_one": + self.assertAlmostEqual(v.position, (1, 2, 3), 5) + elif key == "part1" and k == "joint_two": + self.assertAlmostEqual(v.position, (7, 8, 9), 5) + elif key == "part2" and k == "joint_one": + self.assertAlmostEqual(v.position, (13, 14, 15), 5) + elif key == "part2" and k == "joint_two": + self.assertAlmostEqual(v.position, (19, 20, 21), 5) + else: + self.assertTrue(False) + os.remove("sample.json") + + def test_intersection(self): + e = Edge.make_line((0, 0, 0), (1, 1, 1)) + l0 = e.location_at(0) + l1 = e.location_at(1) + self.assertIsNone(l0 & l1) + self.assertEqual(l1 & l1, l1) + + i = l1 & Vector(1, 1, 1) + self.assertTrue(isinstance(i, Vector)) + self.assertAlmostEqual(i, (1, 1, 1), 5) + + i = l1 & Axis((0.5, 0.5, 0.5), (1, 1, 1)) + self.assertTrue(isinstance(i, Location)) + self.assertEqual(i, l1) + + p = Plane.XY.rotated((45, 0, 0)).shift_origin((1, 0, 0)) + l = Location((1, 0, 0), (1, 0, 0), 45) + i = l & p + self.assertTrue(isinstance(i, Location)) + self.assertAlmostEqual(i.position, (1, 0, 0), 5) + self.assertAlmostEqual(i.orientation, l.orientation, 5) + + b = Solid.make_box(1, 1, 1) + l = Location((0.5, 0.5, 0.5), (1, 0, 0), 45) + i = (l & b).vertex() + self.assertTrue(isinstance(i, Vertex)) + self.assertAlmostEqual(Vector(i), (0.5, 0.5, 0.5), 5) + + e1 = Edge.make_line((0, -1), (2, 1)) + e2 = Edge.make_line((0, 1), (2, -1)) + e3 = Edge.make_line((0, 0), (2, 0)) + + i = e1.intersect(e2, e3) + self.assertTrue(isinstance(i, Vertex)) + self.assertAlmostEqual(Vector(i), (1, 0, 0), 5) + + e4 = Edge.make_line((1, -1), (1, 1)) + e5 = Edge.make_line((2, -1), (2, 1)) + i = e3.intersect(e4, e5) + self.assertIsNone(i) + + self.assertIsNone(b.intersect(b.moved(Pos(X=10)))) + + # Look for common vertices + e1 = Edge.make_line((0, 0), (1, 0)) + e2 = Edge.make_line((1, 0), (1, 1)) + e3 = Edge.make_line((1, 0), (2, 0)) + i = e1.intersect(e2) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + i = e1.intersect(e3) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + + # Intersect with plane + e1 = Edge.make_line((0, 0), (2, 0)) + p1 = Plane.YZ.offset(1) + i = e1.intersect(p1) + self.assertEqual(len(i.vertices()), 1) + self.assertEqual(tuple(i.vertex()), (1, 0, 0)) + + e2 = Edge.make_line(p1.origin, p1.origin + 2 * p1.x_dir) + i = e2.intersect(p1) + self.assertEqual(len(i.vertices()), 2) + self.assertEqual(len(i.edges()), 1) + self.assertAlmostEqual(i.edge().length, 2, 5) + + with self.assertRaises(ValueError): + e1.intersect("line") + + def test_pos(self): + with self.assertRaises(TypeError): + Pos(0, "foo") + self.assertEqual(Pos(1, 2, 3).position, Vector(1, 2, 3)) + self.assertEqual(Pos((1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(v=(1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(X=1, Y=2, Z=3).position, Vector(1, 2, 3)) + self.assertEqual(Pos(Vector(1, 2, 3)).position, Vector(1, 2, 3)) + self.assertEqual(Pos(1, Y=2, Z=3).position, Vector(1, 2, 3)) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_matrix.py b/tests/test_direct_api/test_matrix.py new file mode 100644 index 0000000..09501b5 --- /dev/null +++ b/tests/test_direct_api/test_matrix.py @@ -0,0 +1,194 @@ +""" +build123d imports + +name: test_matrix.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import copy +import math +import unittest + +from OCP.gp import gp_Ax1, gp_Dir, gp_Pnt, gp_Trsf +from build123d.geometry import Axis, Matrix, Vector + + +class TestMatrix(unittest.TestCase): + def test_matrix_creation_and_access(self): + def matrix_vals(m): + return [[m[r, c] for c in range(4)] for r in range(4)] + + # default constructor creates a 4x4 identity matrix + m = Matrix() + identity = [ + [1.0, 0.0, 0.0, 0.0], + [0.0, 1.0, 0.0, 0.0], + [0.0, 0.0, 1.0, 0.0], + [0.0, 0.0, 0.0, 1.0], + ] + self.assertEqual(identity, matrix_vals(m)) + + vals4x4 = [ + [1.0, 0.0, 0.0, 1.0], + [0.0, 1.0, 0.0, 2.0], + [0.0, 0.0, 1.0, 3.0], + [0.0, 0.0, 0.0, 1.0], + ] + vals4x4_tuple = tuple(tuple(r) for r in vals4x4) + + # test constructor with 16-value input + m = Matrix(vals4x4) + self.assertEqual(vals4x4, matrix_vals(m)) + m = Matrix(vals4x4_tuple) + self.assertEqual(vals4x4, matrix_vals(m)) + + # test constructor with 12-value input (the last 4 are an implied + # [0,0,0,1]) + m = Matrix(vals4x4[:3]) + self.assertEqual(vals4x4, matrix_vals(m)) + m = Matrix(vals4x4_tuple[:3]) + self.assertEqual(vals4x4, matrix_vals(m)) + + # Test 16-value input with invalid values for the last 4 + invalid = [ + [1.0, 0.0, 0.0, 1.0], + [0.0, 1.0, 0.0, 2.0], + [0.0, 0.0, 1.0, 3.0], + [1.0, 2.0, 3.0, 4.0], + ] + with self.assertRaises(ValueError): + Matrix(invalid) + # Test input with invalid type + with self.assertRaises(TypeError): + Matrix("invalid") + # Test input with invalid size / nested types + with self.assertRaises(TypeError): + Matrix([[1, 2, 3, 4], [1, 2, 3], [1, 2, 3, 4]]) + with self.assertRaises(TypeError): + Matrix([1, 2, 3]) + + # Invalid sub-type + with self.assertRaises(TypeError): + Matrix([[1, 2, 3, 4], "abc", [1, 2, 3, 4]]) + + # test out-of-bounds access + m = Matrix() + with self.assertRaises(IndexError): + m[0, 4] + with self.assertRaises(IndexError): + m[4, 0] + with self.assertRaises(IndexError): + m["ab"] + + # test __repr__ methods + m = Matrix(vals4x4) + mRepr = "Matrix([[1.0, 0.0, 0.0, 1.0],\n [0.0, 1.0, 0.0, 2.0],\n [0.0, 0.0, 1.0, 3.0],\n [0.0, 0.0, 0.0, 1.0]])" + self.assertEqual(repr(m), mRepr) + self.assertEqual(str(eval(repr(m))), mRepr) + + def test_matrix_functionality(self): + # Test rotate methods + def matrix_almost_equal(m, target_matrix): + for r, row in enumerate(target_matrix): + for c, target_value in enumerate(row): + self.assertAlmostEqual(m[r, c], target_value) + + root_3_over_2 = math.sqrt(3) / 2 + m_rotate_x_30 = [ + [1, 0, 0, 0], + [0, root_3_over_2, -1 / 2, 0], + [0, 1 / 2, root_3_over_2, 0], + [0, 0, 0, 1], + ] + mx = Matrix() + mx.rotate(Axis.X, math.radians(30)) + matrix_almost_equal(mx, m_rotate_x_30) + + m_rotate_y_30 = [ + [root_3_over_2, 0, 1 / 2, 0], + [0, 1, 0, 0], + [-1 / 2, 0, root_3_over_2, 0], + [0, 0, 0, 1], + ] + my = Matrix() + my.rotate(Axis.Y, math.radians(30)) + matrix_almost_equal(my, m_rotate_y_30) + + m_rotate_z_30 = [ + [root_3_over_2, -1 / 2, 0, 0], + [1 / 2, root_3_over_2, 0, 0], + [0, 0, 1, 0], + [0, 0, 0, 1], + ] + mz = Matrix() + mz.rotate(Axis.Z, math.radians(30)) + matrix_almost_equal(mz, m_rotate_z_30) + + # Test matrix multiply vector + v = Vector(1, 0, 0) + self.assertAlmostEqual(mz.multiply(v), (root_3_over_2, 1 / 2, 0), 7) + + # Test matrix multiply matrix + m_rotate_xy_30 = [ + [root_3_over_2, 0, 1 / 2, 0], + [1 / 4, root_3_over_2, -root_3_over_2 / 2, 0], + [-root_3_over_2 / 2, 1 / 2, 3 / 4, 0], + [0, 0, 0, 1], + ] + mxy = mx.multiply(my) + matrix_almost_equal(mxy, m_rotate_xy_30) + + # Test matrix inverse + vals4x4 = [[1, 2, 3, 4], [5, 1, 6, 7], [8, 9, 1, 10], [0, 0, 0, 1]] + vals4x4_invert = [ + [-53 / 144, 25 / 144, 1 / 16, -53 / 144], + [43 / 144, -23 / 144, 1 / 16, -101 / 144], + [37 / 144, 7 / 144, -1 / 16, -107 / 144], + [0, 0, 0, 1], + ] + m = Matrix(vals4x4).inverse() + matrix_almost_equal(m, vals4x4_invert) + + # Test matrix created from transfer function + rot_x = gp_Trsf() + θ = math.pi + rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), θ) + m = Matrix(rot_x) + rot_x_matrix = [ + [1, 0, 0, 0], + [0, math.cos(θ), -math.sin(θ), 0], + [0, math.sin(θ), math.cos(θ), 0], + [0, 0, 0, 1], + ] + matrix_almost_equal(m, rot_x_matrix) + + # Test copy + m2 = copy.copy(m) + matrix_almost_equal(m2, rot_x_matrix) + m3 = copy.deepcopy(m) + matrix_almost_equal(m3, rot_x_matrix) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py new file mode 100644 index 0000000..ebd1744 --- /dev/null +++ b/tests/test_direct_api/test_mixin1_d.py @@ -0,0 +1,318 @@ +""" +build123d imports + +name: test_mixin1_d.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.build_enums import CenterOf, GeomType, PositionMode, Side, SortBy +from build123d.geometry import Axis, Location, Plane, Vector +from build123d.objects_part import Box, Cylinder +from build123d.topology import Compound, Edge, Face, Wire + + +class TestMixin1D(unittest.TestCase): + """Test the add in methods""" + + def test_position_at(self): + self.assertAlmostEqual( + Edge.make_line((0, 0, 0), (1, 1, 1)).position_at(0.5), + (0.5, 0.5, 0.5), + 5, + ) + # Not sure what PARAMETER mode returns - but it's in the ballpark + point = ( + Edge.make_line((0, 0, 0), (1, 1, 1)) + .position_at(0.5, position_mode=PositionMode.PARAMETER) + .to_tuple() + ) + self.assertTrue(all([0.0 < v < 1.0 for v in point])) + + wire = Wire([Edge.make_line((0, 0, 0), (10, 0, 0))]) + self.assertAlmostEqual(wire.position_at(0.3), (3, 0, 0), 5) + self.assertAlmostEqual( + wire.position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 + ) + self.assertAlmostEqual(wire.edge().position_at(0.3), (3, 0, 0), 5) + self.assertAlmostEqual( + wire.edge().position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 + ) + + circle_wire = Wire( + [ + Edge.make_circle(1, start_angle=0, end_angle=180), + Edge.make_circle(1, start_angle=180, end_angle=360), + ] + ) + p1 = circle_wire.position_at(math.pi, position_mode=PositionMode.LENGTH) + p2 = circle_wire.position_at(math.pi / circle_wire.length) + self.assertAlmostEqual(p1, (-1, 0, 0), 14) + self.assertAlmostEqual(p2, (-1, 0, 0), 14) + self.assertAlmostEqual(p1, p2, 14) + + circle_edge = Edge.make_circle(1) + p3 = circle_edge.position_at(math.pi, position_mode=PositionMode.LENGTH) + p4 = circle_edge.position_at(math.pi / circle_edge.length) + self.assertAlmostEqual(p3, (-1, 0, 0), 14) + self.assertAlmostEqual(p4, (-1, 0, 0), 14) + self.assertAlmostEqual(p3, p4, 14) + + circle = Wire( + [ + Edge.make_circle(2, start_angle=0, end_angle=180), + Edge.make_circle(2, start_angle=180, end_angle=360), + ] + ) + self.assertAlmostEqual( + circle.position_at(0.5), + (-2, 0, 0), + 5, + ) + self.assertAlmostEqual( + circle.position_at(2 * math.pi, position_mode=PositionMode.LENGTH), + (-2, 0, 0), + 5, + ) + + def test_positions(self): + e = Edge.make_line((0, 0, 0), (1, 1, 1)) + distances = [i / 4 for i in range(3)] + pts = e.positions(distances) + for i, position in enumerate(pts): + self.assertAlmostEqual(position, (i / 4, i / 4, i / 4), 5) + + def test_tangent_at(self): + self.assertAlmostEqual( + Edge.make_circle(1, start_angle=0, end_angle=90).tangent_at(1.0), + (-1, 0, 0), + 5, + ) + tangent = ( + Edge.make_circle(1, start_angle=0, end_angle=90) + .tangent_at(0.0, position_mode=PositionMode.PARAMETER) + .to_tuple() + ) + self.assertTrue(all([0.0 <= v <= 1.0 for v in tangent])) + + self.assertAlmostEqual( + Edge.make_circle(1, start_angle=0, end_angle=180).tangent_at( + math.pi / 2, position_mode=PositionMode.LENGTH + ), + (-1, 0, 0), + 5, + ) + + def test_tangent_at_point(self): + circle = Wire( + [ + Edge.make_circle(1, start_angle=0, end_angle=180), + Edge.make_circle(1, start_angle=180, end_angle=360), + ] + ) + pnt_on_circle = Vector(math.cos(math.pi / 4), math.sin(math.pi / 4)) + tan = circle.tangent_at(pnt_on_circle) + self.assertAlmostEqual(tan, (-math.sqrt(2) / 2, math.sqrt(2) / 2), 5) + + def test_tangent_at_by_length(self): + circle = Edge.make_circle(1) + tan = circle.tangent_at(circle.length * 0.5, position_mode=PositionMode.LENGTH) + self.assertAlmostEqual(tan, (0, -1), 5) + + def test_tangent_at_error(self): + with self.assertRaises(ValueError): + Edge.make_circle(1).tangent_at("start") + + def test_normal(self): + self.assertAlmostEqual( + Edge.make_circle( + 1, Plane(origin=(0, 0, 0), z_dir=(1, 0, 0)), start_angle=0, end_angle=60 + ).normal(), + (1, 0, 0), + 5, + ) + self.assertAlmostEqual( + Edge.make_ellipse( + 1, + 0.5, + Plane(origin=(0, 0, 0), z_dir=(1, 1, 0)), + start_angle=0, + end_angle=90, + ).normal(), + (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), + 5, + ) + self.assertAlmostEqual( + Edge.make_spline( + [ + (1, 0), + (math.sqrt(2) / 2, math.sqrt(2) / 2), + (0, 1), + ], + tangents=((0, 1, 0), (-1, 0, 0)), + ).normal(), + (0, 0, 1), + 5, + ) + with self.assertRaises(ValueError): + Edge.make_line((0, 0, 0), (1, 1, 1)).normal() + + def test_center(self): + c = Edge.make_circle(1, start_angle=0, end_angle=180) + self.assertAlmostEqual(c.center(), (0, 1, 0), 5) + self.assertAlmostEqual( + c.center(CenterOf.MASS), + (0, 0.6366197723675814, 0), + 5, + ) + self.assertAlmostEqual(c.center(CenterOf.BOUNDING_BOX), (0, 0.5, 0), 5) + + def test_location_at(self): + loc = Edge.make_circle(1).location_at(0.25) + self.assertAlmostEqual(loc.position, (0, 1, 0), 5) + self.assertAlmostEqual(loc.orientation, (0, -90, -90), 5) + + loc = Edge.make_circle(1).location_at( + math.pi / 2, position_mode=PositionMode.LENGTH + ) + self.assertAlmostEqual(loc.position, (0, 1, 0), 5) + self.assertAlmostEqual(loc.orientation, (0, -90, -90), 5) + + def test_locations(self): + locs = Edge.make_circle(1).locations([i / 4 for i in range(4)]) + self.assertAlmostEqual(locs[0].position, (1, 0, 0), 5) + self.assertAlmostEqual(locs[0].orientation, (-90, 0, -180), 5) + self.assertAlmostEqual(locs[1].position, (0, 1, 0), 5) + self.assertAlmostEqual(locs[1].orientation, (0, -90, -90), 5) + self.assertAlmostEqual(locs[2].position, (-1, 0, 0), 5) + self.assertAlmostEqual(locs[2].orientation, (90, 0, 0), 5) + self.assertAlmostEqual(locs[3].position, (0, -1, 0), 5) + self.assertAlmostEqual(locs[3].orientation, (0, 90, 90), 5) + + def test_project(self): + target = Face.make_rect(10, 10, Plane.XY.rotated((0, 45, 0))) + circle = Edge.make_circle(1).locate(Location((0, 0, 10))) + ellipse: Wire = circle.project(target, (0, 0, -1)) + bbox = ellipse.bounding_box() + self.assertAlmostEqual(bbox.min, (-1, -1, -1), 5) + self.assertAlmostEqual(bbox.max, (1, 1, 1), 5) + + def test_project2(self): + target = Cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] + square = Wire.make_rect(1, 1, Plane.YZ).locate(Location((10, 0, 0))) + projections: list[Wire] = square.project( + target, direction=(-1, 0, 0), closest=False + ) + self.assertEqual(len(projections), 2) + + def test_is_forward(self): + plate = Box(10, 10, 1) - Cylinder(1, 1) + hole_edges = plate.edges().filter_by(GeomType.CIRCLE) + self.assertTrue(hole_edges.sort_by(Axis.Z)[-1].is_forward) + self.assertFalse(hole_edges.sort_by(Axis.Z)[0].is_forward) + + def test_offset_2d(self): + base_wire = Wire.make_polygon([(0, 0), (1, 0), (1, 1)], close=False) + corner = base_wire.vertices().group_by(Axis.Y)[0].sort_by(Axis.X)[-1] + base_wire = base_wire.fillet_2d(0.4, [corner]) + offset_wire = base_wire.offset_2d(0.1, side=Side.LEFT) + self.assertTrue(offset_wire.is_closed) + self.assertEqual(len(offset_wire.edges().filter_by(GeomType.LINE)), 6) + self.assertEqual(len(offset_wire.edges().filter_by(GeomType.CIRCLE)), 2) + offset_wire_right = base_wire.offset_2d(0.1, side=Side.RIGHT) + self.assertAlmostEqual( + offset_wire_right.edges() + .filter_by(GeomType.CIRCLE) + .sort_by(SortBy.RADIUS)[-1] + .radius, + 0.5, + 4, + ) + h_perimeter = Compound.make_text("h", font_size=10).wire() + with self.assertRaises(RuntimeError): + h_perimeter.offset_2d(-1) + + # Test for returned Edge - can't find a way to do this + # base_edge = Edge.make_circle(10, start_angle=40, end_angle=50) + # self.assertTrue(isinstance(offset_edge, Edge)) + # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) + # self.assertTrue(offset_edge.geom_type == GeomType.CIRCLE) + # self.assertAlmostEqual(offset_edge.radius, 12, 5) + # base_edge = Edge.make_line((0, 1), (1, 10)) + # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) + # self.assertTrue(isinstance(offset_edge, Edge)) + # self.assertTrue(offset_edge.geom_type == GeomType.LINE) + # self.assertAlmostEqual(offset_edge.position_at(0).X, 3) + + def test_common_plane(self): + # Straight and circular lines + l = Edge.make_line((0, 0, 0), (5, 0, 0)) + c = Edge.make_circle(2, Plane.XZ, -90, 90) + common = l.common_plane(c) + self.assertAlmostEqual(common.z_dir.X, 0, 5) + self.assertAlmostEqual(abs(common.z_dir.Y), 1, 5) # the direction isn't known + self.assertAlmostEqual(common.z_dir.Z, 0, 5) + + # Co-axial straight lines + l1 = Edge.make_line((0, 0), (1, 1)) + l2 = Edge.make_line((0.25, 0.25), (0.75, 0.75)) + common = l1.common_plane(l2) + # the z_dir isn't know + self.assertAlmostEqual(common.x_dir.Z, 0, 5) + + # Parallel lines + l1 = Edge.make_line((0, 0), (1, 0)) + l2 = Edge.make_line((0, 1), (1, 1)) + common = l1.common_plane(l2) + self.assertAlmostEqual(common.z_dir.X, 0, 5) + self.assertAlmostEqual(common.z_dir.Y, 0, 5) + self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known + + # Many lines + common = Edge.common_plane(*Wire.make_rect(10, 10).edges()) + self.assertAlmostEqual(common.z_dir.X, 0, 5) + self.assertAlmostEqual(common.z_dir.Y, 0, 5) + self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known + + # Wire and Edges + c = Wire.make_circle(1, Plane.YZ) + lines = Wire.make_rect(2, 2, Plane.YZ).edges() + common = c.common_plane(*lines) + self.assertAlmostEqual(abs(common.z_dir.X), 1, 5) # the direction isn't known + self.assertAlmostEqual(common.z_dir.Y, 0, 5) + self.assertAlmostEqual(common.z_dir.Z, 0, 5) + + def test_edge_volume(self): + edge = Edge.make_line((0, 0), (1, 1)) + self.assertAlmostEqual(edge.volume, 0, 5) + + def test_wire_volume(self): + wire = Wire.make_rect(1, 1) + self.assertAlmostEqual(wire.volume, 0, 5) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_mixin3_d.py b/tests/test_direct_api/test_mixin3_d.py new file mode 100644 index 0000000..5e04e7b --- /dev/null +++ b/tests/test_direct_api/test_mixin3_d.py @@ -0,0 +1,154 @@ +""" +build123d imports + +name: test_mixin3_d.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from unittest.mock import patch + +from build123d.build_enums import CenterOf, Kind +from build123d.geometry import Axis, Plane +from build123d.topology import Face, Shape, Solid + + +class TestMixin3D(unittest.TestCase): + """Test that 3D add ins""" + + def test_chamfer(self): + box = Solid.make_box(1, 1, 1) + chamfer_box = box.chamfer(0.1, None, box.edges().sort_by(Axis.Z)[-1:]) + self.assertAlmostEqual(chamfer_box.volume, 1 - 0.005, 5) + + def test_chamfer_asym_length(self): + box = Solid.make_box(1, 1, 1) + chamfer_box = box.chamfer(0.1, 0.2, box.edges().sort_by(Axis.Z)[-1:]) + self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) + + def test_chamfer_asym_length_with_face(self): + box = Solid.make_box(1, 1, 1) + face = box.faces().sort_by(Axis.Z)[0] + edge = [face.edges().sort_by(Axis.Y)[0]] + chamfer_box = box.chamfer(0.1, 0.2, edge, face=face) + self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) + + def test_chamfer_too_high_length(self): + box = Solid.make_box(1, 1, 1) + face = box.faces + self.assertRaises( + ValueError, box.chamfer, 2, None, box.edges().sort_by(Axis.Z)[-1:] + ) + + def test_chamfer_edge_not_part_of_face(self): + box = Solid.make_box(1, 1, 1) + edge = box.edges().sort_by(Axis.Z)[-1:] + face = box.faces().sort_by(Axis.Z)[0] + self.assertRaises(ValueError, box.chamfer, 0.1, None, edge, face=face) + + @patch.object(Shape, "is_valid", return_value=False) + def test_chamfer_invalid_shape_raises_error(self, mock_is_valid): + box = Solid.make_box(1, 1, 1) + + # Assert that ValueError is raised + with self.assertRaises(ValueError) as chamfer_context: + max = box.chamfer(0.1, None, box.edges()) + + # Check the error message + self.assertEqual( + str(chamfer_context.exception), + "Failed creating a chamfer, try a smaller length value(s)", + ) + + # Verify is_valid was called + mock_is_valid.assert_called_once() + + def test_hollow(self): + shell_box = Solid.make_box(1, 1, 1).hollow([], thickness=-0.1) + self.assertAlmostEqual(shell_box.volume, 1 - 0.8**3, 5) + + shell_box = Solid.make_box(1, 1, 1) + shell_box = shell_box.hollow( + shell_box.faces().filter_by(Axis.Z), thickness=0.1, kind=Kind.INTERSECTION + ) + self.assertAlmostEqual(shell_box.volume, 1 * 1.2**2 - 1**3, 5) + + shell_box = Solid.make_box(1, 1, 1).hollow( + [], thickness=0.1, kind=Kind.INTERSECTION + ) + self.assertAlmostEqual(shell_box.volume, 1.2**3 - 1**3, 5) + + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).hollow([], thickness=0.1, kind=Kind.TANGENT) + + def test_is_inside(self): + self.assertTrue(Solid.make_box(1, 1, 1).is_inside((0.5, 0.5, 0.5))) + + def test_dprism(self): + # face + f = Face.make_rect(0.5, 0.5) + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [f], additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) + + # face with depth + f = Face.make_rect(0.5, 0.5) + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [f], depth=0.5, thru_all=False, additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) + + # face until + f = Face.make_rect(0.5, 0.5) + limit = Face.make_rect(1, 1, Plane((0, 0, 0.5))) + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [f], up_to_face=limit, thru_all=False, additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) + + # wire + w = Face.make_rect(0.5, 0.5).outer_wire() + d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( + None, [w], additive=False + ) + self.assertTrue(d.is_valid()) + self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) + + def test_center(self): + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).center(CenterOf.GEOMETRY) + + self.assertAlmostEqual( + Solid.make_box(1, 1, 1).center(CenterOf.BOUNDING_BOX), + (0.5, 0.5, 0.5), + 5, + ) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_plane.py b/tests/test_direct_api/test_plane.py new file mode 100644 index 0000000..3a2f899 --- /dev/null +++ b/tests/test_direct_api/test_plane.py @@ -0,0 +1,480 @@ +""" +build123d imports + +name: test_plane.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# Always equal to any other object, to test that __eq__ cooperation is working +import copy +import math +import random +import unittest + +import numpy as np +from OCP.BRepGProp import BRepGProp +from OCP.GProp import GProp_GProps +from build123d.build_common import Locations +from build123d.build_enums import Align, GeomType, Mode +from build123d.build_part import BuildPart +from build123d.build_sketch import BuildSketch +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import Circle, Rectangle +from build123d.operations_generic import fillet, add +from build123d.operations_part import extrude +from build123d.topology import Edge, Face, Solid, Vertex + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +class TestPlane(unittest.TestCase): + """Plane with class properties""" + + def test_class_properties(self): + """Validate + Name x_dir y_dir z_dir + ======= ====== ====== ====== + XY +x +y +z + YZ +y +z +x + ZX +z +x +y + XZ +x +z -y + YX +y +x -z + ZY +z +y -x + front +x +z -y + back -x +z +y + left -y +z -x + right +y +z +x + top +x +y +z + bottom +x -y -z + isometric +x+y -x+y+z +x+y-z + """ + planes = [ + (Plane.XY, (1, 0, 0), (0, 0, 1)), + (Plane.YZ, (0, 1, 0), (1, 0, 0)), + (Plane.ZX, (0, 0, 1), (0, 1, 0)), + (Plane.XZ, (1, 0, 0), (0, -1, 0)), + (Plane.YX, (0, 1, 0), (0, 0, -1)), + (Plane.ZY, (0, 0, 1), (-1, 0, 0)), + (Plane.front, (1, 0, 0), (0, -1, 0)), + (Plane.back, (-1, 0, 0), (0, 1, 0)), + (Plane.left, (0, -1, 0), (-1, 0, 0)), + (Plane.right, (0, 1, 0), (1, 0, 0)), + (Plane.top, (1, 0, 0), (0, 0, 1)), + (Plane.bottom, (1, 0, 0), (0, 0, -1)), + ( + Plane.isometric, + (1 / 2**0.5, 1 / 2**0.5, 0), + (1 / 3**0.5, -1 / 3**0.5, 1 / 3**0.5), + ), + ] + for plane, x_dir, z_dir in planes: + self.assertAlmostEqual(plane.x_dir, x_dir, 5) + self.assertAlmostEqual(plane.z_dir, z_dir, 5) + + def test_plane_init(self): + # from origin + o = (0, 0, 0) + x = (1, 0, 0) + y = (0, 1, 0) + z = (0, 0, 1) + planes = [ + Plane(o), + Plane(o, x), + Plane(o, x, z), + Plane(o, x, z_dir=z), + Plane(o, x_dir=x, z_dir=z), + Plane(o, x_dir=x), + Plane(o, z_dir=z), + Plane(origin=o, x_dir=x, z_dir=z), + Plane(origin=o, x_dir=x), + Plane(origin=o, z_dir=z), + ] + for p in planes: + self.assertAlmostEqual(p.origin, o, 6) + self.assertAlmostEqual(p.x_dir, x, 6) + self.assertAlmostEqual(p.y_dir, y, 6) + self.assertAlmostEqual(p.z_dir, z, 6) + with self.assertRaises(TypeError): + Plane() + with self.assertRaises(TypeError): + Plane(o, z_dir="up") + + # rotated location around z + loc = Location((0, 0, 0), (0, 0, 45)) + p_from_loc = Plane(loc) + p_from_named_loc = Plane(location=loc) + for p in [p_from_loc, p_from_named_loc]: + self.assertAlmostEqual(p.origin, (0, 0, 0), 6) + self.assertAlmostEqual(p.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p.z_dir, (0, 0, 1), 6) + self.assertAlmostEqual(loc.position, p.location.position, 6) + self.assertAlmostEqual(loc.orientation, p.location.orientation, 6) + + # rotated location around x and origin <> (0,0,0) + loc = Location((0, 2, -1), (45, 0, 0)) + p = Plane(loc) + self.assertAlmostEqual(p.origin, (0, 2, -1), 6) + self.assertAlmostEqual(p.x_dir, (1, 0, 0), 6) + self.assertAlmostEqual(p.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(loc.position, p.location.position, 6) + self.assertAlmostEqual(loc.orientation, p.location.orientation, 6) + + # from a face + f = Face.make_rect(1, 2).located(Location((1, 2, 3), (45, 0, 45))) + p_from_face = Plane(f) + p_from_named_face = Plane(face=f) + plane_from_gp_pln = Plane(gp_pln=p_from_face.wrapped) + p_deep_copy = copy.deepcopy(p_from_face) + for p in [p_from_face, p_from_named_face, plane_from_gp_pln, p_deep_copy]: + self.assertAlmostEqual(p.origin, (1, 2, 3), 6) + self.assertAlmostEqual(p.x_dir, (math.sqrt(2) / 2, 0.5, 0.5), 6) + self.assertAlmostEqual(p.y_dir, (-math.sqrt(2) / 2, 0.5, 0.5), 6) + self.assertAlmostEqual(p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(f.location.position, p.location.position, 6) + self.assertAlmostEqual(f.location.orientation, p.location.orientation, 6) + + # from a face with x_dir + f = Face.make_rect(1, 2) + x = (1, 1) + y = (-1, 1) + planes = [ + Plane(f, x), + Plane(f, x_dir=x), + Plane(face=f, x_dir=x), + ] + for p in planes: + self.assertAlmostEqual(p.origin, (0, 0, 0), 6) + self.assertAlmostEqual(p.x_dir, Vector(x).normalized(), 6) + self.assertAlmostEqual(p.y_dir, Vector(y).normalized(), 6) + self.assertAlmostEqual(p.z_dir, (0, 0, 1), 6) + + with self.assertRaises(TypeError): + Plane(Edge.make_line((0, 0), (0, 1))) + + # can be instantiated from planar faces of surface types other than Geom_Plane + # this loft creates the trapezoid faces of type Geom_BSplineSurface + lofted_solid = Solid.make_loft( + [ + Rectangle(3, 1).wire(), + Pos(0, 0, 1) * Rectangle(1, 1).wire(), + ] + ) + + expected = [ + # Trapezoid face, negative y coordinate + ( + Axis.X.direction, # plane x_dir + Axis.Z.direction, # plane y_dir + -Axis.Y.direction, # plane z_dir + ), + # Trapezoid face, positive y coordinate + ( + -Axis.X.direction, + Axis.Z.direction, + Axis.Y.direction, + ), + ] + # assert properties of the trapezoid faces + for i, f in enumerate(lofted_solid.faces() | Plane.XZ > Axis.Y): + p = Plane(f) + f_props = GProp_GProps() + BRepGProp.SurfaceProperties_s(f.wrapped, f_props) + self.assertAlmostEqual(p.origin, Vector(f_props.CentreOfMass()), 6) + self.assertAlmostEqual(p.x_dir, expected[i][0], 6) + self.assertAlmostEqual(p.y_dir, expected[i][1], 6) + self.assertAlmostEqual(p.z_dir, expected[i][2], 6) + + def test_plane_neg(self): + p = Plane( + origin=(1, 2, 3), + x_dir=Vector(1, 2, 3).normalized(), + z_dir=Vector(4, 5, 6).normalized(), + ) + p2 = -p + self.assertAlmostEqual(p2.origin, p.origin, 6) + self.assertAlmostEqual(p2.x_dir, p.x_dir, 6) + self.assertAlmostEqual(p2.z_dir, -p.z_dir, 6) + self.assertAlmostEqual(p2.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6) + p3 = p.reverse() + self.assertAlmostEqual(p3.origin, p.origin, 6) + self.assertAlmostEqual(p3.x_dir, p.x_dir, 6) + self.assertAlmostEqual(p3.z_dir, -p.z_dir, 6) + self.assertAlmostEqual(p3.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6) + + def test_plane_mul(self): + p = Plane(origin=(1, 2, 3), x_dir=(1, 0, 0), z_dir=(0, 0, 1)) + p2 = p * Location((1, 2, -1), (0, 0, 45)) + self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) + self.assertAlmostEqual(p2.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p2.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) + self.assertAlmostEqual(p2.z_dir, (0, 0, 1), 6) + + p2 = p * Location((1, 2, -1), (0, 45, 0)) + self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) + self.assertAlmostEqual(p2.x_dir, (math.sqrt(2) / 2, 0, -math.sqrt(2) / 2), 6) + self.assertAlmostEqual(p2.y_dir, (0, 1, 0), 6) + self.assertAlmostEqual(p2.z_dir, (math.sqrt(2) / 2, 0, math.sqrt(2) / 2), 6) + + p2 = p * Location((1, 2, -1), (45, 0, 0)) + self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) + self.assertAlmostEqual(p2.x_dir, (1, 0, 0), 6) + self.assertAlmostEqual(p2.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + self.assertAlmostEqual(p2.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) + with self.assertRaises(TypeError): + p2 * Vector(1, 1, 1) + + def test_plane_methods(self): + # Test error checking + p = Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 0)) + with self.assertRaises(ValueError): + p.to_local_coords("box") + + # Test translation to local coordinates + local_box = p.to_local_coords(Solid.make_box(1, 1, 1)) + local_box_vertices = [(v.X, v.Y, v.Z) for v in local_box.vertices()] + target_vertices = [ + (0, -1, 0), + (0, 0, 0), + (0, -1, 1), + (0, 0, 1), + (1, -1, 0), + (1, 0, 0), + (1, -1, 1), + (1, 0, 1), + ] + for i, target_point in enumerate(target_vertices): + np.testing.assert_allclose(target_point, local_box_vertices[i], 1e-7) + + def test_localize_vertex(self): + vertex = Vertex(random.random(), random.random(), random.random()) + np.testing.assert_allclose( + Plane.YZ.to_local_coords(vertex).to_tuple(), + Plane.YZ.to_local_coords(Vector(vertex)).to_tuple(), + 5, + ) + + def test_repr(self): + self.assertEqual( + repr(Plane.XY), + "Plane(o=(0.00, 0.00, 0.00), x=(1.00, 0.00, 0.00), z=(0.00, 0.00, 1.00))", + ) + + def test_shift_origin_axis(self): + cyl = Cylinder(1, 2, align=Align.MIN) + top = cyl.faces().sort_by(Axis.Z)[-1] + pln = Plane(top).shift_origin(Axis.Z) + with BuildPart() as p: + add(cyl) + with BuildSketch(pln): + with Locations((1, 1)): + Circle(0.5) + extrude(amount=-2, mode=Mode.SUBTRACT) + self.assertAlmostEqual(p.part.volume, math.pi * (1**2 - 0.5**2) * 2, 5) + + def test_shift_origin_vertex(self): + box = Box(1, 1, 1, align=Align.MIN) + front = box.faces().sort_by(Axis.X)[-1] + pln = Plane(front).shift_origin( + front.vertices().group_by(Axis.Z)[-1].sort_by(Axis.Y)[-1] + ) + with BuildPart() as p: + add(box) + with BuildSketch(pln): + with Locations((-0.5, 0.5)): + Circle(0.5) + extrude(amount=-1, mode=Mode.SUBTRACT) + self.assertAlmostEqual(p.part.volume, 1**3 - math.pi * (0.5**2) * 1, 5) + + def test_shift_origin_vector(self): + with BuildPart() as p: + Box(4, 4, 2) + b = fillet(p.edges().filter_by(Axis.Z), 0.5) + top = p.faces().sort_by(Axis.Z)[-1] + ref = ( + top.edges() + .filter_by(GeomType.CIRCLE) + .group_by(Axis.X)[-1] + .sort_by(Axis.Y)[0] + .arc_center + ) + pln = Plane(top, x_dir=(0, 1, 0)).shift_origin(ref) + with BuildSketch(pln): + with Locations((0.5, 0.5)): + Rectangle(2, 2, align=Align.MIN) + extrude(amount=-1, mode=Mode.SUBTRACT) + self.assertAlmostEqual(p.part.volume, b.volume - 2**2 * 1, 5) + + def test_shift_origin_error(self): + with self.assertRaises(ValueError): + Plane.XY.shift_origin(Vertex(1, 1, 1)) + + with self.assertRaises(ValueError): + Plane.XY.shift_origin((1, 1, 1)) + + with self.assertRaises(ValueError): + Plane.XY.shift_origin(Axis((0, 0, 1), (0, 1, 0))) + + with self.assertRaises(TypeError): + Plane.XY.shift_origin(Edge.make_line((0, 0), (1, 1))) + + def test_move(self): + pln = Plane.XY.move(Location((1, 2, 3))) + self.assertAlmostEqual(pln.origin, (1, 2, 3), 5) + + def test_rotated(self): + rotated_plane = Plane.XY.rotated((45, 0, 0)) + self.assertAlmostEqual(rotated_plane.x_dir, (1, 0, 0), 5) + self.assertAlmostEqual( + rotated_plane.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 5 + ) + + def test_invalid_plane(self): + # Test plane creation error handling + with self.assertRaises(ValueError): + Plane(origin=(0, 0, 0), x_dir=(0, 0, 0), z_dir=(0, 1, 1)) + with self.assertRaises(ValueError): + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 0)) + + def test_plane_equal(self): + # default orientation + self.assertEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + ) + # moved origin + self.assertEqual( + Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + ) + # moved x-axis + self.assertEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), + ) + # moved z-axis + self.assertEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), + ) + # __eq__ cooperation + self.assertEqual(Plane.XY, AlwaysEqual()) + + def test_plane_not_equal(self): + # type difference + for value in [None, 0, 1, "abc"]: + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), value + ) + # origin difference + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + ) + # x-axis difference + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), + ) + # z-axis difference + self.assertNotEqual( + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), + Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), + ) + + def test_to_location(self): + loc = Plane(origin=(1, 2, 3), x_dir=(0, 1, 0), z_dir=(0, 0, 1)).location + self.assertAlmostEqual(loc.position, (1, 2, 3), 5) + self.assertAlmostEqual(loc.orientation, (0, 0, 90), 5) + + def test_intersect(self): + self.assertAlmostEqual( + Plane.XY.intersect(Axis((1, 2, 3), (0, 0, -1))), (1, 2, 0), 5 + ) + self.assertIsNone(Plane.XY.intersect(Axis((1, 2, 3), (0, 1, 0)))) + + self.assertEqual(Plane.XY.intersect(Plane.XZ), Axis.X) + + self.assertIsNone(Plane.XY.intersect(Plane.XY.offset(1))) + + with self.assertRaises(ValueError): + Plane.XY.intersect("Plane.XZ") + + with self.assertRaises(ValueError): + Plane.XY.intersect(pln=Plane.XZ) + + def test_from_non_planar_face(self): + flat = Face.make_rect(1, 1) + pln = Plane(flat) + self.assertTrue(isinstance(pln, Plane)) + cyl = ( + Solid.make_cylinder(1, 4).faces().filter_by(GeomType.PLANE, reverse=True)[0] + ) + with self.assertRaises(ValueError): + pln = Plane(cyl) + + def test_plane_intersect(self): + section = Plane.XY.intersect(Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5))) + self.assertEqual(len(section.solids()), 0) + self.assertEqual(len(section.faces()), 1) + self.assertAlmostEqual(section.face().area, 2) + + section = Plane.XY & Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5)) + self.assertEqual(len(section.solids()), 0) + self.assertEqual(len(section.faces()), 1) + self.assertAlmostEqual(section.face().area, 2) + + self.assertEqual(Plane.XY & Plane.XZ, Axis.X) + # x_axis_as_edge = Plane.XY & Plane.XZ + # common = (x_axis_as_edge.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() + # self.assertAlmostEqual(common.length, 1, 5) + + i = Plane.XY & Vector(1, 2) + self.assertTrue(isinstance(i, Vector)) + self.assertAlmostEqual(i, (1, 2, 0), 5) + + a = Axis((0, 0, 0), (1, 1, 0)) + i = Plane.XY & a + self.assertTrue(isinstance(i, Axis)) + self.assertEqual(i, a) + + a = Axis((1, 2, -1), (0, 0, 1)) + i = Plane.XY & a + self.assertTrue(isinstance(i, Vector)) + self.assertAlmostEqual(i, Vector(1, 2, 0), 5) + + def test_plane_origin_setter(self): + pln = Plane.XY + pln.origin = (1, 2, 3) + ocp_origin = Vector(pln.wrapped.Location()) + self.assertAlmostEqual(ocp_origin, (1, 2, 3), 5) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_projection.py b/tests/test_direct_api/test_projection.py new file mode 100644 index 0000000..5fbb7bd --- /dev/null +++ b/tests/test_direct_api/test_projection.py @@ -0,0 +1,103 @@ +""" +build123d imports + +name: test_projection.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.build_enums import Align +from build123d.geometry import Axis, Plane, Pos, Vector +from build123d.objects_part import Box +from build123d.topology import Compound, Edge, Solid, Wire + + +class TestProjection(unittest.TestCase): + def test_flat_projection(self): + sphere = Solid.make_sphere(50) + projection_direction = Vector(0, -1, 0) + planar_text_faces = ( + Compound.make_text("Flat", 30, align=(Align.CENTER, Align.CENTER)) + .rotate(Axis.X, 90) + .faces() + ) + projected_text_faces = [ + f.project_to_shape(sphere, projection_direction)[0] + for f in planar_text_faces + ] + self.assertEqual(len(projected_text_faces), 4) + + def test_multiple_output_wires(self): + target = Box(10, 10, 4) - Pos((0, 0, 2)) * Box(5, 5, 2) + circle = Wire.make_circle(3, Plane.XY.offset(10)) + projection = circle.project_to_shape(target, (0, 0, -1)) + bbox = projection[0].bounding_box() + self.assertAlmostEqual(bbox.min, (-3, -3, 1), 2) + self.assertAlmostEqual(bbox.max, (3, 3, 2), 2) + bbox = projection[1].bounding_box() + self.assertAlmostEqual(bbox.min, (-3, -3, -2), 2) + self.assertAlmostEqual(bbox.max, (3, 3, -2), 2) + + def test_text_projection(self): + sphere = Solid.make_sphere(50) + arch_path = ( + sphere.cut( + Solid.make_cylinder( + 80, 100, Plane(origin=(-50, 0, -70), z_dir=(1, 0, 0)) + ) + ) + .edges() + .sort_by(Axis.Z)[0] + ) + + projected_text = sphere.project_faces( + faces=Compound.make_text("dog", font_size=14), + path=arch_path, + start=0.01, # avoid a character spanning the sphere edge + ) + self.assertEqual(len(projected_text.solids()), 0) + self.assertEqual(len(projected_text.faces()), 3) + + def test_error_handling(self): + sphere = Solid.make_sphere(50) + circle = Wire.make_circle(1) + with self.assertRaises(ValueError): + circle.project_to_shape(sphere, center=None, direction=None)[0] + + def test_project_edge(self): + projection = Edge.make_circle(1, Plane.XY.offset(-5)).project_to_shape( + Solid.make_box(1, 1, 1), (0, 0, 1) + ) + self.assertAlmostEqual(projection[0].position_at(1), (1, 0, 0), 5) + self.assertAlmostEqual(projection[0].position_at(0), (0, 1, 0), 5) + self.assertAlmostEqual(projection[0].arc_center, (0, 0, 0), 5) + + def test_to_axis(self): + with self.assertRaises(ValueError): + Edge.make_circle(1, end_angle=30).to_axis() + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_rotation.py b/tests/test_direct_api/test_rotation.py new file mode 100644 index 0000000..aae49c8 --- /dev/null +++ b/tests/test_direct_api/test_rotation.py @@ -0,0 +1,58 @@ +""" +build123d imports + +name: test_rotation.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.build_enums import Extrinsic, Intrinsic +from build123d.geometry import Rotation + + +class TestRotation(unittest.TestCase): + def test_rotation_parameters(self): + r = Rotation(10, 20, 30) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + r = Rotation(10, 20, Z=30) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + r = Rotation(10, 20, Z=30, ordering=Intrinsic.XYZ) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + r = Rotation(10, Y=20, Z=30) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + r = Rotation((10, 20, 30)) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + r = Rotation(10, 20, 30, Intrinsic.XYZ) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + r = Rotation((30, 20, 10), Extrinsic.ZYX) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + r = Rotation((30, 20, 10), ordering=Extrinsic.ZYX) + self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) + with self.assertRaises(TypeError): + Rotation(x=10) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py new file mode 100644 index 0000000..835b70b --- /dev/null +++ b/tests/test_direct_api/test_shape.py @@ -0,0 +1,619 @@ +""" +build123d imports + +name: test_shape.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# Always equal to any other object, to test that __eq__ cooperation is working +import unittest +from random import uniform +from unittest.mock import patch + +import numpy as np +from build123d.build_enums import CenterOf, Keep +from build123d.geometry import ( + Axis, + Color, + Location, + Matrix, + Plane, + Pos, + Rotation, + Vector, +) +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import Circle +from build123d.operations_part import extrude +from build123d.topology import ( + Compound, + Edge, + Face, + Shape, + ShapeList, + Shell, + Solid, + Vertex, + Wire, +) + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +class TestShape(unittest.TestCase): + """Misc Shape tests""" + + def test_mirror(self): + box_bb = Solid.make_box(1, 1, 1).mirror(Plane.XZ).bounding_box() + self.assertAlmostEqual(box_bb.min.X, 0, 5) + self.assertAlmostEqual(box_bb.max.X, 1, 5) + self.assertAlmostEqual(box_bb.min.Y, -1, 5) + self.assertAlmostEqual(box_bb.max.Y, 0, 5) + + box_bb = Solid.make_box(1, 1, 1).mirror().bounding_box() + self.assertAlmostEqual(box_bb.min.Z, -1, 5) + self.assertAlmostEqual(box_bb.max.Z, 0, 5) + + def test_compute_mass(self): + with self.assertRaises(NotImplementedError): + Shape.compute_mass(Vertex()) + + def test_combined_center(self): + objs = [Solid.make_box(1, 1, 1, Plane((x, 0, 0))) for x in [-2, 1]] + self.assertAlmostEqual( + Shape.combined_center(objs, center_of=CenterOf.MASS), + (0, 0.5, 0.5), + 5, + ) + + objs = [Solid.make_sphere(1, Plane((x, 0, 0))) for x in [-2, 1]] + self.assertAlmostEqual( + Shape.combined_center(objs, center_of=CenterOf.BOUNDING_BOX), + (-0.5, 0, 0), + 5, + ) + with self.assertRaises(ValueError): + Shape.combined_center(objs, center_of=CenterOf.GEOMETRY) + + def test_shape_type(self): + self.assertEqual(Vertex().shape_type(), "Vertex") + + def test_scale(self): + self.assertAlmostEqual(Solid.make_box(1, 1, 1).scale(2).volume, 2**3, 5) + + def test_fuse(self): + box1 = Solid.make_box(1, 1, 1) + box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) + combined = box1.fuse(box2, glue=True) + self.assertTrue(combined.is_valid()) + self.assertAlmostEqual(combined.volume, 2, 5) + fuzzy = box1.fuse(box2, tol=1e-6) + self.assertTrue(fuzzy.is_valid()) + self.assertAlmostEqual(fuzzy.volume, 2, 5) + + def test_faces_intersected_by_axis(self): + box = Solid.make_box(1, 1, 1, Plane((0, 0, 1))) + intersected_faces = box.faces_intersected_by_axis(Axis.Z) + self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[0] in intersected_faces) + self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[-1] in intersected_faces) + + def test_split(self): + shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) + split_shape = shape.split(Plane.XY, keep=Keep.BOTTOM) + self.assertTrue(isinstance(split_shape, list)) + self.assertEqual(len(split_shape), 2) + self.assertAlmostEqual(split_shape[0].volume + split_shape[1].volume, 0.25, 5) + split_shape = shape.split(Plane.XY, keep=Keep.TOP) + self.assertEqual(len(split_shape.solids()), 1) + self.assertTrue(isinstance(split_shape, Solid)) + self.assertAlmostEqual(split_shape.volume, 0.5, 5) + + s = Solid.make_cone(1, 0.5, 2, Plane.YZ.offset(10)) + tool = Solid.make_sphere(11).rotate(Axis.Z, 90).face() + s2 = s.split(tool, keep=Keep.TOP) + self.assertLess(s2.volume, s.volume) + self.assertGreater(s2.volume, 0.0) + + def test_split_by_non_planar_face(self): + box = Solid.make_box(1, 1, 1) + tool = Circle(1).wire() + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + top, bottom = box.split(tool_shell, keep=Keep.BOTH) + + self.assertFalse(top is None) + self.assertFalse(bottom is None) + self.assertGreater(top.volume, bottom.volume) + + def test_split_by_shell(self): + box = Solid.make_box(5, 5, 1) + tool = Wire.make_rect(4, 4) + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + split = box.split(tool_shell, keep=Keep.TOP) + inner_vol = 2 * 2 + outer_vol = 5 * 5 + self.assertAlmostEqual(split.volume, outer_vol - inner_vol) + + def test_split_keep_all(self): + shape = Box(1, 1, 1) + split_shape = shape.split(Plane.XY, keep=Keep.ALL) + self.assertTrue(isinstance(split_shape, ShapeList)) + self.assertEqual(len(split_shape), 2) + + def test_split_edge_by_shell(self): + edge = Edge.make_line((-5, 0, 0), (5, 0, 0)) + tool = Wire.make_rect(4, 4) + tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) + top = edge.split(tool_shell, keep=Keep.TOP) + self.assertEqual(len(top), 2) + self.assertAlmostEqual(top[0].length, 3, 5) + + def test_split_return_none(self): + shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) + split_shape = shape.split(Plane.XY, keep=Keep.INSIDE) + self.assertIsNone(split_shape) + + def test_split_by_perimeter(self): + # Test 0 - extract a spherical cap + target0 = Solid.make_sphere(10).rotate(Axis.Z, 90) + circle = Plane.YZ.offset(15) * Circle(5).face() + circle_projected = circle.project_to_shape(target0, (-1, 0, 0))[0] + circle_outerwire = circle_projected.edge() + inside0, outside0 = target0.split_by_perimeter(circle_outerwire, Keep.BOTH) + self.assertLess(inside0.area, outside0.area) + + # Test 1 - extract ring of a sphere + ring = Pos(Z=15) * (Circle(5) - Circle(3)).face() + ring_projected = ring.project_to_shape(target0, (0, 0, -1))[0] + ring_outerwire = ring_projected.outer_wire() + inside1, outside1 = target0.split_by_perimeter(ring_outerwire, Keep.BOTH) + if isinstance(inside1, list): + inside1 = Compound(inside1) + if isinstance(outside1, list): + outside1 = Compound(outside1) + self.assertLess(inside1.area, outside1.area) + self.assertEqual(len(outside1.faces()), 2) + + # Test 2 - extract multiple faces + target2 = Box(1, 10, 10) + square = Face.make_rect(3, 3, Plane((12, 0, 0), z_dir=(1, 0, 0))) + square_projected = square.project_to_shape(target2, (-1, 0, 0))[0] + outside2 = target2.split_by_perimeter( + square_projected.outer_wire(), Keep.OUTSIDE + ) + self.assertTrue(isinstance(outside2, Shell)) + inside2 = target2.split_by_perimeter(square_projected.outer_wire(), Keep.INSIDE) + self.assertTrue(isinstance(inside2, Face)) + + # Test 4 - invalid inputs + with self.assertRaises(ValueError): + _, _ = target2.split_by_perimeter(Edge.make_line((0, 0), (1, 0)), Keep.BOTH) + + with self.assertRaises(ValueError): + _, _ = target2.split_by_perimeter(Edge.make_circle(1), Keep.TOP) + + def test_distance(self): + sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) + sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) + self.assertAlmostEqual(sphere1.distance(sphere2), 8, 5) + + def test_distances(self): + sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) + sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) + sphere3 = Solid.make_sphere(1, Plane((-5, 0, 5))) + distances = [8, 3] + for i, distance in enumerate(sphere1.distances(sphere2, sphere3)): + self.assertAlmostEqual(distances[i], distance, 5) + + def test_max_fillet(self): + test_solids = [Solid.make_box(10, 8, 2), Solid.make_cone(5, 3, 8)] + max_values = [0.96, 3.84] + for i, test_object in enumerate(test_solids): + with self.subTest("solids" + str(i)): + max = test_object.max_fillet(test_object.edges()) + self.assertAlmostEqual(max, max_values[i], 2) + with self.assertRaises(RuntimeError): + test_solids[0].max_fillet( + test_solids[0].edges(), tolerance=1e-6, max_iterations=1 + ) + with self.assertRaises(ValueError): + box = Solid.make_box(1, 1, 1) + box.fillet(0.75, box.edges()) + # invalid_object = box.fillet(0.75, box.edges()) + # invalid_object.max_fillet(invalid_object.edges()) + + @patch.object(Shape, "is_valid", return_value=False) + def test_max_fillet_invalid_shape_raises_error(self, mock_is_valid): + box = Solid.make_box(1, 1, 1) + + # Assert that ValueError is raised + with self.assertRaises(ValueError) as max_fillet_context: + max = box.max_fillet(box.edges()) + + # Check the error message + self.assertEqual(str(max_fillet_context.exception), "Invalid Shape") + + # Verify is_valid was called + mock_is_valid.assert_called_once() + + def test_locate_bb(self): + bounding_box = Solid.make_cone(1, 2, 1).bounding_box() + relocated_bounding_box = Plane.XZ.from_local_coords(bounding_box) + self.assertAlmostEqual(relocated_bounding_box.min.X, -2, 5) + self.assertAlmostEqual(relocated_bounding_box.max.X, 2, 5) + self.assertAlmostEqual(relocated_bounding_box.min.Y, 0, 5) + self.assertAlmostEqual(relocated_bounding_box.max.Y, -1, 5) + self.assertAlmostEqual(relocated_bounding_box.min.Z, -2, 5) + self.assertAlmostEqual(relocated_bounding_box.max.Z, 2, 5) + + def test_is_equal(self): + box = Solid.make_box(1, 1, 1) + self.assertTrue(box.is_equal(box)) + + def test_equal(self): + box = Solid.make_box(1, 1, 1) + self.assertEqual(box, box) + self.assertEqual(box, AlwaysEqual()) + + def test_not_equal(self): + box = Solid.make_box(1, 1, 1) + diff = Solid.make_box(1, 2, 3) + self.assertNotEqual(box, diff) + self.assertNotEqual(box, object()) + + def test_tessellate(self): + box123 = Solid.make_box(1, 2, 3) + verts, triangles = box123.tessellate(1e-6) + self.assertEqual(len(verts), 24) + self.assertEqual(len(triangles), 12) + + def test_transformed(self): + """Validate that transformed works the same as changing location""" + rotation = (uniform(0, 360), uniform(0, 360), uniform(0, 360)) + offset = (uniform(0, 50), uniform(0, 50), uniform(0, 50)) + shape = Solid.make_box(1, 1, 1).transformed(rotation, offset) + predicted_location = Location(offset) * Rotation(*rotation) + located_shape = Solid.make_box(1, 1, 1).locate(predicted_location) + intersect = shape.intersect(located_shape) + self.assertAlmostEqual(intersect.volume, 1, 5) + + def test_position_and_orientation(self): + box = Solid.make_box(1, 1, 1).locate(Location((1, 2, 3), (10, 20, 30))) + self.assertAlmostEqual(box.position, (1, 2, 3), 5) + self.assertAlmostEqual(box.orientation, (10, 20, 30), 5) + + def test_distance_to_with_closest_points(self): + s0 = Solid.make_sphere(1).locate(Location((0, 2.1, 0))) + s1 = Solid.make_sphere(1) + distance, pnt0, pnt1 = s0.distance_to_with_closest_points(s1) + self.assertAlmostEqual(distance, 0.1, 5) + self.assertAlmostEqual(pnt0, (0, 1.1, 0), 5) + self.assertAlmostEqual(pnt1, (0, 1, 0), 5) + + def test_closest_points(self): + c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) + c1 = Edge.make_circle(1) + closest = c0.closest_points(c1) + self.assertAlmostEqual(closest[0], c0.position_at(0.75).to_tuple(), 5) + self.assertAlmostEqual(closest[1], c1.position_at(0.25).to_tuple(), 5) + + def test_distance_to(self): + c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) + c1 = Edge.make_circle(1) + distance = c0.distance_to(c1) + self.assertAlmostEqual(distance, 0.1, 5) + + def test_intersection(self): + box = Solid.make_box(1, 1, 1) + intersections = ( + box.intersect(Axis((0.5, 0.5, 4), (0, 0, -1))).vertices().sort_by(Axis.Z) + ) + self.assertAlmostEqual(Vector(intersections[0]), (0.5, 0.5, 0), 5) + self.assertAlmostEqual(Vector(intersections[1]), (0.5, 0.5, 1), 5) + + def test_clean_error(self): + """Note that this test is here to alert build123d to changes in bad OCCT clean behavior + with spheres or hemispheres. The extra edge in a sphere seems to be the cause of this. + """ + sphere = Solid.make_sphere(1) + divider = Solid.make_box(0.1, 3, 3, Plane(origin=(-0.05, -1.5, -1.5))) + positive_half, negative_half = (s.clean() for s in sphere.cut(divider).solids()) + self.assertGreater(abs(positive_half.volume - negative_half.volume), 0, 1) + + def test_clean_empty(self): + obj = Solid() + self.assertIs(obj, obj.clean()) + + def test_relocate(self): + box = Solid.make_box(10, 10, 10).move(Location((20, -5, -5))) + cylinder = Solid.make_cylinder(2, 50).move(Location((0, 0, 0), (0, 90, 0))) + + box_with_hole = box.cut(cylinder) + box_with_hole.relocate(box.location) + + self.assertEqual(box.location, box_with_hole.location) + + bbox1 = box.bounding_box() + bbox2 = box_with_hole.bounding_box() + self.assertAlmostEqual(bbox1.min, bbox2.min, 5) + self.assertAlmostEqual(bbox1.max, bbox2.max, 5) + + def test_project_to_viewport(self): + # Basic test + box = Solid.make_box(10, 10, 10) + visible, hidden = box.project_to_viewport((-20, 20, 20)) + self.assertEqual(len(visible), 9) + self.assertEqual(len(hidden), 3) + + # Contour edges + cyl = Solid.make_cylinder(2, 10) + visible, hidden = cyl.project_to_viewport((-20, 20, 20)) + # Note that some edges are broken into two + self.assertEqual(len(visible), 6) + self.assertEqual(len(hidden), 2) + + # Hidden contour edges + hole = box - cyl + visible, hidden = hole.project_to_viewport((-20, 20, 20)) + self.assertEqual(len(visible), 13) + self.assertEqual(len(hidden), 6) + + # Outline edges + sphere = Solid.make_sphere(5) + visible, hidden = sphere.project_to_viewport((-20, 20, 20)) + self.assertEqual(len(visible), 1) + self.assertEqual(len(hidden), 0) + + def test_vertex(self): + v = Edge.make_circle(1).vertex() + self.assertTrue(isinstance(v, Vertex)) + with self.assertWarns(UserWarning): + Wire.make_rect(1, 1).vertex() + + def test_edge(self): + e = Edge.make_circle(1).edge() + self.assertTrue(isinstance(e, Edge)) + with self.assertWarns(UserWarning): + Wire.make_rect(1, 1).edge() + + def test_wire(self): + w = Wire.make_circle(1).wire() + self.assertTrue(isinstance(w, Wire)) + with self.assertWarns(UserWarning): + Solid.make_box(1, 1, 1).wire() + + def test_compound(self): + c = Compound.make_text("hello", 10) + self.assertTrue(isinstance(c, Compound)) + c2 = Compound.make_text("world", 10) + with self.assertWarns(UserWarning): + Compound(children=[c, c2]).compound() + + def test_face(self): + f = Face.make_rect(1, 1) + self.assertTrue(isinstance(f, Face)) + with self.assertWarns(UserWarning): + Solid.make_box(1, 1, 1).face() + + def test_shell(self): + s = Solid.make_sphere(1).shell() + self.assertTrue(isinstance(s, Shell)) + with self.assertWarns(UserWarning): + extrude(Compound.make_text("two", 10), amount=5).shell() + + def test_solid(self): + s = Solid.make_sphere(1).solid() + self.assertTrue(isinstance(s, Solid)) + with self.assertWarns(UserWarning): + Compound(Solid.make_sphere(1).split(Plane.XY, keep=Keep.BOTH)).solid() + + def test_manifold(self): + self.assertTrue(Solid.make_box(1, 1, 1).is_manifold) + self.assertTrue(Solid.make_box(1, 1, 1).shell().is_manifold) + self.assertFalse( + Solid.make_box(1, 1, 1) + .shell() + .cut(Solid.make_box(0.5, 0.5, 0.5)) + .is_manifold + ) + self.assertTrue( + Compound( + children=[Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)] + ).is_manifold + ) + + def test_inherit_color(self): + # Create some objects and assign colors to them + b = Box(1, 1, 1).locate(Pos(2, 2, 0)) + b.color = Color("blue") # Blue + c = Cylinder(1, 1).locate(Pos(-2, 2, 0)) + a = Compound(children=[b, c]) + a.color = Color(0, 1, 0) + # Check that assigned colors stay and iheritance works + np.testing.assert_allclose(tuple(a.color), (0, 1, 0, 1), 1e-5) + np.testing.assert_allclose(tuple(b.color), (0, 0, 1, 1), 1e-5) + + def test_ocp_section(self): + # Vertex + verts, edges = Vertex(1, 2, 0)._ocp_section(Vertex(1, 2, 0)) + self.assertListEqual(verts, []) # ? + self.assertListEqual(edges, []) + + verts, edges = Vertex(1, 2, 0)._ocp_section(Edge.make_line((0, 0), (2, 4))) + self.assertListEqual(verts, []) # ? + self.assertListEqual(edges, []) + + verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_rect(5, 5)) + np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) + self.assertListEqual(edges, []) + + verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_plane(Plane.XY)) + np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) + self.assertListEqual(edges, []) + + # spline = Spline((-10, 10, -10), (-10, -5, -5), (20, 0, 5)) + # cylinder = Pos(Z=-10) * extrude(Circle(5), 20) + # cylinder2 = (Rot((0, 90, 0)) * cylinder).face() + # pln = Plane.XY + # box1 = Box(10, 10, 10, align=(Align.CENTER, Align.CENTER, Align.MIN)) + # box2 = Pos(Z=-10) * box1 + + # # vertices, edges = ocp_section(spline, Face.make_rect(1e6, 1e6, pln)) + # vertices1, edges1 = spline.ocp_section(Face.make_plane(pln)) + # print(vertices1, edges1) + + # vertices2, edges2 = cylinder.ocp_section(Face.make_plane(pln)) + # print(vertices2, edges2) + + # vertices3, edges3 = cylinder2.ocp_section(Face.make_plane(pln)) + # print(vertices3, edges3) + + # # vertices4, edges4 = cylinder2.ocp_section(cylinder) + + # vertices5, edges5 = box1.ocp_section(Face.make_plane(pln)) + # print(vertices5, edges5) + + # vertices6, edges6 = box1.ocp_section(box2.faces().sort_by(Axis.Z)[-1]) + + def test_copy_attributes_to(self): + box = Box(1, 1, 1) + box2 = Box(10, 10, 10) + box.label = "box" + box.color = Color("Red") + box.children = [Box(1, 1, 1), Box(2, 2, 2)] + box.topo_parent = box2 + + blank = Compound() + box.copy_attributes_to(blank) + self.assertEqual(blank.label, "box") + self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.color, Color("Red")))) + self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.children, box.children))) + self.assertEqual(blank.topo_parent, box2) + + def test_empty_shape(self): + empty = Solid() + box = Solid.make_box(1, 1, 1) + self.assertIsNone(empty.location) + self.assertIsNone(empty.position) + self.assertIsNone(empty.orientation) + self.assertFalse(empty.is_manifold) + with self.assertRaises(ValueError): + empty.geom_type + self.assertIs(empty, empty.fix()) + self.assertEqual(hash(empty), 0) + self.assertFalse(empty.is_same(Solid())) + self.assertFalse(empty.is_equal(Solid())) + self.assertTrue(empty.is_valid()) + empty_bbox = empty.bounding_box() + self.assertEqual(tuple(empty_bbox.size), (0, 0, 0)) + self.assertIs(empty, empty.mirror(Plane.XY)) + self.assertEqual(Shape.compute_mass(empty), 0) + self.assertEqual(empty.entities("Face"), []) + self.assertEqual(empty.area, 0) + self.assertIs(empty, empty.rotate(Axis.Z, 90)) + translate_matrix = [ + [1.0, 0.0, 0.0, 1.0], + [0.0, 1.0, 0.0, 2.0], + [0.0, 0.0, 1.0, 3.0], + [0.0, 0.0, 0.0, 1.0], + ] + self.assertIs(empty, empty.transform_shape(Matrix(translate_matrix))) + self.assertIs(empty, empty.transform_geometry(Matrix(translate_matrix))) + with self.assertRaises(ValueError): + empty.locate(Location()) + empty_loc = Location() + empty_loc.wrapped = None + with self.assertRaises(ValueError): + box.locate(empty_loc) + with self.assertRaises(ValueError): + empty.located(Location()) + with self.assertRaises(ValueError): + box.located(empty_loc) + with self.assertRaises(ValueError): + empty.move(Location()) + with self.assertRaises(ValueError): + box.move(empty_loc) + with self.assertRaises(ValueError): + empty.moved(Location()) + with self.assertRaises(ValueError): + box.moved(empty_loc) + with self.assertRaises(ValueError): + empty.relocate(Location()) + with self.assertRaises(ValueError): + box.relocate(empty_loc) + with self.assertRaises(ValueError): + empty.distance_to(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + empty.distance_to_with_closest_points(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + empty.distance_to(Vector(1, 1, 1)) + with self.assertRaises(ValueError): + box.intersect(empty_loc) + self.assertEqual(empty._ocp_section(Vertex(1, 1, 1)), ([], [])) + self.assertEqual(empty.faces_intersected_by_axis(Axis.Z), ShapeList()) + with self.assertRaises(ValueError): + empty.split_by_perimeter(Circle(1).wire()) + with self.assertRaises(ValueError): + empty.distance(Vertex(1, 1, 1)) + with self.assertRaises(ValueError): + list(empty.distances(Vertex(0, 0, 0), Vertex(1, 1, 1))) + with self.assertRaises(ValueError): + list(box.distances(empty, Vertex(1, 1, 1))) + with self.assertRaises(ValueError): + empty.mesh(0.001) + with self.assertRaises(ValueError): + empty.tessellate(0.001) + with self.assertRaises(ValueError): + empty.to_splines() + empty_axis = Axis((0, 0, 0), (1, 0, 0)) + empty_axis.wrapped = None + with self.assertRaises(ValueError): + box.vertices().group_by(empty_axis) + empty_wire = Wire() + with self.assertRaises(ValueError): + box.vertices().group_by(empty_wire) + with self.assertRaises(ValueError): + box.vertices().sort_by(empty_axis) + with self.assertRaises(ValueError): + box.vertices().sort_by(empty_wire) + + def test_empty_selectors(self): + self.assertEqual(Vertex(1, 1, 1).edges(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).wires(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).faces(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).shells(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).solids(), ShapeList()) + self.assertEqual(Vertex(1, 1, 1).compounds(), ShapeList()) + self.assertIsNone(Vertex(1, 1, 1).edge()) + self.assertIsNone(Vertex(1, 1, 1).wire()) + self.assertIsNone(Vertex(1, 1, 1).face()) + self.assertIsNone(Vertex(1, 1, 1).shell()) + self.assertIsNone(Vertex(1, 1, 1).solid()) + self.assertIsNone(Vertex(1, 1, 1).compound()) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py new file mode 100644 index 0000000..45ec7eb --- /dev/null +++ b/tests/test_direct_api/test_shape_list.py @@ -0,0 +1,368 @@ +""" +build123d imports + +name: test_shape_list.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# Always equal to any other object, to test that __eq__ cooperation is working +import io +import math +import re +import unittest + +import numpy as np +from IPython.lib import pretty +from build123d.build_common import GridLocations, PolarLocations +from build123d.build_enums import GeomType, SortBy +from build123d.build_part import BuildPart +from build123d.geometry import Axis, Plane, Vector +from build123d.objects_part import Box, Cylinder +from build123d.objects_sketch import RegularPolygon +from build123d.topology import ( + Compound, + Edge, + Face, + ShapeList, + Shell, + Solid, + Vertex, + Wire, +) + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +class TestShapeList(unittest.TestCase): + """Test ShapeList functionality""" + + def assertDunderStrEqual(self, actual: str, expected_lines: list[str]): + actual_lines = actual.splitlines() + self.assertEqual(len(actual_lines), len(expected_lines)) + for actual_line, expected_line in zip(actual_lines, expected_lines): + start, end = re.split(r"at 0x[0-9a-f]+", expected_line, 2, re.I) + self.assertTrue(actual_line.startswith(start)) + self.assertTrue(actual_line.endswith(end)) + + def assertDunderReprEqual(self, actual: str, expected: str): + splitter = r"at 0x[0-9a-f]+" + actual_split_list = re.split(splitter, actual, 0, re.I) + expected_split_list = re.split(splitter, expected, 0, re.I) + for actual_split, expected_split in zip(actual_split_list, expected_split_list): + self.assertEqual(actual_split, expected_split) + + def test_sort_by(self): + faces = Solid.make_box(1, 2, 3).faces() < SortBy.AREA + self.assertAlmostEqual(faces[-1].area, 2, 5) + + def test_filter_by_geomtype(self): + non_planar_faces = ( + Solid.make_cylinder(1, 1).faces().filter_by(GeomType.PLANE, reverse=True) + ) + self.assertEqual(len(non_planar_faces), 1) + self.assertAlmostEqual(non_planar_faces[0].area, 2 * math.pi, 5) + + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).faces().filter_by("True") + + def test_filter_by_axis(self): + box = Solid.make_box(1, 1, 1) + self.assertEqual(len(box.faces().filter_by(Axis.X)), 2) + self.assertEqual(len(box.edges().filter_by(Axis.X)), 4) + self.assertEqual(len(box.vertices().filter_by(Axis.X)), 0) + + def test_filter_by_callable_predicate(self): + boxes = [Solid.make_box(1, 1, 1) for _ in range(3)] + boxes[0].label = "A" + boxes[1].label = "A" + boxes[2].label = "B" + shapelist = ShapeList(boxes) + + self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "A")), 2) + self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "B")), 1) + + def test_first_last(self): + vertices = ( + Solid.make_box(1, 1, 1).vertices().sort_by(Axis((0, 0, 0), (1, 1, 1))) + ) + self.assertAlmostEqual(Vector(vertices.last), (1, 1, 1), 5) + self.assertAlmostEqual(Vector(vertices.first), (0, 0, 0), 5) + + def test_group_by(self): + vertices = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) + self.assertEqual(len(vertices[0]), 4) + + edges = Solid.make_box(1, 1, 1).edges().group_by(SortBy.LENGTH) + self.assertEqual(len(edges[0]), 12) + + edges = ( + Solid.make_cone(2, 1, 2) + .edges() + .filter_by(GeomType.CIRCLE) + .group_by(SortBy.RADIUS) + ) + self.assertEqual(len(edges[0]), 1) + + edges = (Solid.make_cone(2, 1, 2).edges() | GeomType.CIRCLE) << SortBy.RADIUS + self.assertAlmostEqual(edges[0].length, 2 * math.pi, 5) + + vertices = Solid.make_box(1, 1, 1).vertices().group_by(SortBy.DISTANCE) + self.assertAlmostEqual(Vector(vertices[-1][0]), (1, 1, 1), 5) + + box = Solid.make_box(1, 1, 2) + self.assertEqual(len(box.faces().group_by(SortBy.AREA)[0]), 2) + self.assertEqual(len(box.faces().group_by(SortBy.AREA)[1]), 4) + + line = Edge.make_line((0, 0, 0), (1, 1, 2)) + vertices_by_line = box.vertices().group_by(line) + self.assertEqual(len(vertices_by_line[0]), 1) + self.assertEqual(len(vertices_by_line[1]), 2) + self.assertEqual(len(vertices_by_line[2]), 1) + self.assertEqual(len(vertices_by_line[3]), 1) + self.assertEqual(len(vertices_by_line[4]), 2) + self.assertEqual(len(vertices_by_line[5]), 1) + self.assertAlmostEqual(Vector(vertices_by_line[0][0]), (0, 0, 0), 5) + self.assertAlmostEqual(Vector(vertices_by_line[-1][0]), (1, 1, 2), 5) + + with BuildPart() as boxes: + with GridLocations(10, 10, 3, 3): + Box(1, 1, 1) + with PolarLocations(100, 10): + Box(1, 1, 2) + self.assertEqual(len(boxes.solids().group_by(SortBy.VOLUME)[-1]), 10) + self.assertEqual(len((boxes.solids()) << SortBy.VOLUME), 9) + + with self.assertRaises(ValueError): + boxes.solids().group_by("AREA") + + def test_group_by_callable_predicate(self): + boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] + boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] + for box in boxesA: + box.label = "A" + for box in boxesB: + box.label = "B" + boxNoLabel = Solid.make_box(1, 1, 1) + + shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) + result = shapelist.group_by(lambda shape: shape.label) + + self.assertEqual([len(group) for group in result], [1, 3, 2]) + + def test_group_by_retrieve_groups(self): + boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] + boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] + for box in boxesA: + box.label = "A" + for box in boxesB: + box.label = "B" + boxNoLabel = Solid.make_box(1, 1, 1) + + shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) + result = shapelist.group_by(lambda shape: shape.label) + + self.assertEqual(len(result.group("")), 1) + self.assertEqual(len(result.group("A")), 3) + self.assertEqual(len(result.group("B")), 2) + self.assertEqual(result.group(""), result[0]) + self.assertEqual(result.group("A"), result[1]) + self.assertEqual(result.group("B"), result[2]) + self.assertEqual(result.group_for(boxesA[0]), result.group_for(boxesA[0])) + self.assertNotEqual(result.group_for(boxesA[0]), result.group_for(boxesB[0])) + with self.assertRaises(KeyError): + result.group("C") + + def test_group_by_str_repr(self): + nonagon = RegularPolygon(5, 9) + + expected = [ + "[[],", + " [,", + " ],", + " [,", + " ],", + " [,", + " ],", + " [,", + " ]]", + ] + self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) + + expected_repr = ( + "[[]," + " [," + " ]," + " [," + " ]," + " [," + " ]," + " [," + " ]]" + ) + self.assertDunderReprEqual( + repr(nonagon.edges().group_by(Axis.X)), expected_repr + ) + + f = io.StringIO() + p = pretty.PrettyPrinter(f) + nonagon.edges().group_by(Axis.X)._repr_pretty_(p, cycle=True) + self.assertEqual(f.getvalue(), "(...)") + + def test_distance(self): + with BuildPart() as box: + Box(1, 2, 3) + obj = (-0.2, 0.1, 0.5) + edges = box.edges().sort_by_distance(obj) + distances = [Vertex(*obj).distance_to(edge) for edge in edges] + self.assertTrue( + all([distances[i] >= distances[i - 1] for i in range(1, len(edges))]) + ) + + def test_distance_reverse(self): + with BuildPart() as box: + Box(1, 2, 3) + obj = (-0.2, 0.1, 0.5) + edges = box.edges().sort_by_distance(obj, reverse=True) + distances = [Vertex(*obj).distance_to(edge) for edge in edges] + self.assertTrue( + all([distances[i] <= distances[i - 1] for i in range(1, len(edges))]) + ) + + def test_distance_equal(self): + with BuildPart() as box: + Box(1, 1, 1) + self.assertEqual(len(box.edges().sort_by_distance((0, 0, 0))), 12) + + def test_vertices(self): + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + self.assertEqual(len(sl.vertices()), 8) + + def test_vertex(self): + sl = ShapeList([Edge.make_circle(1)]) + np.testing.assert_allclose(sl.vertex().to_tuple(), (1, 0, 0), 1e-5) + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + with self.assertWarns(UserWarning): + sl.vertex() + self.assertEqual(len(Edge().vertices()), 0) + + def test_edges(self): + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + self.assertEqual(len(sl.edges()), 8) + self.assertEqual(len(Edge().edges()), 0) + + def test_edge(self): + sl = ShapeList([Edge.make_circle(1)]) + self.assertAlmostEqual(sl.edge().length, 2 * 1 * math.pi, 5) + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + with self.assertWarns(UserWarning): + sl.edge() + + def test_wires(self): + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + self.assertEqual(len(sl.wires()), 2) + self.assertEqual(len(Wire().wires()), 0) + + def test_wire(self): + sl = ShapeList([Wire.make_circle(1)]) + self.assertAlmostEqual(sl.wire().length, 2 * 1 * math.pi, 5) + sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) + with self.assertWarns(UserWarning): + sl.wire() + + def test_faces(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + self.assertEqual(len(sl.faces()), 9) + self.assertEqual(len(Face().faces()), 0) + + def test_face(self): + sl = ShapeList( + [Vertex(1, 1, 1), Edge.make_line((0, 0), (1, 1)), Face.make_rect(2, 1)] + ) + self.assertAlmostEqual(sl.face().area, 2 * 1, 5) + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.face() + + def test_shells(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + self.assertEqual(len(sl.shells()), 2) + self.assertEqual(len(Shell().shells()), 0) + + def test_shell(self): + sl = ShapeList([Vertex(1, 1, 1), Solid.make_box(1, 1, 1)]) + self.assertAlmostEqual(sl.shell().area, 6 * 1 * 1, 5) + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.shell() + + def test_solids(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + self.assertEqual(len(sl.solids()), 2) + self.assertEqual(len(Solid().solids()), 0) + + def test_solid(self): + sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.solid() + sl = ShapeList([Solid.make_box(1, 2, 3), Vertex(1, 1, 1)]) + self.assertAlmostEqual(sl.solid().volume, 1 * 2 * 3, 5) + + def test_compounds(self): + sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) + self.assertEqual(len(sl.compounds()), 2) + self.assertEqual(len(Compound().compounds()), 0) + + def test_compound(self): + sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) + with self.assertWarns(UserWarning): + sl.compound() + sl = ShapeList([Box(1, 2, 3), Vertex(1, 1, 1)]) + self.assertAlmostEqual(sl.compound().volume, 1 * 2 * 3, 5) + + def test_equal(self): + box = Box(1, 1, 1) + cyl = Cylinder(1, 1) + sl = ShapeList([box, cyl]) + same = ShapeList([cyl, box]) + self.assertEqual(sl, same) + self.assertEqual(sl, AlwaysEqual()) + + def test_not_equal(self): + sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) + diff = ShapeList([Box(1, 1, 1), Box(1, 2, 3)]) + self.assertNotEqual(sl, diff) + self.assertNotEqual(sl, object()) + + def test_center(self): + self.assertEqual(tuple(ShapeList().center()), (0, 0, 0)) + self.assertEqual( + tuple(ShapeList(Vertex(i, 0, 0) for i in range(3)).center()), (1, 0, 0) + ) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_shells.py b/tests/test_direct_api/test_shells.py new file mode 100644 index 0000000..d78de7f --- /dev/null +++ b/tests/test_direct_api/test_shells.py @@ -0,0 +1,115 @@ +""" +build123d imports + +name: test_shells.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.geometry import Plane, Rot, Vector +from build123d.objects_curve import JernArc, Polyline, Spline +from build123d.objects_sketch import Circle +from build123d.operations_generic import sweep +from build123d.topology import Shell, Solid, Wire + + +class TestShells(unittest.TestCase): + def test_shell_init(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + self.assertTrue(box_shell.is_valid()) + + def test_center(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + self.assertAlmostEqual(box_shell.center(), (0.5, 0.5, 0.5), 5) + + def test_manifold_shell_volume(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + self.assertAlmostEqual(box_shell.volume, 1, 5) + + def test_nonmanifold_shell_volume(self): + box_faces = Solid.make_box(1, 1, 1).faces() + nm_shell = Shell(box_faces) + nm_shell -= nm_shell.faces()[0] + self.assertAlmostEqual(nm_shell.volume, 0, 5) + + def test_constructor(self): + with self.assertRaises(TypeError): + Shell(foo="bar") + + x_section = Rot(90) * Spline((0, -5), (-3, -2), (-2, 0), (-3, 2), (0, 5)) + surface = sweep(x_section, Circle(5).wire()) + single_face = Shell(surface.face()) + self.assertTrue(single_face.is_valid()) + single_face = Shell(surface.faces()) + self.assertTrue(single_face.is_valid()) + + def test_sweep(self): + path_c1 = JernArc((0, 0), (-1, 0), 1, 180) + path_e = path_c1.edge() + path_c2 = JernArc((0, 0), (-1, 0), 1, 180) + JernArc((0, 0), (1, 0), 2, -90) + path_w = path_c2.wire() + section_e = Circle(0.5).edge() + section_c2 = Polyline((0, 0), (0.1, 0), (0.2, 0.1)) + section_w = section_c2.wire() + + sweep_e_w = Shell.sweep((path_w ^ 0) * section_e, path_w) + sweep_w_e = Shell.sweep((path_e ^ 0) * section_w, path_e) + sweep_w_w = Shell.sweep((path_w ^ 0) * section_w, path_w) + sweep_c2_c1 = Shell.sweep((path_c1 ^ 0) * section_c2, path_c1) + sweep_c2_c2 = Shell.sweep((path_c2 ^ 0) * section_c2, path_c2) + + self.assertEqual(len(sweep_e_w.faces()), 2) + self.assertEqual(len(sweep_w_e.faces()), 2) + self.assertEqual(len(sweep_c2_c1.faces()), 2) + self.assertEqual(len(sweep_w_w.faces()), 3) # 3 with clean, 4 without + self.assertEqual(len(sweep_c2_c2.faces()), 3) # 3 with clean, 4 without + + def test_make_loft(self): + r = 3 + h = 2 + loft = Shell.make_loft( + [Wire.make_circle(r, Plane((0, 0, h))), Wire.make_circle(r)] + ) + self.assertEqual(loft.volume, 0, "A shell has no volume") + cylinder_area = 2 * math.pi * r * h + self.assertAlmostEqual(loft.area, cylinder_area) + + def test_thicken(self): + rect = Wire.make_rect(10, 5) + shell: Shell = Shell.extrude(rect, Vector(0, 0, 3)) + thick = Solid.thicken(shell, 1) + + self.assertEqual(isinstance(thick, Solid), True) + inner_vol = 3 * 10 * 5 + outer_vol = 3 * 12 * 7 + self.assertAlmostEqual(thick.volume, outer_vol - inner_vol) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_skip_clean.py b/tests/test_direct_api/test_skip_clean.py new file mode 100644 index 0000000..4c26916 --- /dev/null +++ b/tests/test_direct_api/test_skip_clean.py @@ -0,0 +1,68 @@ +""" +build123d imports + +name: test_skip_clean.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.topology import SkipClean + + +class TestSkipClean(unittest.TestCase): + def setUp(self): + # Ensure the class variable is in its default state before each test + SkipClean.clean = True + + def test_context_manager_sets_clean_false(self): + # Verify `clean` is initially True + self.assertTrue(SkipClean.clean) + + # Use the context manager + with SkipClean(): + # Within the context, `clean` should be False + self.assertFalse(SkipClean.clean) + + # After exiting the context, `clean` should revert to True + self.assertTrue(SkipClean.clean) + + def test_exception_handling_does_not_affect_clean(self): + # Verify `clean` is initially True + self.assertTrue(SkipClean.clean) + + # Use the context manager and raise an exception + try: + with SkipClean(): + self.assertFalse(SkipClean.clean) + raise ValueError("Test exception") + except ValueError: + pass + + # Ensure `clean` is restored to True after an exception + self.assertTrue(SkipClean.clean) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_solid.py b/tests/test_direct_api/test_solid.py new file mode 100644 index 0000000..2c67642 --- /dev/null +++ b/tests/test_direct_api/test_solid.py @@ -0,0 +1,238 @@ +""" +build123d imports + +name: test_solid.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import unittest + +from build123d.build_enums import GeomType, Kind, Until +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.objects_curve import Spline +from build123d.objects_sketch import Circle, Rectangle +from build123d.topology import Compound, Edge, Face, Shell, Solid, Vertex, Wire + + +class TestSolid(unittest.TestCase): + def test_make_solid(self): + box_faces = Solid.make_box(1, 1, 1).faces() + box_shell = Shell(box_faces) + box = Solid(box_shell) + self.assertAlmostEqual(box.area, 6, 5) + self.assertAlmostEqual(box.volume, 1, 5) + self.assertTrue(box.is_valid()) + + def test_extrude(self): + v = Edge.extrude(Vertex(1, 1, 1), (0, 0, 1)) + self.assertAlmostEqual(v.length, 1, 5) + + e = Face.extrude(Edge.make_line((2, 1), (2, 0)), (0, 0, 1)) + self.assertAlmostEqual(e.area, 1, 5) + + w = Shell.extrude( + Wire([Edge.make_line((1, 1), (0, 2)), Edge.make_line((1, 1), (1, 0))]), + (0, 0, 1), + ) + self.assertAlmostEqual(w.area, 1 + math.sqrt(2), 5) + + f = Solid.extrude(Face.make_rect(1, 1), (0, 0, 1)) + self.assertAlmostEqual(f.volume, 1, 5) + + s = Compound.extrude( + Shell( + Solid.make_box(1, 1, 1) + .locate(Location((-2, 1, 0))) + .faces() + .sort_by(Axis((0, 0, 0), (1, 1, 1)))[-2:] + ), + (0.1, 0.1, 0.1), + ) + self.assertAlmostEqual(s.volume, 0.2, 5) + + with self.assertRaises(ValueError): + Solid.extrude(Solid.make_box(1, 1, 1), (0, 0, 1)) + + def test_extrude_taper(self): + a = 1 + rect = Face.make_rect(a, a) + flipped = -rect + for direction in [Vector(0, 0, 2), Vector(0, 0, -2)]: + for taper in [10, -10]: + offset_amt = -direction.length * math.tan(math.radians(taper)) + for face in [rect, flipped]: + with self.subTest( + f"{direction=}, {taper=}, flipped={face==flipped}" + ): + taper_solid = Solid.extrude_taper(face, direction, taper) + # V = 1/3 × h × (a² + b² + ab) + h = Vector(direction).length + b = a + 2 * offset_amt + v = h * (a**2 + b**2 + a * b) / 3 + self.assertAlmostEqual(taper_solid.volume, v, 5) + bbox = taper_solid.bounding_box() + size = max(1, b) / 2 + if direction.Z > 0: + self.assertAlmostEqual(bbox.min, (-size, -size, 0), 1) + self.assertAlmostEqual(bbox.max, (size, size, h), 1) + else: + self.assertAlmostEqual(bbox.min, (-size, -size, -h), 1) + self.assertAlmostEqual(bbox.max, (size, size, 0), 1) + + def test_extrude_taper_with_hole(self): + rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) + direction = Vector(0, 0, 0.5) + taper = 10 + taper_solid = Solid.extrude_taper(rect_hole, direction, taper) + offset_amt = -direction.length * math.tan(math.radians(taper)) + hole = taper_solid.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] + self.assertAlmostEqual(hole.radius, 0.25 - offset_amt, 5) + + def test_extrude_taper_with_hole_flipped(self): + rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) + direction = Vector(0, 0, 1) + taper = 10 + taper_solid_t = Solid.extrude_taper(rect_hole, direction, taper, True) + taper_solid_f = Solid.extrude_taper(rect_hole, direction, taper, False) + hole_t = taper_solid_t.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] + hole_f = taper_solid_f.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] + self.assertGreater(hole_t.radius, hole_f.radius) + + def test_extrude_taper_oblique(self): + rect = Face.make_rect(2, 1) + rect_hole = rect.make_holes([Wire.make_circle(0.25)]) + o_rect_hole = rect_hole.moved(Location((0, 0, 0), (1, 0.1, 0), 77)) + taper0 = Solid.extrude_taper(rect_hole, (0, 0, 1), 5) + taper1 = Solid.extrude_taper(o_rect_hole, o_rect_hole.normal_at(), 5) + self.assertAlmostEqual(taper0.volume, taper1.volume, 5) + + def test_extrude_linear_with_rotation(self): + # Face + base = Face.make_rect(1, 1) + twist = Solid.extrude_linear_with_rotation( + base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 + ) + self.assertAlmostEqual(twist.volume, 1, 5) + top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) + bottom = twist.faces().sort_by(Axis.Z)[0] + self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) + # Wire + base = Wire.make_rect(1, 1) + twist = Solid.extrude_linear_with_rotation( + base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 + ) + self.assertAlmostEqual(twist.volume, 1, 5) + top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) + bottom = twist.faces().sort_by(Axis.Z)[0] + self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) + + def test_make_loft(self): + loft = Solid.make_loft( + [Wire.make_rect(2, 2), Wire.make_circle(1, Plane((0, 0, 1)))] + ) + self.assertAlmostEqual(loft.volume, (4 + math.pi) / 2, 1) + + with self.assertRaises(ValueError): + Solid.make_loft([Wire.make_rect(1, 1)]) + + def test_make_loft_with_vertices(self): + loft = Solid.make_loft( + [Vertex(0, 0, -1), Wire.make_rect(1, 1.5), Vertex(0, 0, 1)], True + ) + self.assertAlmostEqual(loft.volume, 1, 5) + + with self.assertRaises(ValueError): + Solid.make_loft( + [Wire.make_rect(1, 1), Vertex(0, 0, 1), Wire.make_rect(1, 1)] + ) + + with self.assertRaises(ValueError): + Solid.make_loft([Vertex(0, 0, 1), Vertex(0, 0, 2)]) + + with self.assertRaises(ValueError): + Solid.make_loft( + [ + Vertex(0, 0, 1), + Wire.make_rect(1, 1), + Vertex(0, 0, 2), + Vertex(0, 0, 3), + ] + ) + + def test_extrude_until(self): + square = Face.make_rect(1, 1) + box = Solid.make_box(4, 4, 1, Plane((-2, -2, 3))) + extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.LAST) + self.assertAlmostEqual(extrusion.volume, 4, 5) + + square = Face.make_rect(1, 1) + box = Solid.make_box(4, 4, 1, Plane((-2, -2, -3))) + extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.PREVIOUS) + self.assertAlmostEqual(extrusion.volume, 2, 5) + + def test_sweep(self): + path = Edge.make_spline([(0, 0), (3, 5), (7, -2)]) + section = Wire.make_circle(1, Plane(path @ 0, z_dir=path % 0)) + area = Face(section).area + swept = Solid.sweep(section, path) + self.assertAlmostEqual(swept.volume, path.length * area, 0) + + def test_hollow_sweep(self): + path = Edge.make_line((0, 0, 0), (0, 0, 5)) + section = (Rectangle(1, 1) - Rectangle(0.1, 0.1)).faces()[0] + swept = Solid.sweep(section, path) + self.assertAlmostEqual(swept.volume, 5 * (1 - 0.1**2), 5) + + def test_sweep_multi(self): + f0 = Face.make_rect(1, 1) + f1 = Pos(X=10) * Circle(1).face() + path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (0, 0, -1))) + binormal = Edge.make_line((0, 1), (10, 1)) + swept = Solid.sweep_multi([f0, f1], path, is_frenet=True, binormal=binormal) + self.assertAlmostEqual(swept.volume, 23.78, 2) + + path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (1, 0, 0))) + swept = Solid.sweep_multi( + [f0, f1], path, is_frenet=True, binormal=Vector(5, 0, 1) + ) + self.assertAlmostEqual(swept.volume, 20.75, 2) + + def test_constructor(self): + with self.assertRaises(TypeError): + Solid(foo="bar") + + def test_offset_3d(self): + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).offset_3d(None, 0.1, kind=Kind.TANGENT) + + def test_revolve(self): + r = Solid.revolve( + Face.make_rect(1, 1, Plane((10, 0, 0))).wire(), 180, axis=Axis.Y + ) + self.assertEqual(len(r.faces()), 6) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_vector.py b/tests/test_direct_api/test_vector.py new file mode 100644 index 0000000..a140f01 --- /dev/null +++ b/tests/test_direct_api/test_vector.py @@ -0,0 +1,288 @@ +""" +build123d imports + +name: test_vector.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# Always equal to any other object, to test that __eq__ cooperation is working +import copy +import math +import unittest + +from OCP.gp import gp_Vec, gp_XYZ +from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.topology import Solid, Vertex + + +class AlwaysEqual: + def __eq__(self, other): + return True + + +class TestVector(unittest.TestCase): + """Test the Vector methods""" + + def test_vector_constructors(self): + v1 = Vector(1, 2, 3) + v2 = Vector((1, 2, 3)) + v3 = Vector(gp_Vec(1, 2, 3)) + v4 = Vector([1, 2, 3]) + v5 = Vector(gp_XYZ(1, 2, 3)) + v5b = Vector(X=1, Y=2, Z=3) + v5c = Vector(v=gp_XYZ(1, 2, 3)) + + for v in [v1, v2, v3, v4, v5, v5b, v5c]: + self.assertAlmostEqual(v, (1, 2, 3), 4) + + v6 = Vector((1, 2)) + v7 = Vector([1, 2]) + v8 = Vector(1, 2) + v8b = Vector(X=1, Y=2) + + for v in [v6, v7, v8, v8b]: + self.assertAlmostEqual(v, (1, 2, 0), 4) + + v9 = Vector() + self.assertAlmostEqual(v9, (0, 0, 0), 4) + + v9.X = 1.0 + v9.Y = 2.0 + v9.Z = 3.0 + self.assertAlmostEqual(v9, (1, 2, 3), 4) + self.assertAlmostEqual(Vector(1, 2, 3, 4), (1, 2, 3), 4) + + v10 = Vector(1) + v11 = Vector((1,)) + v12 = Vector([1]) + v13 = Vector(X=1) + for v in [v10, v11, v12, v13]: + self.assertAlmostEqual(v, (1, 0, 0), 4) + + vertex = Vertex(0, 0, 0).moved(Pos(0, 0, 10)) + self.assertAlmostEqual(Vector(vertex), (0, 0, 10), 4) + + with self.assertRaises(TypeError): + Vector("vector") + with self.assertRaises(ValueError): + Vector(x=1) + + def test_vector_rotate(self): + """Validate vector rotate methods""" + vector_x = Vector(1, 0, 1).rotate(Axis.X, 45) + vector_y = Vector(1, 2, 1).rotate(Axis.Y, 45) + vector_z = Vector(-1, -1, 3).rotate(Axis.Z, 45) + self.assertAlmostEqual(vector_x, (1, -math.sqrt(2) / 2, math.sqrt(2) / 2), 7) + self.assertAlmostEqual(vector_y, (math.sqrt(2), 2, 0), 7) + self.assertAlmostEqual(vector_z, (0, -math.sqrt(2), 3), 7) + + def test_get_signed_angle(self): + """Verify getSignedAngle calculations with and without a provided normal""" + a = math.pi / 3 + v1 = Vector(1, 0, 0) + v2 = Vector(math.cos(a), -math.sin(a), 0) + d1 = v1.get_signed_angle(v2) + d2 = v1.get_signed_angle(v2, Vector(0, 0, 1)) + self.assertAlmostEqual(d1, a * 180 / math.pi) + self.assertAlmostEqual(d2, -a * 180 / math.pi) + + def test_center(self): + v = Vector(1, 1, 1) + self.assertAlmostEqual(v, v.center()) + + def test_dot(self): + v1 = Vector(2, 2, 2) + v2 = Vector(1, -1, 1) + self.assertEqual(2.0, v1.dot(v2)) + + def test_vector_add(self): + result = Vector(1, 2, 0) + Vector(0, 0, 3) + self.assertAlmostEqual(result, (1.0, 2.0, 3.0), 3) + + def test_vector_operators(self): + result = Vector(1, 1, 1) + Vector(2, 2, 2) + self.assertEqual(Vector(3, 3, 3), result) + + result = Vector(1, 2, 3) - Vector(3, 2, 1) + self.assertEqual(Vector(-2, 0, 2), result) + + result = Vector(1, 2, 3) * 2 + self.assertEqual(Vector(2, 4, 6), result) + + result = 3 * Vector(1, 2, 3) + self.assertEqual(Vector(3, 6, 9), result) + + result = Vector(2, 4, 6) / 2 + self.assertEqual(Vector(1, 2, 3), result) + + self.assertEqual(Vector(-1, -1, -1), -Vector(1, 1, 1)) + + self.assertEqual(0, abs(Vector(0, 0, 0))) + self.assertEqual(1, abs(Vector(1, 0, 0))) + self.assertEqual((1 + 4 + 9) ** 0.5, abs(Vector(1, 2, 3))) + + def test_vector_equals(self): + a = Vector(1, 2, 3) + b = Vector(1, 2, 3) + c = Vector(1, 2, 3.000001) + self.assertEqual(a, b) + self.assertEqual(a, c) + self.assertEqual(a, AlwaysEqual()) + + def test_vector_not_equal(self): + a = Vector(1, 2, 3) + b = Vector(3, 2, 1) + self.assertNotEqual(a, b) + self.assertNotEqual(a, object()) + + def test_vector_distance(self): + """ + Test line distance from plane. + """ + v = Vector(1, 2, 3) + + self.assertAlmostEqual(1, v.signed_distance_from_plane(Plane.YZ)) + self.assertAlmostEqual(2, v.signed_distance_from_plane(Plane.ZX)) + self.assertAlmostEqual(3, v.signed_distance_from_plane(Plane.XY)) + self.assertAlmostEqual(-1, v.signed_distance_from_plane(Plane.ZY)) + self.assertAlmostEqual(-2, v.signed_distance_from_plane(Plane.XZ)) + self.assertAlmostEqual(-3, v.signed_distance_from_plane(Plane.YX)) + + self.assertAlmostEqual(1, v.distance_to_plane(Plane.YZ)) + self.assertAlmostEqual(2, v.distance_to_plane(Plane.ZX)) + self.assertAlmostEqual(3, v.distance_to_plane(Plane.XY)) + self.assertAlmostEqual(1, v.distance_to_plane(Plane.ZY)) + self.assertAlmostEqual(2, v.distance_to_plane(Plane.XZ)) + self.assertAlmostEqual(3, v.distance_to_plane(Plane.YX)) + + def test_vector_project(self): + """ + Test line projection and plane projection methods of Vector + """ + decimal_places = 9 + + z_dir = Vector(1, 2, 3) + base = Vector(5, 7, 9) + x_dir = Vector(1, 0, 0) + + # test passing Plane object + point = Vector(10, 11, 12).project_to_plane(Plane(base, x_dir, z_dir)) + self.assertAlmostEqual(point, (59 / 7, 55 / 7, 51 / 7), decimal_places) + + # test line projection + vec = Vector(10, 10, 10) + line = Vector(3, 4, 5) + angle = math.radians(vec.get_angle(line)) + + vecLineProjection = vec.project_to_line(line) + + self.assertAlmostEqual( + vecLineProjection.normalized(), + line.normalized(), + decimal_places, + ) + self.assertAlmostEqual( + vec.length * math.cos(angle), vecLineProjection.length, decimal_places + ) + + def test_vector_not_implemented(self): + pass + + def test_vector_special_methods(self): + self.assertEqual(repr(Vector(1, 2, 3)), "Vector(1, 2, 3)") + self.assertEqual(str(Vector(1, 2, 3)), "Vector(1, 2, 3)") + self.assertEqual( + str(Vector(9.99999999999999, -23.649999999999995, -7.37188088351e-15)), + "Vector(10, -23.65, 0)", + ) + + def test_vector_iter(self): + self.assertEqual(sum([v for v in Vector(1, 2, 3)]), 6) + + def test_reverse(self): + self.assertAlmostEqual(Vector(1, 2, 3).reverse(), (-1, -2, -3), 7) + + def test_copy(self): + v2 = copy.copy(Vector(1, 2, 3)) + v3 = copy.deepcopy(Vector(1, 2, 3)) + self.assertAlmostEqual(v2, (1, 2, 3), 7) + self.assertAlmostEqual(v3, (1, 2, 3), 7) + + def test_radd(self): + vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9)] + vector_sum = sum(vectors) + self.assertAlmostEqual(vector_sum, (12, 15, 18), 5) + + def test_hash(self): + vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9), Vector(1, 2, 3)] + unique_vectors = list(set(vectors)) + self.assertEqual(len(vectors), 4) + self.assertEqual(len(unique_vectors), 3) + + def test_vector_transform(self): + a = Vector(1, 2, 3) + pxy = Plane.XY + pxy_o1 = Plane.XY.offset(1) + self.assertEqual(a.transform(pxy.forward_transform, is_direction=False), a) + self.assertEqual( + a.transform(pxy.forward_transform, is_direction=True), a.normalized() + ) + self.assertEqual( + a.transform(pxy_o1.forward_transform, is_direction=False), Vector(1, 2, 2) + ) + self.assertEqual( + a.transform(pxy_o1.forward_transform, is_direction=True), a.normalized() + ) + self.assertEqual( + a.transform(pxy_o1.reverse_transform, is_direction=False), Vector(1, 2, 4) + ) + self.assertEqual( + a.transform(pxy_o1.reverse_transform, is_direction=True), a.normalized() + ) + + def test_intersect(self): + v1 = Vector(1, 2, 3) + self.assertAlmostEqual(v1 & Vector(1, 2, 3), (1, 2, 3), 5) + self.assertIsNone(v1 & Vector(0, 0, 0)) + + self.assertAlmostEqual(v1 & Location((1, 2, 3)), (1, 2, 3), 5) + self.assertIsNone(v1 & Location()) + + self.assertAlmostEqual(v1 & Axis((1, 2, 3), (1, 0, 0)), (1, 2, 3), 5) + self.assertIsNone(v1 & Axis.X) + + self.assertAlmostEqual(v1 & Plane((1, 2, 3)), (1, 2, 3), 5) + self.assertIsNone(v1 & Plane.XY) + + self.assertAlmostEqual( + Vector((v1 & Solid.make_box(2, 4, 5)).vertex()), (1, 2, 3), 5 + ) + self.assertIsNone(v1.intersect(Solid.make_box(0.5, 0.5, 0.5))) + self.assertIsNone( + Vertex(-10, -10, -10).intersect(Solid.make_box(0.5, 0.5, 0.5)) + ) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_vector_like.py b/tests/test_direct_api/test_vector_like.py new file mode 100644 index 0000000..4926331 --- /dev/null +++ b/tests/test_direct_api/test_vector_like.py @@ -0,0 +1,55 @@ +""" +build123d imports + +name: test_vector_like.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import Axis, Vector +from build123d.topology import Vertex + + +class TestVectorLike(unittest.TestCase): + """Test typedef""" + + def test_axis_from_vertex(self): + axis = Axis(Vertex(1, 2, 3), Vertex(0, 0, 1)) + self.assertAlmostEqual(axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) + + def test_axis_from_vector(self): + axis = Axis(Vector(1, 2, 3), Vector(0, 0, 1)) + self.assertAlmostEqual(axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) + + def test_axis_from_tuple(self): + axis = Axis((1, 2, 3), (0, 0, 1)) + self.assertAlmostEqual(axis.position, (1, 2, 3), 5) + self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_vertex.py b/tests/test_direct_api/test_vertex.py new file mode 100644 index 0000000..434135c --- /dev/null +++ b/tests/test_direct_api/test_vertex.py @@ -0,0 +1,104 @@ +""" +build123d imports + +name: test_vertex.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.geometry import Axis, Vector +from build123d.topology import Vertex + + +class TestVertex(unittest.TestCase): + """Test the extensions to the cadquery Vertex class""" + + def test_basic_vertex(self): + v = Vertex() + self.assertEqual(0, v.X) + + v = Vertex(1, 1, 1) + self.assertEqual(1, v.X) + self.assertEqual(Vector, type(v.center())) + + self.assertAlmostEqual(Vector(Vertex(Vector(1, 2, 3))), (1, 2, 3), 7) + self.assertAlmostEqual(Vector(Vertex((4, 5, 6))), (4, 5, 6), 7) + self.assertAlmostEqual(Vector(Vertex((7,))), (7, 0, 0), 7) + self.assertAlmostEqual(Vector(Vertex((8, 9))), (8, 9, 0), 7) + + def test_vertex_volume(self): + v = Vertex(1, 1, 1) + self.assertAlmostEqual(v.volume, 0, 5) + + def test_vertex_add(self): + test_vertex = Vertex(0, 0, 0) + self.assertAlmostEqual(Vector(test_vertex + (100, -40, 10)), (100, -40, 10), 7) + self.assertAlmostEqual( + Vector(test_vertex + Vector(100, -40, 10)), (100, -40, 10), 7 + ) + self.assertAlmostEqual( + Vector(test_vertex + Vertex(100, -40, 10)), + (100, -40, 10), + 7, + ) + with self.assertRaises(TypeError): + test_vertex + [1, 2, 3] + + def test_vertex_sub(self): + test_vertex = Vertex(0, 0, 0) + self.assertAlmostEqual(Vector(test_vertex - (100, -40, 10)), (-100, 40, -10), 7) + self.assertAlmostEqual( + Vector(test_vertex - Vector(100, -40, 10)), (-100, 40, -10), 7 + ) + self.assertAlmostEqual( + Vector(test_vertex - Vertex(100, -40, 10)), + (-100, 40, -10), + 7, + ) + with self.assertRaises(TypeError): + test_vertex - [1, 2, 3] + + def test_vertex_str(self): + self.assertEqual(str(Vertex(0, 0, 0)), "Vertex(0.0, 0.0, 0.0)") + + def test_vertex_to_vector(self): + self.assertIsInstance(Vector(Vertex(0, 0, 0)), Vector) + self.assertAlmostEqual(Vector(Vertex(0, 0, 0)), (0.0, 0.0, 0.0), 7) + + def test_vertex_init_error(self): + with self.assertRaises(TypeError): + Vertex(Axis.Z) + with self.assertRaises(ValueError): + Vertex(x=1) + with self.assertRaises(TypeError): + Vertex((Axis.X, Axis.Y, Axis.Z)) + + def test_no_intersect(self): + with self.assertRaises(NotImplementedError): + Vertex(1, 2, 3) & Vertex(5, 6, 7) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_vtk_poly_data.py b/tests/test_direct_api/test_vtk_poly_data.py new file mode 100644 index 0000000..69d022f --- /dev/null +++ b/tests/test_direct_api/test_vtk_poly_data.py @@ -0,0 +1,87 @@ +""" +build123d imports + +name: test_v_t_k_poly_data.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest + +from build123d.topology import Solid +from vtkmodules.vtkCommonDataModel import vtkPolyData +from vtkmodules.vtkFiltersCore import vtkTriangleFilter + + +class TestVTKPolyData(unittest.TestCase): + def setUp(self): + # Create a simple test object (e.g., a cylinder) + self.object_under_test = Solid.make_cylinder(1, 2) + + def test_to_vtk_poly_data(self): + # Generate VTK data + vtk_data = self.object_under_test.to_vtk_poly_data( + tolerance=0.1, angular_tolerance=0.2, normals=True + ) + + # Verify the result is of type vtkPolyData + self.assertIsInstance(vtk_data, vtkPolyData) + + # Further verification can include: + # - Checking the number of points, polygons, or cells + self.assertGreater( + vtk_data.GetNumberOfPoints(), 0, "VTK data should have points." + ) + self.assertGreater( + vtk_data.GetNumberOfCells(), 0, "VTK data should have cells." + ) + + # Optionally, compare the output with a known reference object + # (if available) by exporting or analyzing the VTK data + known_filter = vtkTriangleFilter() + known_filter.SetInputData(vtk_data) + known_filter.Update() + known_output = known_filter.GetOutput() + + self.assertEqual( + vtk_data.GetNumberOfPoints(), + known_output.GetNumberOfPoints(), + "Number of points in VTK data does not match the expected output.", + ) + self.assertEqual( + vtk_data.GetNumberOfCells(), + known_output.GetNumberOfCells(), + "Number of cells in VTK data does not match the expected output.", + ) + + def test_empty_shape(self): + # Test handling of empty shape + empty_object = Solid() # Create an empty object + with self.assertRaises(ValueError) as context: + empty_object.to_vtk_poly_data() + + self.assertEqual(str(context.exception), "Cannot convert an empty shape") + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py new file mode 100644 index 0000000..c3295e3 --- /dev/null +++ b/tests/test_direct_api/test_wire.py @@ -0,0 +1,221 @@ +""" +build123d imports + +name: test_wire.py +by: Gumyr +date: January 22, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import random +import unittest + +import numpy as np +from build123d.build_enums import Side +from build123d.geometry import Axis, Color, Location +from build123d.objects_curve import Polyline, Spline +from build123d.objects_sketch import Circle, Rectangle, RegularPolygon +from build123d.topology import Edge, Face, Wire + + +class TestWire(unittest.TestCase): + def test_ellipse_arc(self): + full_ellipse = Wire.make_ellipse(2, 1) + half_ellipse = Wire.make_ellipse( + 2, 1, start_angle=0, end_angle=180, closed=True + ) + self.assertAlmostEqual(full_ellipse.area / 2, half_ellipse.area, 5) + + def test_stitch(self): + half_ellipse1 = Wire.make_ellipse( + 2, 1, start_angle=0, end_angle=180, closed=False + ) + half_ellipse2 = Wire.make_ellipse( + 2, 1, start_angle=180, end_angle=360, closed=False + ) + ellipse = half_ellipse1.stitch(half_ellipse2) + self.assertEqual(len(ellipse.wires()), 1) + + def test_fillet_2d(self): + square = Wire.make_rect(1, 1) + squaroid = square.fillet_2d(0.1, square.vertices()) + self.assertAlmostEqual( + squaroid.length, 4 * (1 - 2 * 0.1) + 2 * math.pi * 0.1, 5 + ) + + def test_chamfer_2d(self): + square = Wire.make_rect(1, 1) + squaroid = square.chamfer_2d(0.1, 0.1, square.vertices()) + self.assertAlmostEqual( + squaroid.length, 4 * (1 - 2 * 0.1 + 0.1 * math.sqrt(2)), 5 + ) + + def test_chamfer_2d_edge(self): + square = Wire.make_rect(1, 1) + edge = square.edges().sort_by(Axis.Y)[0] + vertex = edge.vertices().sort_by(Axis.X)[0] + square = square.chamfer_2d( + distance=0.1, distance2=0.2, vertices=[vertex], edge=edge + ) + self.assertAlmostEqual(square.edges().sort_by(Axis.Y)[0].length, 0.9) + + def test_make_convex_hull(self): + # overlapping_edges = [ + # Edge.make_circle(10, end_angle=60), + # Edge.make_circle(10, start_angle=30, end_angle=90), + # Edge.make_line((-10, 10), (10, -10)), + # ] + # with self.assertRaises(ValueError): + # Wire.make_convex_hull(overlapping_edges) + + adjoining_edges = [ + Edge.make_circle(10, end_angle=45), + Edge.make_circle(10, start_angle=315, end_angle=360), + Edge.make_line((-10, 10), (-10, -10)), + ] + hull_wire = Wire.make_convex_hull(adjoining_edges) + self.assertAlmostEqual(Face(hull_wire).area, 319.9612, 4) + + # def test_fix_degenerate_edges(self): + # # Can't find a way to create one + # edge0 = Edge.make_line((0, 0, 0), (1, 0, 0)) + # edge1 = Edge.make_line(edge0 @ 0, edge0 @ 0 + Vector(0, 1, 0)) + # edge1a = edge1.trim(0, 1e-7) + # edge1b = edge1.trim(1e-7, 1.0) + # edge2 = Edge.make_line(edge1 @ 1, edge1 @ 1 + Vector(1, 1, 0)) + # wire = Wire([edge0, edge1a, edge1b, edge2]) + # fixed_wire = wire.fix_degenerate_edges(1e-6) + # self.assertEqual(len(fixed_wire.edges()), 2) + + def test_trim(self): + e0 = Edge.make_line((0, 0), (1, 0)) + e1 = Edge.make_line((2, 0), (1, 0)) + e2 = Edge.make_line((2, 0), (3, 0)) + w1 = Wire([e0, e1, e2]) + t1 = w1.trim(0.2, 0.9).move(Location((0, 0.1, 0))) + self.assertAlmostEqual(t1.length, 2.1, 5) + + e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) + # Three edges are created 0->0.5->0.75->1.0 + o = e.offset_2d(10, side=Side.RIGHT, closed=False) + t2 = o.trim(0.1, 0.9) + self.assertAlmostEqual(t2.length, o.length * 0.8, 5) + + t3 = o.trim(0.5, 1.0) + self.assertAlmostEqual(t3.length, o.length * 0.5, 5) + + t4 = o.trim(0.5, 0.75) + self.assertAlmostEqual(t4.length, o.length * 0.25, 5) + + with self.assertRaises(ValueError): + o.trim(0.75, 0.25) + spline = Spline( + (0, 0, 0), + (0, 10, 0), + tangents=((0, 0, 1), (0, 0, -1)), + tangent_scalars=(2, 2), + ) + half = spline.trim(0.5, 1) + self.assertAlmostEqual(spline @ 0.5, half @ 0, 4) + self.assertAlmostEqual(spline @ 1, half @ 1, 4) + + w = Rectangle(3, 1).wire() + t5 = w.trim(0, 0.5) + self.assertAlmostEqual(t5.length, 4, 5) + t6 = w.trim(0.5, 1) + self.assertAlmostEqual(t6.length, 4, 5) + + p = RegularPolygon(10, 20).wire() + t7 = p.trim(0.1, 0.2) + self.assertAlmostEqual(p.length * 0.1, t7.length, 5) + + c = Circle(10).wire() + t8 = c.trim(0.4, 0.9) + self.assertAlmostEqual(c.length * 0.5, t8.length, 5) + + def test_param_at_point(self): + e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) + # Three edges are created 0->0.5->0.75->1.0 + o = e.offset_2d(10, side=Side.RIGHT, closed=False) + + e0 = Edge.make_line((0, 0), (1, 0)) + e1 = Edge.make_line((2, 0), (1, 0)) + e2 = Edge.make_line((2, 0), (3, 0)) + w1 = Wire([e0, e1, e2]) + for wire in [o, w1]: + u_value = random.random() + position = wire.position_at(u_value) + self.assertAlmostEqual(wire.param_at_point(position), u_value, 4) + + with self.assertRaises(ValueError): + o.param_at_point((-1, 1)) + + with self.assertRaises(ValueError): + w1.param_at_point((20, 20, 20)) + + def test_order_edges(self): + w1 = Wire( + [ + Edge.make_line((0, 0), (1, 0)), + Edge.make_line((1, 1), (1, 0)), + Edge.make_line((0, 1), (1, 1)), + ] + ) + ordered_edges = w1.order_edges() + self.assertFalse(all(e.is_forward for e in w1.edges())) + self.assertTrue(all(e.is_forward for e in ordered_edges)) + self.assertAlmostEqual(ordered_edges[0] @ 0, (0, 0, 0), 5) + self.assertAlmostEqual(ordered_edges[1] @ 0, (1, 0, 0), 5) + self.assertAlmostEqual(ordered_edges[2] @ 0, (1, 1, 0), 5) + + def test_constructor(self): + e0 = Edge.make_line((0, 0), (1, 0)) + e1 = Edge.make_line((1, 0), (1, 1)) + w0 = Wire.make_circle(1) + w1 = Wire(e0) + self.assertTrue(w1.is_valid()) + w2 = Wire([e0]) + self.assertAlmostEqual(w2.length, 1, 5) + self.assertTrue(w2.is_valid()) + w3 = Wire([e0, e1]) + self.assertTrue(w3.is_valid()) + self.assertAlmostEqual(w3.length, 2, 5) + w4 = Wire(w0.wrapped) + self.assertTrue(w4.is_valid()) + w5 = Wire(obj=w0.wrapped) + self.assertTrue(w5.is_valid()) + w6 = Wire(obj=w0.wrapped, label="w6", color=Color("red")) + self.assertTrue(w6.is_valid()) + self.assertEqual(w6.label, "w6") + np.testing.assert_allclose(tuple(w6.color), (1.0, 0.0, 0.0, 1.0), 1e-5) + w7 = Wire(w6) + self.assertTrue(w7.is_valid()) + c0 = Polyline((0, 0), (1, 0), (1, 1)) + w8 = Wire(c0) + self.assertTrue(w8.is_valid()) + with self.assertRaises(ValueError): + Wire(bob="fred") + + +if __name__ == "__main__": + unittest.main() From 50663a21c45df4b26a9d1164e76cf449a161322b Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 22 Jan 2025 15:28:40 -0500 Subject: [PATCH 155/518] Removed redundant test_direct_api.py --- tests/test_direct_api.py | 4826 -------------------------------------- 1 file changed, 4826 deletions(-) delete mode 100644 tests/test_direct_api.py diff --git a/tests/test_direct_api.py b/tests/test_direct_api.py deleted file mode 100644 index 52d8ac8..0000000 --- a/tests/test_direct_api.py +++ /dev/null @@ -1,4826 +0,0 @@ -# system modules -import copy -import io -from io import StringIO -import itertools -import json -import math -import numpy as np -import os -import platform -import pprint -import random -import re -from typing import Optional -import unittest -from unittest.mock import patch, MagicMock -from random import uniform -from IPython.lib import pretty - -from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge -from OCP.BRepGProp import BRepGProp -from OCP.gp import ( - gp, - gp_Ax1, - gp_Ax2, - gp_Circ, - gp_Dir, - gp_Elips, - gp_EulerSequence, - gp_Pnt, - gp_Quaternion, - gp_Trsf, - gp_Vec, - gp_XYZ, -) -from OCP.GProp import GProp_GProps -from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain # Correct import - -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter - -from build123d.build_common import GridLocations, Locations, PolarLocations -from build123d.build_enums import ( - Align, - AngularDirection, - CenterOf, - Extrinsic, - GeomType, - Intrinsic, - Keep, - Kind, - Mode, - PositionMode, - Side, - SortBy, - Until, -) - -from build123d.build_part import BuildPart -from build123d.exporters3d import export_brep, export_step, export_stl -from build123d.operations_part import extrude -from build123d.operations_sketch import make_face -from build123d.operations_generic import fillet, add, sweep -from build123d.objects_part import Box, Cylinder -from build123d.objects_curve import CenterArc, EllipticalCenterArc, JernArc, Polyline -from build123d.build_sketch import BuildSketch -from build123d.build_line import BuildLine -from build123d.jupyter_tools import to_vtkpoly_string -from build123d.objects_curve import Spline -from build123d.objects_sketch import Circle, Rectangle, RegularPolygon -from build123d.geometry import ( - Axis, - BoundBox, - Color, - Location, - LocationEncoder, - Matrix, - Plane, - Pos, - Rot, - Rotation, - Vector, - VectorLike, -) -from build123d.importers import import_brep, import_step, import_stl -from build123d.mesher import Mesher -from build123d.topology import ( - Compound, - Edge, - Face, - GroupBy, - Shape, - ShapeList, - Shell, - SkipClean, - Solid, - Sketch, - Vertex, - Wire, - edges_to_wires, - polar, - new_edges, - delta, - unwrap_topods_compound, -) -from build123d.jupyter_tools import display - - -# Always equal to any other object, to test that __eq__ cooperation is working -class AlwaysEqual: - def __eq__(self, other): - return True - - -class TestAssembly(unittest.TestCase): - @staticmethod - def create_test_assembly() -> Compound: - box = Solid.make_box(1, 1, 1) - box.orientation = (45, 45, 0) - box.label = "box" - sphere = Solid.make_sphere(1) - sphere.label = "sphere" - sphere.position = (1, 2, 3) - assembly = Compound(label="assembly", children=[box]) - sphere.parent = assembly - return assembly - - def assertTopoEqual(self, actual_topo: str, expected_topo_lines: list[str]): - actual_topo_lines = actual_topo.splitlines() - self.assertEqual(len(actual_topo_lines), len(expected_topo_lines)) - for actual_line, expected_line in zip(actual_topo_lines, expected_topo_lines): - start, end = re.split(r"at 0x[0-9a-f]+,", expected_line, 2, re.I) - self.assertTrue(actual_line.startswith(start)) - self.assertTrue(actual_line.endswith(end)) - - def test_attributes(self): - box = Solid.make_box(1, 1, 1) - box.label = "box" - sphere = Solid.make_sphere(1) - sphere.label = "sphere" - assembly = Compound(label="assembly", children=[box]) - sphere.parent = assembly - - self.assertEqual(len(box.children), 0) - self.assertEqual(box.label, "box") - self.assertEqual(box.parent, assembly) - self.assertEqual(sphere.parent, assembly) - self.assertEqual(len(assembly.children), 2) - - def test_show_topology_compound(self): - assembly = TestAssembly.create_test_assembly() - expected = [ - "assembly Compound at 0x7fced0fd1b50, Location(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))", - "├── box Solid at 0x7fced102d3a0, Location(p=(0.00, 0.00, 0.00), o=(45.00, 45.00, -0.00))", - "└── sphere Solid at 0x7fced0fd1f10, Location(p=(1.00, 2.00, 3.00), o=(-0.00, 0.00, -0.00))", - ] - self.assertTopoEqual(assembly.show_topology("Solid"), expected) - - def test_show_topology_shape_location(self): - assembly = TestAssembly.create_test_assembly() - expected = [ - "Solid at 0x7f3754501530, Position(1.0, 2.0, 3.0)", - "└── Shell at 0x7f3754501a70, Position(1.0, 2.0, 3.0)", - " └── Face at 0x7f3754501030, Position(1.0, 2.0, 3.0)", - ] - self.assertTopoEqual( - assembly.children[1].show_topology("Face", show_center=False), expected - ) - - def test_show_topology_shape(self): - assembly = TestAssembly.create_test_assembly() - expected = [ - "Solid at 0x7f6279043ab0, Center(1.0, 2.0, 3.0)", - "└── Shell at 0x7f62790438f0, Center(1.0, 2.0, 3.0)", - " └── Face at 0x7f62790439f0, Center(1.0, 2.0, 3.0)", - ] - self.assertTopoEqual(assembly.children[1].show_topology("Face"), expected) - - def test_remove_child(self): - assembly = TestAssembly.create_test_assembly() - self.assertEqual(len(assembly.children), 2) - assembly.children = list(assembly.children)[1:] - self.assertEqual(len(assembly.children), 1) - - def test_do_children_intersect(self): - ( - overlap, - pair, - distance, - ) = TestAssembly.create_test_assembly().do_children_intersect() - self.assertFalse(overlap) - box = Solid.make_box(1, 1, 1) - box.orientation = (45, 45, 0) - box.label = "box" - sphere = Solid.make_sphere(1) - sphere.label = "sphere" - sphere.position = (0, 0, 0) - assembly = Compound(label="assembly", children=[box]) - sphere.parent = assembly - overlap, pair, distance = assembly.do_children_intersect() - self.assertTrue(overlap) - - -class TestAxis(unittest.TestCase): - """Test the Axis class""" - - def test_axis_init(self): - test_axis = Axis((1, 2, 3), (0, 0, 1)) - self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis((1, 2, 3), direction=(0, 0, 1)) - self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis(origin=(1, 2, 3), direction=(0, 0, 1)) - self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis(Edge.make_line((1, 2, 3), (1, 2, 4))) - self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) - - test_axis = Axis(edge=Edge.make_line((1, 2, 3), (1, 2, 4))) - self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) - - with self.assertRaises(ValueError): - Axis("one", "up") - with self.assertRaises(ValueError): - Axis(one="up") - - def test_axis_from_occt(self): - occt_axis = gp_Ax1(gp_Pnt(1, 1, 1), gp_Dir(0, 1, 0)) - test_axis = Axis(occt_axis) - self.assertAlmostEqual(test_axis.position, (1, 1, 1), 5) - self.assertAlmostEqual(test_axis.direction, (0, 1, 0), 5) - - def test_axis_repr_and_str(self): - self.assertEqual(repr(Axis.X), "((0.0, 0.0, 0.0),(1.0, 0.0, 0.0))") - self.assertEqual(str(Axis.Y), "Axis: ((0.0, 0.0, 0.0),(0.0, 1.0, 0.0))") - - def test_axis_copy(self): - x_copy = copy.copy(Axis.X) - self.assertAlmostEqual(x_copy.position, (0, 0, 0), 5) - self.assertAlmostEqual(x_copy.direction, (1, 0, 0), 5) - x_copy = copy.deepcopy(Axis.X) - self.assertAlmostEqual(x_copy.position, (0, 0, 0), 5) - self.assertAlmostEqual(x_copy.direction, (1, 0, 0), 5) - - def test_axis_to_location(self): - # TODO: Verify this is correct - x_location = Axis.X.location - self.assertTrue(isinstance(x_location, Location)) - self.assertAlmostEqual(x_location.position, (0, 0, 0), 5) - self.assertAlmostEqual(x_location.orientation, (0, 90, 180), 5) - - def test_axis_located(self): - y_axis = Axis.Z.located(Location((0, 0, 1), (-90, 0, 0))) - self.assertAlmostEqual(y_axis.position, (0, 0, 1), 5) - self.assertAlmostEqual(y_axis.direction, (0, 1, 0), 5) - - def test_axis_to_plane(self): - x_plane = Axis.X.to_plane() - self.assertTrue(isinstance(x_plane, Plane)) - self.assertAlmostEqual(x_plane.origin, (0, 0, 0), 5) - self.assertAlmostEqual(x_plane.z_dir, (1, 0, 0), 5) - - def test_axis_is_coaxial(self): - self.assertTrue(Axis.X.is_coaxial(Axis((0, 0, 0), (1, 0, 0)))) - self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 1), (1, 0, 0)))) - self.assertFalse(Axis.X.is_coaxial(Axis((0, 0, 0), (0, 1, 0)))) - - def test_axis_is_normal(self): - self.assertTrue(Axis.X.is_normal(Axis.Y)) - self.assertFalse(Axis.X.is_normal(Axis.X)) - - def test_axis_is_opposite(self): - self.assertTrue(Axis.X.is_opposite(Axis((1, 1, 1), (-1, 0, 0)))) - self.assertFalse(Axis.X.is_opposite(Axis.X)) - - def test_axis_is_parallel(self): - self.assertTrue(Axis.X.is_parallel(Axis((1, 1, 1), (1, 0, 0)))) - self.assertFalse(Axis.X.is_parallel(Axis.Y)) - - def test_axis_angle_between(self): - self.assertAlmostEqual(Axis.X.angle_between(Axis.Y), 90, 5) - self.assertAlmostEqual( - Axis.X.angle_between(Axis((1, 1, 1), (-1, 0, 0))), 180, 5 - ) - - def test_axis_reverse(self): - self.assertAlmostEqual(Axis.X.reverse().direction, (-1, 0, 0), 5) - - def test_axis_reverse_op(self): - axis = -Axis.X - self.assertAlmostEqual(axis.direction, (-1, 0, 0), 5) - - def test_axis_as_edge(self): - edge = Edge(Axis.X) - self.assertTrue(isinstance(edge, Edge)) - common = (edge & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() - self.assertAlmostEqual(common.length, 1, 5) - - def test_axis_intersect(self): - common = (Axis.X.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() - self.assertAlmostEqual(common.length, 1, 5) - - common = (Axis.X & Edge.make_line((0, 0, 0), (1, 0, 0))).edge() - self.assertAlmostEqual(common.length, 1, 5) - - intersection = Axis.X & Axis((1, 0, 0), (0, 1, 0)) - self.assertAlmostEqual(intersection, (1, 0, 0), 5) - - i = Axis.X & Axis((1, 0, 0), (1, 0, 0)) - self.assertEqual(i, Axis.X) - - intersection = Axis((1, 2, 3), (0, 0, 1)) & Plane.XY - self.assertAlmostEqual(intersection.to_tuple(), (1, 2, 0), 5) - - arc = Edge.make_circle(20, start_angle=0, end_angle=180) - ax0 = Axis((-20, 30, 0), (4, -3, 0)) - intersections = arc.intersect(ax0).vertices().sort_by(Axis.X) - np.testing.assert_allclose(tuple(intersections[0]), (-5.6, 19.2, 0), 1e-5) - np.testing.assert_allclose(tuple(intersections[1]), (20, 0, 0), 1e-5) - - intersections = ax0.intersect(arc).vertices().sort_by(Axis.X) - np.testing.assert_allclose(tuple(intersections[0]), (-5.6, 19.2, 0), 1e-5) - np.testing.assert_allclose(tuple(intersections[1]), (20, 0, 0), 1e-5) - - i = Axis((0, 0, 1), (1, 1, 1)) & Vector(0.5, 0.5, 1.5) - self.assertTrue(isinstance(i, Vector)) - self.assertAlmostEqual(i, (0.5, 0.5, 1.5), 5) - self.assertIsNone(Axis.Y & Vector(2, 0, 0)) - - l = Edge.make_line((0, 0, 1), (0, 0, 2)) ^ 1 - i: Location = Axis.Z & l - self.assertTrue(isinstance(i, Location)) - self.assertAlmostEqual(i.position, l.position, 5) - self.assertAlmostEqual(i.orientation, l.orientation, 5) - - self.assertIsNone(Axis.Z & Edge.make_line((0, 0, 1), (1, 0, 0)).location_at(1)) - self.assertIsNone(Axis.Z & Edge.make_line((1, 0, 1), (1, 0, 2)).location_at(1)) - - # TODO: uncomment when generalized edge to surface intersections are complete - # non_planar = ( - # Solid.make_cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True) - # ) - # intersections = Axis((0, 0, 5), (1, 0, 0)) & non_planar - - # self.assertTrue(len(intersections.vertices(), 2)) - # np.testing.assert_allclose( - # intersection.vertices()[0].to_tuple(), (-1, 0, 5), 5 - # ) - # np.testing.assert_allclose( - # intersection.vertices()[1].to_tuple(), (1, 0, 5), 5 - # ) - - def test_axis_equal(self): - self.assertEqual(Axis.X, Axis.X) - self.assertEqual(Axis.Y, Axis.Y) - self.assertEqual(Axis.Z, Axis.Z) - self.assertEqual(Axis.X, AlwaysEqual()) - - def test_axis_not_equal(self): - self.assertNotEqual(Axis.X, Axis.Y) - random_obj = object() - self.assertNotEqual(Axis.X, random_obj) - - -class TestBoundBox(unittest.TestCase): - def test_basic_bounding_box(self): - v = Vertex(1, 1, 1) - v2 = Vertex(2, 2, 2) - self.assertEqual(BoundBox, type(v.bounding_box())) - self.assertEqual(BoundBox, type(v2.bounding_box())) - - bb1 = v.bounding_box().add(v2.bounding_box()) - - # OCC uses some approximations - self.assertAlmostEqual(bb1.size.X, 1.0, 1) - - # Test adding to an existing bounding box - v0 = Vertex(0, 0, 0) - bb2 = v0.bounding_box().add(v.bounding_box()) - - bb3 = bb1.add(bb2) - self.assertAlmostEqual(bb3.size, (2, 2, 2), 7) - - bb3 = bb2.add((3, 3, 3)) - self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) - - bb3 = bb2.add(Vector(3, 3, 3)) - self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) - - # Test 2D bounding boxes - bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) - bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box()) - bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box()) - # Test that bb2 contains bb1 - self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2)) - self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1)) - # Test that neither bounding box contains the other - self.assertIsNone(BoundBox.find_outside_box_2d(bb1, bb3)) - - # Test creation of a bounding box from a shape - note the low accuracy comparison - # as the box is a little larger than the shape - bb1 = BoundBox.from_topo_ds(Solid.make_cylinder(1, 1).wrapped, optimal=False) - self.assertAlmostEqual(bb1.size, (2, 2, 1), 1) - - bb2 = BoundBox.from_topo_ds( - Solid.make_cylinder(0.5, 0.5).translate((0, 0, 0.1)).wrapped, optimal=False - ) - self.assertTrue(bb2.is_inside(bb1)) - - def test_bounding_box_repr(self): - bb = Solid.make_box(1, 1, 1).bounding_box() - self.assertEqual( - repr(bb), "bbox: 0.0 <= x <= 1.0, 0.0 <= y <= 1.0, 0.0 <= z <= 1.0" - ) - - def test_center_of_boundbox(self): - self.assertAlmostEqual( - Solid.make_box(1, 1, 1).bounding_box().center(), - (0.5, 0.5, 0.5), - 5, - ) - - def test_combined_center_of_boundbox(self): - pass - - def test_clean_boundbox(self): - s = Solid.make_sphere(3) - self.assertAlmostEqual(s.bounding_box().size, (6, 6, 6), 5) - s.mesh(1e-3) - self.assertAlmostEqual(s.bounding_box().size, (6, 6, 6), 5) - - # def test_to_solid(self): - # bbox = Solid.make_sphere(1).bounding_box() - # self.assertAlmostEqual(bbox.min, (-1, -1, -1), 5) - # self.assertAlmostEqual(bbox.max, (1, 1, 1), 5) - # self.assertAlmostEqual(bbox.to_solid().volume, 2**3, 5) - - -class TestCadObjects(unittest.TestCase): - def _make_circle(self): - circle = gp_Circ(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 2.0) - return Edge.cast(BRepBuilderAPI_MakeEdge(circle).Edge()) - - def _make_ellipse(self): - ellipse = gp_Elips(gp_Ax2(gp_Pnt(1, 2, 3), gp.DZ_s()), 4.0, 2.0) - return Edge.cast(BRepBuilderAPI_MakeEdge(ellipse).Edge()) - - def test_edge_wrapper_center(self): - e = self._make_circle() - - self.assertAlmostEqual(e.center(CenterOf.MASS), (1.0, 2.0, 3.0), 3) - - def test_edge_wrapper_ellipse_center(self): - e = self._make_ellipse() - w = Wire([e]) - self.assertAlmostEqual(Face(w).center(), (1.0, 2.0, 3.0), 3) - - def test_edge_wrapper_make_circle(self): - halfCircleEdge = Edge.make_circle(radius=10, start_angle=0, end_angle=180) - - # np.testing.assert_allclose((0.0, 5.0, 0.0), halfCircleEdge.centerOfBoundBox(0.0001),1e-3) - self.assertAlmostEqual(halfCircleEdge.start_point(), (10.0, 0.0, 0.0), 3) - self.assertAlmostEqual(halfCircleEdge.end_point(), (-10.0, 0.0, 0.0), 3) - - def test_edge_wrapper_make_tangent_arc(self): - tangent_arc = Edge.make_tangent_arc( - Vector(1, 1), # starts at 1, 1 - Vector(0, 1), # tangent at start of arc is in the +y direction - Vector(2, 1), # arc cureturn_values 180 degrees and ends at 2, 1 - ) - self.assertAlmostEqual(tangent_arc.start_point(), (1, 1, 0), 3) - self.assertAlmostEqual(tangent_arc.end_point(), (2, 1, 0), 3) - self.assertAlmostEqual(tangent_arc.tangent_at(0), (0, 1, 0), 3) - self.assertAlmostEqual(tangent_arc.tangent_at(0.5), (1, 0, 0), 3) - self.assertAlmostEqual(tangent_arc.tangent_at(1), (0, -1, 0), 3) - - def test_edge_wrapper_make_ellipse1(self): - # Check x_radius > y_radius - x_radius, y_radius = 20, 10 - angle1, angle2 = -75.0, 90.0 - arcEllipseEdge = Edge.make_ellipse( - x_radius=x_radius, - y_radius=y_radius, - plane=Plane.XY, - start_angle=angle1, - end_angle=angle2, - ) - - start = ( - x_radius * math.cos(math.radians(angle1)), - y_radius * math.sin(math.radians(angle1)), - 0.0, - ) - end = ( - x_radius * math.cos(math.radians(angle2)), - y_radius * math.sin(math.radians(angle2)), - 0.0, - ) - self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) - self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) - - def test_edge_wrapper_make_ellipse2(self): - # Check x_radius < y_radius - x_radius, y_radius = 10, 20 - angle1, angle2 = 0.0, 45.0 - arcEllipseEdge = Edge.make_ellipse( - x_radius=x_radius, - y_radius=y_radius, - plane=Plane.XY, - start_angle=angle1, - end_angle=angle2, - ) - - start = ( - x_radius * math.cos(math.radians(angle1)), - y_radius * math.sin(math.radians(angle1)), - 0.0, - ) - end = ( - x_radius * math.cos(math.radians(angle2)), - y_radius * math.sin(math.radians(angle2)), - 0.0, - ) - self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) - self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) - - def test_edge_wrapper_make_circle_with_ellipse(self): - # Check x_radius == y_radius - x_radius, y_radius = 20, 20 - angle1, angle2 = 15.0, 60.0 - arcEllipseEdge = Edge.make_ellipse( - x_radius=x_radius, - y_radius=y_radius, - plane=Plane.XY, - start_angle=angle1, - end_angle=angle2, - ) - - start = ( - x_radius * math.cos(math.radians(angle1)), - y_radius * math.sin(math.radians(angle1)), - 0.0, - ) - end = ( - x_radius * math.cos(math.radians(angle2)), - y_radius * math.sin(math.radians(angle2)), - 0.0, - ) - self.assertAlmostEqual(arcEllipseEdge.start_point(), start, 3) - self.assertAlmostEqual(arcEllipseEdge.end_point(), end, 3) - - def test_face_wrapper_make_rect(self): - mplane = Face.make_rect(10, 10) - - self.assertAlmostEqual(mplane.normal_at(), (0.0, 0.0, 1.0), 3) - - # def testCompoundcenter(self): - # """ - # Tests whether or not a proper weighted center can be found for a compound - # """ - - # def cylinders(self, radius, height): - - # c = Solid.make_cylinder(radius, height, Vector()) - - # # Combine all the cylinders into a single compound - # r = self.eachpoint(lambda loc: c.located(loc), True).combinesolids() - - # return r - - # Workplane.cyl = cylinders - - # # Now test. here we want weird workplane to see if the objects are transformed right - # s = ( - # Workplane("XY") - # .rect(2.0, 3.0, for_construction=true) - # .vertices() - # .cyl(0.25, 0.5) - # ) - - # self.assertEqual(4, len(s.val().solids())) - # np.testing.assert_allclose((0.0, 0.0, 0.25), s.val().center, 1e-3) - - def test_translate(self): - e = Edge.make_circle(2, Plane((1, 2, 3))) - e2 = e.translate(Vector(0, 0, 1)) - - self.assertAlmostEqual(e2.center(CenterOf.MASS), (1.0, 2.0, 4.0), 3) - - def test_vertices(self): - e = Edge.cast(BRepBuilderAPI_MakeEdge(gp_Pnt(0, 0, 0), gp_Pnt(1, 1, 0)).Edge()) - self.assertEqual(2, len(e.vertices())) - - def test_edge_wrapper_radius(self): - # get a radius from a simple circle - e0 = Edge.make_circle(2.4) - self.assertAlmostEqual(e0.radius, 2.4) - - # radius of an arc - e1 = Edge.make_circle( - 1.8, Plane(origin=(5, 6, 7), z_dir=(1, 1, 1)), start_angle=20, end_angle=30 - ) - self.assertAlmostEqual(e1.radius, 1.8) - - # test value errors - e2 = Edge.make_ellipse(10, 20) - with self.assertRaises(ValueError): - e2.radius - - # radius from a wire - w0 = Wire.make_circle(10, Plane(origin=(1, 2, 3), z_dir=(-1, 0, 1))) - self.assertAlmostEqual(w0.radius, 10) - - # radius from a wire with multiple edges - rad = 2.3 - plane = Plane(origin=(7, 8, 0), z_dir=(1, 0.5, 0.1)) - w1 = Wire( - [ - Edge.make_circle(rad, plane, 0, 10), - Edge.make_circle(rad, plane, 10, 25), - Edge.make_circle(rad, plane, 25, 230), - ] - ) - self.assertAlmostEqual(w1.radius, rad) - - # test value error from wire - w2 = Wire.make_polygon( - [ - Vector(-1, 0, 0), - Vector(0, 1, 0), - Vector(1, -1, 0), - ] - ) - with self.assertRaises(ValueError): - w2.radius - - # (I think) the radius of a wire is the radius of it's first edge. - # Since this is stated in the docstring better make sure. - no_rad = Wire( - [ - Edge.make_line(Vector(0, 0, 0), Vector(0, 1, 0)), - Edge.make_circle(1.0, start_angle=90, end_angle=270), - ] - ) - with self.assertRaises(ValueError): - no_rad.radius - yes_rad = Wire( - [ - Edge.make_circle(1.0, start_angle=90, end_angle=270), - Edge.make_line(Vector(0, -1, 0), Vector(0, 1, 0)), - ] - ) - self.assertAlmostEqual(yes_rad.radius, 1.0) - many_rad = Wire( - [ - Edge.make_circle(1.0, start_angle=0, end_angle=180), - Edge.make_circle(3.0, Plane((2, 0, 0)), start_angle=180, end_angle=359), - ] - ) - self.assertAlmostEqual(many_rad.radius, 1.0) - - -class TestCleanMethod(unittest.TestCase): - def setUp(self): - # Create a mock object - self.solid = Solid() - self.solid.wrapped = MagicMock() # Simulate a valid `wrapped` object - - @patch("build123d.topology.shape_core.ShapeUpgrade_UnifySameDomain") - def test_clean_warning_on_exception(self, mock_shape_upgrade): - # Mock the upgrader - mock_upgrader = mock_shape_upgrade.return_value - mock_upgrader.Build.side_effect = Exception("Mocked Build failure") - - # Capture warnings - with self.assertWarns(Warning) as warn_context: - self.solid.clean() - - # Assert the warning message - self.assertIn("Unable to clean", str(warn_context.warning)) - - # Verify the upgrader was constructed with the correct arguments - mock_shape_upgrade.assert_called_once_with(self.solid.wrapped, True, True, True) - - # Verify the Build method was called - mock_upgrader.Build.assert_called_once() - - def test_clean_with_none_wrapped(self): - # Set `wrapped` to None to simulate the error condition - self.solid.wrapped = None - - # Call clean and ensure it returns self - result = self.solid.clean() - self.assertIs(result, self.solid) # Ensure it returns the same object - - -class TestColor(unittest.TestCase): - def test_name1(self): - c = Color("blue") - np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) - - def test_name2(self): - c = Color("blue", alpha=0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) - - def test_name3(self): - c = Color("blue", 0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) - - def test_rgb0(self): - c = Color(0.0, 1.0, 0.0) - np.testing.assert_allclose(tuple(c), (0, 1, 0, 1), 1e-5) - - def test_rgba1(self): - c = Color(1.0, 1.0, 0.0, 0.5) - self.assertEqual(c.wrapped.GetRGB().Red(), 1.0) - self.assertEqual(c.wrapped.GetRGB().Green(), 1.0) - self.assertEqual(c.wrapped.GetRGB().Blue(), 0.0) - self.assertEqual(c.wrapped.Alpha(), 0.5) - - def test_rgba2(self): - c = Color(1.0, 1.0, 0.0, alpha=0.5) - np.testing.assert_allclose(tuple(c), (1, 1, 0, 0.5), 1e-5) - - def test_rgba3(self): - c = Color(red=0.1, green=0.2, blue=0.3, alpha=0.5) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.5), 1e-5) - - def test_bad_color_name(self): - with self.assertRaises(ValueError): - Color("build123d") - - def test_to_tuple(self): - c = Color("blue", alpha=0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) - - def test_hex(self): - c = Color(0x996692) - np.testing.assert_allclose( - tuple(c), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), 5 - ) - - c = Color(0x006692, 0x80) - np.testing.assert_allclose( - tuple(c), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), 5 - ) - - c = Color(0x006692, alpha=0x80) - np.testing.assert_allclose(tuple(c), (0, 102 / 255, 146 / 255, 128 / 255), 1e-5) - - c = Color(color_code=0x996692, alpha=0xCC) - np.testing.assert_allclose( - tuple(c), (153 / 255, 102 / 255, 146 / 255, 204 / 255), 5 - ) - - c = Color(0.0, 0.0, 1.0, 1.0) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) - - c = Color(0, 0, 1, 1) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) - - def test_copy(self): - c = Color(0.1, 0.2, 0.3, alpha=0.4) - c_copy = copy.copy(c) - np.testing.assert_allclose(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), 1e-5) - - def test_str_repr(self): - c = Color(1, 0, 0) - self.assertEqual(str(c), "Color: (1.0, 0.0, 0.0, 1.0) ~ RED") - self.assertEqual(repr(c), "Color(1.0, 0.0, 0.0, 1.0)") - - def test_tuple(self): - c = Color((0.1,)) - np.testing.assert_allclose(tuple(c), (0.1, 1.0, 1.0, 1.0), 1e-5) - c = Color((0.1, 0.2)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 1.0, 1.0), 1e-5) - c = Color((0.1, 0.2, 0.3)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 1.0), 1e-5) - c = Color((0.1, 0.2, 0.3, 0.4)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) - c = Color(color_tuple=(0.1, 0.2, 0.3, 0.4)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) - - -class TestCompound(unittest.TestCase): - def test_make_text(self): - arc = Edge.make_three_point_arc((-50, 0, 0), (0, 20, 0), (50, 0, 0)) - text = Compound.make_text("test", 10, text_path=arc) - self.assertEqual(len(text.faces()), 4) - text = Compound.make_text( - "test", 10, align=(Align.MAX, Align.MAX), text_path=arc - ) - self.assertEqual(len(text.faces()), 4) - - def test_fuse(self): - box1 = Solid.make_box(1, 1, 1) - box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) - combined = Compound([box1]).fuse(box2, glue=True) - self.assertTrue(combined.is_valid()) - self.assertAlmostEqual(combined.volume, 2, 5) - fuzzy = Compound([box1]).fuse(box2, tol=1e-6) - self.assertTrue(fuzzy.is_valid()) - self.assertAlmostEqual(fuzzy.volume, 2, 5) - - def test_remove(self): - box1 = Solid.make_box(1, 1, 1) - box2 = Solid.make_box(1, 1, 1, Plane((2, 0, 0))) - combined = Compound([box1, box2]) - self.assertTrue(len(combined._remove(box2).solids()), 1) - - def test_repr(self): - simple = Compound([Solid.make_box(1, 1, 1)]) - simple_str = repr(simple).split("0x")[0] + repr(simple).split(", ")[1] - self.assertEqual(simple_str, "Compound at label()") - - assembly = Compound([Solid.make_box(1, 1, 1)]) - assembly.children = [Solid.make_box(1, 1, 1)] - assembly.label = "test" - assembly_str = repr(assembly).split("0x")[0] + repr(assembly).split(", l")[1] - self.assertEqual(assembly_str, "Compound at abel(test), #children(1)") - - def test_center(self): - test_compound = Compound( - [ - Solid.make_box(2, 2, 2).locate(Location((-1, -1, -1))), - Solid.make_box(1, 1, 1).locate(Location((8.5, -0.5, -0.5))), - ] - ) - self.assertAlmostEqual(test_compound.center(CenterOf.MASS), (1, 0, 0), 5) - self.assertAlmostEqual( - test_compound.center(CenterOf.BOUNDING_BOX), (4.25, 0, 0), 5 - ) - with self.assertRaises(ValueError): - test_compound.center(CenterOf.GEOMETRY) - - def test_triad(self): - triad = Compound.make_triad(10) - bbox = triad.bounding_box() - self.assertGreater(bbox.min.X, -10 / 8) - self.assertLess(bbox.min.X, 0) - self.assertGreater(bbox.min.Y, -10 / 8) - self.assertLess(bbox.min.Y, 0) - self.assertGreater(bbox.min.Y, -10 / 8) - self.assertAlmostEqual(bbox.min.Z, 0, 4) - self.assertLess(bbox.size.Z, 12.5) - self.assertEqual(triad.volume, 0) - - def test_volume(self): - e = Edge.make_line((0, 0), (1, 1)) - self.assertAlmostEqual(e.volume, 0, 5) - - f = Face.make_rect(1, 1) - self.assertAlmostEqual(f.volume, 0, 5) - - b = Solid.make_box(1, 1, 1) - self.assertAlmostEqual(b.volume, 1, 5) - - bb = Box(1, 1, 1) - self.assertAlmostEqual(bb.volume, 1, 5) - - c = Compound(children=[e, f, b, bb, b.translate((0, 5, 0))]) - self.assertAlmostEqual(c.volume, 3, 5) - # N.B. b and bb overlap but still add to Compound volume - - def test_constructor(self): - with self.assertRaises(TypeError): - Compound(foo="bar") - - def test_len(self): - self.assertEqual(len(Compound()), 0) - skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) - self.assertEqual(len(skt), 4) - - def test_iteration(self): - skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) - for c1, c2 in itertools.combinations(skt, 2): - self.assertGreaterEqual((c1.position - c2.position).length, 10) - - def test_unwrap(self): - skt = Sketch() + GridLocations(10, 10, 2, 2) * Circle(1) - skt2 = Compound(children=[skt]) - self.assertEqual(len(skt2), 1) - skt3 = skt2.unwrap(fully=False) - self.assertEqual(len(skt3), 4) - - comp1 = Compound().unwrap() - self.assertEqual(len(comp1), 0) - comp2 = Compound(children=[Face.make_rect(1, 1)]) - comp3 = Compound(children=[comp2]) - self.assertEqual(len(comp3), 1) - self.assertTrue(isinstance(next(iter(comp3)), Compound)) - comp4 = comp3.unwrap(fully=True) - self.assertTrue(isinstance(comp4, Face)) - - def test_get_top_level_shapes(self): - base_shapes = Compound(children=PolarLocations(15, 20) * Box(4, 4, 4)) - fls = base_shapes.get_top_level_shapes() - self.assertTrue(isinstance(fls, ShapeList)) - self.assertEqual(len(fls), 20) - self.assertTrue(all(isinstance(s, Solid) for s in fls)) - - b1 = Box(1, 1, 1).solid() - self.assertEqual(b1.get_top_level_shapes()[0], b1) - - -class TestEdge(unittest.TestCase): - def test_close(self): - self.assertAlmostEqual( - Edge.make_circle(1, end_angle=180).close().length, math.pi + 2, 5 - ) - self.assertAlmostEqual(Edge.make_circle(1).close().length, 2 * math.pi, 5) - - def test_make_half_circle(self): - half_circle = Edge.make_circle(radius=1, start_angle=0, end_angle=180) - self.assertAlmostEqual(half_circle.start_point(), (1, 0, 0), 3) - self.assertAlmostEqual(half_circle.end_point(), (-1, 0, 0), 3) - - def test_make_half_circle2(self): - half_circle = Edge.make_circle(radius=1, start_angle=270, end_angle=90) - self.assertAlmostEqual(half_circle.start_point(), (0, -1, 0), 3) - self.assertAlmostEqual(half_circle.end_point(), (0, 1, 0), 3) - - def test_make_clockwise_half_circle(self): - half_circle = Edge.make_circle( - radius=1, - start_angle=180, - end_angle=0, - angular_direction=AngularDirection.CLOCKWISE, - ) - self.assertAlmostEqual(half_circle.end_point(), (1, 0, 0), 3) - self.assertAlmostEqual(half_circle.start_point(), (-1, 0, 0), 3) - - def test_make_clockwise_half_circle2(self): - half_circle = Edge.make_circle( - radius=1, - start_angle=90, - end_angle=-90, - angular_direction=AngularDirection.CLOCKWISE, - ) - self.assertAlmostEqual(half_circle.start_point(), (0, 1, 0), 3) - self.assertAlmostEqual(half_circle.end_point(), (0, -1, 0), 3) - - def test_arc_center(self): - self.assertAlmostEqual(Edge.make_ellipse(2, 1).arc_center, (0, 0, 0), 5) - with self.assertRaises(ValueError): - Edge.make_line((0, 0, 0), (0, 0, 1)).arc_center - - def test_spline_with_parameters(self): - spline = Edge.make_spline( - points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 0.4, 1.0] - ) - self.assertAlmostEqual(spline.end_point(), (2, 0, 0), 5) - with self.assertRaises(ValueError): - Edge.make_spline( - points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], parameters=[0.0, 1.0] - ) - with self.assertRaises(ValueError): - Edge.make_spline( - points=[(0, 0, 0), (1, 1, 0), (2, 0, 0)], tangents=[(1, 1, 0)] - ) - - def test_spline_approx(self): - spline = Edge.make_spline_approx([(0, 0), (1, 1), (2, 1), (3, 0)]) - self.assertAlmostEqual(spline.end_point(), (3, 0, 0), 5) - spline = Edge.make_spline_approx( - [(0, 0), (1, 1), (2, 1), (3, 0)], smoothing=(1.0, 5.0, 10.0) - ) - self.assertAlmostEqual(spline.end_point(), (3, 0, 0), 5) - - def test_distribute_locations(self): - line = Edge.make_line((0, 0, 0), (10, 0, 0)) - locs = line.distribute_locations(3) - for i, x in enumerate([0, 5, 10]): - self.assertAlmostEqual(locs[i].position, (x, 0, 0), 5) - self.assertAlmostEqual(locs[0].orientation, (0, 90, 180), 5) - - locs = line.distribute_locations(3, positions_only=True) - for i, x in enumerate([0, 5, 10]): - self.assertAlmostEqual(locs[i].position, (x, 0, 0), 5) - self.assertAlmostEqual(locs[0].orientation, (0, 0, 0), 5) - - def test_to_wire(self): - edge = Edge.make_line((0, 0, 0), (1, 1, 1)) - for end in [0, 1]: - self.assertAlmostEqual( - edge.position_at(end), - edge.to_wire().position_at(end), - 5, - ) - - def test_arc_center2(self): - edges = [ - Edge.make_circle(1, plane=Plane((1, 2, 3)), end_angle=30), - Edge.make_ellipse(1, 0.5, plane=Plane((1, 2, 3)), end_angle=30), - ] - for edge in edges: - self.assertAlmostEqual(edge.arc_center, (1, 2, 3), 5) - with self.assertRaises(ValueError): - Edge.make_line((0, 0), (1, 1)).arc_center - - def test_find_intersection_points(self): - circle = Edge.make_circle(1) - line = Edge.make_line((0, -2), (0, 2)) - crosses = circle.find_intersection_points(line) - for target, actual in zip([(0, 1, 0), (0, -1, 0)], crosses): - self.assertAlmostEqual(actual, target, 5) - - with self.assertRaises(ValueError): - circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) - with self.assertRaises(ValueError): - circle.find_intersection_points(Edge.make_line((0, 0, -1), (0, 0, 1))) - - self_intersect = Edge.make_spline([(-3, 2), (3, -2), (4, 0), (3, 2), (-3, -2)]) - self.assertAlmostEqual( - self_intersect.find_intersection_points()[0], - (-2.6861636507066047, 0, 0), - 5, - ) - line = Edge.make_line((1, -2), (1, 2)) - crosses = line.find_intersection_points(Axis.X) - self.assertAlmostEqual(crosses[0], (1, 0, 0), 5) - - with self.assertRaises(ValueError): - line.find_intersection_points(Plane.YZ) - - # def test_intersections_tolerance(self): - - # Multiple operands not currently supported - - # r1 = ShapeList() + (PolarLocations(1, 4) * Edge.make_line((0, -1), (0, 1))) - # l1 = Edge.make_line((1, 0), (2, 0)) - # i1 = l1.intersect(*r1) - - # r2 = Rectangle(2, 2).edges() - # l2 = Pos(1) * Edge.make_line((0, 0), (1, 0)) - # i2 = l2.intersect(*r2) - - # self.assertEqual(len(i1.vertices()), len(i2.vertices())) - - def test_trim(self): - line = Edge.make_line((-2, 0), (2, 0)) - self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(0), (-1, 0, 0), 5) - self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(1), (1, 0, 0), 5) - with self.assertRaises(ValueError): - line.trim(0.75, 0.25) - - def test_trim_to_length(self): - - e1 = Edge.make_line((0, 0), (10, 10)) - e1_trim = e1.trim_to_length(0.0, 10) - self.assertAlmostEqual(e1_trim.length, 10, 5) - - e2 = Edge.make_circle(10, start_angle=0, end_angle=90) - e2_trim = e2.trim_to_length(0.5, 1) - self.assertAlmostEqual(e2_trim.length, 1, 5) - self.assertAlmostEqual( - e2_trim.position_at(0), Vector(10, 0, 0).rotate(Axis.Z, 45), 5 - ) - - e3 = Edge.make_spline( - [(0, 10, 0), (-4, 5, 2), (0, 0, 0)], tangents=[(-1, 0), (1, 0)] - ) - e3_trim = e3.trim_to_length(0, 7) - self.assertAlmostEqual(e3_trim.length, 7, 5) - - a4 = Axis((0, 0, 0), (1, 1, 1)) - e4_trim = Edge(a4).trim_to_length(0.5, 2) - self.assertAlmostEqual(e4_trim.length, 2, 5) - - def test_bezier(self): - with self.assertRaises(ValueError): - Edge.make_bezier((1, 1)) - cntl_pnts = [(1, 2, 3)] * 30 - with self.assertRaises(ValueError): - Edge.make_bezier(*cntl_pnts) - with self.assertRaises(ValueError): - Edge.make_bezier((0, 0, 0), (1, 1, 1), weights=[1.0]) - - bezier = Edge.make_bezier((0, 0), (0, 1), (1, 1), (1, 0)) - bbox = bezier.bounding_box() - self.assertAlmostEqual(bbox.min, (0, 0, 0), 5) - self.assertAlmostEqual(bbox.max, (1, 0.75, 0), 5) - - def test_mid_way(self): - mid = Edge.make_mid_way( - Edge.make_line((0, 0), (0, 1)), Edge.make_line((1, 0), (1, 1)), 0.25 - ) - self.assertAlmostEqual(mid.position_at(0), (0.25, 0, 0), 5) - self.assertAlmostEqual(mid.position_at(1), (0.25, 1, 0), 5) - - def test_distribute_locations2(self): - with self.assertRaises(ValueError): - Edge.make_circle(1).distribute_locations(1) - - locs = Edge.make_circle(1).distribute_locations(5, positions_only=True) - for i, loc in enumerate(locs): - self.assertAlmostEqual( - loc.position, - Vector(1, 0, 0).rotate(Axis.Z, i * 90).to_tuple(), - 5, - ) - self.assertAlmostEqual(loc.orientation, (0, 0, 0), 5) - - def test_find_tangent(self): - circle = Edge.make_circle(1) - parm = circle.find_tangent(135)[0] - self.assertAlmostEqual( - circle @ parm, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 - ) - line = Edge.make_line((0, 0), (1, 1)) - parm = line.find_tangent(45)[0] - self.assertAlmostEqual(parm, 0, 5) - parm = line.find_tangent(0) - self.assertEqual(len(parm), 0) - - def test_param_at_point(self): - u = Edge.make_circle(1).param_at_point((0, 1)) - self.assertAlmostEqual(u, 0.25, 5) - - u = 0.3 - edge = Edge.make_line((0, 0), (34, 56)) - pnt = edge.position_at(u) - self.assertAlmostEqual(edge.param_at_point(pnt), u, 5) - - ca = CenterArc((0, 0), 1, -200, 220).edge() - for u in [0.3, 1.0]: - pnt = ca.position_at(u) - self.assertAlmostEqual(ca.param_at_point(pnt), u, 5) - - ea = EllipticalCenterArc((15, 0), 10, 5, start_angle=90, end_angle=270).edge() - for u in [0.3, 0.9]: - pnt = ea.position_at(u) - self.assertAlmostEqual(ea.param_at_point(pnt), u, 5) - - with self.assertRaises(ValueError): - edge.param_at_point((-1, 1)) - - def test_conical_helix(self): - helix = Edge.make_helix(1, 4, 1, normal=(-1, 0, 0), angle=10, lefthand=True) - self.assertAlmostEqual(helix.bounding_box().min.X, -4, 5) - - def test_reverse(self): - e1 = Edge.make_line((0, 0), (1, 1)) - self.assertAlmostEqual(e1 @ 0.1, (0.1, 0.1, 0), 5) - self.assertAlmostEqual(e1.reversed() @ 0.1, (0.9, 0.9, 0), 5) - - e2 = Edge.make_circle(1, start_angle=0, end_angle=180) - e2r = e2.reversed() - self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) - - def test_init(self): - with self.assertRaises(TypeError): - Edge(direction=(1, 0, 0)) - - -class TestFace(unittest.TestCase): - def test_make_surface_from_curves(self): - bottom_edge = Edge.make_circle(radius=1, end_angle=90) - top_edge = Edge.make_circle(radius=1, plane=Plane((0, 0, 1)), end_angle=90) - curved = Face.make_surface_from_curves(bottom_edge, top_edge) - self.assertTrue(curved.is_valid()) - self.assertAlmostEqual(curved.area, math.pi / 2, 5) - self.assertAlmostEqual( - curved.normal_at(), (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 - ) - - bottom_wire = Wire.make_circle(1) - top_wire = Wire.make_circle(1, Plane((0, 0, 1))) - curved = Face.make_surface_from_curves(bottom_wire, top_wire) - self.assertTrue(curved.is_valid()) - self.assertAlmostEqual(curved.area, 2 * math.pi, 5) - - def test_center(self): - test_face = Face(Wire.make_polygon([(0, 0), (1, 0), (1, 1), (0, 0)])) - self.assertAlmostEqual(test_face.center(CenterOf.MASS), (2 / 3, 1 / 3, 0), 1) - self.assertAlmostEqual( - test_face.center(CenterOf.BOUNDING_BOX), - (0.5, 0.5, 0), - 5, - ) - - def test_face_volume(self): - rect = Face.make_rect(1, 1) - self.assertAlmostEqual(rect.volume, 0, 5) - - def test_chamfer_2d(self): - test_face = Face.make_rect(10, 10) - test_face = test_face.chamfer_2d( - distance=1, distance2=2, vertices=test_face.vertices() - ) - self.assertAlmostEqual(test_face.area, 100 - 4 * 0.5 * 1 * 2) - - def test_chamfer_2d_reference(self): - test_face = Face.make_rect(10, 10) - edge = test_face.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - test_face = test_face.chamfer_2d( - distance=1, distance2=2, vertices=[vertex], edge=edge - ) - self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 9) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 8) - - def test_chamfer_2d_reference_inverted(self): - test_face = Face.make_rect(10, 10) - edge = test_face.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - test_face = test_face.chamfer_2d( - distance=2, distance2=1, vertices=[vertex], edge=edge - ) - self.assertAlmostEqual(test_face.area, 100 - 0.5 * 1 * 2) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.Y)[0].length, 8) - self.assertAlmostEqual(test_face.edges().sort_by(Axis.X)[0].length, 9) - - def test_chamfer_2d_error_checking(self): - with self.assertRaises(ValueError): - test_face = Face.make_rect(10, 10) - edge = test_face.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - other_edge = test_face.edges().sort_by(Axis.Y)[-1] - test_face = test_face.chamfer_2d( - distance=1, distance2=2, vertices=[vertex], edge=other_edge - ) - - def test_make_rect(self): - test_face = Face.make_plane() - self.assertAlmostEqual(test_face.normal_at(), (0, 0, 1), 5) - - def test_length_width(self): - test_face = Face.make_rect(8, 10, Plane.XZ) - self.assertAlmostEqual(test_face.length, 8, 5) - self.assertAlmostEqual(test_face.width, 10, 5) - - def test_geometry(self): - box = Solid.make_box(1, 1, 2) - self.assertEqual(box.faces().sort_by(Axis.Z).last.geometry, "SQUARE") - self.assertEqual(box.faces().sort_by(Axis.Y).last.geometry, "RECTANGLE") - with BuildPart() as test: - with BuildSketch(): - RegularPolygon(1, 3) - extrude(amount=1) - self.assertEqual(test.faces().sort_by(Axis.Z).last.geometry, "POLYGON") - - def test_is_planar(self): - self.assertTrue(Face.make_rect(1, 1).is_planar) - self.assertFalse( - Solid.make_cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0].is_planar - ) - # Some of these faces have geom_type BSPLINE but are planar - mount = Solid.make_loft( - [ - Rectangle((1 + 16 + 4), 20, align=(Align.MIN, Align.CENTER)).wire(), - Pos(1, 0, 4) - * Rectangle(16, 20, align=(Align.MIN, Align.CENTER)).wire(), - ], - ) - self.assertTrue(all(f.is_planar for f in mount.faces())) - - def test_negate(self): - square = Face.make_rect(1, 1) - self.assertAlmostEqual(square.normal_at(), (0, 0, 1), 5) - flipped_square = -square - self.assertAlmostEqual(flipped_square.normal_at(), (0, 0, -1), 5) - - def test_offset(self): - bbox = Face.make_rect(2, 2, Plane.XY).offset(5).bounding_box() - self.assertAlmostEqual(bbox.min, (-1, -1, 5), 5) - self.assertAlmostEqual(bbox.max, (1, 1, 5), 5) - - def test_make_from_wires(self): - outer = Wire.make_circle(10) - inners = [ - Wire.make_circle(1).locate(Location((-2, 2, 0))), - Wire.make_circle(1).locate(Location((2, 2, 0))), - ] - happy = Face(outer, inners) - self.assertAlmostEqual(happy.area, math.pi * (10**2 - 2), 5) - - outer = Edge.make_circle(10, end_angle=180).to_wire() - with self.assertRaises(ValueError): - Face(outer, inners) - with self.assertRaises(ValueError): - Face(Wire.make_circle(10, Plane.XZ), inners) - - outer = Wire.make_circle(10) - inners = [ - Wire.make_circle(1).locate(Location((-2, 2, 0))), - Edge.make_circle(1, end_angle=180).to_wire().locate(Location((2, 2, 0))), - ] - with self.assertRaises(ValueError): - Face(outer, inners) - - def test_sew_faces(self): - patches = [ - Face.make_rect(1, 1, Plane((x, y, z))) - for x in range(2) - for y in range(2) - for z in range(3) - ] - random.shuffle(patches) - sheets = Face.sew_faces(patches) - self.assertEqual(len(sheets), 3) - self.assertEqual(len(sheets[0]), 4) - self.assertTrue(isinstance(sheets[0][0], Face)) - - def test_surface_from_array_of_points(self): - pnts = [ - [ - Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) - for x in range(11) - ] - for y in range(11) - ] - surface = Face.make_surface_from_array_of_points(pnts) - bbox = surface.bounding_box() - self.assertAlmostEqual(bbox.min, (0, 0, -1), 3) - self.assertAlmostEqual(bbox.max, (10, 10, 2), 2) - - def test_bezier_surface(self): - points = [ - [ - (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) - for x in range(-1, 2) - ] - for y in range(-1, 2) - ] - surface = Face.make_bezier_surface(points) - bbox = surface.bounding_box() - self.assertAlmostEqual(bbox.min, (-1, -1, 0), 3) - self.assertAlmostEqual(bbox.max, (+1, +1, +1), 1) - self.assertLess(bbox.max.Z, 1.0) - - weights = [ - [2 if x == 0 or y == 0 else 1 for x in range(-1, 2)] for y in range(-1, 2) - ] - surface = Face.make_bezier_surface(points, weights) - bbox = surface.bounding_box() - self.assertAlmostEqual(bbox.min, (-1, -1, 0), 3) - self.assertGreater(bbox.max.Z, 1.0) - - too_many_points = [ - [ - (x, y, 2 if x == 0 and y == 0 else 1 if x == 0 or y == 0 else 0) - for x in range(-1, 27) - ] - for y in range(-1, 27) - ] - - with self.assertRaises(ValueError): - Face.make_bezier_surface([[(0, 0)]]) - with self.assertRaises(ValueError): - Face.make_bezier_surface(points, [[1, 1], [1, 1]]) - with self.assertRaises(ValueError): - Face.make_bezier_surface(too_many_points) - - def test_thicken(self): - pnts = [ - [ - Vector(x, y, math.cos(math.pi * x / 10) + math.sin(math.pi * y / 10)) - for x in range(11) - ] - for y in range(11) - ] - surface = Face.make_surface_from_array_of_points(pnts) - solid = Solid.thicken(surface, 1) - self.assertAlmostEqual(solid.volume, 101.59, 2) - - square = Face.make_rect(10, 10) - bbox = Solid.thicken(square, 1, normal_override=(0, 0, -1)).bounding_box() - self.assertAlmostEqual(bbox.min, (-5, -5, -1), 5) - self.assertAlmostEqual(bbox.max, (5, 5, 0), 5) - - def test_make_holes(self): - radius = 10 - circumference = 2 * math.pi * radius - hex_diagonal = 4 * (circumference / 10) / 3 - cylinder = Solid.make_cylinder(radius, hex_diagonal * 5) - cylinder_wall: Face = cylinder.faces().filter_by(GeomType.PLANE, reverse=True)[ - 0 - ] - with BuildSketch(Plane.XZ.offset(radius)) as hex: - with Locations((0, hex_diagonal)): - RegularPolygon( - hex_diagonal * 0.4, 6, align=(Align.CENTER, Align.CENTER) - ) - hex_wire_vertical: Wire = hex.sketch.faces()[0].outer_wire() - - projected_wire: Wire = hex_wire_vertical.project_to_shape( - target_object=cylinder, center=(0, 0, hex_wire_vertical.center().Z) - )[0] - projected_wires = [ - projected_wire.rotate(Axis.Z, -90 + i * 360 / 10).translate( - (0, 0, (j + (i % 2) / 2) * hex_diagonal) - ) - for i in range(5) - for j in range(4 - i % 2) - ] - cylinder_walls_with_holes = cylinder_wall.make_holes(projected_wires) - self.assertTrue(cylinder_walls_with_holes.is_valid()) - self.assertLess(cylinder_walls_with_holes.area, cylinder_wall.area) - - def test_is_inside(self): - square = Face.make_rect(10, 10) - self.assertTrue(square.is_inside((1, 1))) - self.assertFalse(square.is_inside((20, 1))) - - def test_import_stl(self): - torus = Solid.make_torus(10, 1) - # exporter = Mesher() - # exporter.add_shape(torus) - # exporter.write("test_torus.stl") - export_stl(torus, "test_torus.stl") - imported_torus = import_stl("test_torus.stl") - # The torus from stl is tessellated therefore the areas will only be close - self.assertAlmostEqual(imported_torus.area, torus.area, 0) - os.remove("test_torus.stl") - - def test_is_coplanar(self): - square = Face.make_rect(1, 1, plane=Plane.XZ) - self.assertTrue(square.is_coplanar(Plane.XZ)) - self.assertTrue((-square).is_coplanar(Plane.XZ)) - self.assertFalse(square.is_coplanar(Plane.XY)) - surface: Face = Solid.make_sphere(1).faces()[0] - self.assertFalse(surface.is_coplanar(Plane.XY)) - - def test_center_location(self): - square = Face.make_rect(1, 1, plane=Plane.XZ) - cl = square.center_location - self.assertAlmostEqual(cl.position, (0, 0, 0), 5) - self.assertAlmostEqual(Plane(cl).z_dir, Plane.XZ.z_dir, 5) - - def test_position_at(self): - square = Face.make_rect(2, 2, plane=Plane.XZ.offset(1)) - p = square.position_at(0.25, 0.75) - self.assertAlmostEqual(p, (-0.5, -1.0, 0.5), 5) - - def test_location_at(self): - bottom = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.Z)[0] - loc = bottom.location_at(0.5, 0.5) - self.assertAlmostEqual(loc.position, (0.5, 1, 0), 5) - self.assertAlmostEqual(loc.orientation, (-180, 0, -180), 5) - - front = Box(1, 2, 3, align=Align.MIN).faces().filter_by(Axis.X)[0] - loc = front.location_at(0.5, 0.5, x_dir=(0, 0, 1)) - self.assertAlmostEqual(loc.position, (0.0, 1.0, 1.5), 5) - self.assertAlmostEqual(loc.orientation, (0, -90, 0), 5) - - def test_make_surface(self): - corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] - net_exterior = Wire( - [ - Edge.make_line(corners[3], corners[1]), - Edge.make_line(corners[1], corners[0]), - Edge.make_line(corners[0], corners[2]), - Edge.make_three_point_arc( - corners[2], - (corners[2] + corners[3]) / 2 - Vector(0, 0, 3), - corners[3], - ), - ] - ) - surface = Face.make_surface( - net_exterior, - surface_points=[Vector(0, 0, -5)], - ) - hole_flat = Wire.make_circle(10) - hole = hole_flat.project_to_shape(surface, (0, 0, -1))[0] - surface = Face.make_surface( - exterior=net_exterior, - surface_points=[Vector(0, 0, -5)], - interior_wires=[hole], - ) - self.assertTrue(surface.is_valid()) - self.assertEqual(surface.geom_type, GeomType.BSPLINE) - bbox = surface.bounding_box() - self.assertAlmostEqual(bbox.min, (-50.5, -24.5, -5.113393280136395), 5) - self.assertAlmostEqual(bbox.max, (50.5, 24.5, 0), 5) - - # With no surface point - surface = Face.make_surface(net_exterior) - bbox = surface.bounding_box() - self.assertAlmostEqual(bbox.min, (-50.5, -24.5, -3), 5) - self.assertAlmostEqual(bbox.max, (50.5, 24.5, 0), 5) - - # Exterior Edge - surface = Face.make_surface([Edge.make_circle(50)], surface_points=[(0, 0, -5)]) - bbox = surface.bounding_box() - self.assertAlmostEqual(bbox.min, (-50, -50, -5), 5) - self.assertAlmostEqual(bbox.max, (50, 50, 0), 5) - - def test_make_surface_error_checking(self): - with self.assertRaises(ValueError): - Face.make_surface(Edge.make_line((0, 0), (1, 0))) - - with self.assertRaises(RuntimeError): - Face.make_surface([Edge.make_line((0, 0), (1, 0))]) - - if platform.system() != "Darwin": - with self.assertRaises(RuntimeError): - Face.make_surface( - [Edge.make_circle(50)], surface_points=[(0, 0, -50), (0, 0, 50)] - ) - - with self.assertRaises(RuntimeError): - Face.make_surface( - [Edge.make_circle(50)], - interior_wires=[Wire.make_circle(5, Plane.XZ)], - ) - - def test_sweep(self): - edge = Edge.make_line((1, 0), (2, 0)) - path = Wire.make_circle(1) - circle_with_hole = Face.sweep(edge, path) - self.assertTrue(isinstance(circle_with_hole, Face)) - self.assertAlmostEqual(circle_with_hole.area, math.pi * (2**2 - 1**1), 5) - with self.assertRaises(ValueError): - Face.sweep(edge, Polyline((0, 0), (0.1, 0), (0.2, 0.1))) - - def test_to_arcs(self): - with BuildSketch() as bs: - with BuildLine() as bl: - Polyline((0, 0), (1, 0), (1.5, 0.5), (2, 0), (2, 1), (0, 1), (0, 0)) - fillet(bl.vertices(), radius=0.1) - make_face() - smooth = bs.faces()[0] - fragmented = smooth.to_arcs() - self.assertLess(len(smooth.edges()), len(fragmented.edges())) - - def test_outer_wire(self): - face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() - self.assertAlmostEqual(face.outer_wire().length, 4, 5) - - def test_wire(self): - face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() - with self.assertWarns(UserWarning): - outer = face.wire() - self.assertAlmostEqual(outer.length, 4, 5) - - def test_constructor(self): - with self.assertRaises(ValueError): - Face(bob="fred") - - def test_normal_at(self): - face = Face.make_rect(1, 1) - self.assertAlmostEqual(face.normal_at(0, 0), (0, 0, 1), 5) - self.assertAlmostEqual(face.normal_at(face.position_at(0, 0)), (0, 0, 1), 5) - with self.assertRaises(ValueError): - face.normal_at(0) - with self.assertRaises(ValueError): - face.normal_at(center=(0, 0)) - face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] - self.assertAlmostEqual(face.normal_at(0, 1), (1, 0, 0), 5) - - -class TestFunctions(unittest.TestCase): - def test_edges_to_wires(self): - square_edges = Face.make_rect(1, 1).edges() - rectangle_edges = Face.make_rect(2, 1, Plane((5, 0))).edges() - wires = edges_to_wires(square_edges + rectangle_edges) - self.assertEqual(len(wires), 2) - self.assertAlmostEqual(wires[0].length, 4, 5) - self.assertAlmostEqual(wires[1].length, 6, 5) - - def test_polar(self): - pnt = polar(1, 30) - self.assertAlmostEqual(pnt[0], math.sqrt(3) / 2, 5) - self.assertAlmostEqual(pnt[1], 0.5, 5) - - def test_new_edges(self): - c = Solid.make_cylinder(1, 5) - s = Solid.make_sphere(2) - s_minus_c = s - c - seams = new_edges(c, s, combined=s_minus_c) - self.assertEqual(len(seams), 1) - self.assertAlmostEqual(seams[0].radius, 1, 5) - - def test_delta(self): - cyl = Solid.make_cylinder(1, 5) - sph = Solid.make_sphere(2) - con = Solid.make_cone(2, 1, 2) - plug = delta([cyl, sph, con], [sph, con]) - self.assertEqual(len(plug), 1) - self.assertEqual(plug[0], cyl) - - def test_parse_intersect_args(self): - - with self.assertRaises(TypeError): - Vector(1, 1, 1) & ("x", "y", "z") - - def test_unwrap_topods_compound(self): - # Complex Compound - b1 = Box(1, 1, 1).solid() - b2 = Box(2, 2, 2).solid() - c1 = Compound([b1, b2]) - c2 = Compound([b1, c1]) - c3 = Compound([c2]) - c4 = Compound([c3]) - self.assertEqual(c4.wrapped.NbChildren(), 1) - c5 = Compound(unwrap_topods_compound(c4.wrapped, False)) - self.assertEqual(c5.wrapped.NbChildren(), 2) - - # unwrap fully - c0 = Compound([b1]) - c1 = Compound([c0]) - result = Compound.cast(unwrap_topods_compound(c1.wrapped, True)) - self.assertTrue(isinstance(result, Solid)) - - # unwrap not fully - result = Compound.cast(unwrap_topods_compound(c1.wrapped, False)) - self.assertTrue(isinstance(result, Compound)) - - -class TestGroupBy(unittest.TestCase): - - def setUp(self): - # Ensure the class variable is in its default state before each test - self.v = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) - - def test_str(self): - self.assertEqual( - str(self.v), - f"""[[Vertex(0.0, 0.0, 0.0), - Vertex(0.0, 1.0, 0.0), - Vertex(1.0, 0.0, 0.0), - Vertex(1.0, 1.0, 0.0)], - [Vertex(0.0, 0.0, 1.0), - Vertex(0.0, 1.0, 1.0), - Vertex(1.0, 0.0, 1.0), - Vertex(1.0, 1.0, 1.0)]]""", - ) - - def test_repr(self): - self.assertEqual( - repr(self.v), - "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", - ) - - def test_pp(self): - self.assertEqual( - pprint.pformat(self.v), - "[[Vertex(0.0, 0.0, 0.0), Vertex(0.0, 1.0, 0.0), Vertex(1.0, 0.0, 0.0), Vertex(1.0, 1.0, 0.0)], [Vertex(0.0, 0.0, 1.0), Vertex(0.0, 1.0, 1.0), Vertex(1.0, 0.0, 1.0), Vertex(1.0, 1.0, 1.0)]]", - ) - - -class TestImportExport(unittest.TestCase): - def test_import_export(self): - original_box = Solid.make_box(1, 1, 1) - export_step(original_box, "test_box.step") - step_box = import_step("test_box.step") - self.assertTrue(step_box.is_valid()) - self.assertAlmostEqual(step_box.volume, 1, 5) - export_brep(step_box, "test_box.brep") - brep_box = import_brep("test_box.brep") - self.assertTrue(brep_box.is_valid()) - self.assertAlmostEqual(brep_box.volume, 1, 5) - os.remove("test_box.step") - os.remove("test_box.brep") - with self.assertRaises(FileNotFoundError): - step_box = import_step("test_box.step") - - def test_import_stl(self): - # export solid - original_box = Solid.make_box(1, 2, 3) - exporter = Mesher() - exporter.add_shape(original_box) - exporter.write("test.stl") - - # import as face - stl_box = import_stl("test.stl") - self.assertAlmostEqual(stl_box.position, (0, 0, 0), 5) - - -class TestJupyter(unittest.TestCase): - def test_repr_javascript(self): - shape = Solid.make_box(1, 1, 1) - - # Test no exception on rendering to js - js1 = shape._repr_javascript_() - - assert "function render" in js1 - - def test_display_error(self): - with self.assertRaises(AttributeError): - display(Vector()) - - with self.assertRaises(ValueError): - to_vtkpoly_string("invalid") - - with self.assertRaises(ValueError): - display("invalid") - - -class TestLocation(unittest.TestCase): - def test_location(self): - loc0 = Location() - T = loc0.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 0), 1e-6) - angle = math.degrees( - loc0.wrapped.Transformation().GetRotation().GetRotationAngle() - ) - self.assertAlmostEqual(0, angle) - - # Tuple - loc0 = Location((0, 0, 1)) - - T = loc0.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) - - # List - loc0 = Location([0, 0, 1]) - - T = loc0.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) - - # Vector - loc1 = Location(Vector(0, 0, 1)) - - T = loc1.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) - - # rotation + translation - loc2 = Location(Vector(0, 0, 1), Vector(0, 0, 1), 45) - - angle = math.degrees( - loc2.wrapped.Transformation().GetRotation().GetRotationAngle() - ) - self.assertAlmostEqual(45, angle) - - # gp_Trsf - T = gp_Trsf() - T.SetTranslation(gp_Vec(0, 0, 1)) - loc3 = Location(T) - - self.assertEqual( - loc1.wrapped.Transformation().TranslationPart().Z(), - loc3.wrapped.Transformation().TranslationPart().Z(), - ) - - # Test creation from the OCP.gp.gp_Trsf object - loc4 = Location(gp_Trsf()) - np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 0), 1e-7) - np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) - - # Test creation from Plane and Vector - loc4 = Location(Plane.XY, (0, 0, 1)) - np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 1), 1e-7) - np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) - - # Test composition - loc4 = Location((0, 0, 0), Vector(0, 0, 1), 15) - - loc5 = loc1 * loc4 - loc6 = loc4 * loc4 - loc7 = loc4**2 - - T = loc5.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) - - angle5 = math.degrees( - loc5.wrapped.Transformation().GetRotation().GetRotationAngle() - ) - self.assertAlmostEqual(15, angle5) - - angle6 = math.degrees( - loc6.wrapped.Transformation().GetRotation().GetRotationAngle() - ) - self.assertAlmostEqual(30, angle6) - - angle7 = math.degrees( - loc7.wrapped.Transformation().GetRotation().GetRotationAngle() - ) - self.assertAlmostEqual(30, angle7) - - # Test error handling on creation - with self.assertRaises(TypeError): - Location("xy_plane") - - # Test that the computed rotation matrix and intrinsic euler angles return the same - - about_x = uniform(-2 * math.pi, 2 * math.pi) - about_y = uniform(-2 * math.pi, 2 * math.pi) - about_z = uniform(-2 * math.pi, 2 * math.pi) - - rot_x = gp_Trsf() - rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), about_x) - rot_y = gp_Trsf() - rot_y.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), about_y) - rot_z = gp_Trsf() - rot_z.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), about_z) - loc1 = Location(rot_x * rot_y * rot_z) - - q = gp_Quaternion() - q.SetEulerAngles( - gp_EulerSequence.gp_Intrinsic_XYZ, - about_x, - about_y, - about_z, - ) - t = gp_Trsf() - t.SetRotationPart(q) - loc2 = Location(t) - - np.testing.assert_allclose(loc1.to_tuple()[0], loc2.to_tuple()[0], 1e-6) - np.testing.assert_allclose(loc1.to_tuple()[1], loc2.to_tuple()[1], 1e-6) - - loc1 = Location((1, 2), 34) - np.testing.assert_allclose(loc1.to_tuple()[0], (1, 2, 0), 1e-6) - np.testing.assert_allclose(loc1.to_tuple()[1], (0, 0, 34), 1e-6) - - rot_angles = (-115.00, 35.00, -135.00) - loc2 = Location((1, 2, 3), rot_angles) - np.testing.assert_allclose(loc2.to_tuple()[0], (1, 2, 3), 1e-6) - np.testing.assert_allclose(loc2.to_tuple()[1], rot_angles, 1e-6) - - loc3 = Location(loc2) - np.testing.assert_allclose(loc3.to_tuple()[0], (1, 2, 3), 1e-6) - np.testing.assert_allclose(loc3.to_tuple()[1], rot_angles, 1e-6) - - def test_location_parameters(self): - loc = Location((10, 20, 30)) - self.assertAlmostEqual(loc.position, (10, 20, 30), 5) - - loc = Location((10, 20, 30), (10, 20, 30)) - self.assertAlmostEqual(loc.position, (10, 20, 30), 5) - self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) - - loc = Location((10, 20, 30), (10, 20, 30), Intrinsic.XYZ) - self.assertAlmostEqual(loc.position, (10, 20, 30), 5) - self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) - - loc = Location((10, 20, 30), (30, 20, 10), Extrinsic.ZYX) - self.assertAlmostEqual(loc.position, (10, 20, 30), 5) - self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) - - with self.assertRaises(TypeError): - Location(x=10) - - with self.assertRaises(TypeError): - Location((10, 20, 30), (30, 20, 10), (10, 20, 30)) - - with self.assertRaises(TypeError): - Location(Intrinsic.XYZ) - - def test_location_repr_and_str(self): - self.assertEqual( - repr(Location()), "(p=(0.00, 0.00, 0.00), o=(-0.00, 0.00, -0.00))" - ) - self.assertEqual( - str(Location()), - "Location: (position=(0.00, 0.00, 0.00), orientation=(-0.00, 0.00, -0.00))", - ) - loc = Location((1, 2, 3), (33, 45, 67)) - self.assertEqual( - str(loc), - "Location: (position=(1.00, 2.00, 3.00), orientation=(33.00, 45.00, 67.00))", - ) - - def test_location_inverted(self): - loc = Location(Plane.XZ) - self.assertAlmostEqual(loc.inverse().orientation, (-90, 0, 0), 6) - - def test_set_position(self): - loc = Location(Plane.XZ) - loc.position = (1, 2, 3) - self.assertAlmostEqual(loc.position, (1, 2, 3), 6) - self.assertAlmostEqual(loc.orientation, (90, 0, 0), 6) - - def test_set_orientation(self): - loc = Location((1, 2, 3), (90, 0, 0)) - loc.orientation = (-90, 0, 0) - self.assertAlmostEqual(loc.position, (1, 2, 3), 6) - self.assertAlmostEqual(loc.orientation, (-90, 0, 0), 6) - - def test_copy(self): - loc1 = Location((1, 2, 3), (90, 45, 22.5)) - loc2 = copy.copy(loc1) - loc3 = copy.deepcopy(loc1) - self.assertAlmostEqual(loc1.position, loc2.position.to_tuple(), 6) - self.assertAlmostEqual(loc1.orientation, loc2.orientation.to_tuple(), 6) - self.assertAlmostEqual(loc1.position, loc3.position.to_tuple(), 6) - self.assertAlmostEqual(loc1.orientation, loc3.orientation.to_tuple(), 6) - - def test_to_axis(self): - axis = Location((1, 2, 3), (-90, 0, 0)).to_axis() - self.assertAlmostEqual(axis.position, (1, 2, 3), 6) - self.assertAlmostEqual(axis.direction, (0, 1, 0), 6) - - def test_equal(self): - loc = Location((1, 2, 3), (4, 5, 6)) - same = Location((1, 2, 3), (4, 5, 6)) - - self.assertEqual(loc, same) - self.assertEqual(loc, AlwaysEqual()) - - def test_not_equal(self): - loc = Location((1, 2, 3), (40, 50, 60)) - diff_position = Location((3, 2, 1), (40, 50, 60)) - diff_orientation = Location((1, 2, 3), (60, 50, 40)) - - self.assertNotEqual(loc, diff_position) - self.assertNotEqual(loc, diff_orientation) - self.assertNotEqual(loc, object()) - - def test_neg(self): - loc = Location((1, 2, 3), (0, 35, 127)) - n_loc = -loc - self.assertAlmostEqual(n_loc.position, (1, 2, 3), 5) - self.assertAlmostEqual(n_loc.orientation, (180, -35, -127), 5) - - def test_mult_iterable(self): - locs = Location((1, 2, 0)) * GridLocations(4, 4, 2, 1) - self.assertAlmostEqual(locs[0].position, (-1, 2, 0), 5) - self.assertAlmostEqual(locs[1].position, (3, 2, 0), 5) - - def test_as_json(self): - data_dict = { - "part1": { - "joint_one": Location((1, 2, 3), (4, 5, 6)), - "joint_two": Location((7, 8, 9), (10, 11, 12)), - }, - "part2": { - "joint_one": Location((13, 14, 15), (16, 17, 18)), - "joint_two": Location((19, 20, 21), (22, 23, 24)), - }, - } - - # Serializing json with custom Location encoder - json_object = json.dumps(data_dict, indent=4, cls=LocationEncoder) - - # Writing to sample.json - with open("sample.json", "w") as outfile: - outfile.write(json_object) - - # Reading from sample.json - with open("sample.json", "r") as infile: - read_json = json.load(infile, object_hook=LocationEncoder.location_hook) - - # Validate locations - for key, value in read_json.items(): - for k, v in value.items(): - if key == "part1" and k == "joint_one": - self.assertAlmostEqual(v.position, (1, 2, 3), 5) - elif key == "part1" and k == "joint_two": - self.assertAlmostEqual(v.position, (7, 8, 9), 5) - elif key == "part2" and k == "joint_one": - self.assertAlmostEqual(v.position, (13, 14, 15), 5) - elif key == "part2" and k == "joint_two": - self.assertAlmostEqual(v.position, (19, 20, 21), 5) - else: - self.assertTrue(False) - os.remove("sample.json") - - def test_intersection(self): - e = Edge.make_line((0, 0, 0), (1, 1, 1)) - l0 = e.location_at(0) - l1 = e.location_at(1) - self.assertIsNone(l0 & l1) - self.assertEqual(l1 & l1, l1) - - i = l1 & Vector(1, 1, 1) - self.assertTrue(isinstance(i, Vector)) - self.assertAlmostEqual(i, (1, 1, 1), 5) - - i = l1 & Axis((0.5, 0.5, 0.5), (1, 1, 1)) - self.assertTrue(isinstance(i, Location)) - self.assertEqual(i, l1) - - p = Plane.XY.rotated((45, 0, 0)).shift_origin((1, 0, 0)) - l = Location((1, 0, 0), (1, 0, 0), 45) - i = l & p - self.assertTrue(isinstance(i, Location)) - self.assertAlmostEqual(i.position, (1, 0, 0), 5) - self.assertAlmostEqual(i.orientation, l.orientation, 5) - - b = Solid.make_box(1, 1, 1) - l = Location((0.5, 0.5, 0.5), (1, 0, 0), 45) - i = (l & b).vertex() - self.assertTrue(isinstance(i, Vertex)) - self.assertAlmostEqual(Vector(i), (0.5, 0.5, 0.5), 5) - - e1 = Edge.make_line((0, -1), (2, 1)) - e2 = Edge.make_line((0, 1), (2, -1)) - e3 = Edge.make_line((0, 0), (2, 0)) - - i = e1.intersect(e2, e3) - self.assertTrue(isinstance(i, Vertex)) - self.assertAlmostEqual(Vector(i), (1, 0, 0), 5) - - e4 = Edge.make_line((1, -1), (1, 1)) - e5 = Edge.make_line((2, -1), (2, 1)) - i = e3.intersect(e4, e5) - self.assertIsNone(i) - - self.assertIsNone(b.intersect(b.moved(Pos(X=10)))) - - # Look for common vertices - e1 = Edge.make_line((0, 0), (1, 0)) - e2 = Edge.make_line((1, 0), (1, 1)) - e3 = Edge.make_line((1, 0), (2, 0)) - i = e1.intersect(e2) - self.assertEqual(len(i.vertices()), 1) - self.assertEqual(tuple(i.vertex()), (1, 0, 0)) - i = e1.intersect(e3) - self.assertEqual(len(i.vertices()), 1) - self.assertEqual(tuple(i.vertex()), (1, 0, 0)) - - # Intersect with plane - e1 = Edge.make_line((0, 0), (2, 0)) - p1 = Plane.YZ.offset(1) - i = e1.intersect(p1) - self.assertEqual(len(i.vertices()), 1) - self.assertEqual(tuple(i.vertex()), (1, 0, 0)) - - e2 = Edge.make_line(p1.origin, p1.origin + 2 * p1.x_dir) - i = e2.intersect(p1) - self.assertEqual(len(i.vertices()), 2) - self.assertEqual(len(i.edges()), 1) - self.assertAlmostEqual(i.edge().length, 2, 5) - - with self.assertRaises(ValueError): - e1.intersect("line") - - def test_pos(self): - with self.assertRaises(TypeError): - Pos(0, "foo") - self.assertEqual(Pos(1, 2, 3).position, Vector(1, 2, 3)) - self.assertEqual(Pos((1, 2, 3)).position, Vector(1, 2, 3)) - self.assertEqual(Pos(v=(1, 2, 3)).position, Vector(1, 2, 3)) - self.assertEqual(Pos(X=1, Y=2, Z=3).position, Vector(1, 2, 3)) - self.assertEqual(Pos(Vector(1, 2, 3)).position, Vector(1, 2, 3)) - self.assertEqual(Pos(1, Y=2, Z=3).position, Vector(1, 2, 3)) - - -class TestMatrix(unittest.TestCase): - def test_matrix_creation_and_access(self): - def matrix_vals(m): - return [[m[r, c] for c in range(4)] for r in range(4)] - - # default constructor creates a 4x4 identity matrix - m = Matrix() - identity = [ - [1.0, 0.0, 0.0, 0.0], - [0.0, 1.0, 0.0, 0.0], - [0.0, 0.0, 1.0, 0.0], - [0.0, 0.0, 0.0, 1.0], - ] - self.assertEqual(identity, matrix_vals(m)) - - vals4x4 = [ - [1.0, 0.0, 0.0, 1.0], - [0.0, 1.0, 0.0, 2.0], - [0.0, 0.0, 1.0, 3.0], - [0.0, 0.0, 0.0, 1.0], - ] - vals4x4_tuple = tuple(tuple(r) for r in vals4x4) - - # test constructor with 16-value input - m = Matrix(vals4x4) - self.assertEqual(vals4x4, matrix_vals(m)) - m = Matrix(vals4x4_tuple) - self.assertEqual(vals4x4, matrix_vals(m)) - - # test constructor with 12-value input (the last 4 are an implied - # [0,0,0,1]) - m = Matrix(vals4x4[:3]) - self.assertEqual(vals4x4, matrix_vals(m)) - m = Matrix(vals4x4_tuple[:3]) - self.assertEqual(vals4x4, matrix_vals(m)) - - # Test 16-value input with invalid values for the last 4 - invalid = [ - [1.0, 0.0, 0.0, 1.0], - [0.0, 1.0, 0.0, 2.0], - [0.0, 0.0, 1.0, 3.0], - [1.0, 2.0, 3.0, 4.0], - ] - with self.assertRaises(ValueError): - Matrix(invalid) - # Test input with invalid type - with self.assertRaises(TypeError): - Matrix("invalid") - # Test input with invalid size / nested types - with self.assertRaises(TypeError): - Matrix([[1, 2, 3, 4], [1, 2, 3], [1, 2, 3, 4]]) - with self.assertRaises(TypeError): - Matrix([1, 2, 3]) - - # Invalid sub-type - with self.assertRaises(TypeError): - Matrix([[1, 2, 3, 4], "abc", [1, 2, 3, 4]]) - - # test out-of-bounds access - m = Matrix() - with self.assertRaises(IndexError): - m[0, 4] - with self.assertRaises(IndexError): - m[4, 0] - with self.assertRaises(IndexError): - m["ab"] - - # test __repr__ methods - m = Matrix(vals4x4) - mRepr = "Matrix([[1.0, 0.0, 0.0, 1.0],\n [0.0, 1.0, 0.0, 2.0],\n [0.0, 0.0, 1.0, 3.0],\n [0.0, 0.0, 0.0, 1.0]])" - self.assertEqual(repr(m), mRepr) - self.assertEqual(str(eval(repr(m))), mRepr) - - def test_matrix_functionality(self): - # Test rotate methods - def matrix_almost_equal(m, target_matrix): - for r, row in enumerate(target_matrix): - for c, target_value in enumerate(row): - self.assertAlmostEqual(m[r, c], target_value) - - root_3_over_2 = math.sqrt(3) / 2 - m_rotate_x_30 = [ - [1, 0, 0, 0], - [0, root_3_over_2, -1 / 2, 0], - [0, 1 / 2, root_3_over_2, 0], - [0, 0, 0, 1], - ] - mx = Matrix() - mx.rotate(Axis.X, math.radians(30)) - matrix_almost_equal(mx, m_rotate_x_30) - - m_rotate_y_30 = [ - [root_3_over_2, 0, 1 / 2, 0], - [0, 1, 0, 0], - [-1 / 2, 0, root_3_over_2, 0], - [0, 0, 0, 1], - ] - my = Matrix() - my.rotate(Axis.Y, math.radians(30)) - matrix_almost_equal(my, m_rotate_y_30) - - m_rotate_z_30 = [ - [root_3_over_2, -1 / 2, 0, 0], - [1 / 2, root_3_over_2, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1], - ] - mz = Matrix() - mz.rotate(Axis.Z, math.radians(30)) - matrix_almost_equal(mz, m_rotate_z_30) - - # Test matrix multiply vector - v = Vector(1, 0, 0) - self.assertAlmostEqual(mz.multiply(v), (root_3_over_2, 1 / 2, 0), 7) - - # Test matrix multiply matrix - m_rotate_xy_30 = [ - [root_3_over_2, 0, 1 / 2, 0], - [1 / 4, root_3_over_2, -root_3_over_2 / 2, 0], - [-root_3_over_2 / 2, 1 / 2, 3 / 4, 0], - [0, 0, 0, 1], - ] - mxy = mx.multiply(my) - matrix_almost_equal(mxy, m_rotate_xy_30) - - # Test matrix inverse - vals4x4 = [[1, 2, 3, 4], [5, 1, 6, 7], [8, 9, 1, 10], [0, 0, 0, 1]] - vals4x4_invert = [ - [-53 / 144, 25 / 144, 1 / 16, -53 / 144], - [43 / 144, -23 / 144, 1 / 16, -101 / 144], - [37 / 144, 7 / 144, -1 / 16, -107 / 144], - [0, 0, 0, 1], - ] - m = Matrix(vals4x4).inverse() - matrix_almost_equal(m, vals4x4_invert) - - # Test matrix created from transfer function - rot_x = gp_Trsf() - θ = math.pi - rot_x.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), θ) - m = Matrix(rot_x) - rot_x_matrix = [ - [1, 0, 0, 0], - [0, math.cos(θ), -math.sin(θ), 0], - [0, math.sin(θ), math.cos(θ), 0], - [0, 0, 0, 1], - ] - matrix_almost_equal(m, rot_x_matrix) - - # Test copy - m2 = copy.copy(m) - matrix_almost_equal(m2, rot_x_matrix) - m3 = copy.deepcopy(m) - matrix_almost_equal(m3, rot_x_matrix) - - -class TestMixin1D(unittest.TestCase): - """Test the add in methods""" - - def test_position_at(self): - self.assertAlmostEqual( - Edge.make_line((0, 0, 0), (1, 1, 1)).position_at(0.5), - (0.5, 0.5, 0.5), - 5, - ) - # Not sure what PARAMETER mode returns - but it's in the ballpark - point = ( - Edge.make_line((0, 0, 0), (1, 1, 1)) - .position_at(0.5, position_mode=PositionMode.PARAMETER) - .to_tuple() - ) - self.assertTrue(all([0.0 < v < 1.0 for v in point])) - - wire = Wire([Edge.make_line((0, 0, 0), (10, 0, 0))]) - self.assertAlmostEqual(wire.position_at(0.3), (3, 0, 0), 5) - self.assertAlmostEqual( - wire.position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 - ) - self.assertAlmostEqual(wire.edge().position_at(0.3), (3, 0, 0), 5) - self.assertAlmostEqual( - wire.edge().position_at(3, position_mode=PositionMode.LENGTH), (3, 0, 0), 5 - ) - - circle_wire = Wire( - [ - Edge.make_circle(1, start_angle=0, end_angle=180), - Edge.make_circle(1, start_angle=180, end_angle=360), - ] - ) - p1 = circle_wire.position_at(math.pi, position_mode=PositionMode.LENGTH) - p2 = circle_wire.position_at(math.pi / circle_wire.length) - self.assertAlmostEqual(p1, (-1, 0, 0), 14) - self.assertAlmostEqual(p2, (-1, 0, 0), 14) - self.assertAlmostEqual(p1, p2, 14) - - circle_edge = Edge.make_circle(1) - p3 = circle_edge.position_at(math.pi, position_mode=PositionMode.LENGTH) - p4 = circle_edge.position_at(math.pi / circle_edge.length) - self.assertAlmostEqual(p3, (-1, 0, 0), 14) - self.assertAlmostEqual(p4, (-1, 0, 0), 14) - self.assertAlmostEqual(p3, p4, 14) - - circle = Wire( - [ - Edge.make_circle(2, start_angle=0, end_angle=180), - Edge.make_circle(2, start_angle=180, end_angle=360), - ] - ) - self.assertAlmostEqual( - circle.position_at(0.5), - (-2, 0, 0), - 5, - ) - self.assertAlmostEqual( - circle.position_at(2 * math.pi, position_mode=PositionMode.LENGTH), - (-2, 0, 0), - 5, - ) - - def test_positions(self): - e = Edge.make_line((0, 0, 0), (1, 1, 1)) - distances = [i / 4 for i in range(3)] - pts = e.positions(distances) - for i, position in enumerate(pts): - self.assertAlmostEqual(position, (i / 4, i / 4, i / 4), 5) - - def test_tangent_at(self): - self.assertAlmostEqual( - Edge.make_circle(1, start_angle=0, end_angle=90).tangent_at(1.0), - (-1, 0, 0), - 5, - ) - tangent = ( - Edge.make_circle(1, start_angle=0, end_angle=90) - .tangent_at(0.0, position_mode=PositionMode.PARAMETER) - .to_tuple() - ) - self.assertTrue(all([0.0 <= v <= 1.0 for v in tangent])) - - self.assertAlmostEqual( - Edge.make_circle(1, start_angle=0, end_angle=180).tangent_at( - math.pi / 2, position_mode=PositionMode.LENGTH - ), - (-1, 0, 0), - 5, - ) - - def test_tangent_at_point(self): - circle = Wire( - [ - Edge.make_circle(1, start_angle=0, end_angle=180), - Edge.make_circle(1, start_angle=180, end_angle=360), - ] - ) - pnt_on_circle = Vector(math.cos(math.pi / 4), math.sin(math.pi / 4)) - tan = circle.tangent_at(pnt_on_circle) - self.assertAlmostEqual(tan, (-math.sqrt(2) / 2, math.sqrt(2) / 2), 5) - - def test_tangent_at_by_length(self): - circle = Edge.make_circle(1) - tan = circle.tangent_at(circle.length * 0.5, position_mode=PositionMode.LENGTH) - self.assertAlmostEqual(tan, (0, -1), 5) - - def test_tangent_at_error(self): - with self.assertRaises(ValueError): - Edge.make_circle(1).tangent_at("start") - - def test_normal(self): - self.assertAlmostEqual( - Edge.make_circle( - 1, Plane(origin=(0, 0, 0), z_dir=(1, 0, 0)), start_angle=0, end_angle=60 - ).normal(), - (1, 0, 0), - 5, - ) - self.assertAlmostEqual( - Edge.make_ellipse( - 1, - 0.5, - Plane(origin=(0, 0, 0), z_dir=(1, 1, 0)), - start_angle=0, - end_angle=90, - ).normal(), - (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), - 5, - ) - self.assertAlmostEqual( - Edge.make_spline( - [ - (1, 0), - (math.sqrt(2) / 2, math.sqrt(2) / 2), - (0, 1), - ], - tangents=((0, 1, 0), (-1, 0, 0)), - ).normal(), - (0, 0, 1), - 5, - ) - with self.assertRaises(ValueError): - Edge.make_line((0, 0, 0), (1, 1, 1)).normal() - - def test_center(self): - c = Edge.make_circle(1, start_angle=0, end_angle=180) - self.assertAlmostEqual(c.center(), (0, 1, 0), 5) - self.assertAlmostEqual( - c.center(CenterOf.MASS), - (0, 0.6366197723675814, 0), - 5, - ) - self.assertAlmostEqual(c.center(CenterOf.BOUNDING_BOX), (0, 0.5, 0), 5) - - def test_location_at(self): - loc = Edge.make_circle(1).location_at(0.25) - self.assertAlmostEqual(loc.position, (0, 1, 0), 5) - self.assertAlmostEqual(loc.orientation, (0, -90, -90), 5) - - loc = Edge.make_circle(1).location_at( - math.pi / 2, position_mode=PositionMode.LENGTH - ) - self.assertAlmostEqual(loc.position, (0, 1, 0), 5) - self.assertAlmostEqual(loc.orientation, (0, -90, -90), 5) - - def test_locations(self): - locs = Edge.make_circle(1).locations([i / 4 for i in range(4)]) - self.assertAlmostEqual(locs[0].position, (1, 0, 0), 5) - self.assertAlmostEqual(locs[0].orientation, (-90, 0, -180), 5) - self.assertAlmostEqual(locs[1].position, (0, 1, 0), 5) - self.assertAlmostEqual(locs[1].orientation, (0, -90, -90), 5) - self.assertAlmostEqual(locs[2].position, (-1, 0, 0), 5) - self.assertAlmostEqual(locs[2].orientation, (90, 0, 0), 5) - self.assertAlmostEqual(locs[3].position, (0, -1, 0), 5) - self.assertAlmostEqual(locs[3].orientation, (0, 90, 90), 5) - - def test_project(self): - target = Face.make_rect(10, 10, Plane.XY.rotated((0, 45, 0))) - circle = Edge.make_circle(1).locate(Location((0, 0, 10))) - ellipse: Wire = circle.project(target, (0, 0, -1)) - bbox = ellipse.bounding_box() - self.assertAlmostEqual(bbox.min, (-1, -1, -1), 5) - self.assertAlmostEqual(bbox.max, (1, 1, 1), 5) - - def test_project2(self): - target = Cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] - square = Wire.make_rect(1, 1, Plane.YZ).locate(Location((10, 0, 0))) - projections: list[Wire] = square.project( - target, direction=(-1, 0, 0), closest=False - ) - self.assertEqual(len(projections), 2) - - def test_is_forward(self): - plate = Box(10, 10, 1) - Cylinder(1, 1) - hole_edges = plate.edges().filter_by(GeomType.CIRCLE) - self.assertTrue(hole_edges.sort_by(Axis.Z)[-1].is_forward) - self.assertFalse(hole_edges.sort_by(Axis.Z)[0].is_forward) - - def test_offset_2d(self): - base_wire = Wire.make_polygon([(0, 0), (1, 0), (1, 1)], close=False) - corner = base_wire.vertices().group_by(Axis.Y)[0].sort_by(Axis.X)[-1] - base_wire = base_wire.fillet_2d(0.4, [corner]) - offset_wire = base_wire.offset_2d(0.1, side=Side.LEFT) - self.assertTrue(offset_wire.is_closed) - self.assertEqual(len(offset_wire.edges().filter_by(GeomType.LINE)), 6) - self.assertEqual(len(offset_wire.edges().filter_by(GeomType.CIRCLE)), 2) - offset_wire_right = base_wire.offset_2d(0.1, side=Side.RIGHT) - self.assertAlmostEqual( - offset_wire_right.edges() - .filter_by(GeomType.CIRCLE) - .sort_by(SortBy.RADIUS)[-1] - .radius, - 0.5, - 4, - ) - h_perimeter = Compound.make_text("h", font_size=10).wire() - with self.assertRaises(RuntimeError): - h_perimeter.offset_2d(-1) - - # Test for returned Edge - can't find a way to do this - # base_edge = Edge.make_circle(10, start_angle=40, end_angle=50) - # self.assertTrue(isinstance(offset_edge, Edge)) - # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) - # self.assertTrue(offset_edge.geom_type == GeomType.CIRCLE) - # self.assertAlmostEqual(offset_edge.radius, 12, 5) - # base_edge = Edge.make_line((0, 1), (1, 10)) - # offset_edge = base_edge.offset_2d(2, side=Side.RIGHT, closed=False) - # self.assertTrue(isinstance(offset_edge, Edge)) - # self.assertTrue(offset_edge.geom_type == GeomType.LINE) - # self.assertAlmostEqual(offset_edge.position_at(0).X, 3) - - def test_common_plane(self): - # Straight and circular lines - l = Edge.make_line((0, 0, 0), (5, 0, 0)) - c = Edge.make_circle(2, Plane.XZ, -90, 90) - common = l.common_plane(c) - self.assertAlmostEqual(common.z_dir.X, 0, 5) - self.assertAlmostEqual(abs(common.z_dir.Y), 1, 5) # the direction isn't known - self.assertAlmostEqual(common.z_dir.Z, 0, 5) - - # Co-axial straight lines - l1 = Edge.make_line((0, 0), (1, 1)) - l2 = Edge.make_line((0.25, 0.25), (0.75, 0.75)) - common = l1.common_plane(l2) - # the z_dir isn't know - self.assertAlmostEqual(common.x_dir.Z, 0, 5) - - # Parallel lines - l1 = Edge.make_line((0, 0), (1, 0)) - l2 = Edge.make_line((0, 1), (1, 1)) - common = l1.common_plane(l2) - self.assertAlmostEqual(common.z_dir.X, 0, 5) - self.assertAlmostEqual(common.z_dir.Y, 0, 5) - self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known - - # Many lines - common = Edge.common_plane(*Wire.make_rect(10, 10).edges()) - self.assertAlmostEqual(common.z_dir.X, 0, 5) - self.assertAlmostEqual(common.z_dir.Y, 0, 5) - self.assertAlmostEqual(abs(common.z_dir.Z), 1, 5) # the direction isn't known - - # Wire and Edges - c = Wire.make_circle(1, Plane.YZ) - lines = Wire.make_rect(2, 2, Plane.YZ).edges() - common = c.common_plane(*lines) - self.assertAlmostEqual(abs(common.z_dir.X), 1, 5) # the direction isn't known - self.assertAlmostEqual(common.z_dir.Y, 0, 5) - self.assertAlmostEqual(common.z_dir.Z, 0, 5) - - def test_edge_volume(self): - edge = Edge.make_line((0, 0), (1, 1)) - self.assertAlmostEqual(edge.volume, 0, 5) - - def test_wire_volume(self): - wire = Wire.make_rect(1, 1) - self.assertAlmostEqual(wire.volume, 0, 5) - - -class TestMixin3D(unittest.TestCase): - """Test that 3D add ins""" - - def test_chamfer(self): - box = Solid.make_box(1, 1, 1) - chamfer_box = box.chamfer(0.1, None, box.edges().sort_by(Axis.Z)[-1:]) - self.assertAlmostEqual(chamfer_box.volume, 1 - 0.005, 5) - - def test_chamfer_asym_length(self): - box = Solid.make_box(1, 1, 1) - chamfer_box = box.chamfer(0.1, 0.2, box.edges().sort_by(Axis.Z)[-1:]) - self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) - - def test_chamfer_asym_length_with_face(self): - box = Solid.make_box(1, 1, 1) - face = box.faces().sort_by(Axis.Z)[0] - edge = [face.edges().sort_by(Axis.Y)[0]] - chamfer_box = box.chamfer(0.1, 0.2, edge, face=face) - self.assertAlmostEqual(chamfer_box.volume, 1 - 0.01, 5) - - def test_chamfer_too_high_length(self): - box = Solid.make_box(1, 1, 1) - face = box.faces - self.assertRaises( - ValueError, box.chamfer, 2, None, box.edges().sort_by(Axis.Z)[-1:] - ) - - def test_chamfer_edge_not_part_of_face(self): - box = Solid.make_box(1, 1, 1) - edge = box.edges().sort_by(Axis.Z)[-1:] - face = box.faces().sort_by(Axis.Z)[0] - self.assertRaises(ValueError, box.chamfer, 0.1, None, edge, face=face) - - @patch.object(Shape, "is_valid", return_value=False) - def test_chamfer_invalid_shape_raises_error(self, mock_is_valid): - box = Solid.make_box(1, 1, 1) - - # Assert that ValueError is raised - with self.assertRaises(ValueError) as chamfer_context: - max = box.chamfer(0.1, None, box.edges()) - - # Check the error message - self.assertEqual( - str(chamfer_context.exception), - "Failed creating a chamfer, try a smaller length value(s)", - ) - - # Verify is_valid was called - mock_is_valid.assert_called_once() - - def test_hollow(self): - shell_box = Solid.make_box(1, 1, 1).hollow([], thickness=-0.1) - self.assertAlmostEqual(shell_box.volume, 1 - 0.8**3, 5) - - shell_box = Solid.make_box(1, 1, 1) - shell_box = shell_box.hollow( - shell_box.faces().filter_by(Axis.Z), thickness=0.1, kind=Kind.INTERSECTION - ) - self.assertAlmostEqual(shell_box.volume, 1 * 1.2**2 - 1**3, 5) - - shell_box = Solid.make_box(1, 1, 1).hollow( - [], thickness=0.1, kind=Kind.INTERSECTION - ) - self.assertAlmostEqual(shell_box.volume, 1.2**3 - 1**3, 5) - - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).hollow([], thickness=0.1, kind=Kind.TANGENT) - - def test_is_inside(self): - self.assertTrue(Solid.make_box(1, 1, 1).is_inside((0.5, 0.5, 0.5))) - - def test_dprism(self): - # face - f = Face.make_rect(0.5, 0.5) - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [f], additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) - - # face with depth - f = Face.make_rect(0.5, 0.5) - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [f], depth=0.5, thru_all=False, additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) - - # face until - f = Face.make_rect(0.5, 0.5) - limit = Face.make_rect(1, 1, Plane((0, 0, 0.5))) - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [f], up_to_face=limit, thru_all=False, additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) - - # wire - w = Face.make_rect(0.5, 0.5).outer_wire() - d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( - None, [w], additive=False - ) - self.assertTrue(d.is_valid()) - self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) - - def test_center(self): - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).center(CenterOf.GEOMETRY) - - self.assertAlmostEqual( - Solid.make_box(1, 1, 1).center(CenterOf.BOUNDING_BOX), - (0.5, 0.5, 0.5), - 5, - ) - - -class TestPlane(unittest.TestCase): - """Plane with class properties""" - - def test_class_properties(self): - """Validate - Name x_dir y_dir z_dir - ======= ====== ====== ====== - XY +x +y +z - YZ +y +z +x - ZX +z +x +y - XZ +x +z -y - YX +y +x -z - ZY +z +y -x - front +x +z -y - back -x +z +y - left -y +z -x - right +y +z +x - top +x +y +z - bottom +x -y -z - isometric +x+y -x+y+z +x+y-z - """ - planes = [ - (Plane.XY, (1, 0, 0), (0, 0, 1)), - (Plane.YZ, (0, 1, 0), (1, 0, 0)), - (Plane.ZX, (0, 0, 1), (0, 1, 0)), - (Plane.XZ, (1, 0, 0), (0, -1, 0)), - (Plane.YX, (0, 1, 0), (0, 0, -1)), - (Plane.ZY, (0, 0, 1), (-1, 0, 0)), - (Plane.front, (1, 0, 0), (0, -1, 0)), - (Plane.back, (-1, 0, 0), (0, 1, 0)), - (Plane.left, (0, -1, 0), (-1, 0, 0)), - (Plane.right, (0, 1, 0), (1, 0, 0)), - (Plane.top, (1, 0, 0), (0, 0, 1)), - (Plane.bottom, (1, 0, 0), (0, 0, -1)), - ( - Plane.isometric, - (1 / 2**0.5, 1 / 2**0.5, 0), - (1 / 3**0.5, -1 / 3**0.5, 1 / 3**0.5), - ), - ] - for plane, x_dir, z_dir in planes: - self.assertAlmostEqual(plane.x_dir, x_dir, 5) - self.assertAlmostEqual(plane.z_dir, z_dir, 5) - - def test_plane_init(self): - # from origin - o = (0, 0, 0) - x = (1, 0, 0) - y = (0, 1, 0) - z = (0, 0, 1) - planes = [ - Plane(o), - Plane(o, x), - Plane(o, x, z), - Plane(o, x, z_dir=z), - Plane(o, x_dir=x, z_dir=z), - Plane(o, x_dir=x), - Plane(o, z_dir=z), - Plane(origin=o, x_dir=x, z_dir=z), - Plane(origin=o, x_dir=x), - Plane(origin=o, z_dir=z), - ] - for p in planes: - self.assertAlmostEqual(p.origin, o, 6) - self.assertAlmostEqual(p.x_dir, x, 6) - self.assertAlmostEqual(p.y_dir, y, 6) - self.assertAlmostEqual(p.z_dir, z, 6) - with self.assertRaises(TypeError): - Plane() - with self.assertRaises(TypeError): - Plane(o, z_dir="up") - - # rotated location around z - loc = Location((0, 0, 0), (0, 0, 45)) - p_from_loc = Plane(loc) - p_from_named_loc = Plane(location=loc) - for p in [p_from_loc, p_from_named_loc]: - self.assertAlmostEqual(p.origin, (0, 0, 0), 6) - self.assertAlmostEqual(p.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) - self.assertAlmostEqual(p.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) - self.assertAlmostEqual(p.z_dir, (0, 0, 1), 6) - self.assertAlmostEqual(loc.position, p.location.position, 6) - self.assertAlmostEqual(loc.orientation, p.location.orientation, 6) - - # rotated location around x and origin <> (0,0,0) - loc = Location((0, 2, -1), (45, 0, 0)) - p = Plane(loc) - self.assertAlmostEqual(p.origin, (0, 2, -1), 6) - self.assertAlmostEqual(p.x_dir, (1, 0, 0), 6) - self.assertAlmostEqual(p.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6) - self.assertAlmostEqual(p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) - self.assertAlmostEqual(loc.position, p.location.position, 6) - self.assertAlmostEqual(loc.orientation, p.location.orientation, 6) - - # from a face - f = Face.make_rect(1, 2).located(Location((1, 2, 3), (45, 0, 45))) - p_from_face = Plane(f) - p_from_named_face = Plane(face=f) - plane_from_gp_pln = Plane(gp_pln=p_from_face.wrapped) - p_deep_copy = copy.deepcopy(p_from_face) - for p in [p_from_face, p_from_named_face, plane_from_gp_pln, p_deep_copy]: - self.assertAlmostEqual(p.origin, (1, 2, 3), 6) - self.assertAlmostEqual(p.x_dir, (math.sqrt(2) / 2, 0.5, 0.5), 6) - self.assertAlmostEqual(p.y_dir, (-math.sqrt(2) / 2, 0.5, 0.5), 6) - self.assertAlmostEqual(p.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) - self.assertAlmostEqual(f.location.position, p.location.position, 6) - self.assertAlmostEqual(f.location.orientation, p.location.orientation, 6) - - # from a face with x_dir - f = Face.make_rect(1, 2) - x = (1, 1) - y = (-1, 1) - planes = [ - Plane(f, x), - Plane(f, x_dir=x), - Plane(face=f, x_dir=x), - ] - for p in planes: - self.assertAlmostEqual(p.origin, (0, 0, 0), 6) - self.assertAlmostEqual(p.x_dir, Vector(x).normalized(), 6) - self.assertAlmostEqual(p.y_dir, Vector(y).normalized(), 6) - self.assertAlmostEqual(p.z_dir, (0, 0, 1), 6) - - with self.assertRaises(TypeError): - Plane(Edge.make_line((0, 0), (0, 1))) - - # can be instantiated from planar faces of surface types other than Geom_Plane - # this loft creates the trapezoid faces of type Geom_BSplineSurface - lofted_solid = Solid.make_loft( - [ - Rectangle(3, 1).wire(), - Pos(0, 0, 1) * Rectangle(1, 1).wire(), - ] - ) - - expected = [ - # Trapezoid face, negative y coordinate - ( - Axis.X.direction, # plane x_dir - Axis.Z.direction, # plane y_dir - -Axis.Y.direction, # plane z_dir - ), - # Trapezoid face, positive y coordinate - ( - -Axis.X.direction, - Axis.Z.direction, - Axis.Y.direction, - ), - ] - # assert properties of the trapezoid faces - for i, f in enumerate(lofted_solid.faces() | Plane.XZ > Axis.Y): - p = Plane(f) - f_props = GProp_GProps() - BRepGProp.SurfaceProperties_s(f.wrapped, f_props) - self.assertAlmostEqual(p.origin, Vector(f_props.CentreOfMass()), 6) - self.assertAlmostEqual(p.x_dir, expected[i][0], 6) - self.assertAlmostEqual(p.y_dir, expected[i][1], 6) - self.assertAlmostEqual(p.z_dir, expected[i][2], 6) - - def test_plane_neg(self): - p = Plane( - origin=(1, 2, 3), - x_dir=Vector(1, 2, 3).normalized(), - z_dir=Vector(4, 5, 6).normalized(), - ) - p2 = -p - self.assertAlmostEqual(p2.origin, p.origin, 6) - self.assertAlmostEqual(p2.x_dir, p.x_dir, 6) - self.assertAlmostEqual(p2.z_dir, -p.z_dir, 6) - self.assertAlmostEqual(p2.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6) - p3 = p.reverse() - self.assertAlmostEqual(p3.origin, p.origin, 6) - self.assertAlmostEqual(p3.x_dir, p.x_dir, 6) - self.assertAlmostEqual(p3.z_dir, -p.z_dir, 6) - self.assertAlmostEqual(p3.y_dir, (-p.z_dir).cross(p.x_dir).normalized(), 6) - - def test_plane_mul(self): - p = Plane(origin=(1, 2, 3), x_dir=(1, 0, 0), z_dir=(0, 0, 1)) - p2 = p * Location((1, 2, -1), (0, 0, 45)) - self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) - self.assertAlmostEqual(p2.x_dir, (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) - self.assertAlmostEqual(p2.y_dir, (-math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 6) - self.assertAlmostEqual(p2.z_dir, (0, 0, 1), 6) - - p2 = p * Location((1, 2, -1), (0, 45, 0)) - self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) - self.assertAlmostEqual(p2.x_dir, (math.sqrt(2) / 2, 0, -math.sqrt(2) / 2), 6) - self.assertAlmostEqual(p2.y_dir, (0, 1, 0), 6) - self.assertAlmostEqual(p2.z_dir, (math.sqrt(2) / 2, 0, math.sqrt(2) / 2), 6) - - p2 = p * Location((1, 2, -1), (45, 0, 0)) - self.assertAlmostEqual(p2.origin, (2, 4, 2), 6) - self.assertAlmostEqual(p2.x_dir, (1, 0, 0), 6) - self.assertAlmostEqual(p2.y_dir, (0, math.sqrt(2) / 2, math.sqrt(2) / 2), 6) - self.assertAlmostEqual(p2.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 6) - with self.assertRaises(TypeError): - p2 * Vector(1, 1, 1) - - def test_plane_methods(self): - # Test error checking - p = Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 0)) - with self.assertRaises(ValueError): - p.to_local_coords("box") - - # Test translation to local coordinates - local_box = p.to_local_coords(Solid.make_box(1, 1, 1)) - local_box_vertices = [(v.X, v.Y, v.Z) for v in local_box.vertices()] - target_vertices = [ - (0, -1, 0), - (0, 0, 0), - (0, -1, 1), - (0, 0, 1), - (1, -1, 0), - (1, 0, 0), - (1, -1, 1), - (1, 0, 1), - ] - for i, target_point in enumerate(target_vertices): - np.testing.assert_allclose(target_point, local_box_vertices[i], 1e-7) - - def test_localize_vertex(self): - vertex = Vertex(random.random(), random.random(), random.random()) - np.testing.assert_allclose( - Plane.YZ.to_local_coords(vertex).to_tuple(), - Plane.YZ.to_local_coords(Vector(vertex)).to_tuple(), - 5, - ) - - def test_repr(self): - self.assertEqual( - repr(Plane.XY), - "Plane(o=(0.00, 0.00, 0.00), x=(1.00, 0.00, 0.00), z=(0.00, 0.00, 1.00))", - ) - - def test_shift_origin_axis(self): - cyl = Cylinder(1, 2, align=Align.MIN) - top = cyl.faces().sort_by(Axis.Z)[-1] - pln = Plane(top).shift_origin(Axis.Z) - with BuildPart() as p: - add(cyl) - with BuildSketch(pln): - with Locations((1, 1)): - Circle(0.5) - extrude(amount=-2, mode=Mode.SUBTRACT) - self.assertAlmostEqual(p.part.volume, math.pi * (1**2 - 0.5**2) * 2, 5) - - def test_shift_origin_vertex(self): - box = Box(1, 1, 1, align=Align.MIN) - front = box.faces().sort_by(Axis.X)[-1] - pln = Plane(front).shift_origin( - front.vertices().group_by(Axis.Z)[-1].sort_by(Axis.Y)[-1] - ) - with BuildPart() as p: - add(box) - with BuildSketch(pln): - with Locations((-0.5, 0.5)): - Circle(0.5) - extrude(amount=-1, mode=Mode.SUBTRACT) - self.assertAlmostEqual(p.part.volume, 1**3 - math.pi * (0.5**2) * 1, 5) - - def test_shift_origin_vector(self): - with BuildPart() as p: - Box(4, 4, 2) - b = fillet(p.edges().filter_by(Axis.Z), 0.5) - top = p.faces().sort_by(Axis.Z)[-1] - ref = ( - top.edges() - .filter_by(GeomType.CIRCLE) - .group_by(Axis.X)[-1] - .sort_by(Axis.Y)[0] - .arc_center - ) - pln = Plane(top, x_dir=(0, 1, 0)).shift_origin(ref) - with BuildSketch(pln): - with Locations((0.5, 0.5)): - Rectangle(2, 2, align=Align.MIN) - extrude(amount=-1, mode=Mode.SUBTRACT) - self.assertAlmostEqual(p.part.volume, b.volume - 2**2 * 1, 5) - - def test_shift_origin_error(self): - with self.assertRaises(ValueError): - Plane.XY.shift_origin(Vertex(1, 1, 1)) - - with self.assertRaises(ValueError): - Plane.XY.shift_origin((1, 1, 1)) - - with self.assertRaises(ValueError): - Plane.XY.shift_origin(Axis((0, 0, 1), (0, 1, 0))) - - with self.assertRaises(TypeError): - Plane.XY.shift_origin(Edge.make_line((0, 0), (1, 1))) - - def test_move(self): - pln = Plane.XY.move(Location((1, 2, 3))) - self.assertAlmostEqual(pln.origin, (1, 2, 3), 5) - - def test_rotated(self): - rotated_plane = Plane.XY.rotated((45, 0, 0)) - self.assertAlmostEqual(rotated_plane.x_dir, (1, 0, 0), 5) - self.assertAlmostEqual( - rotated_plane.z_dir, (0, -math.sqrt(2) / 2, math.sqrt(2) / 2), 5 - ) - - def test_invalid_plane(self): - # Test plane creation error handling - with self.assertRaises(ValueError): - Plane(origin=(0, 0, 0), x_dir=(0, 0, 0), z_dir=(0, 1, 1)) - with self.assertRaises(ValueError): - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 0)) - - def test_plane_equal(self): - # default orientation - self.assertEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - ) - # moved origin - self.assertEqual( - Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(2, 1, -1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - ) - # moved x-axis - self.assertEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), - ) - # moved z-axis - self.assertEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), - ) - # __eq__ cooperation - self.assertEqual(Plane.XY, AlwaysEqual()) - - def test_plane_not_equal(self): - # type difference - for value in [None, 0, 1, "abc"]: - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), value - ) - # origin difference - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 1), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - ) - # x-axis difference - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(0, 0, 1)), - ) - # z-axis difference - self.assertNotEqual( - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 0, 1)), - Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), - ) - - def test_to_location(self): - loc = Plane(origin=(1, 2, 3), x_dir=(0, 1, 0), z_dir=(0, 0, 1)).location - self.assertAlmostEqual(loc.position, (1, 2, 3), 5) - self.assertAlmostEqual(loc.orientation, (0, 0, 90), 5) - - def test_intersect(self): - self.assertAlmostEqual( - Plane.XY.intersect(Axis((1, 2, 3), (0, 0, -1))), (1, 2, 0), 5 - ) - self.assertIsNone(Plane.XY.intersect(Axis((1, 2, 3), (0, 1, 0)))) - - self.assertEqual(Plane.XY.intersect(Plane.XZ), Axis.X) - - self.assertIsNone(Plane.XY.intersect(Plane.XY.offset(1))) - - with self.assertRaises(ValueError): - Plane.XY.intersect("Plane.XZ") - - with self.assertRaises(ValueError): - Plane.XY.intersect(pln=Plane.XZ) - - def test_from_non_planar_face(self): - flat = Face.make_rect(1, 1) - pln = Plane(flat) - self.assertTrue(isinstance(pln, Plane)) - cyl = ( - Solid.make_cylinder(1, 4).faces().filter_by(GeomType.PLANE, reverse=True)[0] - ) - with self.assertRaises(ValueError): - pln = Plane(cyl) - - def test_plane_intersect(self): - section = Plane.XY.intersect(Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5))) - self.assertEqual(len(section.solids()), 0) - self.assertEqual(len(section.faces()), 1) - self.assertAlmostEqual(section.face().area, 2) - - section = Plane.XY & Solid.make_box(1, 2, 3, Plane.XY.offset(-1.5)) - self.assertEqual(len(section.solids()), 0) - self.assertEqual(len(section.faces()), 1) - self.assertAlmostEqual(section.face().area, 2) - - self.assertEqual(Plane.XY & Plane.XZ, Axis.X) - # x_axis_as_edge = Plane.XY & Plane.XZ - # common = (x_axis_as_edge.intersect(Edge.make_line((0, 0, 0), (1, 0, 0)))).edge() - # self.assertAlmostEqual(common.length, 1, 5) - - i = Plane.XY & Vector(1, 2) - self.assertTrue(isinstance(i, Vector)) - self.assertAlmostEqual(i, (1, 2, 0), 5) - - a = Axis((0, 0, 0), (1, 1, 0)) - i = Plane.XY & a - self.assertTrue(isinstance(i, Axis)) - self.assertEqual(i, a) - - a = Axis((1, 2, -1), (0, 0, 1)) - i = Plane.XY & a - self.assertTrue(isinstance(i, Vector)) - self.assertAlmostEqual(i, Vector(1, 2, 0), 5) - - def test_plane_origin_setter(self): - pln = Plane.XY - pln.origin = (1, 2, 3) - ocp_origin = Vector(pln.wrapped.Location()) - self.assertAlmostEqual(ocp_origin, (1, 2, 3), 5) - - -class TestProjection(unittest.TestCase): - def test_flat_projection(self): - sphere = Solid.make_sphere(50) - projection_direction = Vector(0, -1, 0) - planar_text_faces = ( - Compound.make_text("Flat", 30, align=(Align.CENTER, Align.CENTER)) - .rotate(Axis.X, 90) - .faces() - ) - projected_text_faces = [ - f.project_to_shape(sphere, projection_direction)[0] - for f in planar_text_faces - ] - self.assertEqual(len(projected_text_faces), 4) - - def test_multiple_output_wires(self): - target = Box(10, 10, 4) - Pos((0, 0, 2)) * Box(5, 5, 2) - circle = Wire.make_circle(3, Plane.XY.offset(10)) - projection = circle.project_to_shape(target, (0, 0, -1)) - bbox = projection[0].bounding_box() - self.assertAlmostEqual(bbox.min, (-3, -3, 1), 2) - self.assertAlmostEqual(bbox.max, (3, 3, 2), 2) - bbox = projection[1].bounding_box() - self.assertAlmostEqual(bbox.min, (-3, -3, -2), 2) - self.assertAlmostEqual(bbox.max, (3, 3, -2), 2) - - def test_text_projection(self): - sphere = Solid.make_sphere(50) - arch_path = ( - sphere.cut( - Solid.make_cylinder( - 80, 100, Plane(origin=(-50, 0, -70), z_dir=(1, 0, 0)) - ) - ) - .edges() - .sort_by(Axis.Z)[0] - ) - - projected_text = sphere.project_faces( - faces=Compound.make_text("dog", font_size=14), - path=arch_path, - start=0.01, # avoid a character spanning the sphere edge - ) - self.assertEqual(len(projected_text.solids()), 0) - self.assertEqual(len(projected_text.faces()), 3) - - def test_error_handling(self): - sphere = Solid.make_sphere(50) - circle = Wire.make_circle(1) - with self.assertRaises(ValueError): - circle.project_to_shape(sphere, center=None, direction=None)[0] - - def test_project_edge(self): - projection = Edge.make_circle(1, Plane.XY.offset(-5)).project_to_shape( - Solid.make_box(1, 1, 1), (0, 0, 1) - ) - self.assertAlmostEqual(projection[0].position_at(1), (1, 0, 0), 5) - self.assertAlmostEqual(projection[0].position_at(0), (0, 1, 0), 5) - self.assertAlmostEqual(projection[0].arc_center, (0, 0, 0), 5) - - def test_to_axis(self): - with self.assertRaises(ValueError): - Edge.make_circle(1, end_angle=30).to_axis() - - -class TestRotation(unittest.TestCase): - def test_rotation_parameters(self): - r = Rotation(10, 20, 30) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - r = Rotation(10, 20, Z=30) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - r = Rotation(10, 20, Z=30, ordering=Intrinsic.XYZ) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - r = Rotation(10, Y=20, Z=30) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - r = Rotation((10, 20, 30)) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - r = Rotation(10, 20, 30, Intrinsic.XYZ) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - r = Rotation((30, 20, 10), Extrinsic.ZYX) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - r = Rotation((30, 20, 10), ordering=Extrinsic.ZYX) - self.assertAlmostEqual(r.orientation, (10, 20, 30), 5) - with self.assertRaises(TypeError): - Rotation(x=10) - - -class TestShape(unittest.TestCase): - """Misc Shape tests""" - - def test_mirror(self): - box_bb = Solid.make_box(1, 1, 1).mirror(Plane.XZ).bounding_box() - self.assertAlmostEqual(box_bb.min.X, 0, 5) - self.assertAlmostEqual(box_bb.max.X, 1, 5) - self.assertAlmostEqual(box_bb.min.Y, -1, 5) - self.assertAlmostEqual(box_bb.max.Y, 0, 5) - - box_bb = Solid.make_box(1, 1, 1).mirror().bounding_box() - self.assertAlmostEqual(box_bb.min.Z, -1, 5) - self.assertAlmostEqual(box_bb.max.Z, 0, 5) - - def test_compute_mass(self): - with self.assertRaises(NotImplementedError): - Shape.compute_mass(Vertex()) - - def test_combined_center(self): - objs = [Solid.make_box(1, 1, 1, Plane((x, 0, 0))) for x in [-2, 1]] - self.assertAlmostEqual( - Shape.combined_center(objs, center_of=CenterOf.MASS), - (0, 0.5, 0.5), - 5, - ) - - objs = [Solid.make_sphere(1, Plane((x, 0, 0))) for x in [-2, 1]] - self.assertAlmostEqual( - Shape.combined_center(objs, center_of=CenterOf.BOUNDING_BOX), - (-0.5, 0, 0), - 5, - ) - with self.assertRaises(ValueError): - Shape.combined_center(objs, center_of=CenterOf.GEOMETRY) - - def test_shape_type(self): - self.assertEqual(Vertex().shape_type(), "Vertex") - - def test_scale(self): - self.assertAlmostEqual(Solid.make_box(1, 1, 1).scale(2).volume, 2**3, 5) - - def test_fuse(self): - box1 = Solid.make_box(1, 1, 1) - box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) - combined = box1.fuse(box2, glue=True) - self.assertTrue(combined.is_valid()) - self.assertAlmostEqual(combined.volume, 2, 5) - fuzzy = box1.fuse(box2, tol=1e-6) - self.assertTrue(fuzzy.is_valid()) - self.assertAlmostEqual(fuzzy.volume, 2, 5) - - def test_faces_intersected_by_axis(self): - box = Solid.make_box(1, 1, 1, Plane((0, 0, 1))) - intersected_faces = box.faces_intersected_by_axis(Axis.Z) - self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[0] in intersected_faces) - self.assertTrue(box.faces().sort_by(sort_by=Axis.Z)[-1] in intersected_faces) - - def test_split(self): - shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) - split_shape = shape.split(Plane.XY, keep=Keep.BOTTOM) - self.assertTrue(isinstance(split_shape, list)) - self.assertEqual(len(split_shape), 2) - self.assertAlmostEqual(split_shape[0].volume + split_shape[1].volume, 0.25, 5) - split_shape = shape.split(Plane.XY, keep=Keep.TOP) - self.assertEqual(len(split_shape.solids()), 1) - self.assertTrue(isinstance(split_shape, Solid)) - self.assertAlmostEqual(split_shape.volume, 0.5, 5) - - s = Solid.make_cone(1, 0.5, 2, Plane.YZ.offset(10)) - tool = Solid.make_sphere(11).rotate(Axis.Z, 90).face() - s2 = s.split(tool, keep=Keep.TOP) - self.assertLess(s2.volume, s.volume) - self.assertGreater(s2.volume, 0.0) - - def test_split_by_non_planar_face(self): - box = Solid.make_box(1, 1, 1) - tool = Circle(1).wire() - tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) - top, bottom = box.split(tool_shell, keep=Keep.BOTH) - - self.assertFalse(top is None) - self.assertFalse(bottom is None) - self.assertGreater(top.volume, bottom.volume) - - def test_split_by_shell(self): - box = Solid.make_box(5, 5, 1) - tool = Wire.make_rect(4, 4) - tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) - split = box.split(tool_shell, keep=Keep.TOP) - inner_vol = 2 * 2 - outer_vol = 5 * 5 - self.assertAlmostEqual(split.volume, outer_vol - inner_vol) - - def test_split_keep_all(self): - shape = Box(1, 1, 1) - split_shape = shape.split(Plane.XY, keep=Keep.ALL) - self.assertTrue(isinstance(split_shape, ShapeList)) - self.assertEqual(len(split_shape), 2) - - def test_split_edge_by_shell(self): - edge = Edge.make_line((-5, 0, 0), (5, 0, 0)) - tool = Wire.make_rect(4, 4) - tool_shell: Shell = Shell.extrude(tool, Vector(0, 0, 1)) - top = edge.split(tool_shell, keep=Keep.TOP) - self.assertEqual(len(top), 2) - self.assertAlmostEqual(top[0].length, 3, 5) - - def test_split_return_none(self): - shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) - split_shape = shape.split(Plane.XY, keep=Keep.INSIDE) - self.assertIsNone(split_shape) - - def test_split_by_perimeter(self): - # Test 0 - extract a spherical cap - target0 = Solid.make_sphere(10).rotate(Axis.Z, 90) - circle = Plane.YZ.offset(15) * Circle(5).face() - circle_projected = circle.project_to_shape(target0, (-1, 0, 0))[0] - circle_outerwire = circle_projected.edge() - inside0, outside0 = target0.split_by_perimeter(circle_outerwire, Keep.BOTH) - self.assertLess(inside0.area, outside0.area) - - # Test 1 - extract ring of a sphere - ring = Pos(Z=15) * (Circle(5) - Circle(3)).face() - ring_projected = ring.project_to_shape(target0, (0, 0, -1))[0] - ring_outerwire = ring_projected.outer_wire() - inside1, outside1 = target0.split_by_perimeter(ring_outerwire, Keep.BOTH) - if isinstance(inside1, list): - inside1 = Compound(inside1) - if isinstance(outside1, list): - outside1 = Compound(outside1) - self.assertLess(inside1.area, outside1.area) - self.assertEqual(len(outside1.faces()), 2) - - # Test 2 - extract multiple faces - target2 = Box(1, 10, 10) - square = Face.make_rect(3, 3, Plane((12, 0, 0), z_dir=(1, 0, 0))) - square_projected = square.project_to_shape(target2, (-1, 0, 0))[0] - outside2 = target2.split_by_perimeter( - square_projected.outer_wire(), Keep.OUTSIDE - ) - self.assertTrue(isinstance(outside2, Shell)) - inside2 = target2.split_by_perimeter(square_projected.outer_wire(), Keep.INSIDE) - self.assertTrue(isinstance(inside2, Face)) - - # Test 4 - invalid inputs - with self.assertRaises(ValueError): - _, _ = target2.split_by_perimeter(Edge.make_line((0, 0), (1, 0)), Keep.BOTH) - - with self.assertRaises(ValueError): - _, _ = target2.split_by_perimeter(Edge.make_circle(1), Keep.TOP) - - def test_distance(self): - sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) - sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) - self.assertAlmostEqual(sphere1.distance(sphere2), 8, 5) - - def test_distances(self): - sphere1 = Solid.make_sphere(1, Plane((-5, 0, 0))) - sphere2 = Solid.make_sphere(1, Plane((5, 0, 0))) - sphere3 = Solid.make_sphere(1, Plane((-5, 0, 5))) - distances = [8, 3] - for i, distance in enumerate(sphere1.distances(sphere2, sphere3)): - self.assertAlmostEqual(distances[i], distance, 5) - - def test_max_fillet(self): - test_solids = [Solid.make_box(10, 8, 2), Solid.make_cone(5, 3, 8)] - max_values = [0.96, 3.84] - for i, test_object in enumerate(test_solids): - with self.subTest("solids" + str(i)): - max = test_object.max_fillet(test_object.edges()) - self.assertAlmostEqual(max, max_values[i], 2) - with self.assertRaises(RuntimeError): - test_solids[0].max_fillet( - test_solids[0].edges(), tolerance=1e-6, max_iterations=1 - ) - with self.assertRaises(ValueError): - box = Solid.make_box(1, 1, 1) - box.fillet(0.75, box.edges()) - # invalid_object = box.fillet(0.75, box.edges()) - # invalid_object.max_fillet(invalid_object.edges()) - - @patch.object(Shape, "is_valid", return_value=False) - def test_max_fillet_invalid_shape_raises_error(self, mock_is_valid): - box = Solid.make_box(1, 1, 1) - - # Assert that ValueError is raised - with self.assertRaises(ValueError) as max_fillet_context: - max = box.max_fillet(box.edges()) - - # Check the error message - self.assertEqual(str(max_fillet_context.exception), "Invalid Shape") - - # Verify is_valid was called - mock_is_valid.assert_called_once() - - def test_locate_bb(self): - bounding_box = Solid.make_cone(1, 2, 1).bounding_box() - relocated_bounding_box = Plane.XZ.from_local_coords(bounding_box) - self.assertAlmostEqual(relocated_bounding_box.min.X, -2, 5) - self.assertAlmostEqual(relocated_bounding_box.max.X, 2, 5) - self.assertAlmostEqual(relocated_bounding_box.min.Y, 0, 5) - self.assertAlmostEqual(relocated_bounding_box.max.Y, -1, 5) - self.assertAlmostEqual(relocated_bounding_box.min.Z, -2, 5) - self.assertAlmostEqual(relocated_bounding_box.max.Z, 2, 5) - - def test_is_equal(self): - box = Solid.make_box(1, 1, 1) - self.assertTrue(box.is_equal(box)) - - def test_equal(self): - box = Solid.make_box(1, 1, 1) - self.assertEqual(box, box) - self.assertEqual(box, AlwaysEqual()) - - def test_not_equal(self): - box = Solid.make_box(1, 1, 1) - diff = Solid.make_box(1, 2, 3) - self.assertNotEqual(box, diff) - self.assertNotEqual(box, object()) - - def test_tessellate(self): - box123 = Solid.make_box(1, 2, 3) - verts, triangles = box123.tessellate(1e-6) - self.assertEqual(len(verts), 24) - self.assertEqual(len(triangles), 12) - - def test_transformed(self): - """Validate that transformed works the same as changing location""" - rotation = (uniform(0, 360), uniform(0, 360), uniform(0, 360)) - offset = (uniform(0, 50), uniform(0, 50), uniform(0, 50)) - shape = Solid.make_box(1, 1, 1).transformed(rotation, offset) - predicted_location = Location(offset) * Rotation(*rotation) - located_shape = Solid.make_box(1, 1, 1).locate(predicted_location) - intersect = shape.intersect(located_shape) - self.assertAlmostEqual(intersect.volume, 1, 5) - - def test_position_and_orientation(self): - box = Solid.make_box(1, 1, 1).locate(Location((1, 2, 3), (10, 20, 30))) - self.assertAlmostEqual(box.position, (1, 2, 3), 5) - self.assertAlmostEqual(box.orientation, (10, 20, 30), 5) - - def test_distance_to_with_closest_points(self): - s0 = Solid.make_sphere(1).locate(Location((0, 2.1, 0))) - s1 = Solid.make_sphere(1) - distance, pnt0, pnt1 = s0.distance_to_with_closest_points(s1) - self.assertAlmostEqual(distance, 0.1, 5) - self.assertAlmostEqual(pnt0, (0, 1.1, 0), 5) - self.assertAlmostEqual(pnt1, (0, 1, 0), 5) - - def test_closest_points(self): - c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) - c1 = Edge.make_circle(1) - closest = c0.closest_points(c1) - self.assertAlmostEqual(closest[0], c0.position_at(0.75).to_tuple(), 5) - self.assertAlmostEqual(closest[1], c1.position_at(0.25).to_tuple(), 5) - - def test_distance_to(self): - c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) - c1 = Edge.make_circle(1) - distance = c0.distance_to(c1) - self.assertAlmostEqual(distance, 0.1, 5) - - def test_intersection(self): - box = Solid.make_box(1, 1, 1) - intersections = ( - box.intersect(Axis((0.5, 0.5, 4), (0, 0, -1))).vertices().sort_by(Axis.Z) - ) - self.assertAlmostEqual(Vector(intersections[0]), (0.5, 0.5, 0), 5) - self.assertAlmostEqual(Vector(intersections[1]), (0.5, 0.5, 1), 5) - - def test_clean_error(self): - """Note that this test is here to alert build123d to changes in bad OCCT clean behavior - with spheres or hemispheres. The extra edge in a sphere seems to be the cause of this. - """ - sphere = Solid.make_sphere(1) - divider = Solid.make_box(0.1, 3, 3, Plane(origin=(-0.05, -1.5, -1.5))) - positive_half, negative_half = [s.clean() for s in sphere.cut(divider).solids()] - self.assertGreater(abs(positive_half.volume - negative_half.volume), 0, 1) - - def test_clean_empty(self): - obj = Solid() - self.assertIs(obj, obj.clean()) - - def test_relocate(self): - box = Solid.make_box(10, 10, 10).move(Location((20, -5, -5))) - cylinder = Solid.make_cylinder(2, 50).move(Location((0, 0, 0), (0, 90, 0))) - - box_with_hole = box.cut(cylinder) - box_with_hole.relocate(box.location) - - self.assertEqual(box.location, box_with_hole.location) - - bbox1 = box.bounding_box() - bbox2 = box_with_hole.bounding_box() - self.assertAlmostEqual(bbox1.min, bbox2.min, 5) - self.assertAlmostEqual(bbox1.max, bbox2.max, 5) - - def test_project_to_viewport(self): - # Basic test - box = Solid.make_box(10, 10, 10) - visible, hidden = box.project_to_viewport((-20, 20, 20)) - self.assertEqual(len(visible), 9) - self.assertEqual(len(hidden), 3) - - # Contour edges - cyl = Solid.make_cylinder(2, 10) - visible, hidden = cyl.project_to_viewport((-20, 20, 20)) - # Note that some edges are broken into two - self.assertEqual(len(visible), 6) - self.assertEqual(len(hidden), 2) - - # Hidden contour edges - hole = box - cyl - visible, hidden = hole.project_to_viewport((-20, 20, 20)) - self.assertEqual(len(visible), 13) - self.assertEqual(len(hidden), 6) - - # Outline edges - sphere = Solid.make_sphere(5) - visible, hidden = sphere.project_to_viewport((-20, 20, 20)) - self.assertEqual(len(visible), 1) - self.assertEqual(len(hidden), 0) - - def test_vertex(self): - v = Edge.make_circle(1).vertex() - self.assertTrue(isinstance(v, Vertex)) - with self.assertWarns(UserWarning): - Wire.make_rect(1, 1).vertex() - - def test_edge(self): - e = Edge.make_circle(1).edge() - self.assertTrue(isinstance(e, Edge)) - with self.assertWarns(UserWarning): - Wire.make_rect(1, 1).edge() - - def test_wire(self): - w = Wire.make_circle(1).wire() - self.assertTrue(isinstance(w, Wire)) - with self.assertWarns(UserWarning): - Solid.make_box(1, 1, 1).wire() - - def test_compound(self): - c = Compound.make_text("hello", 10) - self.assertTrue(isinstance(c, Compound)) - c2 = Compound.make_text("world", 10) - with self.assertWarns(UserWarning): - Compound(children=[c, c2]).compound() - - def test_face(self): - f = Face.make_rect(1, 1) - self.assertTrue(isinstance(f, Face)) - with self.assertWarns(UserWarning): - Solid.make_box(1, 1, 1).face() - - def test_shell(self): - s = Solid.make_sphere(1).shell() - self.assertTrue(isinstance(s, Shell)) - with self.assertWarns(UserWarning): - extrude(Compound.make_text("two", 10), amount=5).shell() - - def test_solid(self): - s = Solid.make_sphere(1).solid() - self.assertTrue(isinstance(s, Solid)) - with self.assertWarns(UserWarning): - Compound(Solid.make_sphere(1).split(Plane.XY, keep=Keep.BOTH)).solid() - - def test_manifold(self): - self.assertTrue(Solid.make_box(1, 1, 1).is_manifold) - self.assertTrue(Solid.make_box(1, 1, 1).shell().is_manifold) - self.assertFalse( - Solid.make_box(1, 1, 1) - .shell() - .cut(Solid.make_box(0.5, 0.5, 0.5)) - .is_manifold - ) - self.assertTrue( - Compound( - children=[Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)] - ).is_manifold - ) - - def test_inherit_color(self): - # Create some objects and assign colors to them - b = Box(1, 1, 1).locate(Pos(2, 2, 0)) - b.color = Color("blue") # Blue - c = Cylinder(1, 1).locate(Pos(-2, 2, 0)) - a = Compound(children=[b, c]) - a.color = Color(0, 1, 0) - # Check that assigned colors stay and iheritance works - np.testing.assert_allclose(tuple(a.color), (0, 1, 0, 1), 1e-5) - np.testing.assert_allclose(tuple(b.color), (0, 0, 1, 1), 1e-5) - - def test_ocp_section(self): - # Vertex - verts, edges = Vertex(1, 2, 0)._ocp_section(Vertex(1, 2, 0)) - self.assertListEqual(verts, []) # ? - self.assertListEqual(edges, []) - - verts, edges = Vertex(1, 2, 0)._ocp_section(Edge.make_line((0, 0), (2, 4))) - self.assertListEqual(verts, []) # ? - self.assertListEqual(edges, []) - - verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_rect(5, 5)) - np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) - self.assertListEqual(edges, []) - - verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_plane(Plane.XY)) - np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) - self.assertListEqual(edges, []) - - # spline = Spline((-10, 10, -10), (-10, -5, -5), (20, 0, 5)) - # cylinder = Pos(Z=-10) * extrude(Circle(5), 20) - # cylinder2 = (Rot((0, 90, 0)) * cylinder).face() - # pln = Plane.XY - # box1 = Box(10, 10, 10, align=(Align.CENTER, Align.CENTER, Align.MIN)) - # box2 = Pos(Z=-10) * box1 - - # # vertices, edges = ocp_section(spline, Face.make_rect(1e6, 1e6, pln)) - # vertices1, edges1 = spline.ocp_section(Face.make_plane(pln)) - # print(vertices1, edges1) - - # vertices2, edges2 = cylinder.ocp_section(Face.make_plane(pln)) - # print(vertices2, edges2) - - # vertices3, edges3 = cylinder2.ocp_section(Face.make_plane(pln)) - # print(vertices3, edges3) - - # # vertices4, edges4 = cylinder2.ocp_section(cylinder) - - # vertices5, edges5 = box1.ocp_section(Face.make_plane(pln)) - # print(vertices5, edges5) - - # vertices6, edges6 = box1.ocp_section(box2.faces().sort_by(Axis.Z)[-1]) - - def test_copy_attributes_to(self): - box = Box(1, 1, 1) - box2 = Box(10, 10, 10) - box.label = "box" - box.color = Color("Red") - box.children = [Box(1, 1, 1), Box(2, 2, 2)] - box.topo_parent = box2 - - blank = Compound() - box.copy_attributes_to(blank) - self.assertEqual(blank.label, "box") - self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.color, Color("Red")))) - self.assertTrue(all(c1 == c2 for c1, c2 in zip(blank.children, box.children))) - self.assertEqual(blank.topo_parent, box2) - - def test_empty_shape(self): - empty = Solid() - box = Solid.make_box(1, 1, 1) - self.assertIsNone(empty.location) - self.assertIsNone(empty.position) - self.assertIsNone(empty.orientation) - self.assertFalse(empty.is_manifold) - with self.assertRaises(ValueError): - empty.geom_type - self.assertIs(empty, empty.fix()) - self.assertEqual(hash(empty), 0) - self.assertFalse(empty.is_same(Solid())) - self.assertFalse(empty.is_equal(Solid())) - self.assertTrue(empty.is_valid()) - empty_bbox = empty.bounding_box() - self.assertEqual(tuple(empty_bbox.size), (0, 0, 0)) - self.assertIs(empty, empty.mirror(Plane.XY)) - self.assertEqual(Shape.compute_mass(empty), 0) - self.assertEqual(empty.entities("Face"), []) - self.assertEqual(empty.area, 0) - self.assertIs(empty, empty.rotate(Axis.Z, 90)) - translate_matrix = [ - [1.0, 0.0, 0.0, 1.0], - [0.0, 1.0, 0.0, 2.0], - [0.0, 0.0, 1.0, 3.0], - [0.0, 0.0, 0.0, 1.0], - ] - self.assertIs(empty, empty.transform_shape(Matrix(translate_matrix))) - self.assertIs(empty, empty.transform_geometry(Matrix(translate_matrix))) - with self.assertRaises(ValueError): - empty.locate(Location()) - empty_loc = Location() - empty_loc.wrapped = None - with self.assertRaises(ValueError): - box.locate(empty_loc) - with self.assertRaises(ValueError): - empty.located(Location()) - with self.assertRaises(ValueError): - box.located(empty_loc) - with self.assertRaises(ValueError): - empty.move(Location()) - with self.assertRaises(ValueError): - box.move(empty_loc) - with self.assertRaises(ValueError): - empty.moved(Location()) - with self.assertRaises(ValueError): - box.moved(empty_loc) - with self.assertRaises(ValueError): - empty.relocate(Location()) - with self.assertRaises(ValueError): - box.relocate(empty_loc) - with self.assertRaises(ValueError): - empty.distance_to(Vector(1, 1, 1)) - with self.assertRaises(ValueError): - empty.distance_to_with_closest_points(Vector(1, 1, 1)) - with self.assertRaises(ValueError): - empty.distance_to(Vector(1, 1, 1)) - with self.assertRaises(ValueError): - box.intersect(empty_loc) - self.assertEqual(empty._ocp_section(Vertex(1, 1, 1)), ([], [])) - self.assertEqual(empty.faces_intersected_by_axis(Axis.Z), ShapeList()) - with self.assertRaises(ValueError): - empty.split_by_perimeter(Circle(1).wire()) - with self.assertRaises(ValueError): - empty.distance(Vertex(1, 1, 1)) - with self.assertRaises(ValueError): - list(empty.distances(Vertex(0, 0, 0), Vertex(1, 1, 1))) - with self.assertRaises(ValueError): - list(box.distances(empty, Vertex(1, 1, 1))) - with self.assertRaises(ValueError): - empty.mesh(0.001) - with self.assertRaises(ValueError): - empty.tessellate(0.001) - with self.assertRaises(ValueError): - empty.to_splines() - empty_axis = Axis((0, 0, 0), (1, 0, 0)) - empty_axis.wrapped = None - with self.assertRaises(ValueError): - box.vertices().group_by(empty_axis) - empty_wire = Wire() - with self.assertRaises(ValueError): - box.vertices().group_by(empty_wire) - with self.assertRaises(ValueError): - box.vertices().sort_by(empty_axis) - with self.assertRaises(ValueError): - box.vertices().sort_by(empty_wire) - - def test_empty_selectors(self): - self.assertEqual(Vertex(1, 1, 1).edges(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).wires(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).faces(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).shells(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).solids(), ShapeList()) - self.assertEqual(Vertex(1, 1, 1).compounds(), ShapeList()) - self.assertIsNone(Vertex(1, 1, 1).edge()) - self.assertIsNone(Vertex(1, 1, 1).wire()) - self.assertIsNone(Vertex(1, 1, 1).face()) - self.assertIsNone(Vertex(1, 1, 1).shell()) - self.assertIsNone(Vertex(1, 1, 1).solid()) - self.assertIsNone(Vertex(1, 1, 1).compound()) - - -class TestShapeList(unittest.TestCase): - """Test ShapeList functionality""" - - def assertDunderStrEqual(self, actual: str, expected_lines: list[str]): - actual_lines = actual.splitlines() - self.assertEqual(len(actual_lines), len(expected_lines)) - for actual_line, expected_line in zip(actual_lines, expected_lines): - start, end = re.split(r"at 0x[0-9a-f]+", expected_line, 2, re.I) - self.assertTrue(actual_line.startswith(start)) - self.assertTrue(actual_line.endswith(end)) - - def assertDunderReprEqual(self, actual: str, expected: str): - splitter = r"at 0x[0-9a-f]+" - actual_split_list = re.split(splitter, actual, 0, re.I) - expected_split_list = re.split(splitter, expected, 0, re.I) - for actual_split, expected_split in zip(actual_split_list, expected_split_list): - self.assertEqual(actual_split, expected_split) - - def test_sort_by(self): - faces = Solid.make_box(1, 2, 3).faces() < SortBy.AREA - self.assertAlmostEqual(faces[-1].area, 2, 5) - - def test_filter_by_geomtype(self): - non_planar_faces = ( - Solid.make_cylinder(1, 1).faces().filter_by(GeomType.PLANE, reverse=True) - ) - self.assertEqual(len(non_planar_faces), 1) - self.assertAlmostEqual(non_planar_faces[0].area, 2 * math.pi, 5) - - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).faces().filter_by("True") - - def test_filter_by_axis(self): - box = Solid.make_box(1, 1, 1) - self.assertEqual(len(box.faces().filter_by(Axis.X)), 2) - self.assertEqual(len(box.edges().filter_by(Axis.X)), 4) - self.assertEqual(len(box.vertices().filter_by(Axis.X)), 0) - - def test_filter_by_callable_predicate(self): - boxes = [Solid.make_box(1, 1, 1) for _ in range(3)] - boxes[0].label = "A" - boxes[1].label = "A" - boxes[2].label = "B" - shapelist = ShapeList(boxes) - - self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "A")), 2) - self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "B")), 1) - - def test_first_last(self): - vertices = ( - Solid.make_box(1, 1, 1).vertices().sort_by(Axis((0, 0, 0), (1, 1, 1))) - ) - self.assertAlmostEqual(Vector(vertices.last), (1, 1, 1), 5) - self.assertAlmostEqual(Vector(vertices.first), (0, 0, 0), 5) - - def test_group_by(self): - vertices = Solid.make_box(1, 1, 1).vertices().group_by(Axis.Z) - self.assertEqual(len(vertices[0]), 4) - - edges = Solid.make_box(1, 1, 1).edges().group_by(SortBy.LENGTH) - self.assertEqual(len(edges[0]), 12) - - edges = ( - Solid.make_cone(2, 1, 2) - .edges() - .filter_by(GeomType.CIRCLE) - .group_by(SortBy.RADIUS) - ) - self.assertEqual(len(edges[0]), 1) - - edges = (Solid.make_cone(2, 1, 2).edges() | GeomType.CIRCLE) << SortBy.RADIUS - self.assertAlmostEqual(edges[0].length, 2 * math.pi, 5) - - vertices = Solid.make_box(1, 1, 1).vertices().group_by(SortBy.DISTANCE) - self.assertAlmostEqual(Vector(vertices[-1][0]), (1, 1, 1), 5) - - box = Solid.make_box(1, 1, 2) - self.assertEqual(len(box.faces().group_by(SortBy.AREA)[0]), 2) - self.assertEqual(len(box.faces().group_by(SortBy.AREA)[1]), 4) - - line = Edge.make_line((0, 0, 0), (1, 1, 2)) - vertices_by_line = box.vertices().group_by(line) - self.assertEqual(len(vertices_by_line[0]), 1) - self.assertEqual(len(vertices_by_line[1]), 2) - self.assertEqual(len(vertices_by_line[2]), 1) - self.assertEqual(len(vertices_by_line[3]), 1) - self.assertEqual(len(vertices_by_line[4]), 2) - self.assertEqual(len(vertices_by_line[5]), 1) - self.assertAlmostEqual(Vector(vertices_by_line[0][0]), (0, 0, 0), 5) - self.assertAlmostEqual(Vector(vertices_by_line[-1][0]), (1, 1, 2), 5) - - with BuildPart() as boxes: - with GridLocations(10, 10, 3, 3): - Box(1, 1, 1) - with PolarLocations(100, 10): - Box(1, 1, 2) - self.assertEqual(len(boxes.solids().group_by(SortBy.VOLUME)[-1]), 10) - self.assertEqual(len((boxes.solids()) << SortBy.VOLUME), 9) - - with self.assertRaises(ValueError): - boxes.solids().group_by("AREA") - - def test_group_by_callable_predicate(self): - boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] - boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] - for box in boxesA: - box.label = "A" - for box in boxesB: - box.label = "B" - boxNoLabel = Solid.make_box(1, 1, 1) - - shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) - result = shapelist.group_by(lambda shape: shape.label) - - self.assertEqual([len(group) for group in result], [1, 3, 2]) - - def test_group_by_retrieve_groups(self): - boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] - boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] - for box in boxesA: - box.label = "A" - for box in boxesB: - box.label = "B" - boxNoLabel = Solid.make_box(1, 1, 1) - - shapelist = ShapeList(boxesA + boxesB + [boxNoLabel]) - result = shapelist.group_by(lambda shape: shape.label) - - self.assertEqual(len(result.group("")), 1) - self.assertEqual(len(result.group("A")), 3) - self.assertEqual(len(result.group("B")), 2) - self.assertEqual(result.group(""), result[0]) - self.assertEqual(result.group("A"), result[1]) - self.assertEqual(result.group("B"), result[2]) - self.assertEqual(result.group_for(boxesA[0]), result.group_for(boxesA[0])) - self.assertNotEqual(result.group_for(boxesA[0]), result.group_for(boxesB[0])) - with self.assertRaises(KeyError): - result.group("C") - - def test_group_by_str_repr(self): - nonagon = RegularPolygon(5, 9) - - expected = [ - "[[],", - " [,", - " ],", - " [,", - " ],", - " [,", - " ],", - " [,", - " ]]", - ] - self.assertDunderStrEqual(str(nonagon.edges().group_by(Axis.X)), expected) - - expected_repr = ( - "[[]," - " [," - " ]," - " [," - " ]," - " [," - " ]," - " [," - " ]]" - ) - self.assertDunderReprEqual( - repr(nonagon.edges().group_by(Axis.X)), expected_repr - ) - - f = io.StringIO() - p = pretty.PrettyPrinter(f) - nonagon.edges().group_by(Axis.X)._repr_pretty_(p, cycle=True) - self.assertEqual(f.getvalue(), "(...)") - - def test_distance(self): - with BuildPart() as box: - Box(1, 2, 3) - obj = (-0.2, 0.1, 0.5) - edges = box.edges().sort_by_distance(obj) - distances = [Vertex(*obj).distance_to(edge) for edge in edges] - self.assertTrue( - all([distances[i] >= distances[i - 1] for i in range(1, len(edges))]) - ) - - def test_distance_reverse(self): - with BuildPart() as box: - Box(1, 2, 3) - obj = (-0.2, 0.1, 0.5) - edges = box.edges().sort_by_distance(obj, reverse=True) - distances = [Vertex(*obj).distance_to(edge) for edge in edges] - self.assertTrue( - all([distances[i] <= distances[i - 1] for i in range(1, len(edges))]) - ) - - def test_distance_equal(self): - with BuildPart() as box: - Box(1, 1, 1) - self.assertEqual(len(box.edges().sort_by_distance((0, 0, 0))), 12) - - def test_vertices(self): - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - self.assertEqual(len(sl.vertices()), 8) - - def test_vertex(self): - sl = ShapeList([Edge.make_circle(1)]) - np.testing.assert_allclose(sl.vertex().to_tuple(), (1, 0, 0), 1e-5) - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - with self.assertWarns(UserWarning): - sl.vertex() - self.assertEqual(len(Edge().vertices()), 0) - - def test_edges(self): - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - self.assertEqual(len(sl.edges()), 8) - self.assertEqual(len(Edge().edges()), 0) - - def test_edge(self): - sl = ShapeList([Edge.make_circle(1)]) - self.assertAlmostEqual(sl.edge().length, 2 * 1 * math.pi, 5) - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - with self.assertWarns(UserWarning): - sl.edge() - - def test_wires(self): - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - self.assertEqual(len(sl.wires()), 2) - self.assertEqual(len(Wire().wires()), 0) - - def test_wire(self): - sl = ShapeList([Wire.make_circle(1)]) - self.assertAlmostEqual(sl.wire().length, 2 * 1 * math.pi, 5) - sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) - with self.assertWarns(UserWarning): - sl.wire() - - def test_faces(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - self.assertEqual(len(sl.faces()), 9) - self.assertEqual(len(Face().faces()), 0) - - def test_face(self): - sl = ShapeList( - [Vertex(1, 1, 1), Edge.make_line((0, 0), (1, 1)), Face.make_rect(2, 1)] - ) - self.assertAlmostEqual(sl.face().area, 2 * 1, 5) - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.face() - - def test_shells(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - self.assertEqual(len(sl.shells()), 2) - self.assertEqual(len(Shell().shells()), 0) - - def test_shell(self): - sl = ShapeList([Vertex(1, 1, 1), Solid.make_box(1, 1, 1)]) - self.assertAlmostEqual(sl.shell().area, 6 * 1 * 1, 5) - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.shell() - - def test_solids(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - self.assertEqual(len(sl.solids()), 2) - self.assertEqual(len(Solid().solids()), 0) - - def test_solid(self): - sl = ShapeList([Solid.make_box(1, 1, 1), Solid.make_cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.solid() - sl = ShapeList([Solid.make_box(1, 2, 3), Vertex(1, 1, 1)]) - self.assertAlmostEqual(sl.solid().volume, 1 * 2 * 3, 5) - - def test_compounds(self): - sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) - self.assertEqual(len(sl.compounds()), 2) - self.assertEqual(len(Compound().compounds()), 0) - - def test_compound(self): - sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) - with self.assertWarns(UserWarning): - sl.compound() - sl = ShapeList([Box(1, 2, 3), Vertex(1, 1, 1)]) - self.assertAlmostEqual(sl.compound().volume, 1 * 2 * 3, 5) - - def test_equal(self): - box = Box(1, 1, 1) - cyl = Cylinder(1, 1) - sl = ShapeList([box, cyl]) - same = ShapeList([cyl, box]) - self.assertEqual(sl, same) - self.assertEqual(sl, AlwaysEqual()) - - def test_not_equal(self): - sl = ShapeList([Box(1, 1, 1), Cylinder(1, 1)]) - diff = ShapeList([Box(1, 1, 1), Box(1, 2, 3)]) - self.assertNotEqual(sl, diff) - self.assertNotEqual(sl, object()) - - def test_center(self): - self.assertEqual(tuple(ShapeList().center()), (0, 0, 0)) - self.assertEqual( - tuple(ShapeList(Vertex(i, 0, 0) for i in range(3)).center()), (1, 0, 0) - ) - - -class TestShells(unittest.TestCase): - def test_shell_init(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - self.assertTrue(box_shell.is_valid()) - - def test_center(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - self.assertAlmostEqual(box_shell.center(), (0.5, 0.5, 0.5), 5) - - def test_manifold_shell_volume(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - self.assertAlmostEqual(box_shell.volume, 1, 5) - - def test_nonmanifold_shell_volume(self): - box_faces = Solid.make_box(1, 1, 1).faces() - nm_shell = Shell(box_faces) - nm_shell -= nm_shell.faces()[0] - self.assertAlmostEqual(nm_shell.volume, 0, 5) - - def test_constructor(self): - with self.assertRaises(TypeError): - Shell(foo="bar") - - x_section = Rot(90) * Spline((0, -5), (-3, -2), (-2, 0), (-3, 2), (0, 5)) - surface = sweep(x_section, Circle(5).wire()) - single_face = Shell(surface.face()) - self.assertTrue(single_face.is_valid()) - single_face = Shell(surface.faces()) - self.assertTrue(single_face.is_valid()) - - def test_sweep(self): - path_c1 = JernArc((0, 0), (-1, 0), 1, 180) - path_e = path_c1.edge() - path_c2 = JernArc((0, 0), (-1, 0), 1, 180) + JernArc((0, 0), (1, 0), 2, -90) - path_w = path_c2.wire() - section_e = Circle(0.5).edge() - section_c2 = Polyline((0, 0), (0.1, 0), (0.2, 0.1)) - section_w = section_c2.wire() - - sweep_e_w = Shell.sweep((path_w ^ 0) * section_e, path_w) - sweep_w_e = Shell.sweep((path_e ^ 0) * section_w, path_e) - sweep_w_w = Shell.sweep((path_w ^ 0) * section_w, path_w) - sweep_c2_c1 = Shell.sweep((path_c1 ^ 0) * section_c2, path_c1) - sweep_c2_c2 = Shell.sweep((path_c2 ^ 0) * section_c2, path_c2) - - self.assertEqual(len(sweep_e_w.faces()), 2) - self.assertEqual(len(sweep_w_e.faces()), 2) - self.assertEqual(len(sweep_c2_c1.faces()), 2) - self.assertEqual(len(sweep_w_w.faces()), 3) # 3 with clean, 4 without - self.assertEqual(len(sweep_c2_c2.faces()), 3) # 3 with clean, 4 without - - def test_make_loft(self): - r = 3 - h = 2 - loft = Shell.make_loft( - [Wire.make_circle(r, Plane((0, 0, h))), Wire.make_circle(r)] - ) - self.assertEqual(loft.volume, 0, "A shell has no volume") - cylinder_area = 2 * math.pi * r * h - self.assertAlmostEqual(loft.area, cylinder_area) - - def test_thicken(self): - rect = Wire.make_rect(10, 5) - shell: Shell = Shell.extrude(rect, Vector(0, 0, 3)) - thick = Solid.thicken(shell, 1) - - self.assertEqual(isinstance(thick, Solid), True) - inner_vol = 3 * 10 * 5 - outer_vol = 3 * 12 * 7 - self.assertAlmostEqual(thick.volume, outer_vol - inner_vol) - - -class TestSolid(unittest.TestCase): - def test_make_solid(self): - box_faces = Solid.make_box(1, 1, 1).faces() - box_shell = Shell(box_faces) - box = Solid(box_shell) - self.assertAlmostEqual(box.area, 6, 5) - self.assertAlmostEqual(box.volume, 1, 5) - self.assertTrue(box.is_valid()) - - def test_extrude(self): - v = Edge.extrude(Vertex(1, 1, 1), (0, 0, 1)) - self.assertAlmostEqual(v.length, 1, 5) - - e = Face.extrude(Edge.make_line((2, 1), (2, 0)), (0, 0, 1)) - self.assertAlmostEqual(e.area, 1, 5) - - w = Shell.extrude( - Wire([Edge.make_line((1, 1), (0, 2)), Edge.make_line((1, 1), (1, 0))]), - (0, 0, 1), - ) - self.assertAlmostEqual(w.area, 1 + math.sqrt(2), 5) - - f = Solid.extrude(Face.make_rect(1, 1), (0, 0, 1)) - self.assertAlmostEqual(f.volume, 1, 5) - - s = Compound.extrude( - Shell( - Solid.make_box(1, 1, 1) - .locate(Location((-2, 1, 0))) - .faces() - .sort_by(Axis((0, 0, 0), (1, 1, 1)))[-2:] - ), - (0.1, 0.1, 0.1), - ) - self.assertAlmostEqual(s.volume, 0.2, 5) - - with self.assertRaises(ValueError): - Solid.extrude(Solid.make_box(1, 1, 1), (0, 0, 1)) - - def test_extrude_taper(self): - a = 1 - rect = Face.make_rect(a, a) - flipped = -rect - for direction in [Vector(0, 0, 2), Vector(0, 0, -2)]: - for taper in [10, -10]: - offset_amt = -direction.length * math.tan(math.radians(taper)) - for face in [rect, flipped]: - with self.subTest( - f"{direction=}, {taper=}, flipped={face==flipped}" - ): - taper_solid = Solid.extrude_taper(face, direction, taper) - # V = 1/3 × h × (a² + b² + ab) - h = Vector(direction).length - b = a + 2 * offset_amt - v = h * (a**2 + b**2 + a * b) / 3 - self.assertAlmostEqual(taper_solid.volume, v, 5) - bbox = taper_solid.bounding_box() - size = max(1, b) / 2 - if direction.Z > 0: - self.assertAlmostEqual(bbox.min, (-size, -size, 0), 1) - self.assertAlmostEqual(bbox.max, (size, size, h), 1) - else: - self.assertAlmostEqual(bbox.min, (-size, -size, -h), 1) - self.assertAlmostEqual(bbox.max, (size, size, 0), 1) - - def test_extrude_taper_with_hole(self): - rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) - direction = Vector(0, 0, 0.5) - taper = 10 - taper_solid = Solid.extrude_taper(rect_hole, direction, taper) - offset_amt = -direction.length * math.tan(math.radians(taper)) - hole = taper_solid.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] - self.assertAlmostEqual(hole.radius, 0.25 - offset_amt, 5) - - def test_extrude_taper_with_hole_flipped(self): - rect_hole = Face.make_rect(1, 1).make_holes([Wire.make_circle(0.25)]) - direction = Vector(0, 0, 1) - taper = 10 - taper_solid_t = Solid.extrude_taper(rect_hole, direction, taper, True) - taper_solid_f = Solid.extrude_taper(rect_hole, direction, taper, False) - hole_t = taper_solid_t.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] - hole_f = taper_solid_f.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Z)[-1] - self.assertGreater(hole_t.radius, hole_f.radius) - - def test_extrude_taper_oblique(self): - rect = Face.make_rect(2, 1) - rect_hole = rect.make_holes([Wire.make_circle(0.25)]) - o_rect_hole = rect_hole.moved(Location((0, 0, 0), (1, 0.1, 0), 77)) - taper0 = Solid.extrude_taper(rect_hole, (0, 0, 1), 5) - taper1 = Solid.extrude_taper(o_rect_hole, o_rect_hole.normal_at(), 5) - self.assertAlmostEqual(taper0.volume, taper1.volume, 5) - - def test_extrude_linear_with_rotation(self): - # Face - base = Face.make_rect(1, 1) - twist = Solid.extrude_linear_with_rotation( - base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 - ) - self.assertAlmostEqual(twist.volume, 1, 5) - top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) - bottom = twist.faces().sort_by(Axis.Z)[0] - self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) - # Wire - base = Wire.make_rect(1, 1) - twist = Solid.extrude_linear_with_rotation( - base, center=(0, 0, 0), normal=(0, 0, 1), angle=45 - ) - self.assertAlmostEqual(twist.volume, 1, 5) - top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) - bottom = twist.faces().sort_by(Axis.Z)[0] - self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) - - def test_make_loft(self): - loft = Solid.make_loft( - [Wire.make_rect(2, 2), Wire.make_circle(1, Plane((0, 0, 1)))] - ) - self.assertAlmostEqual(loft.volume, (4 + math.pi) / 2, 1) - - with self.assertRaises(ValueError): - Solid.make_loft([Wire.make_rect(1, 1)]) - - def test_make_loft_with_vertices(self): - loft = Solid.make_loft( - [Vertex(0, 0, -1), Wire.make_rect(1, 1.5), Vertex(0, 0, 1)], True - ) - self.assertAlmostEqual(loft.volume, 1, 5) - - with self.assertRaises(ValueError): - Solid.make_loft( - [Wire.make_rect(1, 1), Vertex(0, 0, 1), Wire.make_rect(1, 1)] - ) - - with self.assertRaises(ValueError): - Solid.make_loft([Vertex(0, 0, 1), Vertex(0, 0, 2)]) - - with self.assertRaises(ValueError): - Solid.make_loft( - [ - Vertex(0, 0, 1), - Wire.make_rect(1, 1), - Vertex(0, 0, 2), - Vertex(0, 0, 3), - ] - ) - - def test_extrude_until(self): - square = Face.make_rect(1, 1) - box = Solid.make_box(4, 4, 1, Plane((-2, -2, 3))) - extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.LAST) - self.assertAlmostEqual(extrusion.volume, 4, 5) - - square = Face.make_rect(1, 1) - box = Solid.make_box(4, 4, 1, Plane((-2, -2, -3))) - extrusion = Solid.extrude_until(square, box, (0, 0, 1), Until.PREVIOUS) - self.assertAlmostEqual(extrusion.volume, 2, 5) - - def test_sweep(self): - path = Edge.make_spline([(0, 0), (3, 5), (7, -2)]) - section = Wire.make_circle(1, Plane(path @ 0, z_dir=path % 0)) - area = Face(section).area - swept = Solid.sweep(section, path) - self.assertAlmostEqual(swept.volume, path.length * area, 0) - - def test_hollow_sweep(self): - path = Edge.make_line((0, 0, 0), (0, 0, 5)) - section = (Rectangle(1, 1) - Rectangle(0.1, 0.1)).faces()[0] - swept = Solid.sweep(section, path) - self.assertAlmostEqual(swept.volume, 5 * (1 - 0.1**2), 5) - - def test_sweep_multi(self): - f0 = Face.make_rect(1, 1) - f1 = Pos(X=10) * Circle(1).face() - path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (0, 0, -1))) - binormal = Edge.make_line((0, 1), (10, 1)) - swept = Solid.sweep_multi([f0, f1], path, is_frenet=True, binormal=binormal) - self.assertAlmostEqual(swept.volume, 23.78, 2) - - path = Spline((0, 0), (10, 0), tangents=((0, 0, 1), (1, 0, 0))) - swept = Solid.sweep_multi( - [f0, f1], path, is_frenet=True, binormal=Vector(5, 0, 1) - ) - self.assertAlmostEqual(swept.volume, 20.75, 2) - - def test_constructor(self): - with self.assertRaises(TypeError): - Solid(foo="bar") - - def test_offset_3d(self): - with self.assertRaises(ValueError): - Solid.make_box(1, 1, 1).offset_3d(None, 0.1, kind=Kind.TANGENT) - - def test_revolve(self): - r = Solid.revolve( - Face.make_rect(1, 1, Plane((10, 0, 0))).wire(), 180, axis=Axis.Y - ) - self.assertEqual(len(r.faces()), 6) - - -class TestSkipClean(unittest.TestCase): - def setUp(self): - # Ensure the class variable is in its default state before each test - SkipClean.clean = True - - def test_context_manager_sets_clean_false(self): - # Verify `clean` is initially True - self.assertTrue(SkipClean.clean) - - # Use the context manager - with SkipClean(): - # Within the context, `clean` should be False - self.assertFalse(SkipClean.clean) - - # After exiting the context, `clean` should revert to True - self.assertTrue(SkipClean.clean) - - def test_exception_handling_does_not_affect_clean(self): - # Verify `clean` is initially True - self.assertTrue(SkipClean.clean) - - # Use the context manager and raise an exception - try: - with SkipClean(): - self.assertFalse(SkipClean.clean) - raise ValueError("Test exception") - except ValueError: - pass - - # Ensure `clean` is restored to True after an exception - self.assertTrue(SkipClean.clean) - - -class TestVector(unittest.TestCase): - """Test the Vector methods""" - - def test_vector_constructors(self): - v1 = Vector(1, 2, 3) - v2 = Vector((1, 2, 3)) - v3 = Vector(gp_Vec(1, 2, 3)) - v4 = Vector([1, 2, 3]) - v5 = Vector(gp_XYZ(1, 2, 3)) - v5b = Vector(X=1, Y=2, Z=3) - v5c = Vector(v=gp_XYZ(1, 2, 3)) - - for v in [v1, v2, v3, v4, v5, v5b, v5c]: - self.assertAlmostEqual(v, (1, 2, 3), 4) - - v6 = Vector((1, 2)) - v7 = Vector([1, 2]) - v8 = Vector(1, 2) - v8b = Vector(X=1, Y=2) - - for v in [v6, v7, v8, v8b]: - self.assertAlmostEqual(v, (1, 2, 0), 4) - - v9 = Vector() - self.assertAlmostEqual(v9, (0, 0, 0), 4) - - v9.X = 1.0 - v9.Y = 2.0 - v9.Z = 3.0 - self.assertAlmostEqual(v9, (1, 2, 3), 4) - self.assertAlmostEqual(Vector(1, 2, 3, 4), (1, 2, 3), 4) - - v10 = Vector(1) - v11 = Vector((1,)) - v12 = Vector([1]) - v13 = Vector(X=1) - for v in [v10, v11, v12, v13]: - self.assertAlmostEqual(v, (1, 0, 0), 4) - - vertex = Vertex(0, 0, 0).moved(Pos(0, 0, 10)) - self.assertAlmostEqual(Vector(vertex), (0, 0, 10), 4) - - with self.assertRaises(TypeError): - Vector("vector") - with self.assertRaises(ValueError): - Vector(x=1) - - def test_vector_rotate(self): - """Validate vector rotate methods""" - vector_x = Vector(1, 0, 1).rotate(Axis.X, 45) - vector_y = Vector(1, 2, 1).rotate(Axis.Y, 45) - vector_z = Vector(-1, -1, 3).rotate(Axis.Z, 45) - self.assertAlmostEqual(vector_x, (1, -math.sqrt(2) / 2, math.sqrt(2) / 2), 7) - self.assertAlmostEqual(vector_y, (math.sqrt(2), 2, 0), 7) - self.assertAlmostEqual(vector_z, (0, -math.sqrt(2), 3), 7) - - def test_get_signed_angle(self): - """Verify getSignedAngle calculations with and without a provided normal""" - a = math.pi / 3 - v1 = Vector(1, 0, 0) - v2 = Vector(math.cos(a), -math.sin(a), 0) - d1 = v1.get_signed_angle(v2) - d2 = v1.get_signed_angle(v2, Vector(0, 0, 1)) - self.assertAlmostEqual(d1, a * 180 / math.pi) - self.assertAlmostEqual(d2, -a * 180 / math.pi) - - def test_center(self): - v = Vector(1, 1, 1) - self.assertAlmostEqual(v, v.center()) - - def test_dot(self): - v1 = Vector(2, 2, 2) - v2 = Vector(1, -1, 1) - self.assertEqual(2.0, v1.dot(v2)) - - def test_vector_add(self): - result = Vector(1, 2, 0) + Vector(0, 0, 3) - self.assertAlmostEqual(result, (1.0, 2.0, 3.0), 3) - - def test_vector_operators(self): - result = Vector(1, 1, 1) + Vector(2, 2, 2) - self.assertEqual(Vector(3, 3, 3), result) - - result = Vector(1, 2, 3) - Vector(3, 2, 1) - self.assertEqual(Vector(-2, 0, 2), result) - - result = Vector(1, 2, 3) * 2 - self.assertEqual(Vector(2, 4, 6), result) - - result = 3 * Vector(1, 2, 3) - self.assertEqual(Vector(3, 6, 9), result) - - result = Vector(2, 4, 6) / 2 - self.assertEqual(Vector(1, 2, 3), result) - - self.assertEqual(Vector(-1, -1, -1), -Vector(1, 1, 1)) - - self.assertEqual(0, abs(Vector(0, 0, 0))) - self.assertEqual(1, abs(Vector(1, 0, 0))) - self.assertEqual((1 + 4 + 9) ** 0.5, abs(Vector(1, 2, 3))) - - def test_vector_equals(self): - a = Vector(1, 2, 3) - b = Vector(1, 2, 3) - c = Vector(1, 2, 3.000001) - self.assertEqual(a, b) - self.assertEqual(a, c) - self.assertEqual(a, AlwaysEqual()) - - def test_vector_not_equal(self): - a = Vector(1, 2, 3) - b = Vector(3, 2, 1) - self.assertNotEqual(a, b) - self.assertNotEqual(a, object()) - - def test_vector_distance(self): - """ - Test line distance from plane. - """ - v = Vector(1, 2, 3) - - self.assertAlmostEqual(1, v.signed_distance_from_plane(Plane.YZ)) - self.assertAlmostEqual(2, v.signed_distance_from_plane(Plane.ZX)) - self.assertAlmostEqual(3, v.signed_distance_from_plane(Plane.XY)) - self.assertAlmostEqual(-1, v.signed_distance_from_plane(Plane.ZY)) - self.assertAlmostEqual(-2, v.signed_distance_from_plane(Plane.XZ)) - self.assertAlmostEqual(-3, v.signed_distance_from_plane(Plane.YX)) - - self.assertAlmostEqual(1, v.distance_to_plane(Plane.YZ)) - self.assertAlmostEqual(2, v.distance_to_plane(Plane.ZX)) - self.assertAlmostEqual(3, v.distance_to_plane(Plane.XY)) - self.assertAlmostEqual(1, v.distance_to_plane(Plane.ZY)) - self.assertAlmostEqual(2, v.distance_to_plane(Plane.XZ)) - self.assertAlmostEqual(3, v.distance_to_plane(Plane.YX)) - - def test_vector_project(self): - """ - Test line projection and plane projection methods of Vector - """ - decimal_places = 9 - - z_dir = Vector(1, 2, 3) - base = Vector(5, 7, 9) - x_dir = Vector(1, 0, 0) - - # test passing Plane object - point = Vector(10, 11, 12).project_to_plane(Plane(base, x_dir, z_dir)) - self.assertAlmostEqual(point, (59 / 7, 55 / 7, 51 / 7), decimal_places) - - # test line projection - vec = Vector(10, 10, 10) - line = Vector(3, 4, 5) - angle = math.radians(vec.get_angle(line)) - - vecLineProjection = vec.project_to_line(line) - - self.assertAlmostEqual( - vecLineProjection.normalized(), - line.normalized(), - decimal_places, - ) - self.assertAlmostEqual( - vec.length * math.cos(angle), vecLineProjection.length, decimal_places - ) - - def test_vector_not_implemented(self): - pass - - def test_vector_special_methods(self): - self.assertEqual(repr(Vector(1, 2, 3)), "Vector(1, 2, 3)") - self.assertEqual(str(Vector(1, 2, 3)), "Vector(1, 2, 3)") - self.assertEqual( - str(Vector(9.99999999999999, -23.649999999999995, -7.37188088351e-15)), - "Vector(10, -23.65, 0)", - ) - - def test_vector_iter(self): - self.assertEqual(sum([v for v in Vector(1, 2, 3)]), 6) - - def test_reverse(self): - self.assertAlmostEqual(Vector(1, 2, 3).reverse(), (-1, -2, -3), 7) - - def test_copy(self): - v2 = copy.copy(Vector(1, 2, 3)) - v3 = copy.deepcopy(Vector(1, 2, 3)) - self.assertAlmostEqual(v2, (1, 2, 3), 7) - self.assertAlmostEqual(v3, (1, 2, 3), 7) - - def test_radd(self): - vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9)] - vector_sum = sum(vectors) - self.assertAlmostEqual(vector_sum, (12, 15, 18), 5) - - def test_hash(self): - vectors = [Vector(1, 2, 3), Vector(4, 5, 6), Vector(7, 8, 9), Vector(1, 2, 3)] - unique_vectors = list(set(vectors)) - self.assertEqual(len(vectors), 4) - self.assertEqual(len(unique_vectors), 3) - - def test_vector_transform(self): - a = Vector(1, 2, 3) - pxy = Plane.XY - pxy_o1 = Plane.XY.offset(1) - self.assertEqual(a.transform(pxy.forward_transform, is_direction=False), a) - self.assertEqual( - a.transform(pxy.forward_transform, is_direction=True), a.normalized() - ) - self.assertEqual( - a.transform(pxy_o1.forward_transform, is_direction=False), Vector(1, 2, 2) - ) - self.assertEqual( - a.transform(pxy_o1.forward_transform, is_direction=True), a.normalized() - ) - self.assertEqual( - a.transform(pxy_o1.reverse_transform, is_direction=False), Vector(1, 2, 4) - ) - self.assertEqual( - a.transform(pxy_o1.reverse_transform, is_direction=True), a.normalized() - ) - - def test_intersect(self): - v1 = Vector(1, 2, 3) - self.assertAlmostEqual(v1 & Vector(1, 2, 3), (1, 2, 3), 5) - self.assertIsNone(v1 & Vector(0, 0, 0)) - - self.assertAlmostEqual(v1 & Location((1, 2, 3)), (1, 2, 3), 5) - self.assertIsNone(v1 & Location()) - - self.assertAlmostEqual(v1 & Axis((1, 2, 3), (1, 0, 0)), (1, 2, 3), 5) - self.assertIsNone(v1 & Axis.X) - - self.assertAlmostEqual(v1 & Plane((1, 2, 3)), (1, 2, 3), 5) - self.assertIsNone(v1 & Plane.XY) - - self.assertAlmostEqual( - Vector((v1 & Solid.make_box(2, 4, 5)).vertex()), (1, 2, 3), 5 - ) - self.assertIsNone(v1.intersect(Solid.make_box(0.5, 0.5, 0.5))) - self.assertIsNone( - Vertex(-10, -10, -10).intersect(Solid.make_box(0.5, 0.5, 0.5)) - ) - - -class TestVectorLike(unittest.TestCase): - """Test typedef""" - - def test_axis_from_vertex(self): - axis = Axis(Vertex(1, 2, 3), Vertex(0, 0, 1)) - self.assertAlmostEqual(axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) - - def test_axis_from_vector(self): - axis = Axis(Vector(1, 2, 3), Vector(0, 0, 1)) - self.assertAlmostEqual(axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) - - def test_axis_from_tuple(self): - axis = Axis((1, 2, 3), (0, 0, 1)) - self.assertAlmostEqual(axis.position, (1, 2, 3), 5) - self.assertAlmostEqual(axis.direction, (0, 0, 1), 5) - - -class TestVertex(unittest.TestCase): - """Test the extensions to the cadquery Vertex class""" - - def test_basic_vertex(self): - v = Vertex() - self.assertEqual(0, v.X) - - v = Vertex(1, 1, 1) - self.assertEqual(1, v.X) - self.assertEqual(Vector, type(v.center())) - - self.assertAlmostEqual(Vector(Vertex(Vector(1, 2, 3))), (1, 2, 3), 7) - self.assertAlmostEqual(Vector(Vertex((4, 5, 6))), (4, 5, 6), 7) - self.assertAlmostEqual(Vector(Vertex((7,))), (7, 0, 0), 7) - self.assertAlmostEqual(Vector(Vertex((8, 9))), (8, 9, 0), 7) - - def test_vertex_volume(self): - v = Vertex(1, 1, 1) - self.assertAlmostEqual(v.volume, 0, 5) - - def test_vertex_add(self): - test_vertex = Vertex(0, 0, 0) - self.assertAlmostEqual(Vector(test_vertex + (100, -40, 10)), (100, -40, 10), 7) - self.assertAlmostEqual( - Vector(test_vertex + Vector(100, -40, 10)), (100, -40, 10), 7 - ) - self.assertAlmostEqual( - Vector(test_vertex + Vertex(100, -40, 10)), - (100, -40, 10), - 7, - ) - with self.assertRaises(TypeError): - test_vertex + [1, 2, 3] - - def test_vertex_sub(self): - test_vertex = Vertex(0, 0, 0) - self.assertAlmostEqual(Vector(test_vertex - (100, -40, 10)), (-100, 40, -10), 7) - self.assertAlmostEqual( - Vector(test_vertex - Vector(100, -40, 10)), (-100, 40, -10), 7 - ) - self.assertAlmostEqual( - Vector(test_vertex - Vertex(100, -40, 10)), - (-100, 40, -10), - 7, - ) - with self.assertRaises(TypeError): - test_vertex - [1, 2, 3] - - def test_vertex_str(self): - self.assertEqual(str(Vertex(0, 0, 0)), "Vertex(0.0, 0.0, 0.0)") - - def test_vertex_to_vector(self): - self.assertIsInstance(Vector(Vertex(0, 0, 0)), Vector) - self.assertAlmostEqual(Vector(Vertex(0, 0, 0)), (0.0, 0.0, 0.0), 7) - - def test_vertex_init_error(self): - with self.assertRaises(TypeError): - Vertex(Axis.Z) - with self.assertRaises(ValueError): - Vertex(x=1) - with self.assertRaises(TypeError): - Vertex((Axis.X, Axis.Y, Axis.Z)) - - def test_no_intersect(self): - with self.assertRaises(NotImplementedError): - Vertex(1, 2, 3) & Vertex(5, 6, 7) - - -class TestVTKPolyData(unittest.TestCase): - def setUp(self): - # Create a simple test object (e.g., a cylinder) - self.object_under_test = Solid.make_cylinder(1, 2) - - def test_to_vtk_poly_data(self): - # Generate VTK data - vtk_data = self.object_under_test.to_vtk_poly_data( - tolerance=0.1, angular_tolerance=0.2, normals=True - ) - - # Verify the result is of type vtkPolyData - self.assertIsInstance(vtk_data, vtkPolyData) - - # Further verification can include: - # - Checking the number of points, polygons, or cells - self.assertGreater( - vtk_data.GetNumberOfPoints(), 0, "VTK data should have points." - ) - self.assertGreater( - vtk_data.GetNumberOfCells(), 0, "VTK data should have cells." - ) - - # Optionally, compare the output with a known reference object - # (if available) by exporting or analyzing the VTK data - known_filter = vtkTriangleFilter() - known_filter.SetInputData(vtk_data) - known_filter.Update() - known_output = known_filter.GetOutput() - - self.assertEqual( - vtk_data.GetNumberOfPoints(), - known_output.GetNumberOfPoints(), - "Number of points in VTK data does not match the expected output.", - ) - self.assertEqual( - vtk_data.GetNumberOfCells(), - known_output.GetNumberOfCells(), - "Number of cells in VTK data does not match the expected output.", - ) - - def test_empty_shape(self): - # Test handling of empty shape - empty_object = Solid() # Create an empty object - with self.assertRaises(ValueError) as context: - empty_object.to_vtk_poly_data() - - self.assertEqual(str(context.exception), "Cannot convert an empty shape") - - -class TestWire(unittest.TestCase): - def test_ellipse_arc(self): - full_ellipse = Wire.make_ellipse(2, 1) - half_ellipse = Wire.make_ellipse( - 2, 1, start_angle=0, end_angle=180, closed=True - ) - self.assertAlmostEqual(full_ellipse.area / 2, half_ellipse.area, 5) - - def test_stitch(self): - half_ellipse1 = Wire.make_ellipse( - 2, 1, start_angle=0, end_angle=180, closed=False - ) - half_ellipse2 = Wire.make_ellipse( - 2, 1, start_angle=180, end_angle=360, closed=False - ) - ellipse = half_ellipse1.stitch(half_ellipse2) - self.assertEqual(len(ellipse.wires()), 1) - - def test_fillet_2d(self): - square = Wire.make_rect(1, 1) - squaroid = square.fillet_2d(0.1, square.vertices()) - self.assertAlmostEqual( - squaroid.length, 4 * (1 - 2 * 0.1) + 2 * math.pi * 0.1, 5 - ) - - def test_chamfer_2d(self): - square = Wire.make_rect(1, 1) - squaroid = square.chamfer_2d(0.1, 0.1, square.vertices()) - self.assertAlmostEqual( - squaroid.length, 4 * (1 - 2 * 0.1 + 0.1 * math.sqrt(2)), 5 - ) - - def test_chamfer_2d_edge(self): - square = Wire.make_rect(1, 1) - edge = square.edges().sort_by(Axis.Y)[0] - vertex = edge.vertices().sort_by(Axis.X)[0] - square = square.chamfer_2d( - distance=0.1, distance2=0.2, vertices=[vertex], edge=edge - ) - self.assertAlmostEqual(square.edges().sort_by(Axis.Y)[0].length, 0.9) - - def test_make_convex_hull(self): - # overlapping_edges = [ - # Edge.make_circle(10, end_angle=60), - # Edge.make_circle(10, start_angle=30, end_angle=90), - # Edge.make_line((-10, 10), (10, -10)), - # ] - # with self.assertRaises(ValueError): - # Wire.make_convex_hull(overlapping_edges) - - adjoining_edges = [ - Edge.make_circle(10, end_angle=45), - Edge.make_circle(10, start_angle=315, end_angle=360), - Edge.make_line((-10, 10), (-10, -10)), - ] - hull_wire = Wire.make_convex_hull(adjoining_edges) - self.assertAlmostEqual(Face(hull_wire).area, 319.9612, 4) - - # def test_fix_degenerate_edges(self): - # # Can't find a way to create one - # edge0 = Edge.make_line((0, 0, 0), (1, 0, 0)) - # edge1 = Edge.make_line(edge0 @ 0, edge0 @ 0 + Vector(0, 1, 0)) - # edge1a = edge1.trim(0, 1e-7) - # edge1b = edge1.trim(1e-7, 1.0) - # edge2 = Edge.make_line(edge1 @ 1, edge1 @ 1 + Vector(1, 1, 0)) - # wire = Wire([edge0, edge1a, edge1b, edge2]) - # fixed_wire = wire.fix_degenerate_edges(1e-6) - # self.assertEqual(len(fixed_wire.edges()), 2) - - def test_trim(self): - e0 = Edge.make_line((0, 0), (1, 0)) - e1 = Edge.make_line((2, 0), (1, 0)) - e2 = Edge.make_line((2, 0), (3, 0)) - w1 = Wire([e0, e1, e2]) - t1 = w1.trim(0.2, 0.9).move(Location((0, 0.1, 0))) - self.assertAlmostEqual(t1.length, 2.1, 5) - - e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) - # Three edges are created 0->0.5->0.75->1.0 - o = e.offset_2d(10, side=Side.RIGHT, closed=False) - t2 = o.trim(0.1, 0.9) - self.assertAlmostEqual(t2.length, o.length * 0.8, 5) - - t3 = o.trim(0.5, 1.0) - self.assertAlmostEqual(t3.length, o.length * 0.5, 5) - - t4 = o.trim(0.5, 0.75) - self.assertAlmostEqual(t4.length, o.length * 0.25, 5) - - with self.assertRaises(ValueError): - o.trim(0.75, 0.25) - spline = Spline( - (0, 0, 0), - (0, 10, 0), - tangents=((0, 0, 1), (0, 0, -1)), - tangent_scalars=(2, 2), - ) - half = spline.trim(0.5, 1) - self.assertAlmostEqual(spline @ 0.5, half @ 0, 4) - self.assertAlmostEqual(spline @ 1, half @ 1, 4) - - w = Rectangle(3, 1).wire() - t5 = w.trim(0, 0.5) - self.assertAlmostEqual(t5.length, 4, 5) - t6 = w.trim(0.5, 1) - self.assertAlmostEqual(t6.length, 4, 5) - - p = RegularPolygon(10, 20).wire() - t7 = p.trim(0.1, 0.2) - self.assertAlmostEqual(p.length * 0.1, t7.length, 5) - - c = Circle(10).wire() - t8 = c.trim(0.4, 0.9) - self.assertAlmostEqual(c.length * 0.5, t8.length, 5) - - def test_param_at_point(self): - e = Edge.make_three_point_arc((0, -20), (5, 0), (0, 20)) - # Three edges are created 0->0.5->0.75->1.0 - o = e.offset_2d(10, side=Side.RIGHT, closed=False) - - e0 = Edge.make_line((0, 0), (1, 0)) - e1 = Edge.make_line((2, 0), (1, 0)) - e2 = Edge.make_line((2, 0), (3, 0)) - w1 = Wire([e0, e1, e2]) - for wire in [o, w1]: - u_value = random.random() - position = wire.position_at(u_value) - self.assertAlmostEqual(wire.param_at_point(position), u_value, 4) - - with self.assertRaises(ValueError): - o.param_at_point((-1, 1)) - - with self.assertRaises(ValueError): - w1.param_at_point((20, 20, 20)) - - def test_order_edges(self): - w1 = Wire( - [ - Edge.make_line((0, 0), (1, 0)), - Edge.make_line((1, 1), (1, 0)), - Edge.make_line((0, 1), (1, 1)), - ] - ) - ordered_edges = w1.order_edges() - self.assertFalse(all(e.is_forward for e in w1.edges())) - self.assertTrue(all(e.is_forward for e in ordered_edges)) - self.assertAlmostEqual(ordered_edges[0] @ 0, (0, 0, 0), 5) - self.assertAlmostEqual(ordered_edges[1] @ 0, (1, 0, 0), 5) - self.assertAlmostEqual(ordered_edges[2] @ 0, (1, 1, 0), 5) - - def test_constructor(self): - e0 = Edge.make_line((0, 0), (1, 0)) - e1 = Edge.make_line((1, 0), (1, 1)) - w0 = Wire.make_circle(1) - w1 = Wire(e0) - self.assertTrue(w1.is_valid()) - w2 = Wire([e0]) - self.assertAlmostEqual(w2.length, 1, 5) - self.assertTrue(w2.is_valid()) - w3 = Wire([e0, e1]) - self.assertTrue(w3.is_valid()) - self.assertAlmostEqual(w3.length, 2, 5) - w4 = Wire(w0.wrapped) - self.assertTrue(w4.is_valid()) - w5 = Wire(obj=w0.wrapped) - self.assertTrue(w5.is_valid()) - w6 = Wire(obj=w0.wrapped, label="w6", color=Color("red")) - self.assertTrue(w6.is_valid()) - self.assertEqual(w6.label, "w6") - np.testing.assert_allclose(tuple(w6.color), (1.0, 0.0, 0.0, 1.0), 1e-5) - w7 = Wire(w6) - self.assertTrue(w7.is_valid()) - c0 = Polyline((0, 0), (1, 0), (1, 1)) - w8 = Wire(c0) - self.assertTrue(w8.is_valid()) - with self.assertRaises(ValueError): - Wire(bob="fred") - - -if __name__ == "__main__": - unittest.main() From 94fdd97a551385bbb768dc319cf72f27c8f8e628 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 22 Jan 2025 20:04:42 -0500 Subject: [PATCH 156/518] Updating doc: separating key concepts, adding OpenSCAD section --- docs/OpenSCAD.rst | 149 +++++++++++++ docs/index.rst | 2 + docs/key_concepts.rst | 301 +------------------------- docs/key_concepts_builder.rst | 393 ++++++++++++++++++++++++++++++++++ 4 files changed, 547 insertions(+), 298 deletions(-) create mode 100644 docs/OpenSCAD.rst create mode 100644 docs/key_concepts_builder.rst diff --git a/docs/OpenSCAD.rst b/docs/OpenSCAD.rst new file mode 100644 index 0000000..5d2d0d2 --- /dev/null +++ b/docs/OpenSCAD.rst @@ -0,0 +1,149 @@ +Transitioning from OpenSCAD +=========================== + +Welcome to build123d! If you're familiar with OpenSCAD, you'll notice key differences in +how models are constructed. This guide is designed to help you adapt your design approach +and understand the fundamental differences in modeling philosophies. While OpenSCAD relies +heavily on Constructive Solid Geometry (CSG) to combine primitive 3D shapes like cubes and +spheres, build123d encourages a more flexible and efficient workflow based on building +lower-dimensional objects. + +Why Transition to build123d? +---------------------------- + +Transitioning to build123d allows you to harness a modern and efficient approach to 3D modeling. +By starting with lower-dimensional objects and leveraging powerful transformation tools, you can +create precise, complex designs with ease. This workflow emphasizes modularity and maintainability, +enabling quick modifications and reducing computational complexity. + +Moving Beyond Constructive Solid Geometry (CSG) +----------------------------------------------- + +OpenSCAD's modeling paradigm heavily relies on Constructive Solid Geometry (CSG) to build +models by combining and subtracting 3D solids. While build123d supports similar operations, +its design philosophy encourages a fundamentally different, often more efficient approach: +starting with lower-dimensional entities like faces and edges and then transforming them +into solids. + +### Why Transition Away from CSG? + +CSG is a powerful method for creating 3D models, but it has limitations when dealing with +complex designs. build123d’s approach offers several advantages: + +- **Simplified Complexity Management**: + Working with 2D profiles and faces instead of directly manipulating 3D solids simplifies + your workflow. In large models, the number of operations on solids can grow exponentially, + making it difficult to manage and debug. Building with 2D profiles helps keep designs + modular and organized. + +- **Improved Robustness**: + Operations on 2D profiles are inherently less computationally intensive and + less error-prone than equivalent operations on 3D solids. This robustness ensures smoother + workflows and reduces the likelihood of failing operations in complex models. + +- **Enhanced Efficiency**: + Constructing models from 2D profiles using operations like **extruding**, **lofting**, + **sweeping**, or **revolving** is computationally faster. These methods also provide + greater design flexibility, enabling you to create intricate forms with ease. + +- **Better Precision and Control**: + Starting with 2D profiles allows for more precise geometric control. Constraints, dimensions, + and relationships between entities can be established more effectively in 2D, ensuring a solid + foundation for your 3D design. + +Using a More Traditional CAD Design Workflow +-------------------------------------------- + +Most industry-standard CAD packages recommend starting with a sketch (a 2D object) and +transforming it into a 3D model—a design philosophy that is central to build123d. + +In build123d, the design process typically begins with defining the outline of an object. +This might involve creating a complex 1D object using **BuildLine**, which provides tools +for constructing intricate wireframe geometries. The next step involves converting these +1D objects into 2D sketches using **BuildSketch**, which offers a wide range of 2D primitives +and advanced capabilities, such as: + +- **make_face**: Converts a 1D **BuildLine** object into a planar 2D face. +- **make_hull**: Generates a convex hull from a 1D **BuildLine** object. + +Once a 2D profile is created, it can be transformed into 3D objects in a **BuildPart** context +using operations such as: + +- **Extrusion**: Extends a 2D profile along a straight path to create a 3D shape. +- **Revolution**: Rotates a 2D profile around an axis to form a symmetrical 3D object. +- **Lofting**: Connects multiple 2D profiles along a path to create smooth transitions + between shapes. +- **Sweeping**: Moves a 2D profile along a defined path to create a 3D form. + +### Refining the Model + +After creating the initial 3D shape, you can refine the model by adding details or making +modifications using build123d's advanced features, such as: + +- **Fillets and Chamfers**: Smooth or bevel edges to enhance the design. +- **Boolean Operations**: Combine, subtract, or intersect 3D shapes to achieve the desired + geometry. + +### Example Comparison + +To illustrate the advantages of this approach, compare a simple model in OpenSCAD and +build123d: + +**OpenSCAD Approach** + +.. code-block:: openscad + + // A basic cylinder with a hole + difference() { + cylinder(r=10, h=20); + translate([0, 0, 5]) cylinder(r=5, h=20); + } + +**build123d Approach** + +.. code-block:: python + + from build123d import * + + # In Builder mode + with BuildPart() as cylinder_with_hole: + with BuildSketch(): + Circle(10) + extrude(amount=20) + with BuildSketch(cylinder_with_hole.faces().sort_by(Axis.Z).last): + Circle(5) + extrude(amount=-15, mode=Mode.SUBTRACT) + + # In Algebra mode + cyl = extrude(Circle(10), 20) + cyl -= extrude(Plane(cyl.faces().sort_by(Axis.Z)[-1]) * Circle + + +This approach emphasizes creating a 2D profile (such as the **Circle**) and then applying a +3D operation (like **extrude**) to achieve the desired result. Topological features of the +part under construction are extracted and used as references for adding further details. + +Tips for Transitioning +---------------------- + +- **Think in Lower Dimensions**: Begin with 1D curves or 2D sketches as the foundation + and progressively build upwards into 3D shapes. + +- **Leverage Topological References**: Use build123d's powerful selector system to + reference features of existing objects for creating new ones. For example, apply + inside or outside fillets and chamfers to vertices and edges of an existing part + with precision. + +- **Explore the Documentation**: Dive into build123d’s comprehensive API documentation + to unlock its full potential and discover advanced features. + +By shifting your design mindset from solid-based CSG to a profile-driven approach, you +can fully harness build123d's capabilities to create precise, efficient, and complex models. +Welcome aboard, and happy designing! + +Conclusion +---------- +While OpenSCAD and build123d share the goal of empowering users to create parametric 3D +models, their approaches differ significantly. Embracing build123d’s workflow of building +with lower-dimensional objects and applying extrusion, lofting, sweeping, or revolution +will unlock its full potential and lead to better design outcomes. \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index f5bf239..7a76273 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -106,7 +106,9 @@ Table Of Contents introduction.rst installation.rst key_concepts.rst + key_concepts_builder.rst key_concepts_algebra.rst + OpenSCAD.rst introductory_examples.rst tutorials.rst objects.rst diff --git a/docs/key_concepts.rst b/docs/key_concepts.rst index e8a7756..1b2f11b 100644 --- a/docs/key_concepts.rst +++ b/docs/key_concepts.rst @@ -1,14 +1,6 @@ -########################### -Key Concepts (builder mode) -########################### - -There are two primary APIs provided by build123d: builder and algebra. The builder -API may be easier for new users as it provides some assistance and shortcuts; however, -if you know what a Quaternion is you might prefer the algebra API which allows -CAD objects to be created in the style of mathematical equations. Both API can -be mixed in the same model with the exception that the algebra API can't be used -from within a builder context. As with music, there is no "best" genre or API, -use the one you prefer or both if you like. +############ +Key Concepts +############ The following key concepts will help new users understand build123d quickly. @@ -120,118 +112,6 @@ topology of a shape as shown here for a unit cube: Users of build123d will often reference topological objects as part of the process of creating the object as described below. -Builders -======== - -The three builders, ``BuildLine``, ``BuildSketch``, and ``BuildPart`` are tools to create -new objects - not the objects themselves. Each of the objects and operations applicable -to these builders create objects of the standard CadQuery Direct API, most commonly -``Compound`` objects. This is opposed to CadQuery's Fluent API which creates objects -of the ``Workplane`` class which frequently needed to be converted back to base -class for further processing. - -One can access the objects created by these builders by referencing the appropriate -instance variable. For example: - -.. code-block:: python - - with BuildPart() as my_part: - ... - - show_object(my_part.part) - -.. code-block:: python - - with BuildSketch() as my_sketch: - ... - - show_object(my_sketch.sketch) - -.. code-block:: python - - with BuildLine() as my_line: - ... - - show_object(my_line.line) - -Implicit Builder Instance Variables -=================================== - -One might expect to have to reference a builder's instance variable when using -objects or operations that impact that builder like this: - -.. code-block:: python - - with BuildPart() as part_builder: - Box(part_builder, 10,10,10) - -Instead, build123d determines from the scope of the object or operation which -builder it applies to thus eliminating the need for the user to provide this -information - as follows: - -.. code-block:: python - - with BuildPart() as part_builder: - Box(10,10,10) - with BuildSketch() as sketch_builder: - Circle(2) - -In this example, ``Box`` is in the scope of ``part_builder`` while ``Circle`` -is in the scope of ``sketch_builder``. - -Workplanes -========== - -As build123d is a 3D CAD package one must be able to position objects anywhere. As one -frequently will work in the same plane for a sequence of operations, the first parameter(s) -of the builders is a (sequence of) workplane(s) which is (are) used -to aid in the location of features. The default workplane in most cases is the ``Plane.XY`` -where a tuple of numbers represent positions on the x and y axes. However workplanes can -be generated on any plane which allows users to put a workplane where they are working -and then work in local 2D coordinate space. - - -.. code-block:: python - - with BuildPart(Plane.XY) as example: - ... # a 3D-part - with BuildSketch(example.faces().sort_by(sort_by=Axis.Z)[0]) as bottom: - ... - with BuildSketch(Plane.XZ) as vertical: - ... - with BuildSketch(example.faces().sort_by(sort_by=Axis.Z)[-1]) as top: - ... - -When ``BuildPart`` is invoked it creates the workplane provided as a parameter (which has a -default of the ``Plane.XY``). The ``bottom`` sketch is therefore created on the ``Plane.XY`` but with the -normal reversed to point down. Subsequently the user has created the ``vertical`` (``Plane.XZ``) sketch. -All objects or operations within the scope of a workplane will automatically be orientated with -respect to this plane so the user only has to work with local coordinates. - -As shown above, workplanes can be created from faces as well. The ``top`` sketch is -positioned on top of ``example`` by selecting its faces and finding the one with the greatest z value. - -One is not limited to a single workplane at a time. In the following example all six -faces of the first box are used to define workplanes which are then used to position -rotated boxes. - -.. code-block:: python - - import build123d as bd - - with bd.BuildPart() as bp: - bd.Box(3, 3, 3) - with bd.BuildSketch(*bp.faces()): - bd.Rectangle(1, 2, rotation=45) - bd.extrude(amount=0.1) - -This is the result: - -.. image:: boxes_on_faces.svg - :align: center - -.. _location_context_link: - Location ======== @@ -286,182 +166,7 @@ There are also four methods that are used to change the location of objects: Locations can be combined with the ``*`` operator and have their direction flipped with the ``-`` operator. -Locations Context -================= - -When positioning objects or operations within a builder Location Contexts are used. These -function in a very similar was to the builders in that they create a context where one or -more locations are active within a scope. For example: - -.. code-block:: python - - with BuildPart(): - with Locations((0,10),(0,-10)): - Box(1,1,1) - with GridLocations(x_spacing=5, y_spacing=5, x_count=2, y_count=2): - Sphere(1) - Cylinder(1,1) - -In this example ``Locations`` creates two positions on the current workplane at (0,10) and (0,-10). -Since ``Box`` is within the scope of ``Locations``, two boxes are created at these locations. The -``GridLocations`` context creates four positions which apply to the ``Sphere``. The ``Cylinder`` is -out of the scope of ``GridLocations`` but in the scope of ``Locations`` so two cylinders are created. - -Note that these contexts are creating Location objects not just simple points. The difference -isn't obvious until the ``PolarLocations`` context is used which can also rotate objects within -its scope - much as the hour and minute indicator on an analogue clock. - -Also note that the locations are local to the current location(s) - i.e. ``Locations`` can be -nested. It's easy for a user to retrieve the global locations: - -.. code-block:: python - - with Locations(Plane.XY, Plane.XZ): - locs = GridLocations(1, 1, 2, 2) - for l in locs: - print(l) - -.. code-block:: - - Location(p=(-0.50,-0.50,0.00), o=(0.00,-0.00,0.00)) - Location(p=(-0.50,0.50,0.00), o=(0.00,-0.00,0.00)) - Location(p=(0.50,-0.50,0.00), o=(0.00,-0.00,0.00)) - Location(p=(0.50,0.50,0.00), o=(0.00,-0.00,0.00)) - Location(p=(-0.50,-0.00,-0.50), o=(90.00,-0.00,0.00)) - Location(p=(-0.50,0.00,0.50), o=(90.00,-0.00,0.00)) - Location(p=(0.50,0.00,-0.50), o=(90.00,-0.00,0.00)) - Location(p=(0.50,0.00,0.50), o=(90.00,-0.00,0.00)) - - -Operation Inputs -================ - -When one is operating on an existing object, e.g. adding a fillet to a part, -an iterable of objects is often required (often a ShapeList). - -Here is the definition of :meth:`~operations_generic.fillet` to help illustrate: - -.. code-block:: python - - def fillet( - objects: Union[Union[Edge, Vertex], Iterable[Union[Edge, Vertex]]], - radius: float, - ): - -To use this fillet operation, an edge or vertex or iterable of edges or -vertices must be provided followed by a fillet radius with or without the keyword as follows: - -.. code-block:: python - - with BuildPart() as pipes: - Box(10, 10, 10, rotation=(10, 20, 30)) - ... - fillet(pipes.edges(Select.LAST), radius=0.2) - -Here the fillet accepts the iterable ShapeList of edges from the last operation of -the ``pipes`` builder and a radius is provided as a keyword argument. - -Combination Modes -================= - -Almost all objects or operations have a ``mode`` parameter which is defined by the -``Mode`` Enum class as follows: - -.. code-block:: python - - class Mode(Enum): - ADD = auto() - SUBTRACT = auto() - INTERSECT = auto() - REPLACE = auto() - PRIVATE = auto() - -The ``mode`` parameter describes how the user would like the object or operation to -interact with the object within the builder. For example, ``Mode.ADD`` will -integrate a new object(s) in with an existing ``part``. Note that a part doesn't -necessarily have to be a single object so multiple distinct objects could be added -resulting is multiple objects stored as a ``Compound`` object. As one might expect -``Mode.SUBTRACT``, ``Mode.INTERSECT``, and ``Mode.REPLACE`` subtract, intersect, or replace -(from) the builder's object. ``Mode.PRIVATE`` instructs the builder that this object -should not be combined with the builder's object in any way. - -Most commonly, the default ``mode`` is ``Mode.ADD`` but this isn't always true. -For example, the ``Hole`` classes use a default ``Mode.SUBTRACT`` as they remove -a volume from the part under normal circumstances. However, the ``mode`` used in -the ``Hole`` classes can be specified as ``Mode.ADD`` or ``Mode.INTERSECT`` to -help in inspection or debugging. - Selectors ========= .. include:: selectors.rst - -Using Locations & Rotating Objects -================================== - -build123d stores points (to be specific ``Location`` (s)) internally to be used as -positions for the placement of new objects. By default, a single location -will be created at the origin of the given workplane such that: - -.. code-block:: python - - with BuildPart() as pipes: - Box(10, 10, 10, rotation=(10, 20, 30)) - -will create a single 10x10x10 box centered at (0,0,0) - by default objects are -centered. One can create multiple objects by pushing points prior to creating -objects as follows: - -.. code-block:: python - - with BuildPart() as pipes: - with Locations((-10, -10, -10), (10, 10, 10)): - Box(10, 10, 10, rotation=(10, 20, 30)) - -which will create two boxes. - -To orient a part, a ``rotation`` parameter is available on ``BuildSketch``` and -``BuildPart`` APIs. When working in a sketch, the rotation is a single angle in -degrees so the parameter is a float. When working on a part, the rotation is -a three dimensional ``Rotation`` object of the form -``Rotation(, , )`` although a simple three tuple of -floats can be used as input. As 3D rotations are not cumulative, one can -combine rotations with the `*` operator like this: -``Rotation(10, 20, 30) * Rotation(0, 90, 0)`` to generate any desired rotation. - -.. hint:: - Experts Only - - ``Locations`` will accept ``Location`` objects for input which allows one - to specify both the position and orientation. However, the orientation - is often determined by the ``Plane`` that an object was created on. - ``Rotation`` is a subclass of ``Location`` and therefore will also accept - a position component. - -Builder's Pending Objects -========================= - -When a builder exits, it will push the object created back to its parent if -there was one. Here is an example: - -.. code-block:: python - - height, width, thickness, f_rad = 60, 80, 20, 10 - - with BuildPart() as pillow_block: - with BuildSketch() as plan: - Rectangle(width, height) - fillet(plan.vertices(), radius=f_rad) - extrude(amount=thickness) - -``BuildSketch`` exits after the ``fillet`` operation and when doing so it transfers -the sketch to the ``pillow_block`` instance of ``BuildPart`` as the internal instance variable -``pending_faces``. This allows the ``extrude`` operation to be immediately invoked as it -extrudes these pending faces into ``Solid`` objects. Likewise, ``loft`` would take all of the -``pending_faces`` and attempt to create a single ``Solid`` object from them. - -Normally the user will not need to interact directly with pending objects; however, -one can see pending Edges and Faces with ``.pending_edges`` and -``.pending_faces`` attributes. In the above example, by adding a -``print(pillow_block.pending_faces)`` prior to the ``extrude(amount=thickness)`` the -pending ``Face`` from the ``BuildSketch`` will be displayed. diff --git a/docs/key_concepts_builder.rst b/docs/key_concepts_builder.rst new file mode 100644 index 0000000..20370f3 --- /dev/null +++ b/docs/key_concepts_builder.rst @@ -0,0 +1,393 @@ +########################### +Key Concepts (builder mode) +########################### + +There are two primary APIs provided by build123d: builder and algebra. The builder +API may be easier for new users as it provides some assistance and shortcuts; however, +if you know what a Quaternion is you might prefer the algebra API which allows +CAD objects to be created in the style of mathematical equations. Both API can +be mixed in the same model with the exception that the algebra API can't be used +from within a builder context. As with music, there is no "best" genre or API, +use the one you prefer or both if you like. + +The following key concepts will help new users understand build123d quickly. + +Understanding the Builder Paradigm +================================== + +The **Builder** paradigm in build123d provides a powerful and intuitive way to construct +complex geometric models. At its core, the Builder works like adding a column of numbers +on a piece of paper: a running "total" is maintained internally as each new object is +added or modified. This approach simplifies the process of constructing models by breaking +it into smaller, incremental steps. + +How the Builder Works +---------------------- + +When using a Builder (such as **BuildLine**, **BuildSketch**, or **BuildPart**), the +following principles apply: + +1. **Running Total**: + - The Builder maintains an internal "total," which represents the current state of + the object being built. + - Each operation updates this total by combining the new object with the existing one. + +2. **Combination Modes**: + - Just as numbers in a column may have a `+` or `-` sign to indicate addition or + subtraction, Builders use **modes** to control how each object is combined with + the current total. + - Common modes include: + + - **ADD**: Adds the new object to the current total. + - **SUBTRACT**: Removes the new object from the current total. + - **INTERSECT**: Keeps only the overlapping regions of the new object and the current total. + - **REPLACE**: Entirely replace the running total. + - **PRIVATE**: Don't change the running total at all. + + - The mode can be set dynamically for each operation, allowing for flexible and precise modeling. + +3. **Extracting the Result**: + - At the end of the building process, the final object is accessed through the + Builder's attributes, such as ``.line``, ``.sketch``, or ``.part``, depending on + the Builder type. + - For example: + + - **BuildLine**: Use ``.line`` to retrieve the final wireframe geometry. + - **BuildSketch**: Use ``.sketch`` to extract the completed 2D profile. + - **BuildPart**: Use ``.part`` to obtain the 3D solid. + +Example Workflow +----------------- + +Here is an example of using a Builder to create a simple part: + +.. code-block:: python + + from build123d import * + + # Using BuildPart to create a 3D model + with BuildPart() as example_part: + with BuildSketch() as base_sketch: + Rectangle(20, 20) + extrude(amount=10) # Create a base block + with BuildSketch(Plane(example_part.faces().sort_by(Axis.Z).last)) as cut_sketch: + Circle(5) + extrude(amount=-5, mode=Mode.SUBTRACT) # Subtract a cylinder + + # Access the final part + result_part = example_part.part + +Key Concepts +------------ + +- **Incremental Construction**: + Builders allow you to build objects step-by-step, maintaining clarity and modularity. + +- **Dynamic Mode Switching**: + The **mode** parameter gives you precise control over how each operation modifies + the current total. + +- **Seamless Extraction**: + The Builder paradigm simplifies the retrieval of the final object, ensuring that you + always have access to the most up-to-date result. + +Analogy: Adding Numbers on Paper +-------------------------------- + +Think of the Builder as a running tally when adding numbers on a piece of paper: + +- Each number represents an operation or object. +- The ``+`` or ``-`` sign corresponds to the **ADD** or **SUBTRACT** mode. +- At the end, the total is the sum of all operations, which you can retrieve by referencing + the Builder’s output. + +By adopting this approach, build123d ensures a natural, intuitive workflow for constructing +2D and 3D models. + +Builders +======== + +The three builders, ``BuildLine``, ``BuildSketch``, and ``BuildPart`` are tools to create +new objects - not the objects themselves. Each of the objects and operations applicable +to these builders create objects of the standard CadQuery Direct API, most commonly +``Compound`` objects. This is opposed to CadQuery's Fluent API which creates objects +of the ``Workplane`` class which frequently needed to be converted back to base +class for further processing. + +One can access the objects created by these builders by referencing the appropriate +instance variable. For example: + +.. code-block:: python + + with BuildPart() as my_part: + ... + + show_object(my_part.part) + +.. code-block:: python + + with BuildSketch() as my_sketch: + ... + + show_object(my_sketch.sketch) + +.. code-block:: python + + with BuildLine() as my_line: + ... + + show_object(my_line.line) + +Implicit Builder Instance Variables +=================================== + +One might expect to have to reference a builder's instance variable when using +objects or operations that impact that builder like this: + +.. code-block:: python + + with BuildPart() as part_builder: + Box(part_builder, 10,10,10) + +Instead, build123d determines from the scope of the object or operation which +builder it applies to thus eliminating the need for the user to provide this +information - as follows: + +.. code-block:: python + + with BuildPart() as part_builder: + Box(10,10,10) + with BuildSketch() as sketch_builder: + Circle(2) + +In this example, ``Box`` is in the scope of ``part_builder`` while ``Circle`` +is in the scope of ``sketch_builder``. + +Workplanes +========== + +As build123d is a 3D CAD package one must be able to position objects anywhere. As one +frequently will work in the same plane for a sequence of operations, the first parameter(s) +of the builders is a (sequence of) workplane(s) which is (are) used +to aid in the location of features. The default workplane in most cases is the ``Plane.XY`` +where a tuple of numbers represent positions on the x and y axes. However workplanes can +be generated on any plane which allows users to put a workplane where they are working +and then work in local 2D coordinate space. + + +.. code-block:: python + + with BuildPart(Plane.XY) as example: + ... # a 3D-part + with BuildSketch(example.faces().sort_by(sort_by=Axis.Z)[0]) as bottom: + ... + with BuildSketch(Plane.XZ) as vertical: + ... + with BuildSketch(example.faces().sort_by(sort_by=Axis.Z)[-1]) as top: + ... + +When ``BuildPart`` is invoked it creates the workplane provided as a parameter (which has a +default of the ``Plane.XY``). The ``bottom`` sketch is therefore created on the ``Plane.XY`` but with the +normal reversed to point down. Subsequently the user has created the ``vertical`` (``Plane.XZ``) sketch. +All objects or operations within the scope of a workplane will automatically be orientated with +respect to this plane so the user only has to work with local coordinates. + +As shown above, workplanes can be created from faces as well. The ``top`` sketch is +positioned on top of ``example`` by selecting its faces and finding the one with the greatest z value. + +One is not limited to a single workplane at a time. In the following example all six +faces of the first box are used to define workplanes which are then used to position +rotated boxes. + +.. code-block:: python + + import build123d as bd + + with bd.BuildPart() as bp: + bd.Box(3, 3, 3) + with bd.BuildSketch(*bp.faces()): + bd.Rectangle(1, 2, rotation=45) + bd.extrude(amount=0.1) + +This is the result: + +.. image:: boxes_on_faces.svg + :align: center + +.. _location_context_link: + +Locations Context +================= + +When positioning objects or operations within a builder Location Contexts are used. These +function in a very similar was to the builders in that they create a context where one or +more locations are active within a scope. For example: + +.. code-block:: python + + with BuildPart(): + with Locations((0,10),(0,-10)): + Box(1,1,1) + with GridLocations(x_spacing=5, y_spacing=5, x_count=2, y_count=2): + Sphere(1) + Cylinder(1,1) + +In this example ``Locations`` creates two positions on the current workplane at (0,10) and (0,-10). +Since ``Box`` is within the scope of ``Locations``, two boxes are created at these locations. The +``GridLocations`` context creates four positions which apply to the ``Sphere``. The ``Cylinder`` is +out of the scope of ``GridLocations`` but in the scope of ``Locations`` so two cylinders are created. + +Note that these contexts are creating Location objects not just simple points. The difference +isn't obvious until the ``PolarLocations`` context is used which can also rotate objects within +its scope - much as the hour and minute indicator on an analogue clock. + +Also note that the locations are local to the current location(s) - i.e. ``Locations`` can be +nested. It's easy for a user to retrieve the global locations: + +.. code-block:: python + + with Locations(Plane.XY, Plane.XZ): + locs = GridLocations(1, 1, 2, 2) + for l in locs: + print(l) + +.. code-block:: + + Location(p=(-0.50,-0.50,0.00), o=(0.00,-0.00,0.00)) + Location(p=(-0.50,0.50,0.00), o=(0.00,-0.00,0.00)) + Location(p=(0.50,-0.50,0.00), o=(0.00,-0.00,0.00)) + Location(p=(0.50,0.50,0.00), o=(0.00,-0.00,0.00)) + Location(p=(-0.50,-0.00,-0.50), o=(90.00,-0.00,0.00)) + Location(p=(-0.50,0.00,0.50), o=(90.00,-0.00,0.00)) + Location(p=(0.50,0.00,-0.50), o=(90.00,-0.00,0.00)) + Location(p=(0.50,0.00,0.50), o=(90.00,-0.00,0.00)) + + +Operation Inputs +================ + +When one is operating on an existing object, e.g. adding a fillet to a part, +an iterable of objects is often required (often a ShapeList). + +Here is the definition of :meth:`~operations_generic.fillet` to help illustrate: + +.. code-block:: python + + def fillet( + objects: Union[Union[Edge, Vertex], Iterable[Union[Edge, Vertex]]], + radius: float, + ): + +To use this fillet operation, an edge or vertex or iterable of edges or +vertices must be provided followed by a fillet radius with or without the keyword as follows: + +.. code-block:: python + + with BuildPart() as pipes: + Box(10, 10, 10, rotation=(10, 20, 30)) + ... + fillet(pipes.edges(Select.LAST), radius=0.2) + +Here the fillet accepts the iterable ShapeList of edges from the last operation of +the ``pipes`` builder and a radius is provided as a keyword argument. + +Combination Modes +================= + +Almost all objects or operations have a ``mode`` parameter which is defined by the +``Mode`` Enum class as follows: + +.. code-block:: python + + class Mode(Enum): + ADD = auto() + SUBTRACT = auto() + INTERSECT = auto() + REPLACE = auto() + PRIVATE = auto() + +The ``mode`` parameter describes how the user would like the object or operation to +interact with the object within the builder. For example, ``Mode.ADD`` will +integrate a new object(s) in with an existing ``part``. Note that a part doesn't +necessarily have to be a single object so multiple distinct objects could be added +resulting is multiple objects stored as a ``Compound`` object. As one might expect +``Mode.SUBTRACT``, ``Mode.INTERSECT``, and ``Mode.REPLACE`` subtract, intersect, or replace +(from) the builder's object. ``Mode.PRIVATE`` instructs the builder that this object +should not be combined with the builder's object in any way. + +Most commonly, the default ``mode`` is ``Mode.ADD`` but this isn't always true. +For example, the ``Hole`` classes use a default ``Mode.SUBTRACT`` as they remove +a volume from the part under normal circumstances. However, the ``mode`` used in +the ``Hole`` classes can be specified as ``Mode.ADD`` or ``Mode.INTERSECT`` to +help in inspection or debugging. + + +Using Locations & Rotating Objects +================================== + +build123d stores points (to be specific ``Location`` (s)) internally to be used as +positions for the placement of new objects. By default, a single location +will be created at the origin of the given workplane such that: + +.. code-block:: python + + with BuildPart() as pipes: + Box(10, 10, 10, rotation=(10, 20, 30)) + +will create a single 10x10x10 box centered at (0,0,0) - by default objects are +centered. One can create multiple objects by pushing points prior to creating +objects as follows: + +.. code-block:: python + + with BuildPart() as pipes: + with Locations((-10, -10, -10), (10, 10, 10)): + Box(10, 10, 10, rotation=(10, 20, 30)) + +which will create two boxes. + +To orient a part, a ``rotation`` parameter is available on ``BuildSketch``` and +``BuildPart`` APIs. When working in a sketch, the rotation is a single angle in +degrees so the parameter is a float. When working on a part, the rotation is +a three dimensional ``Rotation`` object of the form +``Rotation(, , )`` although a simple three tuple of +floats can be used as input. As 3D rotations are not cumulative, one can +combine rotations with the `*` operator like this: +``Rotation(10, 20, 30) * Rotation(0, 90, 0)`` to generate any desired rotation. + +.. hint:: + Experts Only + + ``Locations`` will accept ``Location`` objects for input which allows one + to specify both the position and orientation. However, the orientation + is often determined by the ``Plane`` that an object was created on. + ``Rotation`` is a subclass of ``Location`` and therefore will also accept + a position component. + +Builder's Pending Objects +========================= + +When a builder exits, it will push the object created back to its parent if +there was one. Here is an example: + +.. code-block:: python + + height, width, thickness, f_rad = 60, 80, 20, 10 + + with BuildPart() as pillow_block: + with BuildSketch() as plan: + Rectangle(width, height) + fillet(plan.vertices(), radius=f_rad) + extrude(amount=thickness) + +``BuildSketch`` exits after the ``fillet`` operation and when doing so it transfers +the sketch to the ``pillow_block`` instance of ``BuildPart`` as the internal instance variable +``pending_faces``. This allows the ``extrude`` operation to be immediately invoked as it +extrudes these pending faces into ``Solid`` objects. Likewise, ``loft`` would take all of the +``pending_faces`` and attempt to create a single ``Solid`` object from them. + +Normally the user will not need to interact directly with pending objects; however, +one can see pending Edges and Faces with ``.pending_edges`` and +``.pending_faces`` attributes. In the above example, by adding a +``print(pillow_block.pending_faces)`` prior to the ``extrude(amount=thickness)`` the +pending ``Face`` from the ``BuildSketch`` will be displayed. From 97eff88585d34c4d8b4f416ab5911040363de618 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 22 Jan 2025 22:32:38 -0600 Subject: [PATCH 157/518] mypy.ini -> exclude OCP-stubs --- mypy.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mypy.ini b/mypy.ini index 2960c49..b4b1a7b 100644 --- a/mypy.ini +++ b/mypy.ini @@ -17,6 +17,9 @@ ignore_missing_imports = True [mypy-OCP.*] ignore_missing_imports = True +[mypy-OCP-stubs.*] +ignore_missing_imports = True + [mypy-ocpsvg.*] ignore_missing_imports = True From bd1ad47ac5310eb9079f105f6c4250deb85df9c0 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 23 Jan 2025 07:39:10 -0600 Subject: [PATCH 158/518] Update mypy.ini --- mypy.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy.ini b/mypy.ini index b4b1a7b..c9bab94 100644 --- a/mypy.ini +++ b/mypy.ini @@ -17,7 +17,7 @@ ignore_missing_imports = True [mypy-OCP.*] ignore_missing_imports = True -[mypy-OCP-stubs.*] +[mypy-ocp-stubs.*] ignore_missing_imports = True [mypy-ocpsvg.*] From f077d72819529cee0dfefb58dc6ee2ee624fa1ae Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 23 Jan 2025 09:53:15 -0500 Subject: [PATCH 159/518] Added sort_by lambda Issue#485 --- src/build123d/topology/shape_core.py | 12 ++++++++++-- tests/test_direct_api/test_shape_list.py | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index b30e596..42fb793 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2624,7 +2624,9 @@ class ShapeList(list[T]): return ShapeList([s for shape in self for s in shape.solids()]) # type: ignore def sort_by( - self, sort_by: Axis | Edge | Wire | SortBy = Axis.Z, reverse: bool = False + self, + sort_by: Axis | Callable[[T], K] | Edge | Wire | SortBy = Axis.Z, + reverse: bool = False, ) -> ShapeList[T]: """sort by @@ -2639,7 +2641,11 @@ class ShapeList(list[T]): ShapeList: sorted list of objects """ - if isinstance(sort_by, Axis): + if callable(sort_by): + # If a callable is provided, use it directly as the key + objects = sorted(self, key=sort_by, reverse=reverse) + + elif isinstance(sort_by, Axis): if sort_by.wrapped is None: raise ValueError("Cannot sort by an empty axis") assert sort_by.location is not None @@ -2702,6 +2708,8 @@ class ShapeList(list[T]): key=lambda obj: obj.volume, # type: ignore reverse=reverse, ) + else: + raise ValueError("Invalid sort_by criteria provided") return ShapeList(objects) diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py index 45ec7eb..98139d8 100644 --- a/tests/test_direct_api/test_shape_list.py +++ b/tests/test_direct_api/test_shape_list.py @@ -79,6 +79,20 @@ class TestShapeList(unittest.TestCase): faces = Solid.make_box(1, 2, 3).faces() < SortBy.AREA self.assertAlmostEqual(faces[-1].area, 2, 5) + def test_sort_by_lambda(self): + c = Solid.make_cone(2, 1, 2) + flat_faces = c.faces().filter_by(GeomType.PLANE) + sorted_flat_faces = flat_faces.sort_by(lambda f: f.area) + smallest = sorted_flat_faces[0] + largest = sorted_flat_faces[-1] + + self.assertAlmostEqual(smallest.area, math.pi * 1**2, 5) + self.assertAlmostEqual(largest.area, math.pi * 2**2, 5) + + def test_sort_by_invalid(self): + with self.assertRaises(ValueError): + Solid.make_box(1, 1, 1).faces().sort_by(">Z") + def test_filter_by_geomtype(self): non_planar_faces = ( Solid.make_cylinder(1, 1).faces().filter_by(GeomType.PLANE, reverse=True) From 4f392c534a058c152ba04660613c32bd50dff1c4 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 23 Jan 2025 10:00:40 -0500 Subject: [PATCH 160/518] Exclude cadquery-ocp-stubs --- mypy.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mypy.ini b/mypy.ini index 2960c49..b014dd5 100644 --- a/mypy.ini +++ b/mypy.ini @@ -8,6 +8,9 @@ ignore_missing_imports = True [mypy-build123d.topology.jupyter_tools.*] ignore_missing_imports = True +[mypy-cadquery-ocp-stubs.*] +ignore_missing_imports = True + [mypy-IPython.*] ignore_missing_imports = True From 0625c77e4e355819a4b3a470e0ac50c29cc08e3a Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 23 Jan 2025 10:40:26 -0500 Subject: [PATCH 161/518] Updating sort_by docstring --- src/build123d/topology/shape_core.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 42fb793..d266f01 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2634,9 +2634,15 @@ class ShapeList(list[T]): objects. Args: - sort_by (SortBy, optional): sort criteria. Defaults to SortBy.Z. + sort_by (Axis | Callable[[T], K] | Edge | Wire | SortBy, optional): sort criteria. + Defaults to Axis.Z. reverse (bool, optional): flip order of sort. Defaults to False. + Raises: + ValueError: Cannot sort by an empty axis + ValueError: Cannot sort by an empty object + ValueError: Invalid sort_by criteria provided + Returns: ShapeList: sorted list of objects """ From 22611e1554c0a4877df8cfd264bdbfe8a355345e Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 23 Jan 2025 10:09:14 -0600 Subject: [PATCH 162/518] pyproject.toml -> move cadquery-ocp-stubs from [development] to [stubs] and exclude from [all] (optional dependencies) --- pyproject.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9daf205..4a71828 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,6 @@ ocp_vscode = [ # development dependencies development = [ - "cadquery-ocp-stubs >= 7.8, < 7.9", "wheel", "pytest", "pytest-cov", @@ -69,6 +68,11 @@ development = [ "black", ] +# typing stubs for the OCP CAD kernel +stubs = [ + "cadquery-ocp-stubs >= 7.8, < 7.9", +] + # dependency to run the pytest benchmarks benchmark = [ "pytest-benchmark", @@ -90,6 +94,7 @@ all = [ "build123d[development]", "build123d[benchmark]", "build123d[docs]", + # "build123d[stubs]", # excluded for now as mypy fails ] [tool.setuptools.packages.find] From 1740f388a5747df31cdf812c87026748218b5a81 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 23 Jan 2025 10:09:56 -0600 Subject: [PATCH 163/518] mypy.ini -> remove stubs exclusion attempt --- mypy.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/mypy.ini b/mypy.ini index 1faebf7..b014dd5 100644 --- a/mypy.ini +++ b/mypy.ini @@ -20,9 +20,6 @@ ignore_missing_imports = True [mypy-OCP.*] ignore_missing_imports = True -[mypy-ocp-stubs.*] -ignore_missing_imports = True - [mypy-ocpsvg.*] ignore_missing_imports = True From 4aee76f6c03e26dd412b45e4880c0430438e4185 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 24 Jan 2025 11:08:57 -0500 Subject: [PATCH 164/518] Added Edge.is_interior property Issue #816 --- src/build123d/topology/__init__.py | 14 ++++- src/build123d/topology/one_d.py | 73 +++++++++++++++++++++++++- tests/test_direct_api/test_edge.py | 12 ++++- tests/test_topo_explore.py | 84 ++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 4 deletions(-) diff --git a/src/build123d/topology/__init__.py b/src/build123d/topology/__init__.py index abee547..2bf01d3 100644 --- a/src/build123d/topology/__init__.py +++ b/src/build123d/topology/__init__.py @@ -51,8 +51,16 @@ from .utils import ( find_max_dimension, ) from .zero_d import Vertex, topo_explore_common_vertex -from .one_d import Edge, Wire, Mixin1D, edges_to_wires, topo_explore_connected_edges -from .two_d import Face, Shell, Mixin2D,sort_wires_by_build_order +from .one_d import ( + Edge, + Wire, + Mixin1D, + edges_to_wires, + topo_explore_connected_edges, + offset_topods_face, + topo_explore_connected_faces, +) +from .two_d import Face, Shell, Mixin2D, sort_wires_by_build_order from .three_d import Solid, Mixin3D from .composite import Compound, Curve, Sketch, Part @@ -79,7 +87,9 @@ __all__ = [ "Edge", "Wire", "edges_to_wires", + "offset_topods_face", "topo_explore_connected_edges", + "topo_explore_connected_faces", "Face", "Shell", "sort_wires_by_build_order", diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index b5a3acf..366cf51 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -66,7 +66,11 @@ from scipy.spatial import ConvexHull import OCP.TopAbs as ta from OCP.BRep import BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_CompCurve, BRepAdaptor_Curve -from OCP.BRepAlgoAPI import BRepAlgoAPI_Common, BRepAlgoAPI_Splitter +from OCP.BRepAlgoAPI import ( + BRepAlgoAPI_Common, + BRepAlgoAPI_Section, + BRepAlgoAPI_Splitter, +) from OCP.BRepBuilderAPI import ( BRepBuilderAPI_DisconnectedWire, BRepBuilderAPI_EmptyWire, @@ -80,6 +84,7 @@ from OCP.BRepExtrema import BRepExtrema_DistShapeShape from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepLib import BRepLib, BRepLib_FindSurface +from OCP.BRepOffset import BRepOffset_MakeOffset from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace from OCP.BRepProj import BRepProj_Projection @@ -134,6 +139,7 @@ from OCP.TopoDS import ( TopoDS, TopoDS_Compound, TopoDS_Edge, + TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Wire, @@ -223,6 +229,34 @@ class Mixin1D(Shape): raise ValueError("Can't determine direction of empty Edge or Wire") return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD + @property + def is_interior(self) -> bool: + """ + Check if the edge is an interior edge. + + An interior edge lies between surfaces that are part of the body (internal + to the geometry) and does not form part of the exterior boundary. + + Returns: + bool: True if the edge is an interior edge, False otherwise. + """ + # Find the faces connected to this edge and offset them + topods_face_pair = topo_explore_connected_faces(self) + offset_face_pair = [ + offset_topods_face(f, self.length / 100) for f in topods_face_pair + ] + + # Intersect the offset faces + sectionor = BRepAlgoAPI_Section( + offset_face_pair[0], offset_face_pair[1], PerformNow=False + ) + sectionor.Build() + face_intersection_result = sectionor.Shape() + + # If an edge was created the faces intersect and the edge is interior + explorer = TopExp_Explorer(face_intersection_result, ta.TopAbs_EDGE) + return explorer.More() + @property def length(self) -> float: """Edge or Wire length""" @@ -3004,6 +3038,15 @@ def edges_to_wires(edges: Iterable[Edge], tol: float = 1e-6) -> ShapeList[Wire]: return wires +def offset_topods_face(face: TopoDS_Face, amount: float) -> TopoDS_Shape: + """Offset a topods_face""" + offsetor = BRepOffset_MakeOffset() + offsetor.Initialize(face, Offset=amount, Tol=TOLERANCE) + offsetor.MakeOffsetShape() + + return offsetor.Shape() + + def topo_explore_connected_edges( edge: Edge, parent: Shape | None = None ) -> ShapeList[Edge]: @@ -3029,3 +3072,31 @@ def topo_explore_connected_edges( connected_edges.add(topods_edge) return ShapeList(Edge(e) for e in connected_edges) + + +def topo_explore_connected_faces( + edge: Edge, parent: Shape | None = None +) -> list[TopoDS_Face]: + """Given an edge extracted from a Shape, return the topods_faces connected to it""" + + parent = parent if parent is not None else edge.topo_parent + if parent is None: + raise ValueError("edge has no valid parent") + + # make a edge --> faces mapping + edge_face_map = TopTools_IndexedDataMapOfShapeListOfShape() + TopExp.MapShapesAndAncestors_s( + parent.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map + ) + + # Query the map + faces = [] + if edge_face_map.Contains(edge.wrapped): + face_list = edge_face_map.FindFromKey(edge.wrapped) + for face in face_list: + faces.append(TopoDS.Face_s(face)) + + if len(faces) != 2: + raise RuntimeError("Invalid # of faces connected to this edge") + + return faces diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 3589ec0..3eb2da5 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -29,9 +29,11 @@ license: import math import unittest -from build123d.build_enums import AngularDirection +from build123d.build_enums import AngularDirection, GeomType, Transition from build123d.geometry import Axis, Plane, Vector from build123d.objects_curve import CenterArc, EllipticalCenterArc +from build123d.objects_sketch import Circle, Rectangle, RegularPolygon +from build123d.operations_generic import sweep from build123d.topology import Edge @@ -284,6 +286,14 @@ class TestEdge(unittest.TestCase): with self.assertRaises(TypeError): Edge(direction=(1, 0, 0)) + def test_is_interior(self): + path = RegularPolygon(5, 5).face().outer_wire() + profile = path.location_at(0) * (Circle(0.6) & Rectangle(2, 1)) + target = sweep(profile, path, transition=Transition.RIGHT) + inside_edges = target.edges().filter_by(lambda e: e.is_interior) + self.assertEqual(len(inside_edges), 5) + self.assertTrue(all(e.geom_type == GeomType.ELLIPSE for e in inside_edges)) + if __name__ == "__main__": unittest.main() diff --git a/tests/test_topo_explore.py b/tests/test_topo_explore.py index 75b4e3a..8524795 100644 --- a/tests/test_topo_explore.py +++ b/tests/test_topo_explore.py @@ -1,6 +1,11 @@ from typing import Optional import unittest +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeFace +from OCP.GProp import GProp_GProps +from OCP.BRepGProp import BRepGProp +from OCP.gp import gp_Pnt, gp_Pln +from OCP.TopoDS import TopoDS_Face, TopoDS_Shape from build123d.build_enums import SortBy from build123d.objects_part import Box @@ -12,8 +17,11 @@ from build123d.geometry import ( from build123d.topology import ( Edge, Face, + Shell, Wire, + offset_topods_face, topo_explore_connected_edges, + topo_explore_connected_faces, topo_explore_common_vertex, ) @@ -78,6 +86,17 @@ class TestTopoExplore(DirectApiTestCase): connected_edges = topo_explore_connected_edges(face.edges()[0]) self.assertEqual(len(connected_edges), 1) + def test_topo_explore_connected_edges_errors(self): + # No parent case + with self.assertRaises(ValueError): + topo_explore_connected_edges(Edge()) + + # Null edge case + null_edge = Wire.make_rect(1, 1).edges()[0] + null_edge.wrapped = None + with self.assertRaises(ValueError): + topo_explore_connected_edges(null_edge) + def test_topo_explore_common_vertex(self): triangle = Face( Wire( @@ -98,5 +117,70 @@ class TestTopoExplore(DirectApiTestCase): ) +class TestOffsetTopodsFace(unittest.TestCase): + def setUp(self): + # Create a simple planar face for testing + self.face = Face.make_rect(1, 1).wrapped + + def get_face_center(self, face: TopoDS_Face) -> tuple: + """Calculate the center of a face""" + props = GProp_GProps() + BRepGProp.SurfaceProperties_s(face, props) + center = props.CentreOfMass() + return (center.X(), center.Y(), center.Z()) + + def test_offset_topods_face(self): + # Offset the face by a positive amount + offset_amount = 1.0 + original_center = self.get_face_center(self.face) + offset_shape = offset_topods_face(self.face, offset_amount) + offset_center = self.get_face_center(offset_shape) + self.assertIsInstance(offset_shape, TopoDS_Shape) + self.assertAlmostEqual(Vector(0, 0, 1), offset_center) + + # Offset the face by a negative amount + offset_amount = -1.0 + offset_shape = offset_topods_face(self.face, offset_amount) + offset_center = self.get_face_center(offset_shape) + self.assertIsInstance(offset_shape, TopoDS_Shape) + self.assertAlmostEqual(Vector(0, 0, -1), offset_center) + + def test_offset_topods_face_zero(self): + # Offset the face by zero amount + offset_amount = 0.0 + original_center = self.get_face_center(self.face) + offset_shape = offset_topods_face(self.face, offset_amount) + offset_center = self.get_face_center(offset_shape) + self.assertIsInstance(offset_shape, TopoDS_Shape) + self.assertAlmostEqual(Vector(original_center), offset_center) + + +class TestTopoExploreConnectedFaces(unittest.TestCase): + def setUp(self): + # Create a shell with 4 faces + walls = Shell.extrude(Wire.make_rect(1, 1), (0, 0, 1)) + diagonal = Axis((0, 0, 0), (1, 1, 0)) + + # Extract the edge that is connected to two faces + self.connected_edge = walls.edges().filter_by(Axis.Z).sort_by(diagonal)[-1] + + # Create an edge that is only connected to one face + self.unconnected_edge = Face.make_rect(1, 1).edges()[0] + + def test_topo_explore_connected_faces(self): + # Add the edge to the faces + faces = topo_explore_connected_faces(self.connected_edge) + self.assertEqual(len(faces), 2) + + def test_topo_explore_connected_faces_invalid(self): + # Test with an edge that is not connected to two faces + with self.assertRaises(RuntimeError): + topo_explore_connected_faces(self.unconnected_edge) + + # No parent case + with self.assertRaises(ValueError): + topo_explore_connected_faces(Edge()) + + if __name__ == "__main__": unittest.main() From d2d3580fc8d9eab01757891d2bd3a9d6514d2ec7 Mon Sep 17 00:00:00 2001 From: Victor Poughon Date: Thu, 19 Dec 2024 11:58:54 +0100 Subject: [PATCH 165/518] jupyter_tools: move template to separate file --- src/build123d/jupyter_tools.py | 151 ++----------------------------- src/build123d/template_render.js | 137 ++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 145 deletions(-) create mode 100644 src/build123d/template_render.js diff --git a/src/build123d/jupyter_tools.py b/src/build123d/jupyter_tools.py index 0fd9f64..830f603 100644 --- a/src/build123d/jupyter_tools.py +++ b/src/build123d/jupyter_tools.py @@ -25,156 +25,17 @@ license: # pylint: disable=no-name-in-module from json import dumps +import os +from string import Template from typing import Any, Dict, List from IPython.display import Javascript from vtkmodules.vtkIOXML import vtkXMLPolyDataWriter DEFAULT_COLOR = [1, 0.8, 0, 1] -TEMPLATE_RENDER = """ - -function render(data, parent_element, ratio){{ - - // Initial setup - const renderWindow = vtk.Rendering.Core.vtkRenderWindow.newInstance(); - const renderer = vtk.Rendering.Core.vtkRenderer.newInstance({{ background: [1, 1, 1 ] }}); - renderWindow.addRenderer(renderer); - - // iterate over all children children - for (var el of data){{ - var trans = el.position; - var rot = el.orientation; - var rgba = el.color; - var shape = el.shape; - - // load the inline data - var reader = vtk.IO.XML.vtkXMLPolyDataReader.newInstance(); - const textEncoder = new TextEncoder(); - reader.parseAsArrayBuffer(textEncoder.encode(shape)); - - // setup actor,mapper and add - const mapper = vtk.Rendering.Core.vtkMapper.newInstance(); - mapper.setInputConnection(reader.getOutputPort()); - mapper.setResolveCoincidentTopologyToPolygonOffset(); - mapper.setResolveCoincidentTopologyPolygonOffsetParameters(0.5,100); - - const actor = vtk.Rendering.Core.vtkActor.newInstance(); - actor.setMapper(mapper); - - // set color and position - actor.getProperty().setColor(rgba.slice(0,3)); - actor.getProperty().setOpacity(rgba[3]); - - actor.rotateZ(rot[2]*180/Math.PI); - actor.rotateY(rot[1]*180/Math.PI); - actor.rotateX(rot[0]*180/Math.PI); - - actor.setPosition(trans); - - renderer.addActor(actor); - - }}; - - renderer.resetCamera(); - - const openglRenderWindow = vtk.Rendering.OpenGL.vtkRenderWindow.newInstance(); - renderWindow.addView(openglRenderWindow); - - // Add output to the "parent element" - var container; - var dims; - - if(typeof(parent_element.appendChild) !== "undefined"){{ - container = document.createElement("div"); - parent_element.appendChild(container); - dims = parent_element.getBoundingClientRect(); - }}else{{ - container = parent_element.append("
").children("div:last-child").get(0); - dims = parent_element.get(0).getBoundingClientRect(); - }}; - - openglRenderWindow.setContainer(container); - - // handle size - if (ratio){{ - openglRenderWindow.setSize(dims.width, dims.width*ratio); - }}else{{ - openglRenderWindow.setSize(dims.width, dims.height); - }}; - - // Interaction setup - const interact_style = vtk.Interaction.Style.vtkInteractorStyleManipulator.newInstance(); - - const manips = {{ - rot: vtk.Interaction.Manipulators.vtkMouseCameraTrackballRotateManipulator.newInstance(), - pan: vtk.Interaction.Manipulators.vtkMouseCameraTrackballPanManipulator.newInstance(), - zoom1: vtk.Interaction.Manipulators.vtkMouseCameraTrackballZoomManipulator.newInstance(), - zoom2: vtk.Interaction.Manipulators.vtkMouseCameraTrackballZoomManipulator.newInstance(), - roll: vtk.Interaction.Manipulators.vtkMouseCameraTrackballRollManipulator.newInstance(), - }}; - - manips.zoom1.setControl(true); - manips.zoom2.setScrollEnabled(true); - manips.roll.setShift(true); - manips.pan.setButton(2); - - for (var k in manips){{ - interact_style.addMouseManipulator(manips[k]); - }}; - - const interactor = vtk.Rendering.Core.vtkRenderWindowInteractor.newInstance(); - interactor.setView(openglRenderWindow); - interactor.initialize(); - interactor.bindEvents(container); - interactor.setInteractorStyle(interact_style); - - // Orientation marker - - const axes = vtk.Rendering.Core.vtkAnnotatedCubeActor.newInstance(); - axes.setXPlusFaceProperty({{text: '+X'}}); - axes.setXMinusFaceProperty({{text: '-X'}}); - axes.setYPlusFaceProperty({{text: '+Y'}}); - axes.setYMinusFaceProperty({{text: '-Y'}}); - axes.setZPlusFaceProperty({{text: '+Z'}}); - axes.setZMinusFaceProperty({{text: '-Z'}}); - - const orientationWidget = vtk.Interaction.Widgets.vtkOrientationMarkerWidget.newInstance({{ - actor: axes, - interactor: interactor }}); - orientationWidget.setEnabled(true); - orientationWidget.setViewportCorner(vtk.Interaction.Widgets.vtkOrientationMarkerWidget.Corners.BOTTOM_LEFT); - orientationWidget.setViewportSize(0.2); - -}}; -""" - -TEMPLATE = ( - TEMPLATE_RENDER - + """ - -new Promise( - function(resolve, reject) - {{ - if (typeof(require) !== "undefined" ){{ - require.config({{ - "paths": {{"vtk": "https://unpkg.com/vtk"}}, - }}); - require(["vtk"], resolve, reject); - }} else if ( typeof(vtk) === "undefined" ){{ - var script = document.createElement("script"); - script.onload = resolve; - script.onerror = reject; - script.src = "https://unpkg.com/vtk.js"; - document.head.appendChild(script); - }} else {{ resolve() }}; - }} -).then(() => {{ - var parent_element = {element}; - var data = {data}; - render(data, parent_element, {ratio}); -}}); -""" -) +dir_path = os.path.dirname(os.path.realpath(__file__)) +with open(os.path.join(dir_path, "template_render.js"), encoding="utf-8") as f: + TEMPLATE_JS = f.read() def to_vtkpoly_string( @@ -229,6 +90,6 @@ def display(shape: Any) -> Javascript: "orientation": [0, 0, 0], } ) - code = TEMPLATE.format(data=dumps(payload), element="element", ratio=0.5) + code = Template(TEMPLATE_JS).substitute(data=dumps(payload), element="element", ratio=0.5) return Javascript(code) diff --git a/src/build123d/template_render.js b/src/build123d/template_render.js new file mode 100644 index 0000000..8d287f5 --- /dev/null +++ b/src/build123d/template_render.js @@ -0,0 +1,137 @@ +function render(data, parent_element, ratio){ + + // Initial setup + const renderWindow = vtk.Rendering.Core.vtkRenderWindow.newInstance(); + const renderer = vtk.Rendering.Core.vtkRenderer.newInstance({ background: [1, 1, 1 ] }); + renderWindow.addRenderer(renderer); + + // iterate over all children children + for (var el of data){ + var trans = el.position; + var rot = el.orientation; + var rgba = el.color; + var shape = el.shape; + + // load the inline data + var reader = vtk.IO.XML.vtkXMLPolyDataReader.newInstance(); + const textEncoder = new TextEncoder(); + reader.parseAsArrayBuffer(textEncoder.encode(shape)); + + // setup actor,mapper and add + const mapper = vtk.Rendering.Core.vtkMapper.newInstance(); + mapper.setInputConnection(reader.getOutputPort()); + mapper.setResolveCoincidentTopologyToPolygonOffset(); + mapper.setResolveCoincidentTopologyPolygonOffsetParameters(0.5,100); + + const actor = vtk.Rendering.Core.vtkActor.newInstance(); + actor.setMapper(mapper); + + // set color and position + actor.getProperty().setColor(rgba.slice(0,3)); + actor.getProperty().setOpacity(rgba[3]); + + actor.rotateZ(rot[2]*180/Math.PI); + actor.rotateY(rot[1]*180/Math.PI); + actor.rotateX(rot[0]*180/Math.PI); + + actor.setPosition(trans); + + renderer.addActor(actor); + + }; + + renderer.resetCamera(); + + const openglRenderWindow = vtk.Rendering.OpenGL.vtkRenderWindow.newInstance(); + renderWindow.addView(openglRenderWindow); + + // Add output to the "parent element" + var container; + var dims; + + if(typeof(parent_element.appendChild) !== "undefined"){ + container = document.createElement("div"); + parent_element.appendChild(container); + dims = parent_element.getBoundingClientRect(); + }else{ + container = parent_element.append("
").children("div:last-child").get(0); + dims = parent_element.get(0).getBoundingClientRect(); + }; + + openglRenderWindow.setContainer(container); + + // handle size + if (ratio){ + openglRenderWindow.setSize(dims.width, dims.width*ratio); + }else{ + openglRenderWindow.setSize(dims.width, dims.height); + }; + + // Interaction setup + const interact_style = vtk.Interaction.Style.vtkInteractorStyleManipulator.newInstance(); + + const manips = { + rot: vtk.Interaction.Manipulators.vtkMouseCameraTrackballRotateManipulator.newInstance(), + pan: vtk.Interaction.Manipulators.vtkMouseCameraTrackballPanManipulator.newInstance(), + zoom1: vtk.Interaction.Manipulators.vtkMouseCameraTrackballZoomManipulator.newInstance(), + zoom2: vtk.Interaction.Manipulators.vtkMouseCameraTrackballZoomManipulator.newInstance(), + roll: vtk.Interaction.Manipulators.vtkMouseCameraTrackballRollManipulator.newInstance(), + }; + + manips.zoom1.setControl(true); + manips.zoom2.setScrollEnabled(true); + manips.roll.setShift(true); + manips.pan.setButton(2); + + for (var k in manips){ + interact_style.addMouseManipulator(manips[k]); + }; + + const interactor = vtk.Rendering.Core.vtkRenderWindowInteractor.newInstance(); + interactor.setView(openglRenderWindow); + interactor.initialize(); + interactor.bindEvents(container); + interactor.setInteractorStyle(interact_style); + + // Orientation marker + + const axes = vtk.Rendering.Core.vtkAnnotatedCubeActor.newInstance(); + axes.setXPlusFaceProperty({text: '+X'}); + axes.setXMinusFaceProperty({text: '-X'}); + axes.setYPlusFaceProperty({text: '+Y'}); + axes.setYMinusFaceProperty({text: '-Y'}); + axes.setZPlusFaceProperty({text: '+Z'}); + axes.setZMinusFaceProperty({text: '-Z'}); + + const orientationWidget = vtk.Interaction.Widgets.vtkOrientationMarkerWidget.newInstance({ + actor: axes, + interactor: interactor }); + orientationWidget.setEnabled(true); + orientationWidget.setViewportCorner(vtk.Interaction.Widgets.vtkOrientationMarkerWidget.Corners.BOTTOM_LEFT); + orientationWidget.setViewportSize(0.2); + +}; + + +new Promise( + function(resolve, reject) + { + if (typeof(require) !== "undefined" ){ + require.config({ + "paths": {"vtk": "https://unpkg.com/vtk"}, + }); + require(["vtk"], resolve, reject); + } else if ( typeof(vtk) === "undefined" ){ + var script = document.createElement("script"); + script.onload = resolve; + script.onerror = reject; + script.src = "https://unpkg.com/vtk.js"; + document.head.appendChild(script); + } else { resolve() }; + } +).then(() => { + // element, data and ratio are templated by python + var parent_element = $element; + var data = $data; + render(data, parent_element, $ratio); +}); From 5204b763eab65363eb6640f896d5fc4d1a1afa20 Mon Sep 17 00:00:00 2001 From: Victor Poughon Date: Sun, 19 Jan 2025 12:49:55 +0100 Subject: [PATCH 166/518] jupyter_tools: fix async render issue using a unique id div --- src/build123d/jupyter_tools.py | 16 ++++++++++------ src/build123d/template_render.js | 27 ++++++++++----------------- src/build123d/topology/shape_core.py | 6 +++--- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/build123d/jupyter_tools.py b/src/build123d/jupyter_tools.py index 830f603..0b3884c 100644 --- a/src/build123d/jupyter_tools.py +++ b/src/build123d/jupyter_tools.py @@ -28,7 +28,7 @@ from json import dumps import os from string import Template from typing import Any, Dict, List -from IPython.display import Javascript +from IPython.display import HTML from vtkmodules.vtkIOXML import vtkXMLPolyDataWriter DEFAULT_COLOR = [1, 0.8, 0, 1] @@ -65,8 +65,8 @@ def to_vtkpoly_string( return writer.GetOutputString() -def display(shape: Any) -> Javascript: - """display +def shape_to_html(shape: Any) -> HTML: + """shape_to_html Args: shape (Shape): object to display @@ -75,7 +75,7 @@ def display(shape: Any) -> Javascript: ValueError: not a valid Shape Returns: - Javascript: code + HTML: html code """ payload: list[dict[str, Any]] = [] @@ -90,6 +90,10 @@ def display(shape: Any) -> Javascript: "orientation": [0, 0, 0], } ) - code = Template(TEMPLATE_JS).substitute(data=dumps(payload), element="element", ratio=0.5) - return Javascript(code) + # A new div with a unique id, plus the JS code templated with the id + div_id = "shape-" + str(id(shape)) + code = Template(TEMPLATE_JS).substitute(data=dumps(payload), div_id=div_id, ratio=0.5) + html = HTML(f"
") + + return html diff --git a/src/build123d/template_render.js b/src/build123d/template_render.js index 8d287f5..afc7bd3 100644 --- a/src/build123d/template_render.js +++ b/src/build123d/template_render.js @@ -1,4 +1,4 @@ -function render(data, parent_element, ratio){ +function render(data, div_id, ratio){ // Initial setup const renderWindow = vtk.Rendering.Core.vtkRenderWindow.newInstance(); @@ -45,18 +45,9 @@ function render(data, parent_element, ratio){ const openglRenderWindow = vtk.Rendering.OpenGL.vtkRenderWindow.newInstance(); renderWindow.addView(openglRenderWindow); - // Add output to the "parent element" - var container; - var dims; - - if(typeof(parent_element.appendChild) !== "undefined"){ - container = document.createElement("div"); - parent_element.appendChild(container); - dims = parent_element.getBoundingClientRect(); - }else{ - container = parent_element.append("
").children("div:last-child").get(0); - dims = parent_element.get(0).getBoundingClientRect(); - }; + // Get the div container + const container = document.getElementById(div_id); + const dims = container.parentElement.getBoundingClientRect(); openglRenderWindow.setContainer(container); @@ -130,8 +121,10 @@ new Promise( } else { resolve() }; } ).then(() => { - // element, data and ratio are templated by python - var parent_element = $element; - var data = $data; - render(data, parent_element, $ratio); + // data, div_id and ratio are templated by python + const div_id = "$div_id"; + const data = $data; + const ratio = $ratio; + + render(data, div_id, ratio); }); diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index d266f01..7ebeaae 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2117,12 +2117,12 @@ class Shape(NodeMixin, Generic[TOPODS]): return (vertices, edges) - def _repr_javascript_(self): + def _repr_html_(self): """Jupyter 3D representation support""" - from build123d.jupyter_tools import display + from build123d.jupyter_tools import shape_to_html - return display(self)._repr_javascript_() + return shape_to_html(self)._repr_html_() class Comparable(ABC): From f8d86e172269de1014029d053e9e37a051d7bbe2 Mon Sep 17 00:00:00 2001 From: Victor Poughon Date: Fri, 24 Jan 2025 19:04:35 +0100 Subject: [PATCH 167/518] test: update test_jupyter.py --- tests/test_direct_api/test_jupyter.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_direct_api/test_jupyter.py b/tests/test_direct_api/test_jupyter.py index 51053a4..7ae4074 100644 --- a/tests/test_direct_api/test_jupyter.py +++ b/tests/test_direct_api/test_jupyter.py @@ -29,28 +29,28 @@ license: import unittest from build123d.geometry import Vector -from build123d.jupyter_tools import to_vtkpoly_string, display +from build123d.jupyter_tools import to_vtkpoly_string, shape_to_html from build123d.topology import Solid class TestJupyter(unittest.TestCase): - def test_repr_javascript(self): + def test_repr_html(self): shape = Solid.make_box(1, 1, 1) - # Test no exception on rendering to js - js1 = shape._repr_javascript_() + # Test no exception on rendering to html + html1 = shape._repr_html_() - assert "function render" in js1 + assert "function render" in html1 def test_display_error(self): with self.assertRaises(AttributeError): - display(Vector()) + shape_to_html(Vector()) with self.assertRaises(ValueError): to_vtkpoly_string("invalid") with self.assertRaises(ValueError): - display("invalid") + shape_to_html("invalid") if __name__ == "__main__": From edf1dbdaa1fdfa0fcf7ae811a8b55c023fa65a2f Mon Sep 17 00:00:00 2001 From: Victor Poughon Date: Tue, 21 Jan 2025 18:39:40 +0100 Subject: [PATCH 168/518] jupyter_tools: use uuid for unique shape id --- src/build123d/jupyter_tools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/build123d/jupyter_tools.py b/src/build123d/jupyter_tools.py index 0b3884c..1299a73 100644 --- a/src/build123d/jupyter_tools.py +++ b/src/build123d/jupyter_tools.py @@ -26,6 +26,7 @@ license: # pylint: disable=no-name-in-module from json import dumps import os +import uuid from string import Template from typing import Any, Dict, List from IPython.display import HTML @@ -92,7 +93,7 @@ def shape_to_html(shape: Any) -> HTML: ) # A new div with a unique id, plus the JS code templated with the id - div_id = "shape-" + str(id(shape)) + div_id = 'shape-' + uuid.uuid4().hex[:8] code = Template(TEMPLATE_JS).substitute(data=dumps(payload), div_id=div_id, ratio=0.5) html = HTML(f"
") From 0da16cf7e148775348879433e0805497c40746ba Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 24 Jan 2025 15:19:15 -0500 Subject: [PATCH 169/518] Improving OpenSCAD example --- docs/OpenSCAD.rst | 103 +++++++++++++++++++++++++++++--------- docs/assets/AngleIron.png | Bin 0 -> 6848 bytes 2 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 docs/assets/AngleIron.png diff --git a/docs/OpenSCAD.rst b/docs/OpenSCAD.rst index 5d2d0d2..899cee9 100644 --- a/docs/OpenSCAD.rst +++ b/docs/OpenSCAD.rst @@ -25,7 +25,8 @@ its design philosophy encourages a fundamentally different, often more efficient starting with lower-dimensional entities like faces and edges and then transforming them into solids. -### Why Transition Away from CSG? +Why Transition Away from CSG? +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ CSG is a powerful method for creating 3D models, but it has limitations when dealing with complex designs. build123d’s approach offers several advantages: @@ -75,7 +76,8 @@ using operations such as: between shapes. - **Sweeping**: Moves a 2D profile along a defined path to create a 3D form. -### Refining the Model +Refining the Model +^^^^^^^^^^^^^^^^^^ After creating the initial 3D shape, you can refine the model by adding details or making modifications using build123d's advanced features, such as: @@ -84,44 +86,87 @@ modifications using build123d's advanced features, such as: - **Boolean Operations**: Combine, subtract, or intersect 3D shapes to achieve the desired geometry. -### Example Comparison +Example Comparison +^^^^^^^^^^^^^^^^^^ To illustrate the advantages of this approach, compare a simple model in OpenSCAD and -build123d: +build123d of a piece of angle iron: **OpenSCAD Approach** .. code-block:: openscad - // A basic cylinder with a hole + $fn = 100; // Increase the resolution for smooth fillets + + // Dimensions + length = 100; // 10 cm long + width = 30; // 3 cm wide + thickness = 4; // 4 mm thick + fillet = 5; // 5 mm fillet radius + delta = 0.001; // a small number + + // Create the angle iron difference() { - cylinder(r=10, h=20); - translate([0, 0, 5]) cylinder(r=5, h=20); + // Outer shape + cube([width, length, width], center = false); + // Inner shape + union() { + translate([thickness+fillet,-delta,thickness+fillet]) + rotate([-90,0,0]) + cylinder(length+2*delta, fillet,fillet); + translate([thickness,-delta,thickness+fillet]) + cube([width-thickness,length+2*delta,width-fillet],center=false); + translate([thickness+fillet,-delta,thickness]) + cube([width-fillet,length+2*delta,width-thickness],center=false); + + } } **build123d Approach** .. code-block:: python - from build123d import * - - # In Builder mode - with BuildPart() as cylinder_with_hole: - with BuildSketch(): - Circle(10) - extrude(amount=20) - with BuildSketch(cylinder_with_hole.faces().sort_by(Axis.Z).last): - Circle(5) - extrude(amount=-15, mode=Mode.SUBTRACT) - - # In Algebra mode - cyl = extrude(Circle(10), 20) - cyl -= extrude(Plane(cyl.faces().sort_by(Axis.Z)[-1]) * Circle + # Builder mode + with BuildPart() as angle_iron: + with BuildSketch() as profile: + Rectangle(3 * CM, 4 * MM, align=Align.MIN) + Rectangle(4 * MM, 3 * CM, align=Align.MIN) + extrude(amount=10 * CM) + fillet(angle_iron.edges().filter_by(lambda e: e.is_interior), 5 * MM) -This approach emphasizes creating a 2D profile (such as the **Circle**) and then applying a -3D operation (like **extrude**) to achieve the desired result. Topological features of the -part under construction are extracted and used as references for adding further details. +.. code-block:: python + + # Algebra mode + profile = Rectangle(3 * CM, 4 * MM, align=Align.MIN) + profile += Rectangle(4 * MM, 3 * CM, align=Align.MIN) + angle_iron = extrude(profile, 10 * CM) + angle_iron = fillet(angle_iron.edges().filter_by(lambda e: e.is_interior), 5 * MM) + +.. image:: ./assets/AngleIron.png + +OpenSCAD and build123d offer distinct paradigms for creating 3D models, as demonstrated +by the angle iron example. OpenSCAD relies on Constructive Solid Geometry (CSG) operations, +combining and subtracting 3D shapes like cubes and cylinders. Fillets are approximated by +manually adding high-resolution cylinders, making adjustments cumbersome and less precise. +This static approach can handle simple models but becomes challenging for complex or iterative designs. + +In contrast, build123d emphasizes a profile-driven workflow. It starts with a 2D sketch, +defining the geometry’s outline, which is then extruded or otherwise transformed into a +3D model. Features like fillets are applied dynamically by querying topological elements, +such as edges, using intuitive filtering methods. This approach ensures precision and +flexibility, making changes straightforward without the need for manual repositioning or realignment. + +The build123d methodology is computationally efficient, leveraging mathematical precision +for features like fillets. By separating the design into manageable steps—sketching, extruding, +and refining—it aligns with traditional CAD practices and enhances readability, modularity, +and maintainability. Unlike OpenSCAD, build123d’s dynamic querying of topological features +allows for easy updates and adjustments, making it better suited for modern, complex, and +iterative design workflows. + +In summary, build123d’s sketch-based paradigm and topological querying capabilities provide +superior precision, flexibility, and efficiency compared to OpenSCAD’s static, CSG-centric +approach, making it a better choice for robust and adaptable CAD modeling. Tips for Transitioning ---------------------- @@ -134,9 +179,17 @@ Tips for Transitioning inside or outside fillets and chamfers to vertices and edges of an existing part with precision. +- **Operational Equivalency and Beyond**: Build123d provides equivalents to almost all + features available in OpenSCAD, with the exception of the 3D **minkowski** operation. + However, a 2D equivalent, **make_hull**, is available in build123d. Beyond operational + equivalency, build123d offers a wealth of additional functionality, including advanced + features like topological queries, dynamic filtering, and robust tools for creating complex + geometries. By exploring build123d's extensive operations, you can unlock new possibilities + and take your designs far beyond the capabilities of OpenSCAD. + - **Explore the Documentation**: Dive into build123d’s comprehensive API documentation to unlock its full potential and discover advanced features. - + By shifting your design mindset from solid-based CSG to a profile-driven approach, you can fully harness build123d's capabilities to create precise, efficient, and complex models. Welcome aboard, and happy designing! diff --git a/docs/assets/AngleIron.png b/docs/assets/AngleIron.png new file mode 100644 index 0000000000000000000000000000000000000000..1a734f9159fea24f00aadbb1a50802d41c8d09f0 GIT binary patch literal 6848 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 literal 0 HcmV?d00001 From 9f5b4eaa67b91e37bce1ba6082dee6255a6ce463 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 24 Jan 2025 19:50:16 -0500 Subject: [PATCH 170/518] Added section on moving shapes --- docs/index.rst | 1 + docs/moving_objects.rst | 130 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 docs/moving_objects.rst diff --git a/docs/index.rst b/docs/index.rst index 7a76273..beec8ec 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -108,6 +108,7 @@ Table Of Contents key_concepts.rst key_concepts_builder.rst key_concepts_algebra.rst + moving_objects.rst OpenSCAD.rst introductory_examples.rst tutorials.rst diff --git a/docs/moving_objects.rst b/docs/moving_objects.rst new file mode 100644 index 0000000..088973c --- /dev/null +++ b/docs/moving_objects.rst @@ -0,0 +1,130 @@ +Moving Objects +============== + +In build123d, there are several methods to move objects. These methods vary +based on the mode of operation and provide flexibility for object placement +and orientation. Below, we outline the three main approaches to moving objects: +builder mode, algebra mode, and direct manipulation methods. + +Builder Mode +------------ +In builder mode, object locations are defined before the objects themselves are +created. This approach ensures that objects are positioned correctly during the +construction process. The following tools are commonly used to specify locations: + +1. :class:`~build_common.Locations` Use this to define a specific location for the objects within the `with` block. +2. :class:`~build_common.GridLocations` Arrange objects in a grid pattern. +3. :class:`~build_common.PolarLocations` Position objects in a circular pattern. +4. :class:`~build_common.HexLocations` Arrange objects in a hexagonal grid. + +.. note:: + The location(s) of an object must be defined prior to its creation when using builder mode. + +Example: + +.. code-block:: python + + with Locations((10, 20, 30)): + Box(5, 5, 5) + +Algebra Mode +------------ +In algebra mode, object movement is expressed using algebraic operations. The +:class:`~geometry.Pos` function, short for Position, represents a location, which can be combined +with objects or planes to define placement. + +1. ``Pos() * shape``: Applies a position to a shape. +2. ``Plane() * Pos() * shape``: Combines a plane with a position and applies it to a shape. + +Rotation is an important concept in this mode. A :class:`~geometry.Rotation` represents a location +with orientation values set, which can be used to define a new location or modify +an existing one. + +Example: + +.. code-block:: python + + rotated_box = Rotation(45, 0, 0) * box + +Direct Manipulation Methods +--------------------------- +The following methods allow for direct manipulation of a shape's location and orientation +after it has been created. These methods offer a mix of absolute and relative transformations. + +Position +^^^^^^^^ +- **Absolute Position:** Set the position directly. + +.. code-block:: python + + shape.position = (x, y, z) + +- **Relative Position:** Adjust the position incrementally. + +.. code-block:: python + + shape.position += (x, y, z) + shape.position -= (x, y, z) + + +Orientation +^^^^^^^^^^^ +- **Absolute Orientation:** Set the orientation directly. + +.. code-block:: python + + shape.orientation = (X, Y, Z) + +- **Relative Orientation:** Adjust the orientation incrementally. + +.. code-block:: python + + shape.orientation += (X, Y, Z) + shape.orientation -= (X, Y, Z) + +Movement Methods +^^^^^^^^^^^^^^^^ +- **Relative Move:** + +.. code-block:: python + + shape.move(Location) + +- **Relative Move of Copy:** + +.. code-block:: python + + relocated_shape = shape.moved(Location) + +- **Absolute Move:** + +.. code-block:: python + + shape.locate(Location) + +- **Absolute Move of Copy:** + +.. code-block:: python + + relocated_shape = shape.located(Location) + + +Transformation a.k.a. Translation and Rotation +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. note:: + These methods don't work in the same way as the previous methods in that they don't just change + the object's internal :class:`~geometry.Location` but transform the base object itself which + is quite slow and potentially problematic. + +- **Translation:** Move a shape relative to its current position. + +.. code-block:: python + + relocated_shape = shape.translate(x, y, z) + +- **Rotation:** Rotate a shape around a specified axis by a given angle. + +.. code-block:: python + + rotated_shape = shape.rotate(Axis, angle_in_degrees) From c47c81a89304b46019d12dafc170d7f4bb29b1ba Mon Sep 17 00:00:00 2001 From: snoyer Date: Sat, 25 Jan 2025 12:45:47 +0400 Subject: [PATCH 171/518] allow to filter and group by property --- src/build123d/topology/shape_core.py | 11 +++++++++-- tests/test_direct_api/test_shape_list.py | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 7ebeaae..0344da6 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2351,7 +2351,7 @@ class ShapeList(list[T]): def filter_by( self, - filter_by: ShapePredicate | Axis | Plane | GeomType, + filter_by: ShapePredicate | Axis | Plane | GeomType | property, reverse: bool = False, tolerance: float = 1e-5, ) -> ShapeList[T]: @@ -2446,6 +2446,8 @@ class ShapeList(list[T]): # convert input to callable predicate if callable(filter_by): predicate = filter_by + elif isinstance(filter_by, property): + predicate = filter_by.__get__ elif isinstance(filter_by, Axis): predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) elif isinstance(filter_by, Plane): @@ -2524,7 +2526,9 @@ class ShapeList(list[T]): def group_by( self, - group_by: Callable[[Shape], K] | Axis | Edge | Wire | SortBy = Axis.Z, + group_by: ( + Callable[[Shape], K] | Axis | Edge | Wire | SortBy | property + ) = Axis.Z, reverse=False, tol_digits=6, ) -> GroupBy[T, K]: @@ -2594,6 +2598,9 @@ class ShapeList(list[T]): elif callable(group_by): key_f = group_by + elif isinstance(group_by, property): + key_f = group_by.__get__ + else: raise ValueError(f"Unsupported group_by function: {group_by}") diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py index 98139d8..4892e5e 100644 --- a/tests/test_direct_api/test_shape_list.py +++ b/tests/test_direct_api/test_shape_list.py @@ -89,6 +89,12 @@ class TestShapeList(unittest.TestCase): self.assertAlmostEqual(smallest.area, math.pi * 1**2, 5) self.assertAlmostEqual(largest.area, math.pi * 2**2, 5) + def test_sort_by_property(self): + box1 = Box(2, 2, 2) + box2 = Box(2, 2, 2).translate((1, 1, 1)) + assert len((box1 + box2).edges().filter_by(Edge.is_interior)) == 6 + assert len((box1 - box2).edges().filter_by(Edge.is_interior)) == 3 + def test_sort_by_invalid(self): with self.assertRaises(ValueError): Solid.make_box(1, 1, 1).faces().sort_by(">Z") @@ -187,6 +193,17 @@ class TestShapeList(unittest.TestCase): self.assertEqual([len(group) for group in result], [1, 3, 2]) + def test_group_by_property(self): + box1 = Box(2, 2, 2) + box2 = Box(2, 2, 2).translate((1, 1, 1)) + g1 = (box1 + box2).edges().group_by(Edge.is_interior) + assert len(g1.group(True)) == 6 + assert len(g1.group(False)) == 24 + + g2 = (box1 - box2).edges().group_by(Edge.is_interior) + assert len(g2.group(True)) == 3 + assert len(g2.group(False)) == 18 + def test_group_by_retrieve_groups(self): boxesA = [Solid.make_box(1, 1, 1) for _ in range(3)] boxesB = [Solid.make_box(1, 1, 1) for _ in range(2)] From 89a09f38decb5e9dc65b10a42d9e07e1b1b0e6a6 Mon Sep 17 00:00:00 2001 From: snoyer Date: Sat, 25 Jan 2025 12:52:54 +0400 Subject: [PATCH 172/518] appease mypy --- src/build123d/topology/shape_core.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 0344da6..c506b86 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2447,7 +2447,10 @@ class ShapeList(list[T]): if callable(filter_by): predicate = filter_by elif isinstance(filter_by, property): - predicate = filter_by.__get__ + + def predicate(obj): + return filter_by.__get__(obj) + elif isinstance(filter_by, Axis): predicate = axis_parallel_predicate(filter_by, tolerance=tolerance) elif isinstance(filter_by, Plane): From 677e47fedc3113d53a69ccffb90288a3c9f4438d Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Mon, 27 Jan 2025 08:26:46 +0100 Subject: [PATCH 173/518] README: Adds links --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8bb86b6..38033e7 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,13 @@ [![Downloads/month](https://pepy.tech/badge/build123d/month)](https://pepy.tech/project/build123d) [![PyPI - Wheel](https://img.shields.io/pypi/wheel/build123d.svg)](https://pypi.org/project/build123d/) -Build123d is a python-based, parametric, boundary representation (BREP) modeling framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as FreeCAD and SolidWorks. +Build123d is a python-based, parametric, [boundary representation (BREP)][BREP] modeling framework for 2D and 3D CAD. It's built on the [Open Cascade] geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as [FreeCAD] and SolidWorks. -Build123d could be considered as an evolution of [CadQuery](https://cadquery.readthedocs.io/en/latest/index.html) where the somewhat restrictive Fluent API (method chaining) is replaced with stateful context managers - e.g. `with` blocks - thus enabling the full python toolbox: for loops, references to objects, object sorting and filtering, etc. +Build123d could be considered as an evolution of [CadQuery] where the somewhat restrictive Fluent API (method chaining) is replaced with stateful context managers - e.g. `with` blocks - thus enabling the full python toolbox: for loops, references to objects, object sorting and filtering, etc. The documentation for **build123d** can found at [readthedocs](https://build123d.readthedocs.io/en/latest/index.html). -There is a [***Discord***](https://discord.com/invite/Bj9AQPsCfx) server (shared with CadQuery) where you can ask for help in the build123d channel. +There is a [***Discord***](https://discord.com/invite/Bj9AQPsCfx) server (shared with [CadQuery]) where you can ask for help in the build123d channel. The recommended method for most users is to install **build123d** is: ``` @@ -54,3 +54,8 @@ python3 -m pip install -e . ``` Further installation instructions are available (e.g. Poetry) see the [installation section on readthedocs](https://build123d.readthedocs.io/en/latest/installation.html). + +[BREP]: https://en.wikipedia.org/wiki/Boundary_representation +[CadQuery]: https://cadquery.readthedocs.io/en/latest/index.html +[FreeCAD]: https://www.freecad.org/ +[Open Cascade]: https://dev.opencascade.org/ From 6d5aaa4bea90e439af17e49fc1e55181b7d4335e Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Mon, 27 Jan 2025 08:28:48 +0100 Subject: [PATCH 174/518] README: Shorten a bit ... and make compatible with the original Markdown standard, where more empty lines are required --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 38033e7..d0987f1 100644 --- a/README.md +++ b/README.md @@ -26,17 +26,21 @@ The documentation for **build123d** can found at [readthedocs](https://build123d There is a [***Discord***](https://discord.com/invite/Bj9AQPsCfx) server (shared with [CadQuery]) where you can ask for help in the build123d channel. The recommended method for most users is to install **build123d** is: + ``` pip install build123d ``` To get the latest non-released version of **build123d** one can install from GitHub using one of the following two commands: -In Linux/MacOS, use the following command: +Linux/MacOS: + ``` python3 -m pip install git+https://github.com/gumyr/build123d ``` -In Windows, use the following command: + +Windows: + ``` python -m pip install git+https://github.com/gumyr/build123d ``` @@ -46,7 +50,8 @@ If you receive errors about conflicting dependencies, you can retry the installa python3 -m pip install --upgrade pip ``` -Development install +Development install: + ``` git clone https://github.com/gumyr/build123d.git cd build123d From 8ddfee219d9876e021371a8ab18e9ad7096f5b9f Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Mon, 27 Jan 2025 08:30:34 +0100 Subject: [PATCH 175/518] README: Fixes two minor language issues --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d0987f1..91d23f1 100644 --- a/README.md +++ b/README.md @@ -21,11 +21,11 @@ Build123d is a python-based, parametric, [boundary representation (BREP)][BREP] Build123d could be considered as an evolution of [CadQuery] where the somewhat restrictive Fluent API (method chaining) is replaced with stateful context managers - e.g. `with` blocks - thus enabling the full python toolbox: for loops, references to objects, object sorting and filtering, etc. -The documentation for **build123d** can found at [readthedocs](https://build123d.readthedocs.io/en/latest/index.html). +The documentation for **build123d** can be found at [readthedocs](https://build123d.readthedocs.io/en/latest/index.html). There is a [***Discord***](https://discord.com/invite/Bj9AQPsCfx) server (shared with [CadQuery]) where you can ask for help in the build123d channel. -The recommended method for most users is to install **build123d** is: +The recommended method for most users to install **build123d** is: ``` pip install build123d From bdd11a92501dfc712cddbcf9fa2238b171c55f74 Mon Sep 17 00:00:00 2001 From: snoyer Date: Tue, 28 Jan 2025 07:00:40 +0400 Subject: [PATCH 176/518] add property support to `sort_by` --- src/build123d/topology/shape_core.py | 5 ++++- tests/test_direct_api/test_shape_list.py | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index c506b86..46310ca 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2635,7 +2635,7 @@ class ShapeList(list[T]): def sort_by( self, - sort_by: Axis | Callable[[T], K] | Edge | Wire | SortBy = Axis.Z, + sort_by: Axis | Callable[[T], K] | Edge | Wire | SortBy | property = Axis.Z, reverse: bool = False, ) -> ShapeList[T]: """sort by @@ -2661,6 +2661,9 @@ class ShapeList(list[T]): # If a callable is provided, use it directly as the key objects = sorted(self, key=sort_by, reverse=reverse) + elif isinstance(sort_by, property): + objects = sorted(self, key=sort_by.__get__, reverse=reverse) + elif isinstance(sort_by, Axis): if sort_by.wrapped is None: raise ValueError("Cannot sort by an empty axis") diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py index 4892e5e..c1c967f 100644 --- a/tests/test_direct_api/test_shape_list.py +++ b/tests/test_direct_api/test_shape_list.py @@ -90,10 +90,12 @@ class TestShapeList(unittest.TestCase): self.assertAlmostEqual(largest.area, math.pi * 2**2, 5) def test_sort_by_property(self): - box1 = Box(2, 2, 2) - box2 = Box(2, 2, 2).translate((1, 1, 1)) - assert len((box1 + box2).edges().filter_by(Edge.is_interior)) == 6 - assert len((box1 - box2).edges().filter_by(Edge.is_interior)) == 3 + box1 = Box(1, 1, 1) + box2 = Box(2, 2, 2) + box3 = Box(3, 3, 3) + unsorted_boxes = ShapeList([box2, box3, box1]) + assert unsorted_boxes.sort_by(Solid.volume) == [box1, box2, box3] + assert unsorted_boxes.sort_by(Solid.volume, reverse=True) == [box3, box2, box1] def test_sort_by_invalid(self): with self.assertRaises(ValueError): @@ -125,6 +127,12 @@ class TestShapeList(unittest.TestCase): self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "A")), 2) self.assertEqual(len(shapelist.filter_by(lambda s: s.label == "B")), 1) + def test_filter_by_property(self): + box1 = Box(2, 2, 2) + box2 = Box(2, 2, 2).translate((1, 1, 1)) + assert len((box1 + box2).edges().filter_by(Edge.is_interior)) == 6 + assert len((box1 - box2).edges().filter_by(Edge.is_interior)) == 3 + def test_first_last(self): vertices = ( Solid.make_box(1, 1, 1).vertices().sort_by(Axis((0, 0, 0), (1, 1, 1))) From 8fe3ec18af0649e8276d7bad4aee3ebe54f2c0d2 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 28 Jan 2025 21:52:04 -0500 Subject: [PATCH 177/518] Added Shape static_moments, matrix_of_inertia, principal_properties and radius_of_gyration properties method --- src/build123d/topology/shape_core.py | 126 +++++++++++++++++ tests/test_direct_api/test_mass_properties.py | 130 ++++++++++++++++++ 2 files changed, 256 insertions(+) create mode 100644 tests/test_direct_api/test_mass_properties.py diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 46310ca..b2d645f 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -449,6 +449,48 @@ class Shape(NodeMixin, Generic[TOPODS]): if self.wrapped is not None: self.wrapped.Location(value.wrapped) + @property + def matrix_of_inertia(self) -> list[list[float]]: + """ + Compute the inertia matrix (moment of inertia tensor) of the shape. + + The inertia matrix represents how the mass of the shape is distributed + with respect to its reference frame. It is a 3×3 symmetric tensor that + describes the resistance of the shape to rotational motion around + different axes. + + Returns: + list[list[float]]: A 3×3 nested list representing the inertia matrix. + The elements of the matrix are given as: + + | Ixx Ixy Ixz | + | Ixy Iyy Iyz | + | Ixz Iyz Izz | + + where: + - Ixx, Iyy, Izz are the moments of inertia about the X, Y, and Z axes. + - Ixy, Ixz, Iyz are the products of inertia. + + Example: + >>> obj = MyShape() + >>> obj.matrix_of_inertia + [[1000.0, 50.0, 0.0], + [50.0, 1200.0, 0.0], + [0.0, 0.0, 300.0]] + + Notes: + - The inertia matrix is computed relative to the shape's center of mass. + - It is commonly used in structural analysis, mechanical simulations, + and physics-based motion calculations. + """ + properties = GProp_GProps() + BRepGProp.VolumeProperties_s(self.wrapped, properties) + inertia_matrix = properties.MatrixOfInertia() + matrix = [] + for i in range(3): + matrix.append([inertia_matrix.Value(i + 1, j + 1) for j in range(3)]) + return matrix + @property def orientation(self) -> Vector | None: """Get the orientation component of this Shape's Location""" @@ -479,6 +521,59 @@ class Shape(NodeMixin, Generic[TOPODS]): loc.position = Vector(value) self.location = loc + @property + def principal_properties(self) -> list[tuple[Vector, float]]: + """ + Compute the principal moments of inertia and their corresponding axes. + + Returns: + list[tuple[Vector, float]]: A list of tuples, where each tuple contains: + - A `Vector` representing the axis of inertia. + - A `float` representing the moment of inertia for that axis. + + Example: + >>> obj = MyShape() + >>> obj.principal_properties + [(Vector(1, 0, 0), 1200.0), + (Vector(0, 1, 0), 1000.0), + (Vector(0, 0, 1), 300.0)] + """ + properties = GProp_GProps() + BRepGProp.VolumeProperties_s(self.wrapped, properties) + principal_props = properties.PrincipalProperties() + principal_moments = principal_props.Moments() + return [ + (Vector(principal_props.FirstAxisOfInertia()), principal_moments[0]), + (Vector(principal_props.SecondAxisOfInertia()), principal_moments[1]), + (Vector(principal_props.ThirdAxisOfInertia()), principal_moments[2]), + ] + + @property + def static_moments(self) -> tuple[float, float, float]: + """ + Compute the static moments (first moments of mass) of the shape. + + The static moments represent the weighted sum of the coordinates + with respect to the mass distribution, providing insight into the + center of mass and mass distribution of the shape. + + Returns: + tuple[float, float, float]: The static moments (Mx, My, Mz), + where: + - Mx is the first moment of mass about the YZ plane. + - My is the first moment of mass about the XZ plane. + - Mz is the first moment of mass about the XY plane. + + Example: + >>> obj = MyShape() + >>> obj.static_moments + (150.0, 200.0, 50.0) + + """ + properties = GProp_GProps() + BRepGProp.VolumeProperties_s(self.wrapped, properties) + return properties.StaticMoments() + # ---- Class Methods ---- @classmethod @@ -1486,6 +1581,37 @@ class Shape(NodeMixin, Generic[TOPODS]): return ShapeList(projected_faces) + def radius_of_gyration(self, axis: Axis) -> float: + """ + Compute the radius of gyration of the shape about a given axis. + + The radius of gyration represents the distance from the axis at which the entire + mass of the shape could be concentrated without changing its moment of inertia. + It provides insight into how mass is distributed relative to the axis and is + useful in structural analysis, rotational dynamics, and mechanical simulations. + + Args: + axis (Axis): The axis about which the radius of gyration is computed. + The axis should be defined in the same coordinate system + as the shape. + + Returns: + float: The radius of gyration in the same units as the shape's dimensions. + + Example: + >>> obj = MyShape() + >>> axis = Axis((0, 0, 0), (0, 0, 1)) + >>> obj.radius_of_gyration(axis) + 5.47 + + Notes: + - The radius of gyration is computed based on the shape’s mass properties. + - It is useful for evaluating structural stability and rotational behavior. + """ + properties = GProp_GProps() + BRepGProp.VolumeProperties_s(self.wrapped, properties) + return properties.RadiusOfGyration(axis.wrapped) + def relocate(self, loc: Location): """Change the location of self while keeping it geometrically similar diff --git a/tests/test_direct_api/test_mass_properties.py b/tests/test_direct_api/test_mass_properties.py new file mode 100644 index 0000000..df7d80c --- /dev/null +++ b/tests/test_direct_api/test_mass_properties.py @@ -0,0 +1,130 @@ +""" +build123d tests + +name: test_mass_properties.py +by: Gumyr +date: January 28, 2025 + +desc: + This python module contains tests for shape properties. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import unittest +from build123d.objects_part import Box, Cylinder, Sphere +from build123d.geometry import Align, Axis +from build123d import Sphere, Align, Axis +from math import pi + + +class TestMassProperties(unittest.TestCase): + + def test_sphere(self): + r = 2 # Sphere radius + sphere = Sphere(r) + + # Expected mass properties + volume = (4 / 3) * pi * r**3 + expected_static_moments = (0, 0, 0) # COM at (0,0,0) + expected_inertia = (2 / 5) * volume * r**2 # Ixx = Iyy = Izz + + # Test static moments (should be zero if centered at origin) + self.assertAlmostEqual( + sphere.static_moments[0], expected_static_moments[0], places=5 + ) + self.assertAlmostEqual( + sphere.static_moments[1], expected_static_moments[1], places=5 + ) + self.assertAlmostEqual( + sphere.static_moments[2], expected_static_moments[2], places=5 + ) + + # Test matrix of inertia (diagonal and equal for a sphere) + inertia_matrix = sphere.matrix_of_inertia + self.assertAlmostEqual(inertia_matrix[0][0], expected_inertia, places=5) + self.assertAlmostEqual(inertia_matrix[1][1], expected_inertia, places=5) + self.assertAlmostEqual(inertia_matrix[2][2], expected_inertia, places=5) + + # Test principal properties (should match matrix of inertia) + principal_axes, principal_moments = zip(*sphere.principal_properties) + self.assertAlmostEqual(principal_moments[0], expected_inertia, places=5) + self.assertAlmostEqual(principal_moments[1], expected_inertia, places=5) + self.assertAlmostEqual(principal_moments[2], expected_inertia, places=5) + + # Test radius of gyration (should be sqrt(2/5) * r) + expected_radius_of_gyration = (2 / 5) ** 0.5 * r + self.assertAlmostEqual( + sphere.radius_of_gyration(Axis.X), expected_radius_of_gyration, places=5 + ) + + def test_cube(self): + side = 2 + cube = Box(side, side, side, align=Align.CENTER) + + # Expected values + volume = side**3 + expected_static_moments = (0, 0, 0) # Centered + expected_inertia = (1 / 6) * volume * side**2 # Ixx = Iyy = Izz + + # Test inertia matrix (should be diagonal) + inertia_matrix = cube.matrix_of_inertia + self.assertAlmostEqual(inertia_matrix[0][0], expected_inertia, places=5) + self.assertAlmostEqual(inertia_matrix[1][1], expected_inertia, places=5) + self.assertAlmostEqual(inertia_matrix[2][2], expected_inertia, places=5) + + # Test principal moments (should be equal) + principal_axes, principal_moments = zip(*cube.principal_properties) + self.assertAlmostEqual(principal_moments[0], expected_inertia, places=5) + self.assertAlmostEqual(principal_moments[1], expected_inertia, places=5) + self.assertAlmostEqual(principal_moments[2], expected_inertia, places=5) + + # Test radius of gyration (should be sqrt(1/6) * side) + expected_radius_of_gyration = (1 / 6) ** 0.5 * side + self.assertAlmostEqual( + cube.radius_of_gyration(Axis.X), expected_radius_of_gyration, places=5 + ) + + def test_cylinder(self): + r, h = 2, 5 + cylinder = Cylinder(r, h, align=Align.CENTER) + + # Expected values + volume = pi * r**2 * h + expected_inertia_xx = (1 / 12) * volume * (3 * r**2 + h**2) # Ixx = Iyy + expected_inertia_zz = (1 / 2) * volume * r**2 # Iz about Z-axis + + # Test principal moments (should align with Z) + principal_axes, principal_moments = zip(*cylinder.principal_properties) + self.assertAlmostEqual(principal_moments[0], expected_inertia_xx, places=5) + self.assertAlmostEqual(principal_moments[1], expected_inertia_xx, places=5) + self.assertAlmostEqual(principal_moments[2], expected_inertia_zz, places=5) + + # Test radius of gyration (should be sqrt(I/m)) + expected_radius_x = (expected_inertia_xx / volume) ** 0.5 + expected_radius_z = (expected_inertia_zz / volume) ** 0.5 + self.assertAlmostEqual( + cylinder.radius_of_gyration(Axis.X), expected_radius_x, places=5 + ) + self.assertAlmostEqual( + cylinder.radius_of_gyration(Axis.Z), expected_radius_z, places=5 + ) + + +if __name__ == "__main__": + unittest.main() From 98e989debc5c5dc6e9720c45053513df01961e01 Mon Sep 17 00:00:00 2001 From: Bernhard Date: Wed, 29 Jan 2025 09:39:37 +0100 Subject: [PATCH 178/518] encapsulate VTK in a separate file --- novtk.sh | 4 + src/build123d/jupyter_tools.py | 31 +--- src/build123d/topology/shape_core.py | 63 --------- src/build123d/vtk_tools.py | 149 ++++++++++++++++++++ tests/test_direct_api/test_jupyter.py | 5 +- tests/test_direct_api/test_vtk_poly_data.py | 7 +- 6 files changed, 162 insertions(+), 97 deletions(-) create mode 100755 novtk.sh create mode 100644 src/build123d/vtk_tools.py diff --git a/novtk.sh b/novtk.sh new file mode 100755 index 0000000..825d027 --- /dev/null +++ b/novtk.sh @@ -0,0 +1,4 @@ +uv pip install --no-deps ocpsvg svgelements cadquery_ocp_novtk +gsed -i '/cadquery-ocp >/d; /ocpsvg/d' pyproject.toml +uv pip install -e . +git checkout pyproject.toml diff --git a/src/build123d/jupyter_tools.py b/src/build123d/jupyter_tools.py index 1299a73..ce05a73 100644 --- a/src/build123d/jupyter_tools.py +++ b/src/build123d/jupyter_tools.py @@ -28,9 +28,9 @@ from json import dumps import os import uuid from string import Template -from typing import Any, Dict, List +from typing import Any from IPython.display import HTML -from vtkmodules.vtkIOXML import vtkXMLPolyDataWriter +from build123d.vtk_tools import to_vtkpoly_string DEFAULT_COLOR = [1, 0.8, 0, 1] @@ -39,33 +39,6 @@ with open(os.path.join(dir_path, "template_render.js"), encoding="utf-8") as f: TEMPLATE_JS = f.read() -def to_vtkpoly_string( - shape: Any, tolerance: float = 1e-3, angular_tolerance: float = 0.1 -) -> str: - """to_vtkpoly_string - - Args: - shape (Shape): object to convert - tolerance (float, optional): Defaults to 1e-3. - angular_tolerance (float, optional): Defaults to 0.1. - - Raises: - ValueError: not a valid Shape - - Returns: - str: vtkpoly str - """ - if not hasattr(shape, "wrapped"): - raise ValueError(f"Type {type(shape)} is not supported") - - writer = vtkXMLPolyDataWriter() - writer.SetWriteToOutputString(True) - writer.SetInputData(shape.to_vtk_poly_data(tolerance, angular_tolerance, True)) - writer.Write() - - return writer.GetOutputString() - - def shape_to_html(shape: Any) -> HTML: """shape_to_html diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index b2d645f..228dce5 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -68,7 +68,6 @@ from collections.abc import Callable, Iterable, Iterator import OCP.GeomAbs as ga import OCP.TopAbs as ta from IPython.lib.pretty import pretty, RepresentationPrinter -from OCP.Aspect import Aspect_TOL_SOLID from OCP.BOPAlgo import BOPAlgo_GlueEnum from OCP.BRep import BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Surface @@ -104,10 +103,6 @@ from OCP.GProp import GProp_GProps from OCP.Geom import Geom_Line from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher -from OCP.IVtkVTK import IVtkVTK_ShapeData -from OCP.Prs3d import Prs3d_IsoAspect -from OCP.Quantity import Quantity_Color from OCP.ShapeAnalysis import ShapeAnalysis_Curve from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters from OCP.ShapeFix import ShapeFix_Shape @@ -152,8 +147,6 @@ from build123d.geometry import ( from typing_extensions import Self from typing import Literal -from vtkmodules.vtkCommonDataModel import vtkPolyData -from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter if TYPE_CHECKING: # pragma: no cover @@ -1938,62 +1931,6 @@ class Shape(NodeMixin, Generic[TOPODS]): return self.__class__.cast(result) - def to_vtk_poly_data( - self, - tolerance: float | None = None, - angular_tolerance: float | None = None, - normals: bool = False, - ) -> vtkPolyData: - """Convert shape to vtkPolyData - - Args: - tolerance: float: - angular_tolerance: float: (Default value = 0.1) - normals: bool: (Default value = True) - - Returns: data object in VTK consisting of points, vertices, lines, and polygons - """ - if self.wrapped is None: - raise ValueError("Cannot convert an empty shape") - - vtk_shape = IVtkOCC_Shape(self.wrapped) - shape_data = IVtkVTK_ShapeData() - shape_mesher = IVtkOCC_ShapeMesher() - - drawer = vtk_shape.Attributes() - drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) - - if tolerance: - drawer.SetDeviationCoefficient(tolerance) - - if angular_tolerance: - drawer.SetDeviationAngle(angular_tolerance) - - shape_mesher.Build(vtk_shape, shape_data) - - vtk_poly_data = shape_data.getVtkPolyData() - - # convert to triangles and split edges - t_filter = vtkTriangleFilter() - t_filter.SetInputData(vtk_poly_data) - t_filter.Update() - - return_value = t_filter.GetOutput() - - # compute normals - if normals: - n_filter = vtkPolyDataNormals() - n_filter.SetComputePointNormals(True) - n_filter.SetComputeCellNormals(True) - n_filter.SetFeatureAngle(360) - n_filter.SetInputData(return_value) - n_filter.Update() - - return_value = n_filter.GetOutput() - - return return_value - def transform_geometry(self, t_matrix: Matrix) -> Self: """Apply affine transform diff --git a/src/build123d/vtk_tools.py b/src/build123d/vtk_tools.py new file mode 100644 index 0000000..9d22185 --- /dev/null +++ b/src/build123d/vtk_tools.py @@ -0,0 +1,149 @@ +""" +build123d topology + +name: vtk_tools.py +by: Gumyr +date: January 07, 2025 + +desc: + +This module defines the foundational classes and methods for the build123d CAD library, enabling +detailed geometric operations and 3D modeling capabilities. It provides a hierarchy of classes +representing various geometric entities like vertices, edges, wires, faces, shells, solids, and +compounds. These classes are designed to work seamlessly with the OpenCascade Python bindings, +leveraging its robust CAD kernel. + +Key Features: +- **Shape Base Class:** Implements core functionalities such as transformations (rotation, + translation, scaling), geometric queries, and boolean operations (cut, fuse, intersect). +- **Custom Utilities:** Includes helper classes like `ShapeList` for advanced filtering, sorting, + and grouping of shapes, and `GroupBy` for organizing shapes by specific criteria. +- **Type Safety:** Extensive use of Python typing features ensures clarity and correctness in type + handling. +- **Advanced Geometry:** Supports operations like finding intersections, computing bounding boxes, + projecting faces, and generating triangulated meshes. + +The module is designed for extensibility, enabling developers to build complex 3D assemblies and +perform detailed CAD operations programmatically while maintaining a clean and structured API. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +from typing import Any +import warnings + +from OCP.Aspect import Aspect_TOL_SOLID +from OCP.Prs3d import Prs3d_IsoAspect +from OCP.Quantity import Quantity_Color + +HAS_VTK = True +try: + from OCP.IVtkOCC import IVtkOCC_Shape, IVtkOCC_ShapeMesher + from OCP.IVtkVTK import IVtkVTK_ShapeData + from vtkmodules.vtkCommonDataModel import vtkPolyData + from vtkmodules.vtkFiltersCore import vtkPolyDataNormals, vtkTriangleFilter + from vtkmodules.vtkIOXML import vtkXMLPolyDataWriter +except ImportError: + HAS_VTK = False + + +def to_vtk_poly_data( + obj, + tolerance: float | None = None, + angular_tolerance: float | None = None, + normals: bool = False, +) -> "vtkPolyData": + """Convert shape to vtkPolyData + + Args: + tolerance: float: + angular_tolerance: float: (Default value = 0.1) + normals: bool: (Default value = True) + + Returns: data object in VTK consisting of points, vertices, lines, and polygons + """ + if not HAS_VTK: + warnings.warn("VTK not supported", stacklevel=2) + + if obj.wrapped is None: + raise ValueError("Cannot convert an empty shape") + + vtk_shape = IVtkOCC_Shape(obj.wrapped) + shape_data = IVtkVTK_ShapeData() + shape_mesher = IVtkOCC_ShapeMesher() + + drawer = vtk_shape.Attributes() + drawer.SetUIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) + drawer.SetVIsoAspect(Prs3d_IsoAspect(Quantity_Color(), Aspect_TOL_SOLID, 1, 0)) + + if tolerance: + drawer.SetDeviationCoefficient(tolerance) + + if angular_tolerance: + drawer.SetDeviationAngle(angular_tolerance) + + shape_mesher.Build(vtk_shape, shape_data) + + vtk_poly_data = shape_data.getVtkPolyData() + + # convert to triangles and split edges + t_filter = vtkTriangleFilter() + t_filter.SetInputData(vtk_poly_data) + t_filter.Update() + + return_value = t_filter.GetOutput() + + # compute normals + if normals: + n_filter = vtkPolyDataNormals() + n_filter.SetComputePointNormals(True) + n_filter.SetComputeCellNormals(True) + n_filter.SetFeatureAngle(360) + n_filter.SetInputData(return_value) + n_filter.Update() + + return_value = n_filter.GetOutput() + + return return_value + + +def to_vtkpoly_string( + shape: Any, tolerance: float = 1e-3, angular_tolerance: float = 0.1 +) -> str: + """to_vtkpoly_string + + Args: + shape (Shape): object to convert + tolerance (float, optional): Defaults to 1e-3. + angular_tolerance (float, optional): Defaults to 0.1. + + Raises: + ValueError: not a valid Shape + + Returns: + str: vtkpoly str + """ + if not hasattr(shape, "wrapped"): + raise ValueError(f"Type {type(shape)} is not supported") + + writer = vtkXMLPolyDataWriter() + writer.SetWriteToOutputString(True) + writer.SetInputData(to_vtk_poly_data(shape, tolerance, angular_tolerance, True)) + writer.Write() + + return writer.GetOutputString() diff --git a/tests/test_direct_api/test_jupyter.py b/tests/test_direct_api/test_jupyter.py index 7ae4074..765159d 100644 --- a/tests/test_direct_api/test_jupyter.py +++ b/tests/test_direct_api/test_jupyter.py @@ -29,7 +29,8 @@ license: import unittest from build123d.geometry import Vector -from build123d.jupyter_tools import to_vtkpoly_string, shape_to_html +from build123d.jupyter_tools import shape_to_html +from build123d.vtk_tools import to_vtkpoly_string from build123d.topology import Solid @@ -43,7 +44,7 @@ class TestJupyter(unittest.TestCase): assert "function render" in html1 def test_display_error(self): - with self.assertRaises(AttributeError): + with self.assertRaises(TypeError): shape_to_html(Vector()) with self.assertRaises(ValueError): diff --git a/tests/test_direct_api/test_vtk_poly_data.py b/tests/test_direct_api/test_vtk_poly_data.py index 69d022f..b3ba166 100644 --- a/tests/test_direct_api/test_vtk_poly_data.py +++ b/tests/test_direct_api/test_vtk_poly_data.py @@ -29,6 +29,7 @@ license: import unittest from build123d.topology import Solid +from build123d.vtk_tools import to_vtk_poly_data from vtkmodules.vtkCommonDataModel import vtkPolyData from vtkmodules.vtkFiltersCore import vtkTriangleFilter @@ -40,8 +41,8 @@ class TestVTKPolyData(unittest.TestCase): def test_to_vtk_poly_data(self): # Generate VTK data - vtk_data = self.object_under_test.to_vtk_poly_data( - tolerance=0.1, angular_tolerance=0.2, normals=True + vtk_data = to_vtk_poly_data( + self.object_under_test, tolerance=0.1, angular_tolerance=0.2, normals=True ) # Verify the result is of type vtkPolyData @@ -78,7 +79,7 @@ class TestVTKPolyData(unittest.TestCase): # Test handling of empty shape empty_object = Solid() # Create an empty object with self.assertRaises(ValueError) as context: - empty_object.to_vtk_poly_data() + to_vtk_poly_data(empty_object) self.assertEqual(str(context.exception), "Cannot convert an empty shape") From ee2a3724e9b34f0c0bffa910a8cf0c4603fd42da Mon Sep 17 00:00:00 2001 From: Bernhard Date: Wed, 29 Jan 2025 09:41:15 +0100 Subject: [PATCH 179/518] remove the install script for novtk --- novtk.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 novtk.sh diff --git a/novtk.sh b/novtk.sh deleted file mode 100755 index 825d027..0000000 --- a/novtk.sh +++ /dev/null @@ -1,4 +0,0 @@ -uv pip install --no-deps ocpsvg svgelements cadquery_ocp_novtk -gsed -i '/cadquery-ocp >/d; /ocpsvg/d' pyproject.toml -uv pip install -e . -git checkout pyproject.toml From b8dcad3bcbaf9c788446fbe40189297352db8a9a Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 31 Jan 2025 16:06:09 -0500 Subject: [PATCH 180/518] Added Axis.is_skew and tested for is_skew in Axis.intersect --- src/build123d/geometry.py | 81 ++++++++++++++++++++---------- tests/test_direct_api/test_axis.py | 23 +++++++++ 2 files changed, 78 insertions(+), 26 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 370435c..6ac8309 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -780,6 +780,43 @@ class Axis(metaclass=AxisMeta): """ return self.wrapped.IsParallel(other.wrapped, angular_tolerance * (pi / 180)) + def is_skew(self, other: Axis, tolerance: float = 1e-5) -> bool: + """are axes skew + + Returns True if this axis and another axis are skew, meaning they are neither + parallel nor coplanar. Two axes are skew if they do not lie in the same plane + and never intersect. + + Mathematically, this means: + - The axes are **not parallel** (the cross product of their direction vectors + is nonzero). + - The axes are **not coplanar** (the vector between their positions is not + aligned with the plane spanned by their directions). + + If either condition is false (i.e., the axes are parallel or coplanar), they are + not skew. + + Args: + other (Axis): axis to compare to + tolerance (float, optional): max deviation. Defaults to 1e-5. + + Returns: + bool: axes are skew + """ + if self.is_parallel(other, tolerance): + # If parallel, check if they are coincident + parallel_offset = (self.position - other.position).cross(self.direction) + # True if distinct, False if coincident + return parallel_offset.length > tolerance + + # Compute the determinant + coplanarity = (self.position - other.position).dot( + self.direction.cross(other.direction) + ) + + # If determinant is near zero, they are coplanar; otherwise, they are skew + return abs(coplanarity) > tolerance + def angle_between(self, other: Axis) -> float: """calculate angle between axes @@ -830,37 +867,29 @@ class Axis(metaclass=AxisMeta): if axis is not None: if self.is_coaxial(axis): return self - else: - # Extract points and directions to numpy arrays - p1 = np.array([*self.position]) - d1 = np.array([*self.direction]) - p2 = np.array([*axis.position]) - d2 = np.array([*axis.direction]) - # Compute the cross product of directions - cross_d1_d2 = np.cross(d1, d2) - cross_d1_d2_norm = np.linalg.norm(cross_d1_d2) + if self.is_skew(axis): + return None - if cross_d1_d2_norm < TOLERANCE: - # The directions are parallel - return None + # Extract points and directions to numpy arrays + p1 = np.array([*self.position]) + d1 = np.array([*self.direction]) + p2 = np.array([*axis.position]) + d2 = np.array([*axis.direction]) - # Solve the system of equations to find the intersection - system_of_equations = np.array([d1, -d2, cross_d1_d2]).T - origin_diff = p2 - p1 - try: - t1, t2, _ = np.linalg.solve(system_of_equations, origin_diff) - except np.linalg.LinAlgError: - return None # The lines do not intersect + # Solve the system of equations to find the intersection + system_of_equations = np.array([d1, -d2, np.cross(d1, d2)]).T + origin_diff = p2 - p1 + t1, t2, _ = np.linalg.lstsq(system_of_equations, origin_diff, rcond=None)[0] - # Calculate the intersection point - intersection_point = p1 + t1 * d1 - return Vector(*intersection_point) + # Calculate the intersection point + intersection_point = p1 + t1 * d1 + return Vector(*intersection_point) - elif plane is not None: + if plane is not None: return plane.intersect(self) - elif vector is not None: + if vector is not None: # Create a vector from the origin to the point vec_to_point = vector - self.position @@ -872,7 +901,7 @@ class Axis(metaclass=AxisMeta): if vector == projected_vec: return vector - elif location is not None: + if location is not None: # Find the "direction" of the location location_dir = Plane(location).z_dir @@ -883,7 +912,7 @@ class Axis(metaclass=AxisMeta): ): return location - elif shape is not None: + if shape is not None: return shape.intersect(self) diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py index 658e273..49144c4 100644 --- a/tests/test_direct_api/test_axis.py +++ b/tests/test_direct_api/test_axis.py @@ -123,6 +123,26 @@ class TestAxis(unittest.TestCase): self.assertTrue(Axis.X.is_parallel(Axis((1, 1, 1), (1, 0, 0)))) self.assertFalse(Axis.X.is_parallel(Axis.Y)) + def test_axis_is_skew(self): + self.assertTrue(Axis.X.is_skew(Axis((0, 1, 1), (0, 0, 1)))) + self.assertFalse(Axis.X.is_skew(Axis.Y)) + + def test_axis_is_skew(self): + # Skew Axes + self.assertTrue(Axis.X.is_skew(Axis((0, 1, 1), (0, 0, 1)))) + + # Perpendicular but intersecting + self.assertFalse(Axis.X.is_skew(Axis.Y)) + + # Parallel coincident axes + self.assertFalse(Axis.X.is_skew(Axis.X)) + + # Parallel but distinct axes + self.assertTrue(Axis.X.is_skew(Axis((0, 1, 0), (1, 0, 0)))) + + # Coplanar but not intersecting + self.assertTrue(Axis((0, 0, 0), (1, 1, 0)).is_skew(Axis((0, 1, 0), (1, 1, 0)))) + def test_axis_angle_between(self): self.assertAlmostEqual(Axis.X.angle_between(Axis.Y), 90, 5) self.assertAlmostEqual( @@ -155,6 +175,9 @@ class TestAxis(unittest.TestCase): i = Axis.X & Axis((1, 0, 0), (1, 0, 0)) self.assertEqual(i, Axis.X) + # Skew case + self.assertIsNone(Axis.X.intersect(Axis((0, 1, 1), (0, 0, 1)))) + intersection = Axis((1, 2, 3), (0, 0, 1)) & Plane.XY self.assertAlmostEqual(intersection.to_tuple(), (1, 2, 0), 5) From 0e3dbbe15b68e43f42c53de3341b9c87732edeb9 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 1 Feb 2025 09:35:03 -0500 Subject: [PATCH 181/518] Making Axis friendly to sub-classing --- src/build123d/geometry.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 6ac8309..418d98c 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -558,17 +558,17 @@ class AxisMeta(type): @property def X(cls) -> Axis: """X Axis""" - return Axis((0, 0, 0), (1, 0, 0)) + return cls((0, 0, 0), (1, 0, 0)) @property def Y(cls) -> Axis: """Y Axis""" - return Axis((0, 0, 0), (0, 1, 0)) + return cls((0, 0, 0), (0, 1, 0)) @property def Z(cls) -> Axis: """Z Axis""" - return Axis((0, 0, 0), (0, 0, 1)) + return cls((0, 0, 0), (0, 0, 1)) class Axis(metaclass=AxisMeta): @@ -690,7 +690,7 @@ class Axis(metaclass=AxisMeta): def __str__(self) -> str: """Display self""" - return f"Axis: ({self.position.to_tuple()},{self.direction.to_tuple()})" + return f"{type(self).__name__}: ({self.position.to_tuple()},{self.direction.to_tuple()})" def __eq__(self, other: object) -> bool: if not isinstance(other, Axis): @@ -833,7 +833,7 @@ class Axis(metaclass=AxisMeta): def reverse(self) -> Axis: """Return a copy of self with the direction reversed""" - return Axis(self.wrapped.Reversed()) + return type(self)(self.wrapped.Reversed()) def __neg__(self) -> Axis: """Flip direction operator -""" From b14c187ca2ec623ec90116dbd40e3f973aa8c81a Mon Sep 17 00:00:00 2001 From: Luz Paz Date: Sun, 2 Feb 2025 09:08:01 -0500 Subject: [PATCH 182/518] Fix various typos Found with `codespell -q 3 -L parm,parms,re-use` --- docs/algebra_definition.rst | 2 +- docs/joints.rst | 2 +- docs/key_concepts_algebra.rst | 2 +- docs/tips.rst | 2 +- docs/tutorial_design.rst | 2 +- src/build123d/build_sketch.py | 2 +- src/build123d/drafting.py | 2 +- src/build123d/geometry.py | 2 +- src/build123d/mesher.py | 2 +- src/build123d/topology/one_d.py | 2 +- tests/test_pack.py | 4 ++-- tools/refactor_topo.py | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/algebra_definition.rst b/docs/algebra_definition.rst index ae98eb5..e87c42c 100644 --- a/docs/algebra_definition.rst +++ b/docs/algebra_definition.rst @@ -61,7 +61,7 @@ with :math:`B^3 \subset C^3, B^2 \subset C^2` and :math:`B^1 \subset C^1` * This definition also includes that neither ``-`` nor ``&`` are commutative. -Locations, planes and location arithmentic +Locations, planes and location arithmetic --------------------------------------------- **Set definitions:** diff --git a/docs/joints.rst b/docs/joints.rst index 3ffaaab..e6a7e7c 100644 --- a/docs/joints.rst +++ b/docs/joints.rst @@ -196,7 +196,7 @@ is found within a rod end as shown here: :emphasize-lines: 40-44,51,53 Note how limits are defined during the instantiation of the ball joint when ensures that the pin or bolt -within the rod end does not interfer with the rod end itself. The ``connect_to`` sets the three angles +within the rod end does not interfere with the rod end itself. The ``connect_to`` sets the three angles (only two are significant in this example). .. autoclass:: BallJoint diff --git a/docs/key_concepts_algebra.rst b/docs/key_concepts_algebra.rst index b76a1df..655b6c7 100644 --- a/docs/key_concepts_algebra.rst +++ b/docs/key_concepts_algebra.rst @@ -60,7 +60,7 @@ The generic forms of object placement are: location * alg_compound 2. Placement on the ``plane`` and then moved relative to the ``plane`` by ``location`` -(the location is relative to the local corrdinate system of the plane). +(the location is relative to the local coordinate system of the plane). .. code-block:: python diff --git a/docs/tips.rst b/docs/tips.rst index 8bd9d7f..ad5c299 100644 --- a/docs/tips.rst +++ b/docs/tips.rst @@ -271,7 +271,7 @@ reoriented, all ``BuildLine`` instances within the scope of ``BuildSketch`` shou on the default ``Plane.XY``. *************************************************************** -Don't Builders inherit workplane/coordinate sytems when nested +Don't Builders inherit workplane/coordinate systems when nested *************************************************************** Some users expect that nested Builders will inherit the workplane or coordinate system from diff --git a/docs/tutorial_design.rst b/docs/tutorial_design.rst index 250de88..3950399 100644 --- a/docs/tutorial_design.rst +++ b/docs/tutorial_design.rst @@ -106,7 +106,7 @@ For solid or prismatic shapes, extrude the 2D profiles along the necessary axis. also combine multiple extrusions by intersecting or unionizing them to form complex shapes. Use the resulting geometry as sub-parts if needed. -*The next step in implmenting our design in build123d is to convert the above sketch into +*The next step in implementing our design in build123d is to convert the above sketch into a part by extruding it as shown in this code:* .. code-block:: python diff --git a/src/build123d/build_sketch.py b/src/build123d/build_sketch.py index b42721e..7509000 100644 --- a/src/build123d/build_sketch.py +++ b/src/build123d/build_sketch.py @@ -50,7 +50,7 @@ class BuildSketch(Builder): Note that all sketch construction is done within sketch_local on Plane.XY. When objects are added to the sketch they must be coplanar to Plane.XY, usually handled automatically but may need user input for Edges and Wires - since their construction plane isn't alway able to be determined. + since their construction plane isn't always able to be determined. Args: workplanes (Union[Face, Plane, Location], optional): objects converted to diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index 2c995ab..b1388dd 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -227,7 +227,7 @@ class Draft: """Convert a raw number to a unit of measurement string based on the class settings""" def simplify_fraction(numerator: int, denominator: int) -> tuple[int, int]: - """Mathematically simplify a fraction given a numerator and demoninator""" + """Mathematically simplify a fraction given a numerator and denominator""" greatest_common_demoninator = gcd(numerator, denominator) return ( int(numerator / greatest_common_demoninator), diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 418d98c..2f3b626 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1134,7 +1134,7 @@ class Color: @overload def __init__(self, color_code: int, alpha: int = 0xFF): - """Color from a hexidecimal color code with an optional alpha value + """Color from a hexadecimal color code with an optional alpha value Args: color_code (hexidecimal int): 0xRRGGBB diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index f4ba23c..de102a1 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -242,7 +242,7 @@ class Mesher: return meta_data_contents def get_meta_data_by_key(self, name_space: str, name: str) -> dict: - """Retrive the metadata value and type for the provided name space and name""" + """Retrieve the metadata value and type for the provided name space and name""" meta_data_group = self.model.GetMetaDataGroup() meta_data_contents = {} meta_data = meta_data_group.GetMetaDataByKey(name_space, name) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 366cf51..e412478 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -997,7 +997,7 @@ class Mixin1D(Shape): split_result = unwrap_topods_compound(split_result, True) # For speed the user may just want all the objects which they - # can sort more efficiently then the generic algoritm below + # can sort more efficiently then the generic algorithm below if keep == Keep.ALL: return ShapeList( self.__class__.cast(part) diff --git a/tests/test_pack.py b/tests/test_pack.py index 56f64f7..1d733d5 100644 --- a/tests/test_pack.py +++ b/tests/test_pack.py @@ -39,7 +39,7 @@ class TestPack(unittest.TestCase): test_boxes = [ Box(random.randint(1, 20), random.randint(1, 20), 1) for _ in range(50) ] - # Not raising in this call shows successfull non-overlap. + # Not raising in this call shows successful non-overlap. packed = pack(test_boxes, 1) self.assertEqual( "bbox: 0.0 <= x <= 94.0, 0.0 <= y <= 86.0, -0.5 <= z <= 0.5", @@ -54,7 +54,7 @@ class TestPack(unittest.TestCase): widths = [random.randint(2, 20) for _ in range(50)] heights = [random.randint(1, width - 1) for width in widths] inputs = [SlotOverall(width, height) for width, height in zip(widths, heights)] - # Not raising in this call shows successfull non-overlap. + # Not raising in this call shows successful non-overlap. packed = pack(inputs, 1) bb = (Sketch() + packed).bounding_box() self.assertEqual(bb.min, Vector(0, 0, 0)) diff --git a/tools/refactor_topo.py b/tools/refactor_topo.py index 8aadbb1..be56a28 100644 --- a/tools/refactor_topo.py +++ b/tools/refactor_topo.py @@ -7,7 +7,7 @@ date: Dec 05, 2024 desc: This python script refactors the very large topology.py module into several - files based on the topological heirarchical order: + files based on the topological hierarchical order: + shape_core.py - base classes Shape, ShapeList + utils.py - utility classes & functions + zero_d.py - Vertex From c728124b3b8503d5460fe0f6bd855e3e2b0e4655 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 4 Feb 2025 09:58:40 -0500 Subject: [PATCH 183/518] Adding Face.remove_holes and Face.total_area property --- src/build123d/topology/two_d.py | 41 +++++++++++++++++++++++++++++- tests/test_direct_api/test_face.py | 35 +++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 4d24e58..bf4e1a6 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -73,7 +73,7 @@ from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeFilling, BRepOffsetAPI_MakePipeShell -from OCP.BRepTools import BRepTools +from OCP.BRepTools import BRepTools, BRepTools_ReShape from OCP.GProp import GProp_GProps from OCP.Geom import Geom_BezierSurface, Geom_Surface from OCP.GeomAPI import GeomAPI_PointsToBSplineSurface, GeomAPI_ProjectPointOnSurf @@ -405,6 +405,23 @@ class Face(Mixin2D, Shape[TopoDS_Face]): result = face_vertices[-1].X - face_vertices[0].X return result + @property + def total_area(self) -> float: + """ + Calculate the total surface area of the face, including the areas of any holes. + + This property returns the overall area of the face as if the inner boundaries (holes) + were filled in. + + Returns: + float: The total surface area, including the area of holes. Returns 0.0 if + the face is empty. + """ + if self.wrapped is None: + return 0.0 + + return self.remove_holes().area + @property def volume(self) -> float: """volume - the volume of this Face, which is always zero""" @@ -1201,6 +1218,28 @@ class Face(Mixin2D, Shape[TopoDS_Face]): projected_shapes.append(shape) return projected_shapes + def remove_holes(self) -> Face: + """remove_holes + + Remove all of the holes from this face. + + Returns: + Face: A new Face instance identical to the original but without any holes. + """ + if self.wrapped is None: + raise ValueError("Cannot remove holes from an empty face") + + if not (inner_wires := self.inner_wires()): + return self + + holeless = copy.deepcopy(self) + reshaper = BRepTools_ReShape() + for hole_wire in inner_wires: + reshaper.Remove(hole_wire.wrapped) + modified_shape = downcast(reshaper.Apply(self.wrapped)) + holeless.wrapped = modified_shape + return holeless + def to_arcs(self, tolerance: float = 1e-3) -> Face: """to_arcs diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 3092833..6f16eca 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -447,6 +447,41 @@ class TestFace(unittest.TestCase): face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] self.assertAlmostEqual(face.normal_at(0, 1), (1, 0, 0), 5) + def test_remove_holes(self): + # Planar test + frame = (Rectangle(1, 1) - Rectangle(0.5, 0.5)).face() + filled = frame.remove_holes() + self.assertEqual(len(frame.inner_wires()), 1) + self.assertEqual(len(filled.inner_wires()), 0) + self.assertAlmostEqual(frame.area, 0.75, 5) + self.assertAlmostEqual(filled.area, 1.0, 5) + + # Errors + frame.wrapped = None + with self.assertRaises(ValueError): + frame.remove_holes() + + # No holes + rect = Face.make_rect(1, 1) + self.assertEqual(rect, rect.remove_holes()) + + # Non-planar test + cyl_face = ( + (Cylinder(1, 3) - Cylinder(0.5, 3, rotation=(90, 0, 0))) + .faces() + .sort_by(Face.area)[-1] + ) + filled = cyl_face.remove_holes() + self.assertEqual(len(cyl_face.inner_wires()), 2) + self.assertEqual(len(filled.inner_wires()), 0) + self.assertTrue(cyl_face.area < filled.area) + self.assertAlmostEqual(cyl_face.total_area, filled.area, 5) + + def test_total_area(self): + frame = (Rectangle(1, 1) - Rectangle(0.5, 0.5)).face() + frame.wrapped = None + self.assertAlmostEqual(frame.total_area, 0.0, 5) + if __name__ == "__main__": unittest.main() From 05ed5fd8e105dc9cfc5d598447aaea9a8fb30e16 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 4 Feb 2025 13:51:56 -0500 Subject: [PATCH 184/518] Added OrientedBoundBox to geometry and Shape.oriented_bounding_box --- src/build123d/__init__.py | 1 + src/build123d/geometry.py | 158 ++++++++++++++++ src/build123d/topology/shape_core.py | 13 +- .../test_oriented_bound_box.py | 179 ++++++++++++++++++ 4 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 tests/test_direct_api/test_oriented_bound_box.py diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index a1f59ca..57b82f5 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -127,6 +127,7 @@ __all__ = [ "Wedge", # Direct API Classes "BoundBox", + "OrientedBoundBox", "Rotation", "Rot", "Pos", diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 418d98c..784dc1d 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1724,6 +1724,164 @@ class LocationEncoder(json.JSONEncoder): return obj +class OrientedBoundBox: + """ + An Oriented Bounding Box + + This class computes the oriented bounding box for a given build123d shape. + It exposes properties such as the center, principal axis directions, the + extents along these axes, and the full diagonal length of the box. + """ + + def __init__(self, shape: Bnd_OBB | Shape): + """ + Create an oriented bounding box from either a precomputed Bnd_OBB or + a build123d Shape (which wraps a TopoDS_Shape). + + Args: + shape (Bnd_OBB | Shape): Either a precomputed Bnd_OBB or a build123d shape + from which to compute the oriented bounding box. + """ + if isinstance(shape, Bnd_OBB): + obb = shape + else: + obb = Bnd_OBB() + # Compute the oriented bounding box for the shape. + BRepBndLib.AddOBB_s(shape.wrapped, obb, True) + self.wrapped = obb + + @property + def diagonal(self) -> float: + """ + The full length of the body diagonal of the oriented bounding box, + which represents the maximum size of the object. + + Returns: + float: The diagonal length. + """ + if self.wrapped is None: + return 0.0 + return self.wrapped.SquareExtent() ** 0.5 + + @property + def plane(self) -> Plane: + """ + The oriented coordinate system of the bounding box. + + Returns: + Plane: The coordinate system defined by the center and primary + (X) and tertiary (Z) directions of the bounding box. + """ + return Plane( + origin=self.center(), x_dir=self.x_direction, z_dir=self.z_direction + ) + + @property + def size(self) -> Vector: + """ + The full extents of the bounding box along its primary axes. + + Returns: + Vector: The oriented size (full dimensions) of the box. + """ + return ( + Vector(self.wrapped.XHSize(), self.wrapped.YHSize(), self.wrapped.ZHSize()) + * 2.0 + ) + + @property + def x_direction(self) -> Vector: + """ + The primary (X) direction of the oriented bounding box. + + Returns: + Vector: The X direction as a unit vector. + """ + x_direction_xyz = self.wrapped.XDirection() + coords = [getattr(x_direction_xyz, attr)() for attr in ("X", "Y", "Z")] + return Vector(*coords) + + @property + def y_direction(self) -> Vector: + """ + The secondary (Y) direction of the oriented bounding box. + + Returns: + Vector: The Y direction as a unit vector. + """ + y_direction_xyz = self.wrapped.YDirection() + coords = [getattr(y_direction_xyz, attr)() for attr in ("X", "Y", "Z")] + return Vector(*coords) + + @property + def z_direction(self) -> Vector: + """ + The tertiary (Z) direction of the oriented bounding box. + + Returns: + Vector: The Z direction as a unit vector. + """ + z_direction_xyz = self.wrapped.ZDirection() + coords = [getattr(z_direction_xyz, attr)() for attr in ("X", "Y", "Z")] + return Vector(*coords) + + def center(self) -> Vector: + """ + Compute and return the center point of the oriented bounding box. + + Returns: + Vector: The center point of the box. + """ + center_xyz = self.wrapped.Center() + coords = [getattr(center_xyz, attr)() for attr in ("X", "Y", "Z")] + return Vector(*coords) + + def is_completely_inside(self, other: OrientedBoundBox) -> bool: + """ + Determine whether the given oriented bounding box is entirely contained + within this bounding box. + + This method checks that every point of 'other' lies strictly within the + boundaries of this box, according to the tolerance criteria inherent to the + underlying OCCT implementation. + + Args: + other (OrientedBoundBox): The bounding box to test for containment. + + Raises: + ValueError: If the 'other' bounding box has an uninitialized (null) underlying geometry. + + Returns: + bool: True if 'other' is completely inside this bounding box; otherwise, False. + """ + if other.wrapped is None: + raise ValueError("Can't compare to a null obb") + return self.wrapped.IsCompletelyInside(other.wrapped) + + def is_outside(self, point: Vector) -> bool: + """ + Determine whether a given point lies entirely outside this oriented bounding box. + + A point is considered outside if it is neither inside the box nor on its surface, + based on the criteria defined by the OCCT implementation. + + Args: + point (Vector): The point to test. + + Raises: + ValueError: If the point's underlying geometry is not set (null). + + Returns: + bool: True if the point is completely outside the bounding box; otherwise, False. + """ + if point.wrapped is None: + raise ValueError("Can't compare to a null point") + return self.wrapped.IsOut(point.to_pnt()) + + def __repr__(self) -> str: + return f"OrientedBoundBox(center={self.center()}, size={self.size}, plane={self.plane})" + + class Rotation(Location): """Subclass of Location used only for object rotation diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 228dce5..d61d0de 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -98,7 +98,7 @@ from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepMesh import BRepMesh_IncrementalMesh from OCP.BRepTools import BRepTools -from OCP.Bnd import Bnd_Box +from OCP.Bnd import Bnd_Box, Bnd_OBB from OCP.GProp import GProp_GProps from OCP.Geom import Geom_Line from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf @@ -139,6 +139,7 @@ from build123d.geometry import ( Color, Location, Matrix, + OrientedBoundBox, Plane, Vector, VectorLike, @@ -1503,6 +1504,16 @@ class Shape(NodeMixin, Generic[TOPODS]): shape_copy.wrapped = tcast(TOPODS, downcast(self.wrapped.Moved(loc.wrapped))) return shape_copy + def oriented_bounding_box(self) -> OrientedBoundBox: + """Create an oriented bounding box for this Shape. + + Returns: + OrientedBoundBox: A box oriented and sized to contain this Shape + """ + if self.wrapped is None: + return OrientedBoundBox(Bnd_OBB()) + return OrientedBoundBox(self) + def project_faces( self, faces: list[Face] | Compound, diff --git a/tests/test_direct_api/test_oriented_bound_box.py b/tests/test_direct_api/test_oriented_bound_box.py new file mode 100644 index 0000000..25bbc2f --- /dev/null +++ b/tests/test_direct_api/test_oriented_bound_box.py @@ -0,0 +1,179 @@ +""" +build123d tests + +name: test_oriented_bound_box.py +by: Gumyr +date: February 4, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import re +import unittest + +from build123d.geometry import Axis, OrientedBoundBox, Pos, Rot, Vector +from build123d.topology import Face, Solid + + +class TestOrientedBoundBox(unittest.TestCase): + def test_size_and_diagonal(self): + # Create a unit cube (with one corner at the origin). + cube = Solid.make_box(1, 1, 1) + obb = OrientedBoundBox(cube) + + # The size property multiplies half-sizes by 2. For a unit cube, expect (1, 1, 1). + size = obb.size + self.assertAlmostEqual(size.X, 1.0, places=6) + self.assertAlmostEqual(size.Y, 1.0, places=6) + self.assertAlmostEqual(size.Z, 1.0, places=6) + + # The full body diagonal should be sqrt(1^2+1^2+1^2) = sqrt(3). + expected_diag = math.sqrt(3) + self.assertAlmostEqual(obb.diagonal, expected_diag, places=6) + + obb.wrapped = None + self.assertAlmostEqual(obb.diagonal, 0.0, places=6) + + def test_center(self): + # For a cube made at the origin, the center should be at (0.5, 0.5, 0.5) + cube = Solid.make_box(1, 1, 1) + obb = OrientedBoundBox(cube) + center = obb.center() + self.assertAlmostEqual(center.X, 0.5, places=6) + self.assertAlmostEqual(center.Y, 0.5, places=6) + self.assertAlmostEqual(center.Z, 0.5, places=6) + + def test_directions_are_unit_vectors(self): + # Create a rotated cube so the direction vectors are non-trivial. + cube = Rot(45, 45, 0) * Solid.make_box(1, 1, 1) + obb = OrientedBoundBox(cube) + + # Check that each primary direction is a unit vector. + for direction in (obb.x_direction, obb.y_direction, obb.z_direction): + self.assertAlmostEqual(direction.length, 1.0, places=6) + + def test_is_outside(self): + # For a unit cube, test a point inside and a point clearly outside. + cube = Solid.make_box(1, 1, 1) + obb = OrientedBoundBox(cube) + + # Use the cube's center as an "inside" test point. + center = obb.center() + self.assertFalse(obb.is_outside(center)) + + # A point far away should be outside. + outside_point = Vector(10, 10, 10) + self.assertTrue(obb.is_outside(outside_point)) + + outside_point._wrapped = None + with self.assertRaises(ValueError): + obb.is_outside(outside_point) + + def test_is_completely_inside(self): + # Create a larger cube and a smaller cube that is centered within it. + large_cube = Solid.make_box(2, 2, 2) + small_cube = Solid.make_box(1, 1, 1) + # Translate the small cube by (0.5, 0.5, 0.5) so its center is at (1,1,1), + # which centers it within the 2x2x2 cube (whose center is also at (1,1,1)). + small_cube = Pos(0.5, 0.5, 0.5) * small_cube + + large_obb = OrientedBoundBox(large_cube) + small_obb = OrientedBoundBox(small_cube) + + # The small box should be completely inside the larger box. + self.assertTrue(large_obb.is_completely_inside(small_obb)) + # Conversely, the larger box cannot be completely inside the smaller one. + self.assertFalse(small_obb.is_completely_inside(large_obb)) + + large_obb.wrapped = None + with self.assertRaises(ValueError): + small_obb.is_completely_inside(large_obb) + + def test_init_from_bnd_obb(self): + # Test that constructing from an already computed Bnd_OBB works as expected. + cube = Solid.make_box(1, 1, 1) + obb1 = OrientedBoundBox(cube) + # Create a new instance by passing the underlying wrapped object. + obb2 = OrientedBoundBox(obb1.wrapped) + + # Compare diagonal, size, and center. + self.assertAlmostEqual(obb1.diagonal, obb2.diagonal, places=6) + size1 = obb1.size + size2 = obb2.size + self.assertAlmostEqual(size1.X, size2.X, places=6) + self.assertAlmostEqual(size1.Y, size2.Y, places=6) + self.assertAlmostEqual(size1.Z, size2.Z, places=6) + center1 = obb1.center() + center2 = obb2.center() + self.assertAlmostEqual(center1.X, center2.X, places=6) + self.assertAlmostEqual(center1.Y, center2.Y, places=6) + self.assertAlmostEqual(center1.Z, center2.Z, places=6) + + def test_plane(self): + rect = Rot(Z=10) * Face.make_rect(1, 2) + obb = rect.oriented_bounding_box() + pln = obb.plane + self.assertAlmostEqual( + abs(pln.x_dir.dot(Vector(0, 1, 0).rotate(Axis.Z, 10))), 1.0, places=6 + ) + self.assertAlmostEqual(abs(pln.z_dir.dot(Vector(0, 0, 1))), 1.0, places=6) + + def test_repr(self): + # Create a simple unit cube OBB. + obb = OrientedBoundBox(Solid.make_box(1, 1, 1)) + rep = repr(obb) + + # Check that the repr string contains expected substrings. + self.assertIn("OrientedBoundBox(center=Vector(", rep) + self.assertIn("size=Vector(", rep) + self.assertIn("plane=Plane(", rep) + + # Use a regular expression to extract numbers. + pattern = ( + r"OrientedBoundBox\(center=Vector\((?P[-\d\.]+), (?P[-\d\.]+), (?P[-\d\.]+)\), " + r"size=Vector\((?P[-\d\.]+), (?P[-\d\.]+), (?P[-\d\.]+)\), " + r"plane=Plane\(o=\((?P[-\d\.]+), (?P[-\d\.]+), (?P[-\d\.]+)\), " + r"x=\((?P[-\d\.]+), (?P[-\d\.]+), (?P[-\d\.]+)\), " + r"z=\((?P[-\d\.]+), (?P[-\d\.]+), (?P[-\d\.]+)\)\)\)" + ) + m = re.match(pattern, rep) + self.assertIsNotNone( + m, "The __repr__ string did not match the expected format." + ) + + # Convert extracted strings to floats. + center = Vector( + float(m.group("c0")), float(m.group("c1")), float(m.group("c2")) + ) + size = Vector(float(m.group("s0")), float(m.group("s1")), float(m.group("s2"))) + # For a unit cube, we expect the center to be (0.5, 0.5, 0.5) + self.assertAlmostEqual(center.X, 0.5, places=6) + self.assertAlmostEqual(center.Y, 0.5, places=6) + self.assertAlmostEqual(center.Z, 0.5, places=6) + # And the full size to be approximately (1, 1, 1) (floating-point values may vary slightly). + self.assertAlmostEqual(size.X, 1.0, places=6) + self.assertAlmostEqual(size.Y, 1.0, places=6) + self.assertAlmostEqual(size.Z, 1.0, places=6) + + +if __name__ == "__main__": + unittest.main() From 72bbc433f0da7db322d9fefb65b395268e5a2742 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 4 Feb 2025 18:39:44 -0500 Subject: [PATCH 185/518] Relaxing OOB orientation test as inconsistent across platforms --- src/build123d/geometry.py | 3 +++ tests/test_direct_api/test_oriented_bound_box.py | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 784dc1d..edb0c91 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1731,6 +1731,9 @@ class OrientedBoundBox: This class computes the oriented bounding box for a given build123d shape. It exposes properties such as the center, principal axis directions, the extents along these axes, and the full diagonal length of the box. + + Note: The axes of the oriented bounding box are arbitary and may not be + consistent across platforms or time. """ def __init__(self, shape: Bnd_OBB | Shape): diff --git a/tests/test_direct_api/test_oriented_bound_box.py b/tests/test_direct_api/test_oriented_bound_box.py index 25bbc2f..643b174 100644 --- a/tests/test_direct_api/test_oriented_bound_box.py +++ b/tests/test_direct_api/test_oriented_bound_box.py @@ -129,12 +129,13 @@ class TestOrientedBoundBox(unittest.TestCase): self.assertAlmostEqual(center1.Z, center2.Z, places=6) def test_plane(self): + """Orientation of plan may not be consistent across platforms""" rect = Rot(Z=10) * Face.make_rect(1, 2) obb = rect.oriented_bounding_box() pln = obb.plane - self.assertAlmostEqual( - abs(pln.x_dir.dot(Vector(0, 1, 0).rotate(Axis.Z, 10))), 1.0, places=6 - ) + # self.assertAlmostEqual( + # abs(pln.x_dir.dot(Vector(0, 1, 0).rotate(Axis.Z, 10))), 1.0, places=6 + # ) self.assertAlmostEqual(abs(pln.z_dir.dot(Vector(0, 0, 1))), 1.0, places=6) def test_repr(self): From 4e42ccb1966cd7f1fa8f0ceba4ca0ae1ff18a6fc Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 6 Feb 2025 10:29:31 -0500 Subject: [PATCH 186/518] Adding OrientedBoundBox.corners and Face.axes_of_symmetry --- src/build123d/geometry.py | 51 +++++++- src/build123d/topology/two_d.py | 101 ++++++++++++++- tests/test_direct_api/test_face.py | 69 +++++++++- .../test_oriented_bound_box.py | 119 +++++++++++++++++- 4 files changed, 334 insertions(+), 6 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index edb0c91..f2ca73c 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -35,11 +35,12 @@ from __future__ import annotations # too-many-arguments, too-many-locals, too-many-public-methods, # too-many-statements, too-many-instance-attributes, too-many-branches import copy as copy_module +import itertools import json import logging import numpy as np -from math import degrees, pi, radians +from math import degrees, pi, radians, isclose from typing import Any, overload, TypeAlias, TYPE_CHECKING from collections.abc import Iterable, Sequence @@ -1753,6 +1754,44 @@ class OrientedBoundBox: BRepBndLib.AddOBB_s(shape.wrapped, obb, True) self.wrapped = obb + @property + def corners(self) -> list[Vector]: + """ + Compute and return the unique corner points of the oriented bounding box + in the coordinate system defined by the OBB's plane. + + For degenerate shapes (e.g. a line or a planar face), only the unique + points are returned. For 2D shapes the corners are returned in an order + that allows a polygon to be directly created from them. + + Returns: + list[Vector]: The unique corner points. + """ + + # Build a dictionary keyed by a tuple indicating if each axis is degenerate. + orders = { + # Straight line cases + (True, True, False): [(1, 1, 1), (1, 1, -1)], + (True, False, True): [(1, 1, 1), (1, -1, 1)], + (False, True, True): [(1, 1, 1), (-1, 1, 1)], + # Planar face cases + (True, False, False): [(1, 1, 1), (1, 1, -1), (1, -1, -1), (1, -1, 1)], + (False, True, False): [(1, 1, 1), (1, 1, -1), (-1, 1, -1), (-1, 1, 1)], + (False, False, True): [(1, 1, 1), (1, -1, 1), (-1, -1, 1), (-1, 1, 1)], + # 3D object case + (False, False, False): [ + (x, y, z) for x, y, z in itertools.product((-1, 1), (-1, 1), (-1, 1)) + ], + } + hs = self.size * 0.5 + order = orders[(hs.X < TOLERANCE, hs.Y < TOLERANCE, hs.Z < TOLERANCE)] + local_corners = [ + Vector(sx * hs.X, sy * hs.Y, sz * hs.Z) for sx, sy, sz in order + ] + corners = [self.plane.from_local_coords(c) for c in local_corners] + + return corners + @property def diagonal(self) -> float: """ @@ -1766,6 +1805,16 @@ class OrientedBoundBox: return 0.0 return self.wrapped.SquareExtent() ** 0.5 + @property + def location(self) -> Location: + """ + The Location of the center of the oriented bounding box. + + Returns: + Location: center location + """ + return Location(self.plane) + @property def plane(self) -> Plane: """ diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index bf4e1a6..9b56973 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -93,12 +93,13 @@ from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid from OCP.gce import gce_MakeLin from OCP.gp import gp_Pnt, gp_Vec -from build123d.build_enums import CenterOf, GeomType, SortBy, Transition +from build123d.build_enums import CenterOf, GeomType, Keep, SortBy, Transition from build123d.geometry import ( TOLERANCE, Axis, Color, Location, + OrientedBoundBox, Plane, Vector, VectorLike, @@ -354,6 +355,104 @@ class Face(Mixin2D, Shape[TopoDS_Face]): # ---- Properties ---- + @property + def axes_of_symmetry(self) -> list[Axis]: + """Computes and returns the axes of symmetry for a planar face. + + The method determines potential symmetry axes by analyzing the face’s + geometry: + - It first validates that the face is non-empty and planar. + - For faces with inner wires (holes), it computes the centroid of the + holes and the face's overall center (COG). + If the holes' centroid significantly deviates from the COG (beyond + a specified tolerance), the symmetry axis is taken along the line + connecting these points; otherwise, each hole’s center is used to + generate a candidate axis. + - For faces without holes, candidate directions are derived by sampling + midpoints along the outer wire's edges. + If curved edges are present, additional candidate directions are + obtained from an oriented bounding box (OBB) constructed around the + face. + + For each candidate direction, the face is split by a plane (defined + using the candidate direction and the face’s normal). The top half of the face + is then mirrored across this plane, and if the area of the intersection between + the mirrored half and the bottom half matches the bottom half’s area within a + small tolerance, the direction is accepted as an axis of symmetry. + + Returns: + list[Axis]: A list of Axis objects, each defined by the face's + center and a direction vector, representing the symmetry axes of + the face. + + Raises: + ValueError: If the face or its underlying representation is empty. + ValueError: If the face is not planar. + """ + + if self.wrapped is None: + raise ValueError("Can't determine axes_of_symmetry of empty face") + + if not self.is_planar_face: + raise ValueError("axes_of_symmetry only supports for planar faces") + + cog = self.center() + normal = self.normal_at() + shape_inner_wires = self.inner_wires() + if shape_inner_wires: + hole_faces = [Face(w) for w in shape_inner_wires] + holes_centroid = Face.combined_center(hole_faces) + # If the holes aren't centered on the cog the axis of symmetry must be + # through the cog and hole centroid + if abs(holes_centroid - cog) > TOLERANCE: + cross_dirs = [(holes_centroid - cog).normalized()] + else: + # There may be an axis of symmetry through the center of the holes + cross_dirs = [(f.center() - cog).normalized() for f in hole_faces] + else: + curved_edges = ( + self.outer_wire().edges().filter_by(GeomType.LINE, reverse=True) + ) + shape_edges = self.outer_wire().edges() + if curved_edges: + obb = OrientedBoundBox(self) + corners = obb.corners + obb_edges = ShapeList( + [Edge.make_line(corners[i], corners[(i + 1) % 4]) for i in range(4)] + ) + mid_points = [ + e @ p for e in shape_edges + obb_edges for p in [0.0, 0.5, 1.0] + ] + else: + mid_points = [e @ p for e in shape_edges for p in [0.0, 0.5, 1.0]] + cross_dirs = [(mid_point - cog).normalized() for mid_point in mid_points] + + symmetry_dirs: set[Vector] = set() + for cross_dir in cross_dirs: + # Split the face by the potential axis and flip the top + split_plane = Plane( + origin=cog, + x_dir=cross_dir, + z_dir=cross_dir.cross(normal), + ) + top, bottom = self.split(split_plane, keep=Keep.BOTH) + top_flipped = top.mirror(split_plane) + + # Are the top/bottom the same? + if abs(bottom.intersect(top_flipped).area - bottom.area) < TOLERANCE: + # If this axis isn't in the set already add it + if not symmetry_dirs: + symmetry_dirs.add(cross_dir) + else: + opposite = any( + d.dot(cross_dir) < -1 + TOLERANCE for d in symmetry_dirs + ) + if not opposite: + symmetry_dirs.add(cross_dir) + + symmetry_axes = [Axis(cog, d) for d in symmetry_dirs] + return symmetry_axes + @property def center_location(self) -> Location: """Location at the center of face""" diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 6f16eca..d1904e0 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -32,7 +32,7 @@ import platform import random import unittest -from build123d.build_common import Locations +from build123d.build_common import Locations, PolarLocations from build123d.build_enums import Align, CenterOf, GeomType from build123d.build_line import BuildLine from build123d.build_part import BuildPart @@ -42,7 +42,13 @@ from build123d.geometry import Axis, Location, Plane, Pos, Vector from build123d.importers import import_stl from build123d.objects_curve import Polyline from build123d.objects_part import Box, Cylinder -from build123d.objects_sketch import Rectangle, RegularPolygon +from build123d.objects_sketch import ( + Circle, + Ellipse, + Rectangle, + RegularPolygon, + Triangle, +) from build123d.operations_generic import fillet from build123d.operations_part import extrude from build123d.operations_sketch import make_face @@ -482,6 +488,65 @@ class TestFace(unittest.TestCase): frame.wrapped = None self.assertAlmostEqual(frame.total_area, 0.0, 5) + def test_axes_of_symmetry(self): + # Empty shape + shape = Face.make_rect(1, 1) + shape.wrapped = None + with self.assertRaises(ValueError): + shape.axes_of_symmetry + + # Non planar + shape = Solid.make_cylinder(1, 2).faces().filter_by(GeomType.CYLINDER)[0] + with self.assertRaises(ValueError): + shape.axes_of_symmetry + + # Test a variety of shapes + shapes = [ + Rectangle(1, 1), + Rectangle(1, 2, align=Align.MIN), + Rectangle(1, 2, rotation=10), + Rectangle(1, 2, align=Align.MIN) - Pos(0.5, 0.75) * Circle(0.2), + (Rectangle(1, 2, align=Align.MIN) - Pos(0.5, 0.75) * Circle(0.2)).rotate( + Axis.Z, 10 + ), + Triangle(a=1, b=0.5, C=90), + Circle(2) - Pos(0.1) * Rectangle(0.5, 0.5), + Circle(2) - Pos(0.1, 0.1) * Rectangle(0.5, 0.5), + Circle(2) - (Pos(0.1, 0.1) * PolarLocations(1, 3)) * Circle(0.3), + Circle(2) - (Pos(0.5) * PolarLocations(1, 3)) * Circle(0.3), + Circle(2) - PolarLocations(1, 3) * Circle(0.3), + Ellipse(1, 2, rotation=10), + ] + shape_dir = [ + [(-1, 1), (-1, 0), (-1, -1), (0, -1)], + [(-1, 0), (0, -1)], + [Vector(-1, 0).rotate(Axis.Z, 10), Vector(0, -1).rotate(Axis.Z, 10)], + [(0, -1)], + [Vector(0, -1).rotate(Axis.Z, 10)], + [], + [(1, 0)], + [(1, 1)], + [], + [(1, 0)], + [ + (1, 0), + Vector(1, 0).rotate(Axis.Z, 120), + Vector(1, 0).rotate(Axis.Z, 240), + ], + [Vector(1, 0).rotate(Axis.Z, 10), Vector(0, 1).rotate(Axis.Z, 10)], + ] + + for i, shape in enumerate(shapes): + test_face: Face = shape.face() + cog = test_face.center() + axes = test_face.axes_of_symmetry + target_axes = [Axis(cog, d) for d in shape_dir[i]] + self.assertEqual(len(target_axes), len(axes)) + axes_dirs = sorted(tuple(a.direction) for a in axes) + target_dirs = sorted(tuple(a.direction) for a in target_axes) + self.assertTrue(all(a == t) for a, t in zip(axes_dirs, target_dirs)) + self.assertTrue(all(a.position == cog) for a in axes) + if __name__ == "__main__": unittest.main() diff --git a/tests/test_direct_api/test_oriented_bound_box.py b/tests/test_direct_api/test_oriented_bound_box.py index 643b174..4ed6a6c 100644 --- a/tests/test_direct_api/test_oriented_bound_box.py +++ b/tests/test_direct_api/test_oriented_bound_box.py @@ -30,8 +30,10 @@ import math import re import unittest -from build123d.geometry import Axis, OrientedBoundBox, Pos, Rot, Vector -from build123d.topology import Face, Solid +from build123d.geometry import Location, OrientedBoundBox, Plane, Pos, Rot, Vector +from build123d.topology import Edge, Face, Solid +from build123d.objects_part import Box +from build123d.objects_sketch import Polygon class TestOrientedBoundBox(unittest.TestCase): @@ -175,6 +177,119 @@ class TestOrientedBoundBox(unittest.TestCase): self.assertAlmostEqual(size.Y, 1.0, places=6) self.assertAlmostEqual(size.Z, 1.0, places=6) + def test_rotated_cube_corners(self): + # Create a cube of size 2x2x2 rotated by 45 degrees around each axis. + rotated_cube = Rot(45, 45, 45) * Box(2, 2, 2) + + # Compute the oriented bounding box. + obb = OrientedBoundBox(rotated_cube) + corners = obb.corners + + # There should be eight unique corners. + self.assertEqual(len(corners), 8) + + # The center of the cube should be at or near the origin. + center = obb.center() + + # For a cube with full side lengths 2, the half-size is 1, + # so the distance from the center to any corner is sqrt(1^2 + 1^2 + 1^2) = sqrt(3). + expected_distance = math.sqrt(3) + + # Verify that each corner is at the expected distance from the center. + for corner in corners: + distance = (corner - center).length + self.assertAlmostEqual(distance, expected_distance, places=6) + + def test_planar_face_corners(self): + """ + Test that a planar face returns four unique corner points. + """ + # Create a square face of size 2x2 (centered at the origin). + face = Face.make_rect(2, 2) + # Compute the oriented bounding box from the face. + obb = OrientedBoundBox(face) + corners = obb.corners + + # Convert each Vector to a tuple (rounded for tolerance reasons) + unique_points = { + (round(pt.X, 6), round(pt.Y, 6), round(pt.Z, 6)) for pt in corners + } + # For a planar (2D) face, we expect 4 unique corners. + self.assertEqual( + len(unique_points), + 4, + f"Expected 4 unique corners for a planar face but got {len(unique_points)}", + ) + # Check orientation + for pln in [Plane.XY, Plane.XZ, Plane.YZ]: + rect = Face.make_rect(1, 2, pln) + obb = OrientedBoundBox(rect) + corners = obb.corners + poly = Polygon(*corners, align=None) + self.assertAlmostEqual(rect.intersect(poly).area, rect.area, 5) + + for face in Box(1, 2, 3).faces(): + obb = OrientedBoundBox(face) + corners = obb.corners + poly = Polygon(*corners, align=None) + self.assertAlmostEqual(face.intersect(poly).area, face.area, 5) + + def test_line_corners(self): + """ + Test that a straight line returns two unique endpoints. + """ + # Create a straight line from (0, 0, 0) to (1, 0, 0). + line = Edge.make_line(Vector(0, 0, 0), Vector(1, 0, 0)) + # Compute the oriented bounding box from the line. + obb = OrientedBoundBox(line) + corners = obb.corners + + # Convert each Vector to a tuple (rounded for tolerance) + unique_points = { + (round(pt.X, 6), round(pt.Y, 6), round(pt.Z, 6)) for pt in corners + } + # For a line, we expect only 2 unique endpoints. + self.assertEqual( + len(unique_points), + 2, + f"Expected 2 unique corners for a line but got {len(unique_points)}", + ) + # Check orientation + for end in [(1, 0, 0), (0, 1, 0), (0, 0, 1)]: + line = Edge.make_line((0, 0, 0), end) + obb = OrientedBoundBox(line) + corners = obb.corners + self.assertEqual(len(corners), 2) + self.assertTrue(Vector(end) in corners) + + def test_location(self): + # Create a unit cube. + cube = Solid.make_box(1, 1, 1) + obb = OrientedBoundBox(cube) + + # Get the location property (constructed from the plane). + loc = obb.location + + # Check that loc is a Location instance. + self.assertIsInstance(loc, Location) + + # Compare the location's origin with the oriented bounding box center. + center = obb.center() + self.assertAlmostEqual(loc.position.X, center.X, places=6) + self.assertAlmostEqual(loc.position.Y, center.Y, places=6) + self.assertAlmostEqual(loc.position.Z, center.Z, places=6) + + # Optionally, if the Location preserves the plane's orientation, + # check that the x and z directions match those of the obb's plane. + plane = obb.plane + self.assertAlmostEqual(loc.x_axis.direction.X, plane.x_dir.X, places=6) + self.assertAlmostEqual(loc.x_axis.direction.Y, plane.x_dir.Y, places=6) + self.assertAlmostEqual(loc.x_axis.direction.Z, plane.x_dir.Z, places=6) + + self.assertAlmostEqual(loc.z_axis.direction.X, plane.z_dir.X, places=6) + self.assertAlmostEqual(loc.z_axis.direction.Y, plane.z_dir.Y, places=6) + self.assertAlmostEqual(loc.z_axis.direction.Z, plane.z_dir.Z, places=6) + if __name__ == "__main__": unittest.main() From 6e0af24b21e3bf1553dcdec329ef3d04ef27d120 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 6 Feb 2025 10:48:28 -0500 Subject: [PATCH 187/518] Fixing OOB test on Macs --- tests/test_direct_api/test_oriented_bound_box.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/test_direct_api/test_oriented_bound_box.py b/tests/test_direct_api/test_oriented_bound_box.py index 4ed6a6c..bcdb566 100644 --- a/tests/test_direct_api/test_oriented_bound_box.py +++ b/tests/test_direct_api/test_oriented_bound_box.py @@ -30,7 +30,7 @@ import math import re import unittest -from build123d.geometry import Location, OrientedBoundBox, Plane, Pos, Rot, Vector +from build123d.geometry import Axis, Location, OrientedBoundBox, Plane, Pos, Rot, Vector from build123d.topology import Edge, Face, Solid from build123d.objects_part import Box from build123d.objects_sketch import Polygon @@ -131,14 +131,17 @@ class TestOrientedBoundBox(unittest.TestCase): self.assertAlmostEqual(center1.Z, center2.Z, places=6) def test_plane(self): - """Orientation of plan may not be consistent across platforms""" + # Note: Orientation of plan may not be consistent across platforms rect = Rot(Z=10) * Face.make_rect(1, 2) obb = rect.oriented_bounding_box() pln = obb.plane - # self.assertAlmostEqual( - # abs(pln.x_dir.dot(Vector(0, 1, 0).rotate(Axis.Z, 10))), 1.0, places=6 - # ) self.assertAlmostEqual(abs(pln.z_dir.dot(Vector(0, 0, 1))), 1.0, places=6) + self.assertTrue( + any( + abs(d.dot(Vector(1, 0).rotate(Axis.Z, 10))) > 0.999 + for d in [pln.x_dir, pln.y_dir, pln.z_dir] + ) + ) def test_repr(self): # Create a simple unit cube OBB. From 2247ea9303d505348e6b2ed8f3b34891ee9777ba Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 6 Feb 2025 11:01:38 -0500 Subject: [PATCH 188/518] Renaming Face.total_area to area_without_holes & Face.remove_holes to without_holes --- src/build123d/topology/two_d.py | 40 +++++++++++++++--------------- tests/test_direct_api/test_face.py | 16 ++++++------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 9b56973..38b33da 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -505,7 +505,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return result @property - def total_area(self) -> float: + def area_without_holes(self) -> float: """ Calculate the total surface area of the face, including the areas of any holes. @@ -519,7 +519,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): if self.wrapped is None: return 0.0 - return self.remove_holes().area + return self.without_holes().area @property def volume(self) -> float: @@ -1317,8 +1317,24 @@ class Face(Mixin2D, Shape[TopoDS_Face]): projected_shapes.append(shape) return projected_shapes - def remove_holes(self) -> Face: - """remove_holes + def to_arcs(self, tolerance: float = 1e-3) -> Face: + """to_arcs + + Approximate planar face with arcs and straight line segments. + + Args: + tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. + + Returns: + Face: approximated face + """ + if self.wrapped is None: + raise ValueError("Cannot approximate an empty shape") + + return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) + + def without_holes(self) -> Face: + """without_holes Remove all of the holes from this face. @@ -1339,22 +1355,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): holeless.wrapped = modified_shape return holeless - def to_arcs(self, tolerance: float = 1e-3) -> Face: - """to_arcs - - Approximate planar face with arcs and straight line segments. - - Args: - tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. - - Returns: - Face: approximated face - """ - if self.wrapped is None: - raise ValueError("Cannot approximate an empty shape") - - return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) - def wire(self) -> Wire: """Return the outerwire, generate a warning if inner_wires present""" if self.inner_wires(): diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index d1904e0..a46a895 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -453,10 +453,10 @@ class TestFace(unittest.TestCase): face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] self.assertAlmostEqual(face.normal_at(0, 1), (1, 0, 0), 5) - def test_remove_holes(self): + def test_without_holes(self): # Planar test frame = (Rectangle(1, 1) - Rectangle(0.5, 0.5)).face() - filled = frame.remove_holes() + filled = frame.without_holes() self.assertEqual(len(frame.inner_wires()), 1) self.assertEqual(len(filled.inner_wires()), 0) self.assertAlmostEqual(frame.area, 0.75, 5) @@ -465,11 +465,11 @@ class TestFace(unittest.TestCase): # Errors frame.wrapped = None with self.assertRaises(ValueError): - frame.remove_holes() + frame.without_holes() # No holes rect = Face.make_rect(1, 1) - self.assertEqual(rect, rect.remove_holes()) + self.assertEqual(rect, rect.without_holes()) # Non-planar test cyl_face = ( @@ -477,16 +477,16 @@ class TestFace(unittest.TestCase): .faces() .sort_by(Face.area)[-1] ) - filled = cyl_face.remove_holes() + filled = cyl_face.without_holes() self.assertEqual(len(cyl_face.inner_wires()), 2) self.assertEqual(len(filled.inner_wires()), 0) self.assertTrue(cyl_face.area < filled.area) - self.assertAlmostEqual(cyl_face.total_area, filled.area, 5) + self.assertAlmostEqual(cyl_face.area_without_holes, filled.area, 5) - def test_total_area(self): + def test_area_without_holes(self): frame = (Rectangle(1, 1) - Rectangle(0.5, 0.5)).face() frame.wrapped = None - self.assertAlmostEqual(frame.total_area, 0.0, 5) + self.assertAlmostEqual(frame.area_without_holes, 0.0, 5) def test_axes_of_symmetry(self): # Empty shape From e7aee388c618df82496c15e025068f36771a814e Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 6 Feb 2025 11:09:22 -0500 Subject: [PATCH 189/518] Reordering properties in module --- src/build123d/topology/two_d.py | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 38b33da..91af897 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -355,6 +355,23 @@ class Face(Mixin2D, Shape[TopoDS_Face]): # ---- Properties ---- + @property + def area_without_holes(self) -> float: + """ + Calculate the total surface area of the face, including the areas of any holes. + + This property returns the overall area of the face as if the inner boundaries (holes) + were filled in. + + Returns: + float: The total surface area, including the area of holes. Returns 0.0 if + the face is empty. + """ + if self.wrapped is None: + return 0.0 + + return self.without_holes().area + @property def axes_of_symmetry(self) -> list[Axis]: """Computes and returns the axes of symmetry for a planar face. @@ -504,23 +521,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): result = face_vertices[-1].X - face_vertices[0].X return result - @property - def area_without_holes(self) -> float: - """ - Calculate the total surface area of the face, including the areas of any holes. - - This property returns the overall area of the face as if the inner boundaries (holes) - were filled in. - - Returns: - float: The total surface area, including the area of holes. Returns 0.0 if - the face is empty. - """ - if self.wrapped is None: - return 0.0 - - return self.without_holes().area - @property def volume(self) -> float: """volume - the volume of this Face, which is always zero""" From ce7d7d94c69a6dfc99aeba7d544ca08105d9ce55 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 6 Feb 2025 20:35:11 +0000 Subject: [PATCH 190/518] Fix source typos Found via `codespell -q 3 -w -L parm,parms,re-use,substract` --- src/build123d/drafting.py | 12 ++++++------ src/build123d/geometry.py | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index b1388dd..176e6e6 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -228,10 +228,10 @@ class Draft: def simplify_fraction(numerator: int, denominator: int) -> tuple[int, int]: """Mathematically simplify a fraction given a numerator and denominator""" - greatest_common_demoninator = gcd(numerator, denominator) + greatest_common_denominator = gcd(numerator, denominator) return ( - int(numerator / greatest_common_demoninator), - int(denominator / greatest_common_demoninator), + int(numerator / greatest_common_denominator), + int(denominator / greatest_common_denominator), ) if display_units is None: @@ -258,15 +258,15 @@ class Draft: return_value = f"{measurement}{unit_str}{tolerance_str}" else: whole_part = floor(number / IN) - (numerator, demoninator) = simplify_fraction( + (numerator, denominator) = simplify_fraction( round((number / IN - whole_part) * self.fractional_precision), self.fractional_precision, ) if whole_part == 0: - return_value = f"{numerator}/{demoninator}{unit_str}{tolerance_str}" + return_value = f"{numerator}/{denominator}{unit_str}{tolerance_str}" else: return_value = ( - f"{whole_part} {numerator}/{demoninator}{unit_str}{tolerance_str}" + f"{whole_part} {numerator}/{denominator}{unit_str}{tolerance_str}" ) return return_value diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index fa2a019..2f04499 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1138,8 +1138,8 @@ class Color: """Color from a hexadecimal color code with an optional alpha value Args: - color_code (hexidecimal int): 0xRRGGBB - alpha (hexidecimal int): 0x00 <= alpha as hex <= 0xFF + color_code (hexadecimal int): 0xRRGGBB + alpha (hexadecimal int): 0x00 <= alpha as hex <= 0xFF """ def __init__(self, *args, **kwargs): @@ -1733,7 +1733,7 @@ class OrientedBoundBox: It exposes properties such as the center, principal axis directions, the extents along these axes, and the full diagonal length of the box. - Note: The axes of the oriented bounding box are arbitary and may not be + Note: The axes of the oriented bounding box are arbitrary and may not be consistent across platforms or time. """ From b64807fccc3cb643d9358ea105dcf8b3c1389472 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 6 Feb 2025 21:16:14 -0600 Subject: [PATCH 191/518] add oriented bounding box support to Solid.from_bounding_box and tests --- src/build123d/topology/three_d.py | 9 +++++++-- tests/test_direct_api/test_solid.py | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index c776614..5595888 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -95,6 +95,7 @@ from build123d.geometry import ( BoundBox, Color, Location, + OrientedBoundBox, Plane, Vector, VectorLike, @@ -949,9 +950,13 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): return result @classmethod - def from_bounding_box(cls, bbox: BoundBox) -> Solid: + def from_bounding_box(cls, bbox: BoundBox | OrientedBoundBox) -> Solid: """A box of the same dimensions and location""" - return Solid.make_box(*bbox.size).locate(Location(bbox.min)) + if isinstance(bbox, BoundBox): + return Solid.make_box(*bbox.size).locate(Location(bbox.min)) + else: + moved_plane = Plane(Location(-bbox.size / 2)).move(bbox.location) + return Solid.make_box(*bbox.size, plane=moved_plane) @classmethod def make_box( diff --git a/tests/test_direct_api/test_solid.py b/tests/test_direct_api/test_solid.py index 2c67642..df44353 100644 --- a/tests/test_direct_api/test_solid.py +++ b/tests/test_direct_api/test_solid.py @@ -30,7 +30,15 @@ import math import unittest from build123d.build_enums import GeomType, Kind, Until -from build123d.geometry import Axis, Location, Plane, Pos, Vector +from build123d.geometry import ( + Axis, + BoundBox, + Location, + OrientedBoundBox, + Plane, + Pos, + Vector, +) from build123d.objects_curve import Spline from build123d.objects_sketch import Circle, Rectangle from build123d.topology import Compound, Edge, Face, Shell, Solid, Vertex, Wire @@ -233,6 +241,18 @@ class TestSolid(unittest.TestCase): ) self.assertEqual(len(r.faces()), 6) + def test_from_bounding_box(self): + cyl = Solid.make_cylinder(0.001, 10).locate(Location(Plane.isometric)) + cyl2 = Solid.make_cylinder(1, 10).locate(Location(Plane.isometric)) + + rbb = Solid.from_bounding_box(cyl.bounding_box()) + obb = Solid.from_bounding_box(cyl.oriented_bounding_box()) + obb2 = Solid.from_bounding_box(cyl2.oriented_bounding_box()) + + self.assertAlmostEqual(rbb.volume, (10**3) * (3**0.5) / 9, 0) + self.assertTrue(rbb.volume > obb.volume) + self.assertAlmostEqual(obb2.volume, 40, 4) + if __name__ == "__main__": unittest.main() From 8b53e1ab3cf833328130f37e69b6bcf3a6fc5cfc Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 6 Feb 2025 21:40:25 -0600 Subject: [PATCH 192/518] fix: mypy type checking in Solid.from_bounding_box --- src/build123d/topology/three_d.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 5595888..ee92394 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -955,8 +955,10 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): if isinstance(bbox, BoundBox): return Solid.make_box(*bbox.size).locate(Location(bbox.min)) else: - moved_plane = Plane(Location(-bbox.size / 2)).move(bbox.location) - return Solid.make_box(*bbox.size, plane=moved_plane) + moved_plane: Plane = Plane(Location(-bbox.size / 2)).move(bbox.location) + return Solid.make_box( + bbox.size.X, bbox.size.Y, bbox.size.Z, plane=moved_plane + ) @classmethod def make_box( From f22f54af5f4ce5e648d1932d6872cbe572b3d5ad Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 8 Feb 2025 14:46:13 -0500 Subject: [PATCH 193/518] Covering Face.axes_of_symmetry corner cases --- src/build123d/topology/two_d.py | 40 +++++- tests/test_direct_api/test_face.py | 211 ++++++++++++++++++++++++++++- 2 files changed, 245 insertions(+), 6 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 91af897..b5ae7fe 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -57,7 +57,7 @@ from __future__ import annotations import copy import warnings -from typing import Any, Tuple, Union, overload, TYPE_CHECKING +from typing import Any, overload, TYPE_CHECKING from collections.abc import Iterable, Sequence @@ -93,6 +93,7 @@ from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid from OCP.gce import gce_MakeLin from OCP.gp import gp_Pnt, gp_Vec + from build123d.build_enums import CenterOf, GeomType, Keep, SortBy, Transition from build123d.geometry import ( TOLERANCE, @@ -406,7 +407,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ValueError: If the face or its underlying representation is empty. ValueError: If the face is not planar. """ - if self.wrapped is None: raise ValueError("Can't determine axes_of_symmetry of empty face") @@ -452,12 +452,42 @@ class Face(Mixin2D, Shape[TopoDS_Face]): x_dir=cross_dir, z_dir=cross_dir.cross(normal), ) + # Split by plane top, bottom = self.split(split_plane, keep=Keep.BOTH) - top_flipped = top.mirror(split_plane) + + if type(top) != type(bottom): # exit early if not same + continue + + if top is None or bottom is None: # Impossible to actually happen? + continue + + top_list = ShapeList(top if isinstance(top, list) else [top]) + bottom_list = ShapeList(bottom if isinstance(top, list) else [bottom]) + + if len(top_list) != len(bottom_list): # exit early unequal length + continue + + bottom_list = bottom_list.sort_by(Axis(cog, cross_dir)) + top_flipped_list = ShapeList( + f.mirror(split_plane) for f in top_list + ).sort_by(Axis(cog, cross_dir)) + + bottom_area = sum(f.area for f in bottom_list) + intersect_area = 0.0 + for flipped_face, bottom_face in zip(top_flipped_list, bottom_list): + intersection = flipped_face.intersect(bottom_face) + if intersection is None or isinstance(intersection, list): + intersect_area = -1.0 + break + else: + assert isinstance(intersection, Face) + intersect_area += intersection.area + + if intersect_area == -1.0: + continue # Are the top/bottom the same? - if abs(bottom.intersect(top_flipped).area - bottom.area) < TOLERANCE: - # If this axis isn't in the set already add it + if abs(intersect_area - bottom_area) < TOLERANCE: if not symmetry_dirs: symmetry_dirs.add(cross_dir) else: diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index a46a895..159e979 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -40,7 +40,7 @@ from build123d.build_sketch import BuildSketch from build123d.exporters3d import export_stl from build123d.geometry import Axis, Location, Plane, Pos, Vector from build123d.importers import import_stl -from build123d.objects_curve import Polyline +from build123d.objects_curve import Line, Polyline, Spline, ThreePointArc from build123d.objects_part import Box, Cylinder from build123d.objects_sketch import ( Circle, @@ -547,6 +547,215 @@ class TestFace(unittest.TestCase): self.assertTrue(all(a == t) for a, t in zip(axes_dirs, target_dirs)) self.assertTrue(all(a.position == cog) for a in axes) + # Fast abort code paths + s1 = Spline( + (0.0293923441471, 1.9478225275438), + (0.0293923441471, 1.2810839877038), + (0, -0.0521774724562), + (0.0293923441471, -1.3158620329962), + (0.0293923441471, -1.9478180575162), + ) + l1 = Line(s1 @ 1, s1 @ 0) + self.assertEqual(len(Face(Wire([s1, l1])).axes_of_symmetry), 0) + + with BuildSketch() as skt: + with BuildLine(): + Line( + (-13.186467340991, 2.3737403364651), + (-5.1864673409911, 2.3737403364651), + ) + Line( + (-13.186467340991, 2.3737403364651), + (-13.186467340991, -2.4506956262169), + ) + ThreePointArc( + (-13.186467340991, -2.4506956262169), + (-13.479360559805, -3.1578024074034), + (-14.186467340991, -3.4506956262169), + ) + Line( + (-17.186467340991, -3.4506956262169), + (-14.186467340991, -3.4506956262169), + ) + ThreePointArc( + (-17.186467340991, -3.4506956262169), + (-17.893574122178, -3.1578024074034), + (-18.186467340991, -2.4506956262169), + ) + Line( + (-18.186467340991, 7.6644400497781), + (-18.186467340991, -2.4506956262169), + ) + Line( + (-51.186467340991, 7.6644400497781), + (-18.186467340991, 7.6644400497781), + ) + Line( + (-51.186467340991, 7.6644400497781), + (-51.186467340991, -5.5182296356389), + ) + Line( + (-51.186467340991, -5.5182296356389), + (-33.186467340991, -5.5182296356389), + ) + Line( + (-33.186467340991, -5.5182296356389), + (-33.186467340991, -5.3055423052429), + ) + Line( + (-33.186467340991, -5.3055423052429), + (53.813532659009, -5.3055423052429), + ) + Line( + (53.813532659009, -5.3055423052429), + (53.813532659009, -5.7806956262169), + ) + Line( + (66.813532659009, -5.7806956262169), + (53.813532659009, -5.7806956262169), + ) + Line( + (66.813532659009, -2.7217530775369), + (66.813532659009, -5.7806956262169), + ) + Line( + (54.813532659009, -2.7217530775369), + (66.813532659009, -2.7217530775369), + ) + Line( + (54.813532659009, 7.6644400497781), + (54.813532659009, -2.7217530775369), + ) + Line( + (38.813532659009, 7.6644400497781), + (54.813532659009, 7.6644400497781), + ) + Line( + (38.813532659009, 7.6644400497781), + (38.813532659009, -2.4506956262169), + ) + ThreePointArc( + (38.813532659009, -2.4506956262169), + (38.520639440195, -3.1578024074034), + (37.813532659009, -3.4506956262169), + ) + Line( + (37.813532659009, -3.4506956262169), + (34.813532659009, -3.4506956262169), + ) + ThreePointArc( + (34.813532659009, -3.4506956262169), + (34.106425877822, -3.1578024074034), + (33.813532659009, -2.4506956262169), + ) + Line( + (33.813532659009, 2.3737403364651), + (33.813532659009, -2.4506956262169), + ) + Line( + (25.813532659009, 2.3737403364651), + (33.813532659009, 2.3737403364651), + ) + Line( + (25.813532659009, 2.3737403364651), + (25.813532659009, -2.4506956262169), + ) + ThreePointArc( + (25.813532659009, -2.4506956262169), + (25.520639440195, -3.1578024074034), + (24.813532659009, -3.4506956262169), + ) + Line( + (24.813532659009, -3.4506956262169), + (21.813532659009, -3.4506956262169), + ) + ThreePointArc( + (21.813532659009, -3.4506956262169), + (21.106425877822, -3.1578024074034), + (20.813532659009, -2.4506956262169), + ) + Line( + (20.813532659009, 2.3737403364651), + (20.813532659009, -2.4506956262169), + ) + Line( + (12.813532659009, 2.3737403364651), + (20.813532659009, 2.3737403364651), + ) + Line( + (12.813532659009, 2.3737403364651), + (12.813532659009, -2.4506956262169), + ) + ThreePointArc( + (12.813532659009, -2.4506956262169), + (12.520639440195, -3.1578024074034), + (11.813532659009, -3.4506956262169), + ) + Line( + (8.8135326590089, -3.4506956262169), + (11.813532659009, -3.4506956262169), + ) + ThreePointArc( + (8.8135326590089, -3.4506956262169), + (8.1064258778223, -3.1578024074034), + (7.8135326590089, -2.4506956262169), + ) + Line( + (7.8135326590089, 2.3737403364651), + (7.8135326590089, -2.4506956262169), + ) + Line( + (-0.1864673409911, 2.3737403364651), + (7.8135326590089, 2.3737403364651), + ) + Line( + (-0.1864673409911, 2.3737403364651), + (-0.1864673409911, -2.4506956262169), + ) + ThreePointArc( + (-0.1864673409911, -2.4506956262169), + (-0.4793605598046, -3.1578024074034), + (-1.1864673409911, -3.4506956262169), + ) + Line( + (-4.1864673409911, -3.4506956262169), + (-1.1864673409911, -3.4506956262169), + ) + ThreePointArc( + (-4.1864673409911, -3.4506956262169), + (-4.8935741221777, -3.1578024074034), + (-5.1864673409911, -2.4506956262169), + ) + Line( + (-5.1864673409911, 2.3737403364651), + (-5.1864673409911, -2.4506956262169), + ) + make_face() + self.assertEqual(len(skt.face().axes_of_symmetry), 0) + + +class TestAxesOfSymmetrySplitNone(unittest.TestCase): + def test_split_returns_none(self): + # Create a rectangle face for testing. + rect = Rectangle(10, 5).face() + + # Monkey-patch the split method to simulate the degenerate case: + # Force split to return (None, rect) for any splitting plane. + original_split = Face.split # Save the original split method. + Face.split = lambda self, plane, keep: (None, None) + + # Call axes_of_symmetry. With our patch, every candidate axis is skipped, + # so we expect no symmetry axes to be found. + axes = rect.axes_of_symmetry + + # Verify that the result is an empty list. + self.assertEqual( + axes, [], "Expected no symmetry axes when split returns None for one half." + ) + + # Restore the original split method (cleanup). + Face.split = original_split + if __name__ == "__main__": unittest.main() From f6f916725e360b96d957fd2d4ba8016f1f4cdbd3 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 11 Feb 2025 11:33:11 -0500 Subject: [PATCH 194/518] Fixed handling of wrapped object --- src/build123d/topology/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index c876ba2..c1bbb1e 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -424,7 +424,7 @@ def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: if len(shapetypes) == 1: result = shapetypes.pop() else: - result = shapetype(obj) + result = shapetype(obj.wrapped) else: result = shapetype(obj.wrapped) return result From fd44037ef612302cf766a4b0f69fd236c0d13625 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 12 Feb 2025 19:28:25 -0500 Subject: [PATCH 195/518] Adding Face radius and rotational_axis properties --- src/build123d/topology/two_d.py | 16 ++++++++++++++++ tests/test_direct_api/test_face.py | 21 ++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index b5ae7fe..38a2b95 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -551,6 +551,22 @@ class Face(Mixin2D, Shape[TopoDS_Face]): result = face_vertices[-1].X - face_vertices[0].X return result + @property + def radius(self) -> None | float: + """Return the radius of a cylinder or sphere, otherwise None""" + if self.geom_type in [GeomType.CYLINDER, GeomType.SPHERE]: + return self.geom_adaptor().Radius() + else: + return None + + @property + def rotational_axis(self) -> None | Axis: + """Get the rotational axis of a cylinder""" + if self.geom_type == GeomType.CYLINDER: + return Axis(self.geom_adaptor().Cylinder().Axis()) + else: + return None + @property def volume(self) -> float: """volume - the volume of this Face, which is always zero""" diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 159e979..e3a9f6b 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -41,7 +41,7 @@ from build123d.exporters3d import export_stl from build123d.geometry import Axis, Location, Plane, Pos, Vector from build123d.importers import import_stl from build123d.objects_curve import Line, Polyline, Spline, ThreePointArc -from build123d.objects_part import Box, Cylinder +from build123d.objects_part import Box, Cylinder, Sphere from build123d.objects_sketch import ( Circle, Ellipse, @@ -733,6 +733,25 @@ class TestFace(unittest.TestCase): make_face() self.assertEqual(len(skt.face().axes_of_symmetry), 0) + def test_radius_property(self): + c = Cylinder(1.5, 2).faces().filter_by(GeomType.CYLINDER)[0] + s = Sphere(3).faces().filter_by(GeomType.SPHERE)[0] + b = Box(1, 1, 1).faces()[0] + self.assertAlmostEqual(c.radius, 1.5, 5) + self.assertAlmostEqual(s.radius, 3, 5) + self.assertIsNone(b.radius) + + def test_rotational_axis_property(self): + c = ( + Cylinder(1.5, 2, rotation=(90, 0, 0)) + .faces() + .filter_by(GeomType.CYLINDER)[0] + ) + s = Sphere(3).faces().filter_by(GeomType.SPHERE)[0] + self.assertAlmostEqual(c.rotational_axis.direction, (0, -1, 0), 5) + self.assertAlmostEqual(c.rotational_axis.position, (0, 1, 0), 5) + self.assertIsNone(s.rotational_axis) + class TestAxesOfSymmetrySplitNone(unittest.TestCase): def test_split_returns_none(self): From 36e795857411e302641e7eca9686d44041fa5d54 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 12 Feb 2025 20:55:26 -0500 Subject: [PATCH 196/518] Covering Face properties corner case --- src/build123d/topology/two_d.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 38a2b95..c9869ba 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -75,7 +75,7 @@ from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeFilling, BRepOffsetAPI_MakePipeShell from OCP.BRepTools import BRepTools, BRepTools_ReShape from OCP.GProp import GProp_GProps -from OCP.Geom import Geom_BezierSurface, Geom_Surface +from OCP.Geom import Geom_BezierSurface, Geom_Surface, Geom_RectangularTrimmedSurface from OCP.GeomAPI import GeomAPI_PointsToBSplineSurface, GeomAPI_ProjectPointOnSurf from OCP.GeomAbs import GeomAbs_C0 from OCP.Precision import Precision @@ -554,7 +554,10 @@ class Face(Mixin2D, Shape[TopoDS_Face]): @property def radius(self) -> None | float: """Return the radius of a cylinder or sphere, otherwise None""" - if self.geom_type in [GeomType.CYLINDER, GeomType.SPHERE]: + if ( + self.geom_type in [GeomType.CYLINDER, GeomType.SPHERE] + and type(self.geom_adaptor()) != Geom_RectangularTrimmedSurface + ): return self.geom_adaptor().Radius() else: return None @@ -562,7 +565,10 @@ class Face(Mixin2D, Shape[TopoDS_Face]): @property def rotational_axis(self) -> None | Axis: """Get the rotational axis of a cylinder""" - if self.geom_type == GeomType.CYLINDER: + if ( + self.geom_type == GeomType.CYLINDER + and type(self.geom_adaptor()) != Geom_RectangularTrimmedSurface + ): return Axis(self.geom_adaptor().Cylinder().Axis()) else: return None From bcda4788672fd11706d380002fac9cca9e24f30d Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 14 Feb 2025 13:43:55 -0500 Subject: [PATCH 197/518] Adding a citation --- CITATION.cff | 16 ++++++++++++++++ Citation.md | 19 +++++++++++++++++++ README.md | 2 ++ pyproject.toml | 1 + 4 files changed, 38 insertions(+) create mode 100644 CITATION.cff create mode 100644 Citation.md diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 0000000..29770bf --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,16 @@ +cff-version: 1.2.0 +message: "If you use build123d in your research, please cite it using the following information." +title: "build123d: A Python-based parametric CAD library" +version: "0.9.1" +doi: "10.5281/zenodo.14872323" +authors: + - name: "Roger Maitland" + affiliation: "Independent Developer" +date-released: "2024-02-14" +repository-code: "https://github.com/gumyr/build123d" +license: "Apache-2.0" +keywords: + - CAD + - Python + - OpenCascade + - Parametric Design diff --git a/Citation.md b/Citation.md new file mode 100644 index 0000000..bb4781a --- /dev/null +++ b/Citation.md @@ -0,0 +1,19 @@ +# Citation + +If you use **build123d** in your research, please cite: + +Roger Maitland. **"build123d: A Python-based parametric CAD library"**. Version 0.9.1, 2025. +DOI: [10.5281/zenodo.14872323](https://doi.org/10.5281/zenodo.14872323) +Source Code: [GitHub](https://github.com/gumyr/build123d) + +## BibTeX Entry + +```bibtex +@software{build123d, + author = {Roger Maitland}, + title = {build123d: A Python-based parametric CAD library}, + year = {2025}, + version = {0.9.1}, + doi = {10.5281/zenodo.14872323}, + url = {https://github.com/gumyr/build123d} +} \ No newline at end of file diff --git a/README.md b/README.md index 91d23f1..818210d 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ [![Downloads](https://pepy.tech/badge/build123d)](https://pepy.tech/project/build123d) [![Downloads/month](https://pepy.tech/badge/build123d/month)](https://pepy.tech/project/build123d) [![PyPI - Wheel](https://img.shields.io/pypi/wheel/build123d.svg)](https://pypi.org/project/build123d/) +[![DOI](https://zenodo.org/badge/510925389.svg)](https://doi.org/10.5281/zenodo.14872322) + Build123d is a python-based, parametric, [boundary representation (BREP)][BREP] modeling framework for 2D and 3D CAD. It's built on the [Open Cascade] geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as [FreeCAD] and SolidWorks. diff --git a/pyproject.toml b/pyproject.toml index 4a71828..ebf63d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,6 +51,7 @@ dependencies = [ "Homepage" = "https://github.com/gumyr/build123d" "Documentation" = "https://build123d.readthedocs.io/en/latest/index.html" "Bug Tracker" = "https://github.com/gumyr/build123d/issues" +"Citation" = "https://doi.org/10.5281/zenodo.14872323" [project.optional-dependencies] # enable the optional ocp_vscode visualization package From 838933be3729900869a49ae47de9530aa467dc40 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 14 Feb 2025 13:45:38 -0500 Subject: [PATCH 198/518] Fixing citation date --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 29770bf..6db4126 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -6,7 +6,7 @@ doi: "10.5281/zenodo.14872323" authors: - name: "Roger Maitland" affiliation: "Independent Developer" -date-released: "2024-02-14" +date-released: "2025-02-14" repository-code: "https://github.com/gumyr/build123d" license: "Apache-2.0" keywords: From e0e5d0d36804f8d2fc993c1b5497ec248f34c348 Mon Sep 17 00:00:00 2001 From: snoyer Date: Sat, 15 Feb 2025 19:32:43 +0400 Subject: [PATCH 199/518] make `Axis.position` and `Axis.direction` properties --- src/build123d/geometry.py | 25 +++++++++++++++---------- tests/test_direct_api/test_axis.py | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 2f04499..ec331bf 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -661,16 +661,21 @@ class Axis(metaclass=AxisMeta): gp_Dir(*tuple(direction_vector.normalized())), ) - self.position = Vector( - self.wrapped.Location().X(), - self.wrapped.Location().Y(), - self.wrapped.Location().Z(), - ) #: Axis origin - self.direction = Vector( - self.wrapped.Direction().X(), - self.wrapped.Direction().Y(), - self.wrapped.Direction().Z(), - ) #: Axis direction + @property + def position(self): + return Vector(self.wrapped.Location()) + + @position.setter + def position(self, position: VectorLike): + self.wrapped.SetLocation(Vector(position).to_pnt()) + + @property + def direction(self): + return Vector(self.wrapped.Direction()) + + @direction.setter + def direction(self, direction: VectorLike): + self.wrapped.SetDirection(Vector(direction).to_dir()) @property def location(self) -> Location: diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py index 49144c4..ed422d6 100644 --- a/tests/test_direct_api/test_axis.py +++ b/tests/test_direct_api/test_axis.py @@ -230,6 +230,27 @@ class TestAxis(unittest.TestCase): random_obj = object() self.assertNotEqual(Axis.X, random_obj) + def test_position_property(self): + axis = Axis.X + axis.position = 1, 2, 3 + self.assertAlmostEqual(axis.position, (1, 2, 3)) + + axis.position += 1, 2, 3 + self.assertAlmostEqual(axis.position, (2, 4, 6)) + + self.assertAlmostEqual(Axis(axis.wrapped).position, (2, 4, 6)) + + def test_direction_property(self): + axis = Axis.X + axis.direction = 1, 2, 3 + self.assertAlmostEqual(axis.direction, Vector(1, 2, 3).normalized()) + + axis.direction += 5, 3, 1 + expected = (Vector(1, 2, 3).normalized() + Vector(5, 3, 1)).normalized() + self.assertAlmostEqual(axis.direction, expected) + + self.assertAlmostEqual(Axis(axis.wrapped).direction, expected) + if __name__ == "__main__": unittest.main() From 39b4fc20dc1be807de1747195db95abcf41a35e0 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 17 Feb 2025 19:53:05 -0500 Subject: [PATCH 200/518] Ported PR #875 to refactored topology --- src/build123d/topology/two_d.py | 13 ++++++++----- tests/test_direct_api/test_shells.py | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index c9869ba..6536b52 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -62,7 +62,7 @@ from typing import Any, overload, TYPE_CHECKING from collections.abc import Iterable, Sequence import OCP.TopAbs as ta -from OCP.BRep import BRep_Tool +from OCP.BRep import BRep_Tool, BRep_Builder from OCP.BRepAdaptor import BRepAdaptor_Surface from OCP.BRepAlgo import BRepAlgo from OCP.BRepAlgoAPI import BRepAlgoAPI_Common @@ -1453,10 +1453,13 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): obj = obj_list[0] if isinstance(obj, Face): - builder = BRepBuilderAPI_MakeShell( - BRepAdaptor_Surface(obj.wrapped).Surface().Surface() - ) - obj = builder.Shape() + if obj.wrapped is None: + raise ValueError(f"Can't create a Shell from empty Face") + builder = BRep_Builder() + shell = TopoDS_Shell() + builder.MakeShell(shell) + builder.Add(shell, obj.wrapped) + obj = shell elif isinstance(obj, Iterable): obj = _sew_topods_faces([f.wrapped for f in obj]) diff --git a/tests/test_direct_api/test_shells.py b/tests/test_direct_api/test_shells.py index d78de7f..6c9023b 100644 --- a/tests/test_direct_api/test_shells.py +++ b/tests/test_direct_api/test_shells.py @@ -29,6 +29,7 @@ license: import math import unittest +from build123d.build_enums import GeomType from build123d.geometry import Plane, Rot, Vector from build123d.objects_curve import JernArc, Polyline, Spline from build123d.objects_sketch import Circle @@ -42,6 +43,11 @@ class TestShells(unittest.TestCase): box_shell = Shell(box_faces) self.assertTrue(box_shell.is_valid()) + def test_shell_init_single_face(self): + face = Solid.make_cone(1, 0, 2).faces().filter_by(GeomType.CONE).first + shell = Shell(face) + self.assertTrue(shell.is_valid()) + def test_center(self): box_faces = Solid.make_box(1, 1, 1).faces() box_shell = Shell(box_faces) From 0208621fd770e9b95917c71e14fd4659aeb7912b Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 19 Feb 2025 11:20:06 -0500 Subject: [PATCH 201/518] Adding Face.radii, Face.is_circular_convex, Face.is_circular_concave, rename Face.rotational_axis to Face.axis_of_rotation --- src/build123d/topology/two_d.py | 99 ++++++++++++++++++++++++++---- tests/test_direct_api/test_face.py | 90 +++++++++++++++++++++++++-- 2 files changed, 172 insertions(+), 17 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 6536b52..353fc39 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -373,6 +373,20 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return self.without_holes().area + @property + def axis_of_rotation(self) -> None | Axis: + """Get the rotational axis of a cylinder or torus""" + if type(self.geom_adaptor()) == Geom_RectangularTrimmedSurface: + return None + + if self.geom_type == GeomType.CYLINDER: + return Axis(self.geom_adaptor().Cylinder().Axis()) + + if self.geom_type == GeomType.TORUS: + return Axis(self.geom_adaptor().Torus().Axis()) + + return None + @property def axes_of_symmetry(self) -> list[Axis]: """Computes and returns the axes of symmetry for a planar face. @@ -535,6 +549,69 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return result + @property + def _curvature_sign(self) -> float: + """ + Compute the signed dot product between the face normal and the vector from the + underlying geometry's reference point to the face center. + + For a cylinder, the reference is the cylinder’s axis position. + For a sphere, it is the sphere’s center. + For a torus, we derive a reference point on the central circle. + + Returns: + float: The signed value; positive indicates convexity, negative indicates concavity. + Returns 0 if the geometry type is unsupported. + """ + if self.geom_type == GeomType.CYLINDER: + axis = self.axis_of_rotation + if axis is None: + raise ValueError("Can't find curvature of empty object") + return self.normal_at().dot(self.center() - axis.position) + + elif self.geom_type == GeomType.SPHERE: + loc = self.location # The sphere's center + if loc is None: + raise ValueError("Can't find curvature of empty object") + return self.normal_at().dot(self.center() - loc.position) + + elif self.geom_type == GeomType.TORUS: + # Here we assume that for a torus the rotational axis can be converted to a plane, + # and we then define the central (or core) circle using the first value of self.radii. + axis = self.axis_of_rotation + if axis is None or self.radii is None: + raise ValueError("Can't find curvature of empty object") + loc = Location(axis.to_plane()) + axis_circle = Edge.make_circle(self.radii[0]).locate(loc) + _, pnt_on_axis_circle, _ = axis_circle.distance_to_with_closest_points( + self.center() + ) + return self.normal_at().dot(self.center() - pnt_on_axis_circle) + + return 0.0 + + @property + def is_circular_convex(self) -> bool: + """ + Determine whether a given face is convex relative to its underlying geometry + for supported geometries: cylinder, sphere, torus. + + Returns: + bool: True if convex; otherwise, False. + """ + return self._curvature_sign > TOLERANCE + + @property + def is_circular_concave(self) -> bool: + """ + Determine whether a given face is concave relative to its underlying geometry + for supported geometries: cylinder, sphere, torus. + + Returns: + bool: True if concave; otherwise, False. + """ + return self._curvature_sign < -TOLERANCE + @property def is_planar(self) -> bool: """Is the face planar even though its geom_type may not be PLANE""" @@ -551,6 +628,17 @@ class Face(Mixin2D, Shape[TopoDS_Face]): result = face_vertices[-1].X - face_vertices[0].X return result + @property + def radii(self) -> None | tuple[float, float]: + """Return the major and minor radii of a torus otherwise None""" + if self.geom_type == GeomType.TORUS: + return ( + self.geom_adaptor().MajorRadius(), + self.geom_adaptor().MinorRadius(), + ) + + return None + @property def radius(self) -> None | float: """Return the radius of a cylinder or sphere, otherwise None""" @@ -562,17 +650,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): else: return None - @property - def rotational_axis(self) -> None | Axis: - """Get the rotational axis of a cylinder""" - if ( - self.geom_type == GeomType.CYLINDER - and type(self.geom_adaptor()) != Geom_RectangularTrimmedSurface - ): - return Axis(self.geom_adaptor().Cylinder().Axis()) - else: - return None - @property def volume(self) -> float: """volume - the volume of this Face, which is always zero""" diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index e3a9f6b..4b0557c 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -32,6 +32,8 @@ import platform import random import unittest +from unittest.mock import patch, PropertyMock +from OCP.Geom import Geom_RectangularTrimmedSurface from build123d.build_common import Locations, PolarLocations from build123d.build_enums import Align, CenterOf, GeomType from build123d.build_line import BuildLine @@ -41,7 +43,7 @@ from build123d.exporters3d import export_stl from build123d.geometry import Axis, Location, Plane, Pos, Vector from build123d.importers import import_stl from build123d.objects_curve import Line, Polyline, Spline, ThreePointArc -from build123d.objects_part import Box, Cylinder, Sphere +from build123d.objects_part import Box, Cylinder, Sphere, Torus from build123d.objects_sketch import ( Circle, Ellipse, @@ -49,7 +51,7 @@ from build123d.objects_sketch import ( RegularPolygon, Triangle, ) -from build123d.operations_generic import fillet +from build123d.operations_generic import fillet, offset from build123d.operations_part import extrude from build123d.operations_sketch import make_face from build123d.topology import Edge, Face, Solid, Wire @@ -741,16 +743,92 @@ class TestFace(unittest.TestCase): self.assertAlmostEqual(s.radius, 3, 5) self.assertIsNone(b.radius) - def test_rotational_axis_property(self): + def test_axis_of_rotation_property(self): c = ( Cylinder(1.5, 2, rotation=(90, 0, 0)) .faces() .filter_by(GeomType.CYLINDER)[0] ) s = Sphere(3).faces().filter_by(GeomType.SPHERE)[0] - self.assertAlmostEqual(c.rotational_axis.direction, (0, -1, 0), 5) - self.assertAlmostEqual(c.rotational_axis.position, (0, 1, 0), 5) - self.assertIsNone(s.rotational_axis) + self.assertAlmostEqual(c.axis_of_rotation.direction, (0, -1, 0), 5) + self.assertAlmostEqual(c.axis_of_rotation.position, (0, 1, 0), 5) + self.assertIsNone(s.axis_of_rotation) + + @patch.object( + Face, + "geom_adaptor", + return_value=Geom_RectangularTrimmedSurface( + Face.make_rect(1, 1).geom_adaptor(), 0.0, 1.0, True + ), + ) + def test_axis_of_rotation_property_error(self, mock_is_valid): + c = ( + Cylinder(1.5, 2, rotation=(90, 0, 0)) + .faces() + .filter_by(GeomType.CYLINDER)[0] + ) + self.assertIsNone(c.axis_of_rotation) + # Verify is_valid was called + mock_is_valid.assert_called_once() + + def test_is_convex_concave(self): + + with BuildPart() as open_box: + Box(20, 20, 5) + offset(amount=-2, openings=open_box.faces().sort_by(Axis.Z)[-1]) + fillet(open_box.edges(), 0.5) + + outside_fillets = open_box.faces().filter_by(Face.is_circular_convex) + inside_fillets = open_box.faces().filter_by(Face.is_circular_concave) + self.assertEqual(len(outside_fillets), 28) + self.assertEqual(len(inside_fillets), 12) + + @patch.object( + Face, "axis_of_rotation", new_callable=PropertyMock, return_value=None + ) + def test_is_convex_concave_error0(self, mock_is_valid): + with BuildPart() as open_box: + Box(20, 20, 5) + offset(amount=-2, openings=open_box.faces().sort_by(Axis.Z)[-1]) + fillet(open_box.edges(), 0.5) + + with self.assertRaises(ValueError): + open_box.faces().filter_by(Face.is_circular_convex) + + # Verify is_valid was called + mock_is_valid.assert_called_once() + + @patch.object(Face, "radii", new_callable=PropertyMock, return_value=None) + def test_is_convex_concave_error1(self, mock_is_valid): + with BuildPart() as open_box: + Box(20, 20, 5) + offset(amount=-2, openings=open_box.faces().sort_by(Axis.Z)[-1]) + fillet(open_box.edges(), 0.5) + + with self.assertRaises(ValueError): + open_box.faces().filter_by(Face.is_circular_convex) + + # Verify is_valid was called + mock_is_valid.assert_called_once() + + @patch.object(Face, "location", new_callable=PropertyMock, return_value=None) + def test_is_convex_concave_error2(self, mock_is_valid): + with BuildPart() as open_box: + Box(20, 20, 5) + offset(amount=-2, openings=open_box.faces().sort_by(Axis.Z)[-1]) + fillet(open_box.edges(), 0.5) + + with self.assertRaises(ValueError): + open_box.faces().filter_by(Face.is_circular_convex) + + # Verify is_valid was called + mock_is_valid.assert_called_once() + + def test_radii(self): + t = Torus(5, 1).face() + self.assertAlmostEqual(t.radii, (5, 1), 5) + s = Sphere(1).face() + self.assertIsNone(s.radii) class TestAxesOfSymmetrySplitNone(unittest.TestCase): From 2d84e6ebdf64dad42130614e514d65a07a500254 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 19 Feb 2025 18:20:46 -0500 Subject: [PATCH 202/518] Limiting ocpsvg version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ebf63d6..2a96c45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ dependencies = [ "ezdxf >= 1.1.0, < 2", "ipython >= 8.0.0, < 9", "py-lib3mf >= 2.3.1", - "ocpsvg >= 0.4", + "ocpsvg >= 0.4, < 0.5", "trianglesolver", ] From 40cf1437ed47cbe98a1f1385d99497b927ff242d Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 20 Feb 2025 11:14:26 -0500 Subject: [PATCH 203/518] Updated edges() to use WireExplorer when appropriate Issue #864 --- src/build123d/topology/one_d.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index e412478..018800b 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -88,7 +88,7 @@ from OCP.BRepOffset import BRepOffset_MakeOffset from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace from OCP.BRepProj import BRepProj_Projection -from OCP.BRepTools import BRepTools +from OCP.BRepTools import BRepTools, BRepTools_WireExplorer from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse from OCP.GCPnts import GCPnts_AbscissaPoint from OCP.GProp import GProp_GProps @@ -480,10 +480,20 @@ class Mixin1D(Shape): def edges(self) -> ShapeList[Edge]: """edges - all the edges in this Shape""" - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) + if isinstance(self, Wire): + # The WireExplorer is a tool to explore the edges of a wire in a connection order. + explorer = BRepTools_WireExplorer(self.wrapped) + + edge_list: ShapeList[Edge] = ShapeList() + while explorer.More(): + edge_list.append(Edge(explorer.Current())) + explorer.Next() + return edge_list + else: + edge_list = Shape.get_shape_list(self, "Edge") + return edge_list.filter_by( + lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True + ) def end_point(self) -> Vector: """The end point of this edge. From 8e4aa3370deaab114a3cccad72e56001297b3c95 Mon Sep 17 00:00:00 2001 From: snoyer Date: Fri, 21 Feb 2025 20:28:06 +0400 Subject: [PATCH 204/518] add `align` parameter to `import_svg` --- pyproject.toml | 2 +- src/build123d/importers.py | 19 ++++++++++++++++--- tests/test_importers.py | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2a96c45..b5aa333 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ dependencies = [ "ezdxf >= 1.1.0, < 2", "ipython >= 8.0.0, < 9", "py-lib3mf >= 2.3.1", - "ocpsvg >= 0.4, < 0.5", + "ocpsvg >= 0.5, < 0.6", "trianglesolver", ] diff --git a/src/build123d/importers.py b/src/build123d/importers.py index 0fa4bb8..73be5a7 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -70,7 +70,8 @@ from OCP.XCAFDoc import ( from ocpsvg import ColorAndLabel, import_svg_document from svgpathtools import svg2paths -from build123d.geometry import Color, Location +from build123d.build_enums import Align +from build123d.geometry import Color, Location, Vector, to_align_offset from build123d.topology import ( Compound, Edge, @@ -337,6 +338,7 @@ def import_svg( svg_file: str | Path | TextIO, *, flip_y: bool = True, + align: Align | tuple[Align, Align] | None = Align.MIN, ignore_visibility: bool = False, label_by: Literal["id", "class", "inkscape:label"] | str = "id", is_inkscape_label: bool | None = None, # TODO remove for `1.0` release @@ -346,6 +348,8 @@ def import_svg( Args: svg_file (Union[str, Path, TextIO]): svg file flip_y (bool, optional): flip objects to compensate for svg orientation. Defaults to True. + align (Align | tuple[Align, Align] | None, optional): alignment of the SVG's viewbox, + if None, the viewbox's origin will be at `(0,0,0)`. Defaults to Align.MIN. ignore_visibility (bool, optional): Defaults to False. label_by (str, optional): XML attribute to use for imported shapes' `label` property. Defaults to "id". @@ -368,12 +372,18 @@ def import_svg( label_by = re.sub( r"^inkscape:(.+)", r"{http://www.inkscape.org/namespaces/inkscape}\1", label_by ) - for face_or_wire, color_and_label in import_svg_document( + imported = import_svg_document( svg_file, flip_y=flip_y, ignore_visibility=ignore_visibility, metadata=ColorAndLabel.Label_by(label_by), - ): + ) + + doc_xy = Vector(imported.viewbox.x, imported.viewbox.y) + doc_wh = Vector(imported.viewbox.width, imported.viewbox.height) + offset = to_align_offset(doc_xy, doc_xy + doc_wh, align) + + for face_or_wire, color_and_label in imported: if isinstance(face_or_wire, TopoDS_Wire): shape = Wire(face_or_wire) elif isinstance(face_or_wire, TopoDS_Face): @@ -381,6 +391,9 @@ def import_svg( else: # should not happen raise ValueError(f"unexpected shape type: {type(face_or_wire).__name__}") + if offset.X != 0 or offset.Y != 0: # avoid copying if we don't need to + shape = shape.translate(offset) + if shape.wrapped: shape.color = Color(*color_and_label.color_for(shape.wrapped)) shape.label = color_and_label.label diff --git a/tests/test_importers.py b/tests/test_importers.py index 0fa7088..f246ef3 100644 --- a/tests/test_importers.py +++ b/tests/test_importers.py @@ -16,10 +16,10 @@ from build123d.importers import ( import_step, import_stl, ) -from build123d.geometry import Pos +from build123d.geometry import Pos, Vector from build123d.exporters import ExportSVG from build123d.exporters3d import export_brep, export_step -from build123d.build_enums import GeomType +from build123d.build_enums import Align, GeomType class ImportSVG(unittest.TestCase): @@ -116,6 +116,38 @@ class ImportSVG(unittest.TestCase): self.assertEqual(str(svg[1].color), str(Color(1, 0, 0, 1))) self.assertEqual(str(svg[2].color), str(Color(0, 0, 0, 1))) + def test_import_svg_origin(self): + svg_src = ( + '' + '' + "" + ) + + svg = import_svg(StringIO(svg_src), align=None, flip_y=False) + self.assertAlmostEqual(svg[0].bounding_box().center(), Vector(2.0, +3.0)) + + svg = import_svg(StringIO(svg_src), align=None, flip_y=True) + self.assertAlmostEqual(svg[0].bounding_box().center(), Vector(2.0, -3.0)) + + def test_import_svg_align(self): + svg_src = ( + '' + '' + "" + ) + + svg = import_svg(StringIO(svg_src), align=Align.MIN, flip_y=False) + self.assertAlmostEqual(svg[0].bounding_box().min, Vector(0.0, 0.0)) + + svg = import_svg(StringIO(svg_src), align=Align.MIN, flip_y=True) + self.assertAlmostEqual(svg[0].bounding_box().min, Vector(0, 0)) + + svg = import_svg(StringIO(svg_src), align=Align.MAX, flip_y=False) + self.assertAlmostEqual(svg[0].bounding_box().max, Vector(0.0, 0.0)) + + svg = import_svg(StringIO(svg_src), align=Align.MAX, flip_y=True) + self.assertAlmostEqual(svg[0].bounding_box().max, Vector(0, 0)) + class ImportBREP(unittest.TestCase): def test_bad_filename(self): From aeb6b32b6594b51209a70ee1922ff63a00080dc1 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 22 Feb 2025 10:55:46 -0500 Subject: [PATCH 205/518] Fixing examples, PR #910 --- docs/tutorial_lego.rst | 32 +++---- .../build123d_customizable_logo_algebra.py | 2 +- examples/build123d_logo_algebra.py | 2 +- examples/custom_sketch_objects_algebra.py | 2 +- examples/lego.py | 94 +++++++++++-------- examples/platonic_solids.py | 2 +- examples/projection.py | 4 +- examples/projection_algebra.py | 4 +- examples/roller_coaster_algebra.py | 6 +- src/build123d/operations_generic.py | 2 +- 10 files changed, 83 insertions(+), 67 deletions(-) diff --git a/docs/tutorial_lego.rst b/docs/tutorial_lego.rst index 168b3d0..0ac2ab4 100644 --- a/docs/tutorial_lego.rst +++ b/docs/tutorial_lego.rst @@ -21,7 +21,7 @@ The dimensions of the Lego block follow. A key parameter is ``pip_count``, the l of the Lego blocks in pips. This parameter must be at least 2. .. literalinclude:: ../examples/lego.py - :lines: 29, 32-45 + :lines: 30,31, 34-47 ******************** Step 2: Part Builder @@ -31,7 +31,7 @@ The Lego block will be created by the ``BuildPart`` builder as it's a discrete t dimensional part; therefore, we'll instantiate a ``BuildPart`` with the name ``lego``. .. literalinclude:: ../examples/lego.py - :lines: 47 + :lines: 49 ********************** Step 3: Sketch Builder @@ -43,7 +43,7 @@ object. As this sketch will be part of the lego part, we'll create a sketch bui in the context of the part builder as follows: .. literalinclude:: ../examples/lego.py - :lines: 47-49 + :lines: 49-51 :emphasize-lines: 3 @@ -59,7 +59,7 @@ of the Lego block. The following step is going to refer to this rectangle, so it be assigned the identifier ``perimeter``. .. literalinclude:: ../examples/lego.py - :lines: 47-51 + :lines: 49-53 :emphasize-lines: 5 Once the ``Rectangle`` object is created the sketch appears as follows: @@ -76,7 +76,7 @@ hollowed out. This will be done with the ``Offset`` operation which is going to create a new object from ``perimeter``. .. literalinclude:: ../examples/lego.py - :lines: 47-51,55-61 + :lines: 49-53,58-64 :emphasize-lines: 7-12 The first parameter to ``Offset`` is the reference object. The ``amount`` is a @@ -104,7 +104,7 @@ objects are in the scope of a location context (``GridLocations`` in this case) that defined multiple points, multiple rectangles are created. .. literalinclude:: ../examples/lego.py - :lines: 47-51,55-61,65-69 + :lines: 49-53,58-64,69-73 :emphasize-lines: 13-17 Here we can see that the first ``GridLocations`` creates two positions which causes @@ -125,8 +125,8 @@ To convert the internal grid to ridges, the center needs to be removed. This wil with another ``Rectangle``. .. literalinclude:: ../examples/lego.py - :lines: 47-51,55-61,65-69,74-78 - :emphasize-lines: 17-22 + :lines: 49-53,58-64,69-73,78-83 + :emphasize-lines: 18-23 The ``Rectangle`` is subtracted from the sketch to leave the ridges as follows: @@ -142,8 +142,8 @@ Lego blocks use a set of internal hollow cylinders that the pips push against to hold two blocks together. These will be created with ``Circle``. .. literalinclude:: ../examples/lego.py - :lines: 47-51,55-61,65-69,74-76,82-87 - :emphasize-lines: 21-26 + :lines: 49-53,58-64,69-73,78-83,88-93 + :emphasize-lines: 24-29 Here another ``GridLocations`` is used to position the centers of the circles. Note that since both ``Circle`` objects are in the scope of the location context, both @@ -162,8 +162,8 @@ Now that the sketch is complete it needs to be extruded into the three dimension wall object. .. literalinclude:: ../examples/lego.py - :lines: 47-51,55-61,65-69,74-76,82-87,91-92 - :emphasize-lines: 27-28 + :lines: 49-53,58-64,69-73,78-83,88-93,98-99 + :emphasize-lines: 30-31 Note how the ``Extrude`` operation is no longer in the ``BuildSketch`` scope and has returned back into the ``BuildPart`` scope. This causes ``BuildSketch`` to exit and transfer the @@ -183,8 +183,8 @@ Now that the walls are complete, the top of the block needs to be added. Althoug could be done with another sketch, we'll add a box to the top of the walls. .. literalinclude:: ../examples/lego.py - :lines: 47-51,55-61,65-69,74-76,82-87,91-92,100-108 - :emphasize-lines: 29-37 + :lines: 49-53,58-64,69-73,78-83,88-93,98-99,110-118 + :emphasize-lines: 32-40 To position the top, we'll describe the top center of the lego walls with a ``Locations`` context. To determine the height we'll extract that from the @@ -211,8 +211,8 @@ The final step is to add the pips to the top of the Lego block. To do this we'll a new workplane on top of the block where we can position the pips. .. literalinclude:: ../examples/lego.py - :lines: 47-51,55-61,65-69,74-76,82-87,91-92,100-108,116-124 - :emphasize-lines: 38-46 + :lines: 49-53,58-64,69-73,78-83,88-93,98-99,110-118,129-137 + :emphasize-lines: 41-49 In this case, the workplane is created from the top Face of the Lego block by using the ``faces`` method and then sorted vertically and taking the top one ``sort_by(Axis.Z)[-1]``. diff --git a/examples/build123d_customizable_logo_algebra.py b/examples/build123d_customizable_logo_algebra.py index 4492e48..29bd81c 100644 --- a/examples/build123d_customizable_logo_algebra.py +++ b/examples/build123d_customizable_logo_algebra.py @@ -41,7 +41,7 @@ l2 = Line( (logo_width, -font_height * 0.1), (logo_width, -ext_line_length - font_height * 0.1), ) -extension_lines = l1 + l2 +extension_lines = Curve() + (l1 + l2) extension_lines += Pos(*(l1 @ 0.5)) * arrow_left extension_lines += (Pos(*(l2 @ 0.5)) * Rot(Z=180)) * arrow_left extension_lines += Line(l1 @ 0.5, l1 @ 0.5 + Vector(dim_line_length, 0)) diff --git a/examples/build123d_logo_algebra.py b/examples/build123d_logo_algebra.py index 7c6d65b..f5d732a 100644 --- a/examples/build123d_logo_algebra.py +++ b/examples/build123d_logo_algebra.py @@ -37,7 +37,7 @@ l2 = Line( (logo_width, -font_height * 0.1), (logo_width, -ext_line_length - font_height * 0.1), ) -extension_lines = l1 + l2 +extension_lines = Curve() + (l1 + l2) extension_lines += Pos(*(l1 @ 0.5)) * arrow_left extension_lines += (Pos(*(l2 @ 0.5)) * Rot(Z=180)) * arrow_left extension_lines += Line(l1 @ 0.5, l1 @ 0.5 + Vector(dim_line_length, 0)) diff --git a/examples/custom_sketch_objects_algebra.py b/examples/custom_sketch_objects_algebra.py index c67a3f8..a61c4c6 100644 --- a/examples/custom_sketch_objects_algebra.py +++ b/examples/custom_sketch_objects_algebra.py @@ -33,7 +33,7 @@ class Spade(Sketch): b1 = Bezier(b0 @ 1, (242, -72), (114, -168), (11, -105)) b2 = Bezier(b1 @ 1, (31, -174), (42, -179), (53, -198)) l0 = Line(b2 @ 1, (0, -198)) - spade = l0 + b0 + b1 + b2 + spade = b0 + b1 + b2 + l0 spade += mirror(spade, Plane.YZ) spade = make_face(spade) spade = scale(spade, height / spade.bounding_box().size.Y) diff --git a/examples/lego.py b/examples/lego.py index cbd7cad..88cb1a4 100644 --- a/examples/lego.py +++ b/examples/lego.py @@ -26,9 +26,11 @@ license: See the License for the specific language governing permissions and limitations under the License. """ -from build123d import * -from ocp_vscode import * +from build123d import * +from ocp_vscode import show_object + +GEN_DOCS = False pip_count = 6 lego_unit_size = 8 @@ -49,9 +51,10 @@ with BuildPart() as lego: with BuildSketch() as plan: # Start with a Rectangle the size of the block perimeter = Rectangle(width=block_length, height=block_width) - exporter = ExportSVG(scale=6) - exporter.add_shape(plan.sketch) - exporter.write("assets/lego_step4.svg") + if GEN_DOCS: + exporter = ExportSVG(scale=6) + exporter.add_shape(plan.sketch) + exporter.write("assets/lego_step4.svg") # Subtract an offset to create the block walls offset( perimeter, @@ -59,44 +62,51 @@ with BuildPart() as lego: kind=Kind.INTERSECTION, mode=Mode.SUBTRACT, ) - exporter = ExportSVG(scale=6) - exporter.add_shape(plan.sketch) - exporter.write("assets/lego_step5.svg") + if GEN_DOCS: + exporter = ExportSVG(scale=6) + exporter.add_shape(plan.sketch) + exporter.write("assets/lego_step5.svg") # Add a grid of lengthwise and widthwise bars with GridLocations(x_spacing=0, y_spacing=lego_unit_size, x_count=1, y_count=2): Rectangle(width=block_length, height=ridge_width) with GridLocations(lego_unit_size, 0, pip_count, 1): Rectangle(width=ridge_width, height=block_width) - exporter = ExportSVG(scale=6) - exporter.add_shape(plan.sketch) - exporter.write("assets/lego_step6.svg") + if GEN_DOCS: + exporter = ExportSVG(scale=6) + exporter.add_shape(plan.sketch) + exporter.write("assets/lego_step6.svg") # Substract a rectangle leaving ribs on the block walls Rectangle( block_length - 2 * (wall_thickness + ridge_depth), block_width - 2 * (wall_thickness + ridge_depth), mode=Mode.SUBTRACT, ) - exporter = ExportSVG(scale=6) - exporter.add_shape(plan.sketch) - exporter.write("assets/lego_step7.svg") + if GEN_DOCS: + exporter = ExportSVG(scale=6) + exporter.add_shape(plan.sketch) + exporter.write("assets/lego_step7.svg") # Add a row of hollow circles to the center with GridLocations( x_spacing=lego_unit_size, y_spacing=0, x_count=pip_count - 1, y_count=1 ): Circle(radius=support_outer_diameter / 2) Circle(radius=support_inner_diameter / 2, mode=Mode.SUBTRACT) - exporter = ExportSVG(scale=6) - exporter.add_shape(plan.sketch) - exporter.write("assets/lego_step8.svg") + if GEN_DOCS: + exporter = ExportSVG(scale=6) + exporter.add_shape(plan.sketch) + exporter.write("assets/lego_step8.svg") # Extrude this base sketch to the height of the walls extrude(amount=base_height - wall_thickness) - visible, hidden = lego.part.project_to_viewport((-5, -30, 50)) - exporter = ExportSVG(scale=6) - exporter.add_layer("Visible") - exporter.add_layer("Hidden", line_color=(99, 99, 99), line_type=LineType.ISO_DOT) - exporter.add_shape(visible, layer="Visible") - exporter.add_shape(hidden, layer="Hidden") - exporter.write("assets/lego_step9.svg") + if GEN_DOCS: + visible, hidden = lego.part.project_to_viewport((-5, -30, 50)) + exporter = ExportSVG(scale=6) + exporter.add_layer("Visible") + exporter.add_layer( + "Hidden", line_color=(99, 99, 99), line_type=LineType.ISO_DOT + ) + exporter.add_shape(visible, layer="Visible") + exporter.add_shape(hidden, layer="Hidden") + exporter.write("assets/lego_step9.svg") # Create a box on the top of the walls with Locations((0, 0, lego.vertices().sort_by(Axis.Z)[-1].Z)): # Create the top of the block @@ -106,13 +116,16 @@ with BuildPart() as lego: height=wall_thickness, align=(Align.CENTER, Align.CENTER, Align.MIN), ) - visible, hidden = lego.part.project_to_viewport((-5, -30, 50)) - exporter = ExportSVG(scale=6) - exporter.add_layer("Visible") - exporter.add_layer("Hidden", line_color=(99, 99, 99), line_type=LineType.ISO_DOT) - exporter.add_shape(visible, layer="Visible") - exporter.add_shape(hidden, layer="Hidden") - exporter.write("assets/lego_step10.svg") + if GEN_DOCS: + visible, hidden = lego.part.project_to_viewport((-5, -30, 50)) + exporter = ExportSVG(scale=6) + exporter.add_layer("Visible") + exporter.add_layer( + "Hidden", line_color=(99, 99, 99), line_type=LineType.ISO_DOT + ) + exporter.add_shape(visible, layer="Visible") + exporter.add_shape(hidden, layer="Hidden") + exporter.write("assets/lego_step10.svg") # Create a workplane on the top of the block with BuildPart(lego.faces().sort_by(Axis.Z)[-1]): # Create a grid of pips @@ -122,14 +135,17 @@ with BuildPart() as lego: height=pip_height, align=(Align.CENTER, Align.CENTER, Align.MIN), ) - visible, hidden = lego.part.project_to_viewport((-100, -100, 50)) - exporter = ExportSVG(scale=6) - exporter.add_layer("Visible") - exporter.add_layer("Hidden", line_color=(99, 99, 99), line_type=LineType.ISO_DOT) - exporter.add_shape(visible, layer="Visible") - exporter.add_shape(hidden, layer="Hidden") - exporter.write("assets/lego.svg") + if GEN_DOCS: + visible, hidden = lego.part.project_to_viewport((-100, -100, 50)) + exporter = ExportSVG(scale=6) + exporter.add_layer("Visible") + exporter.add_layer( + "Hidden", line_color=(99, 99, 99), line_type=LineType.ISO_DOT + ) + exporter.add_shape(visible, layer="Visible") + exporter.add_shape(hidden, layer="Hidden") + exporter.write("assets/lego.svg") assert abs(lego.part.volume - 3212.187337781355) < 1e-3 -show_object(lego.part.wrapped, name="lego") +show_object(lego.part, name="lego") diff --git a/examples/platonic_solids.py b/examples/platonic_solids.py index c862690..0d527f4 100644 --- a/examples/platonic_solids.py +++ b/examples/platonic_solids.py @@ -118,7 +118,7 @@ class PlatonicSolid(BasePartObject): platonic_faces.append(Face(Wire.make_polygon(corner_vertices))) # Create the solid from the Faces - platonic_solid = Solid.make_solid(Shell.make_shell(platonic_faces)).clean() + platonic_solid = Solid(Shell(platonic_faces)).clean() # By definition, all vertices are the same distance from the origin so # scale proportionally to this distance diff --git a/examples/projection.py b/examples/projection.py index dedc0ca..b5c3b7b 100644 --- a/examples/projection.py +++ b/examples/projection.py @@ -37,7 +37,7 @@ projection_direction = Vector(0, 1, 0) square = Face.make_rect(20, 20, Plane.ZX.offset(-80)) square_projected = square.project_to_shape(sphere, projection_direction) -square_solids = Compound([f.thicken(2) for f in square_projected]) +square_solids = Compound([Solid.thicken(f, 2) for f in square_projected]) projection_beams = [ Solid.make_loft( [ @@ -75,7 +75,7 @@ text = Compound.make_text( font_size=15, align=(Align.MIN, Align.CENTER), ) -projected_text = sphere.project_faces(text, path=arch_path) +projected_text = Sketch(sphere.project_faces(text, path=arch_path)) # Example 1 show_object(sphere, name="sphere_solid", options={"alpha": 0.8}) diff --git a/examples/projection_algebra.py b/examples/projection_algebra.py index 14ed71d..3e0ece2 100644 --- a/examples/projection_algebra.py +++ b/examples/projection_algebra.py @@ -9,7 +9,7 @@ projection_direction = Vector(0, 1, 0) square = Plane.ZX.offset(-80) * Rectangle(20, 20) square_projected = square.faces()[0].project_to_shape(sphere, projection_direction) -square_solids = Part() + [f.thicken(2) for f in square_projected] +square_solids = Part() + [Solid.thicken(f, 2) for f in square_projected] face = square.faces()[0] projection_beams = loft([face, Pos(0, 160, 0) * face]) @@ -39,7 +39,7 @@ text = Text( font_size=15, align=(Align.MIN, Align.CENTER), ) -projected_text = sphere.project_faces(text.faces(), path=arch_path) +projected_text = Sketch(sphere.project_faces(text.faces(), path=arch_path)) # Example 1 show_object(sphere, name="sphere_solid", options={"alpha": 0.8}) diff --git a/examples/roller_coaster_algebra.py b/examples/roller_coaster_algebra.py index db2fa6b..67c21a3 100644 --- a/examples/roller_coaster_algebra.py +++ b/examples/roller_coaster_algebra.py @@ -1,4 +1,5 @@ from build123d import * +from ocp_vscode import show_object powerup = Spline( (0, 0, 0), @@ -10,11 +11,10 @@ powerup = Spline( corner = RadiusArc(powerup @ 1, (100, 60, 0), -30) screw = Helix(75, 150, 15, center=(75, 40, 15), direction=(-1, 0, 0)) -roller_coaster = powerup + corner + screw +roller_coaster = Curve() + (powerup + corner + screw) roller_coaster += Spline(corner @ 1, screw @ 0, tangents=(corner % 1, screw % 0)) roller_coaster += Spline( screw @ 1, (-100, 30, 10), powerup @ 0, tangents=(screw % 1, powerup % 0) ) -if "show_object" in locals(): - show_object(roller_coaster) +show_object(roller_coaster) diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 80b0f00..c2b2e50 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -821,7 +821,7 @@ def project( elif isinstance(context, BuildLine): projected_shapes.extend(projection) else: # BuildPart - projected_shapes.append(projection[0]) + projected_shapes.extend(projection.faces()) projected_points: ShapeList[Vector] = ShapeList() for pnt in point_list: From 80097a9227cf2b092e0c309fca825ae7d5f09f05 Mon Sep 17 00:00:00 2001 From: Ami Fischman Date: Fri, 21 Feb 2025 23:41:52 -0800 Subject: [PATCH 206/518] Add a new TestCase that asserts that examples exit successfully. Examples changes that were necessary: - loft.py: failed on macos (only) because of (seemingly) over-precise floating-point accuracy assertion. Loosened the tolerance, and expressed it as a multiple of the expected value. > AssertionError: delta=0.002982314711971412 is greater than tolerance=0.001; got=1306.3375467197516, want=1306.3405290344635 - packed_boxes.py: only emit output files when GEN_DOCS is True (mimicking lego.py). --- examples/loft.py | 6 ++- examples/packed_boxes.py | 5 ++- tests/test_examples.py | 86 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 tests/test_examples.py diff --git a/examples/loft.py b/examples/loft.py index 1204672..a92ad0b 100644 --- a/examples/loft.py +++ b/examples/loft.py @@ -41,7 +41,11 @@ with BuildPart() as art: top_bottom = art.faces().filter_by(GeomType.PLANE) offset(openings=top_bottom, amount=0.5) -assert abs(art.part.volume - 1306.3405290344635) < 1e-3 +want = 1306.3405290344635 +got = art.part.volume +delta = abs(got - want) +tolerance = want * 1e-5 +assert delta < tolerance, f"{delta=} is greater than {tolerance=}; {got=}, {want=}" show(art, names=["art"]) # [End] diff --git a/examples/packed_boxes.py b/examples/packed_boxes.py index f037d2c..e4eacbd 100644 --- a/examples/packed_boxes.py +++ b/examples/packed_boxes.py @@ -12,6 +12,8 @@ import operator import random import build123d as bd +GEN_DOCS = False + random.seed(123456) test_boxes = [bd.Box(random.randint(1, 20), random.randint(1, 20), random.randint(1, 5)) for _ in range(50)] @@ -28,7 +30,8 @@ def export_svg(parts, name): exporter.add_layer("Hidden", line_color=(99, 99, 99), line_type=bd.LineType.ISO_DOT) exporter.add_shape(visible, layer="Visible") exporter.add_shape(hidden, layer="Hidden") - exporter.write(f"../docs/assets/{name}.svg") + if GEN_DOCS: + exporter.write(f"../docs/assets/{name}.svg") export_svg(test_boxes, "packed_boxes_input") export_svg(packed, "packed_boxes_output") diff --git a/tests/test_examples.py b/tests/test_examples.py new file mode 100644 index 0000000..e342f0d --- /dev/null +++ b/tests/test_examples.py @@ -0,0 +1,86 @@ +""" +build123d Example tests + +name: test_examples.py +by: fischman +date: February 21 2025 + +desc: Unit tests for the build123d examples, ensuring they don't raise. +""" + +from pathlib import Path + +import os +import subprocess +import sys +import tempfile +import unittest + + +_examples_dir = Path(os.path.abspath(os.path.dirname(__file__))).parent / "examples" + +_MOCK_OCP_VSCODE_CONTENTS = """ +from pathlib import Path + +import re +import sys +from unittest.mock import Mock +mock_module = Mock() +mock_module.show = Mock() +mock_module.show_object = Mock() +mock_module.show_all = Mock() +sys.modules["ocp_vscode"] = mock_module +""" + + +def generate_example_test(path: Path): + """Generate and return a function to test the example at `path`.""" + name = path.name + + def assert_example_does_not_raise(self): + with tempfile.TemporaryDirectory( + prefix=f"build123d_test_examples_{name}" + ) as tmpdir: + # More examples emit output files than read input files, + # so default to running with a temporary directory to + # avoid cluttering the git working directory. For + # examples that want to read assets from the examples + # directory, use that. If an example is added in the + # future that wants to both read assets from the examples + # directory and write output files, deal with it then. + cwd = tmpdir if 'benchy' not in path.name else _examples_dir + mock_ocp_vscode = Path(tmpdir) / "_mock_ocp_vscode.py" + with open(mock_ocp_vscode, "w", encoding="utf-8") as f: + f.write(_MOCK_OCP_VSCODE_CONTENTS) + got = subprocess.run( + [ + sys.executable, + "-c", + f"exec(open(r'{mock_ocp_vscode}').read()); exec(open(r'{path}').read())", + ], + capture_output=True, + cwd=cwd, + check=False, + ) + self.assertEqual( + 0, got.returncode, f"stdout/stderr: {got.stdout} / {got.stderr}" + ) + + return assert_example_does_not_raise + + +class TestExamples(unittest.TestCase): + """Tests build123d examples.""" + + +for example in sorted(_examples_dir.iterdir()): + if example.name.startswith("_") or not example.name.endswith(".py"): + continue + setattr( + TestExamples, + f"test_{example.name.replace('.', '_')}", + generate_example_test(example), + ) + +if __name__ == "__main__": + unittest.main() From bda0a6a719501829f2a5427a04f4cca38da5c826 Mon Sep 17 00:00:00 2001 From: Ami Fischman Date: Sat, 22 Feb 2025 10:35:50 -0800 Subject: [PATCH 207/518] Run tests in parallel by default, and update CONTRIBUTING.md to recommend this flow. test_mesher.py was reusing the same filename across tests which meant that when running in parallel tests would stomp on each other. Robustified by having each test use a distinct file name. --- .github/workflows/test.yml | 2 +- CONTRIBUTING.md | 6 +++--- pyproject.toml | 1 + tests/test_mesher.py | 42 +++++++++++++++++++++++++------------- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b636f04..f35c15f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,4 +23,4 @@ jobs: python-version: ${{ matrix.python-version }} - name: test run: | - python -m pytest + python -m pytest -n auto diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 115577a..c1344c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,10 +3,10 @@ tests, ensure they build and pass, and ensure that `pylint` and `mypy` are happy with your code. - Install `pip` following their [documentation](https://pip.pypa.io/en/stable/installation/). -- Install development dependencies: `pip install pylint pytest mypy sphinx black` -- Install docs dependencies: `pip install -r docs/requirements.txt` (might need to comment out the build123d line in that file) +- Install development dependencies: `pip install -e .[development]` +- Install docs dependencies: `pip install -e .[docs]` - Install `build123d` in editable mode from current dir: `pip install -e .` -- Run tests with: `python -m pytest` +- Run tests with: `python -m pytest -n auto` - Build docs with: `cd docs && make html` - Check added files' style with: `pylint ` - Check added files' type annotations with: `mypy ` diff --git a/pyproject.toml b/pyproject.toml index b5aa333..167ed01 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,6 +64,7 @@ development = [ "wheel", "pytest", "pytest-cov", + "pytest-xdist", "pylint", "mypy", "black", diff --git a/tests/test_mesher.py b/tests/test_mesher.py index 9547d08..65edaff 100644 --- a/tests/test_mesher.py +++ b/tests/test_mesher.py @@ -2,7 +2,8 @@ import unittest, uuid from packaging.specifiers import SpecifierSet from pathlib import Path from os import fsdecode, fsencode -import time +import sys +import tempfile import pytest @@ -18,6 +19,12 @@ from build123d.geometry import Axis, Color, Location, Vector, VectorLike from build123d.mesher import Mesher +def temp_3mf_file(): + caller = sys._getframe(1) + prefix = f"build123d_{caller.f_locals.get('self').__class__.__name__}_{caller.f_code.co_name}" + return tempfile.mktemp(suffix=".3mf", prefix=prefix) + + class DirectApiTestCase(unittest.TestCase): def assertTupleAlmostEquals( self, @@ -47,11 +54,12 @@ class TestProperties(unittest.TestCase): def test_units(self): for unit in Unit: + filename = temp_3mf_file() exporter = Mesher(unit=unit) exporter.add_shape(Solid.make_box(1, 1, 1)) - exporter.write("test.3mf") + exporter.write(filename) importer = Mesher() - _shape = importer.read("test.3mf") + _shape = importer.read(filename) self.assertEqual(unit, importer.model_unit) def test_vertex_and_triangle_counts(self): @@ -73,9 +81,10 @@ class TestMetaData(unittest.TestCase): exporter.add_shape(Solid.make_box(1, 1, 1)) exporter.add_meta_data("test_space", "test0", "some data", "str", True) exporter.add_meta_data("test_space", "test1", "more data", "str", True) - exporter.write("test.3mf") + filename = temp_3mf_file() + exporter.write(filename) importer = Mesher() - _shape = importer.read("test.3mf") + _shape = importer.read(filename) imported_meta_data: list[dict] = importer.get_meta_data() self.assertEqual(imported_meta_data[0]["name_space"], "test_space") self.assertEqual(imported_meta_data[0]["name"], "test0") @@ -90,9 +99,10 @@ class TestMetaData(unittest.TestCase): exporter = Mesher() exporter.add_shape(Solid.make_box(1, 1, 1)) exporter.add_code_to_metadata() - exporter.write("test.3mf") + filename = temp_3mf_file() + exporter.write(filename) importer = Mesher() - _shape = importer.read("test.3mf") + _shape = importer.read(filename) source_code = importer.get_meta_data_by_key("build123d", "test_mesher.py") self.assertEqual(len(source_code), 2) self.assertEqual(source_code["type"], "python") @@ -118,9 +128,10 @@ class TestMeshProperties(unittest.TestCase): part_number=str(mesh_type.value), uuid_value=test_uuid, ) - exporter.write("test.3mf") + filename = temp_3mf_file() + exporter.write(filename) importer = Mesher() - shape = importer.read("test.3mf") + shape = importer.read(filename) self.assertEqual(shape[0].label, name) self.assertEqual(importer.mesh_count, 1) properties = importer.get_mesh_properties() @@ -141,9 +152,10 @@ class TestAddShape(DirectApiTestCase): red_shape.color = Color("red") red_shape.label = "red" exporter.add_shape([blue_shape, red_shape]) - exporter.write("test.3mf") + filename = temp_3mf_file() + exporter.write(filename) importer = Mesher() - box, cone = importer.read("test.3mf") + box, cone = importer.read(filename) self.assertVectorAlmostEquals(box.bounding_box().size, (1, 1, 1), 2) self.assertVectorAlmostEquals(box.bounding_box().size, (1, 1, 1), 2) self.assertEqual(len(box.clean().faces()), 6) @@ -158,9 +170,10 @@ class TestAddShape(DirectApiTestCase): cone = Solid.make_cone(1, 0, 2).locate(Location((0, -1, 0))) shape_assembly = Compound([box, cone]) exporter.add_shape(shape_assembly) - exporter.write("test.3mf") + filename = temp_3mf_file() + exporter.write(filename) importer = Mesher() - shapes = importer.read("test.3mf") + shapes = importer.read(filename) self.assertEqual(importer.mesh_count, 2) @@ -216,7 +229,8 @@ class TestImportDegenerateTriangles(unittest.TestCase): "format", (Path, fsencode, fsdecode), ids=["path", "bytes", "str"] ) def test_pathlike_mesher(tmp_path, format): - path = format(tmp_path / "test.3mf") + filename = temp_3mf_file() + path = format(tmp_path / filename) exporter, importer = Mesher(), Mesher() exporter.add_shape(Solid.make_box(1, 1, 1)) exporter.write(path) From 1d8980441798fd35984eccc44e78f0520e04ea07 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 24 Feb 2025 15:36:58 -0500 Subject: [PATCH 208/518] Added GeomEncoder for JSON deprecating LocationEncoder --- src/build123d/__init__.py | 1 + src/build123d/geometry.py | 79 +++++++++++++++++++++- tests/test_direct_api/test_json.py | 92 ++++++++++++++++++++++++++ tests/test_direct_api/test_location.py | 6 +- 4 files changed, 173 insertions(+), 5 deletions(-) create mode 100644 tests/test_direct_api/test_json.py diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index 57b82f5..197fb43 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -150,6 +150,7 @@ __all__ = [ "Compound", "Location", "LocationEncoder", + "GeomEncoder", "Joint", "RigidJoint", "RevoluteJoint", diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index ec331bf..455e0dc 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -39,11 +39,11 @@ import itertools import json import logging import numpy as np - -from math import degrees, pi, radians, isclose -from typing import Any, overload, TypeAlias, TYPE_CHECKING +import warnings from collections.abc import Iterable, Sequence +from math import degrees, pi, radians, isclose +from typing import Any, overload, TypeAlias, TYPE_CHECKING import OCP.TopAbs as TopAbs_ShapeEnum @@ -1252,6 +1252,68 @@ class Color: return f"Color{str(tuple(self))}" +class GeomEncoder(json.JSONEncoder): + """ + A JSON encoder for build123d geometry objects. + + This class extends ``json.JSONEncoder`` to provide custom serialization for + geometry objects such as Axis, Color, Location, Plane, and Vector. It converts + each geometry object into a dictionary containing exactly one key that identifies + the geometry type (e.g. ``"Axis"``, ``"Vector"``, etc.), paired with a tuple or + list that represents the underlying data. Any other object types are handled by + the standard encoder. + + The inverse decoding is performed by the ``geometry_hook`` static method, which + expects the dictionary to have precisely one key from the known geometry types. + It then uses a class registry (``CLASS_REGISTRY``) to look up and instantiate + the appropriate class with the provided values. + + **Usage Example**:: + + import json + + # Suppose we have some geometry objects: + axis = Axis(position=(0, 0, 0), direction=(1, 0, 0)) + vector = Vector(0.0, 1.0, 2.0) + + data = { + "my_axis": axis, + "my_vector": vector + } + + # Encode them to JSON: + encoded_data = json.dumps(data, cls=GeomEncoder, indent=4) + + # Decode them back: + decoded_data = json.loads(encoded_data, object_hook=GeomEncoder.geometry_hook) + + """ + + def default(self, obj): + """Return a JSON-serializable representation of a known geometry object.""" + if isinstance(obj, Axis): + return {"Axis": (tuple(obj.position), tuple(obj.direction))} + elif isinstance(obj, Color): + return {"Color": obj.to_tuple()} + if isinstance(obj, Location): + return {"Location": obj.to_tuple()} + elif isinstance(obj, Plane): + return {"Plane": (tuple(obj.origin), tuple(obj.x_dir), tuple(obj.z_dir))} + elif isinstance(obj, Vector): + return {"Vector": tuple(obj)} + else: + # Let the base class default method raise the TypeError + return super().default(obj) + + @staticmethod + def geometry_hook(json_dict): + """Convert dictionaries back into geometry objects for decoding.""" + if len(json_dict.items()) != 1: + raise ValueError(f"Invalid geometry json object {json_dict}") + for key, value in json_dict.items(): + return CLASS_REGISTRY[key](*value) + + class Location: """Location in 3D space. Depending on usage can be absolute or relative. @@ -1714,6 +1776,7 @@ class LocationEncoder(json.JSONEncoder): def default(self, o: Location) -> dict: """Return a serializable object""" + warnings.warn("Use GeomEncoder instead", DeprecationWarning, stacklevel=2) if not isinstance(o, Location): raise TypeError("Only applies to Location objects") return {"Location": o.to_tuple()} @@ -1725,6 +1788,7 @@ class LocationEncoder(json.JSONEncoder): Example: read_json = json.load(infile, object_hook=LocationEncoder.location_hook) """ + warnings.warn("Use GeomEncoder instead", DeprecationWarning, stacklevel=2) if "Location" in obj: obj = Location(*[[float(f) for f in v] for v in obj["Location"]]) return obj @@ -2890,6 +2954,15 @@ class Plane(metaclass=PlaneMeta): return shape.intersect(self) +CLASS_REGISTRY = { + "Axis": Axis, + "Color": Color, + "Location": Location, + "Plane": Plane, + "Vector": Vector, +} + + def to_align_offset( min_point: VectorLike, max_point: VectorLike, diff --git a/tests/test_direct_api/test_json.py b/tests/test_direct_api/test_json.py new file mode 100644 index 0000000..e253148 --- /dev/null +++ b/tests/test_direct_api/test_json.py @@ -0,0 +1,92 @@ +""" +build123d tests + +name: test_json.py +by: Gumyr +date: February 24, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import json +import os +import unittest +from build123d.geometry import ( + Axis, + Color, + GeomEncoder, + Location, + LocationEncoder, + Matrix, + Plane, + Rotation, + Vector, +) + + +class TestGeomEncode(unittest.TestCase): + + def test_as_json(self): + + a_json = json.dumps(Axis.Y, cls=GeomEncoder) + axis = json.loads(a_json, object_hook=GeomEncoder.geometry_hook) + self.assertEqual(Axis.Y, axis) + + c_json = json.dumps(Color("red"), cls=GeomEncoder) + color = json.loads(c_json, object_hook=GeomEncoder.geometry_hook) + self.assertEqual(Color("red").to_tuple(), color.to_tuple()) + + loc = Location((0, 1, 2), (4, 8, 16)) + l_json = json.dumps(loc, cls=GeomEncoder) + loc_json = json.loads(l_json, object_hook=GeomEncoder.geometry_hook) + self.assertAlmostEqual(loc.position, loc_json.position, 5) + self.assertAlmostEqual(loc.orientation, loc_json.orientation, 5) + + with self.assertWarnsRegex(DeprecationWarning, "Use GeomEncoder instead"): + loc_legacy = json.loads(l_json, object_hook=LocationEncoder.location_hook) + self.assertAlmostEqual(loc.position, loc_legacy.position, 5) + self.assertAlmostEqual(loc.orientation, loc_legacy.orientation, 5) + + p_json = json.dumps(Plane.XZ, cls=GeomEncoder) + plane = json.loads(p_json, object_hook=GeomEncoder.geometry_hook) + self.assertEqual(Plane.XZ, plane) + + rot = Rotation((0, 1, 4)) + r_json = json.dumps(rot, cls=GeomEncoder) + rotation = json.loads(r_json, object_hook=GeomEncoder.geometry_hook) + self.assertAlmostEqual(rot.position, rotation.position, 5) + self.assertAlmostEqual(rot.orientation, rotation.orientation, 5) + + v_json = json.dumps(Vector(1, 2, 4), cls=GeomEncoder) + vector = json.loads(v_json, object_hook=GeomEncoder.geometry_hook) + self.assertEqual(Vector(1, 2, 4), vector) + + def test_as_json_error(self): + with self.assertRaises(TypeError): + json.dumps(Matrix(), cls=GeomEncoder) + + v_json = '{"Vector": [1.0, 2.0, 4.0], "Color": [0, 0, 0, 0]}' + with self.assertRaises(ValueError): + json.loads(v_json, object_hook=GeomEncoder.geometry_hook) + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index 95fd94c..11ca288 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -290,7 +290,8 @@ class TestLocation(unittest.TestCase): } # Serializing json with custom Location encoder - json_object = json.dumps(data_dict, indent=4, cls=LocationEncoder) + with self.assertWarnsRegex(DeprecationWarning, "Use GeomEncoder instead"): + json_object = json.dumps(data_dict, indent=4, cls=LocationEncoder) # Writing to sample.json with open("sample.json", "w") as outfile: @@ -298,7 +299,8 @@ class TestLocation(unittest.TestCase): # Reading from sample.json with open("sample.json") as infile: - read_json = json.load(infile, object_hook=LocationEncoder.location_hook) + with self.assertWarnsRegex(DeprecationWarning, "Use GeomEncoder instead"): + read_json = json.load(infile, object_hook=LocationEncoder.location_hook) # Validate locations for key, value in read_json.items(): From 4d8dfe16a88959eacdc23d427fe59c7ef8852797 Mon Sep 17 00:00:00 2001 From: Ami Fischman Date: Mon, 24 Feb 2025 15:58:25 -0800 Subject: [PATCH 209/518] Avoid deepcopy'ing Shape.topo_parent. Speeds up benchy example from 27s to 5.5s. --- src/build123d/topology/shape_core.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index d61d0de..934a193 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -866,7 +866,10 @@ class Shape(NodeMixin, Generic[TOPODS]): if self.wrapped is not None: memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) for key, value in self.__dict__.items(): - setattr(result, key, copy.deepcopy(value, memo)) + if key == 'topo_parent': + result.topo_parent = value + else: + setattr(result, key, copy.deepcopy(value, memo)) if key == "joints": for joint in result.joints.values(): joint.parent = result From 485bfa1f871c897ce5c6476efe5093cb5aea4982 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 27 Feb 2025 15:54:13 -0600 Subject: [PATCH 210/518] pyproject.toml -> switch to the official lib3mf release on pypi --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 167ed01..0c93d5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ dependencies = [ "anytree >= 2.8.0, < 3", "ezdxf >= 1.1.0, < 2", "ipython >= 8.0.0, < 9", - "py-lib3mf >= 2.3.1", + "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", "trianglesolver", ] From 01cf1082b6c4deac085fd205acc72d070b5989bb Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 27 Feb 2025 15:59:43 -0600 Subject: [PATCH 211/518] Update mesher.py -> use lib3mf instead of py_lib3mf --- src/build123d/mesher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index de102a1..5fb9a54 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -109,7 +109,7 @@ from OCP.TopAbs import TopAbs_ShapeEnum from OCP.TopExp import TopExp_Explorer from OCP.TopLoc import TopLoc_Location from OCP.TopoDS import TopoDS_Compound -from py_lib3mf import Lib3MF +from lib3mf import Lib3MF from build123d.build_enums import MeshType, Unit from build123d.geometry import TOLERANCE, Color From acb22b5dec3a565a6aabae6b51ef8707bf41ef1e Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 27 Feb 2025 16:08:10 -0600 Subject: [PATCH 212/518] mypy.ini -> change py_lib3mf to lib3mf --- mypy.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy.ini b/mypy.ini index b014dd5..e6a7c3d 100644 --- a/mypy.ini +++ b/mypy.ini @@ -41,5 +41,5 @@ ignore_missing_imports = True [mypy-setuptools_scm.*] ignore_missing_imports = True -[mypy-py_lib3mf.*] +[mypy-lib3mf.*] ignore_missing_imports = True From dce0c5dc1b808d5539fb44805d57a48c972a53ef Mon Sep 17 00:00:00 2001 From: mingmingrr Date: Fri, 28 Feb 2025 22:47:53 -0500 Subject: [PATCH 213/518] Update type signature for component getters --- src/build123d/build_common.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index fc6e350..755414a 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -50,7 +50,7 @@ import functools from abc import ABC, abstractmethod from itertools import product from math import sqrt, cos, pi -from typing import Any, cast, overload, Type, TypeVar +from typing import Any, cast, overload, Protocol, Type, TypeVar from collections.abc import Callable, Iterable from typing_extensions import Self @@ -1341,11 +1341,16 @@ class WorkplaneList: # Type variable representing the return type of the wrapped function T2 = TypeVar("T2") +T2_covar = TypeVar("T2_covar", covariant=True) + + +class ContextComponentGetter(Protocol[T2_covar]): + def __call__(self, select: Select = Select.ALL) -> T2_covar: ... def __gen_context_component_getter( - func: Callable[[Builder, Select], T2] -) -> Callable[[Select], T2]: + func: Callable[[Builder, Select], T2], +) -> ContextComponentGetter[T2]: """ Wraps a Builder method to automatically provide the Builder context. @@ -1360,7 +1365,7 @@ def __gen_context_component_getter( a `Select` instance as its second argument. Returns: - Callable[[Select], T2]: A callable that takes only a `Select` argument and + ContextComponentGetter[T2]: A callable that takes only a `Select` argument and internally retrieves the Builder context to call the original method. Raises: From 8ba128c273e83a19d62ab474a427ed9eee155ad1 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 4 Mar 2025 09:51:22 -0500 Subject: [PATCH 214/518] Improved to remove face duplicates --- src/build123d/topology/one_d.py | 18 +++++++++--------- tests/test_topo_explore.py | 4 ---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 018800b..08c1cd4 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -133,6 +133,7 @@ from OCP.TopLoc import TopLoc_Location from OCP.TopTools import ( TopTools_HSequenceOfShape, TopTools_IndexedDataMapOfShapeListOfShape, + TopTools_IndexedMapOfShape, TopTools_ListOfShape, ) from OCP.TopoDS import ( @@ -3099,14 +3100,13 @@ def topo_explore_connected_faces( parent.wrapped, ta.TopAbs_EDGE, ta.TopAbs_FACE, edge_face_map ) - # Query the map - faces = [] + # Query the map and select only unique faces + unique_face_map = TopTools_IndexedMapOfShape() + unique_faces = [] if edge_face_map.Contains(edge.wrapped): - face_list = edge_face_map.FindFromKey(edge.wrapped) - for face in face_list: - faces.append(TopoDS.Face_s(face)) + for face in edge_face_map.FindFromKey(edge.wrapped): + unique_face_map.Add(face) + for i in range(unique_face_map.Extent()): + unique_faces.append(TopoDS.Face_s(unique_face_map(i + 1))) - if len(faces) != 2: - raise RuntimeError("Invalid # of faces connected to this edge") - - return faces + return unique_faces diff --git a/tests/test_topo_explore.py b/tests/test_topo_explore.py index 8524795..5c686df 100644 --- a/tests/test_topo_explore.py +++ b/tests/test_topo_explore.py @@ -173,10 +173,6 @@ class TestTopoExploreConnectedFaces(unittest.TestCase): self.assertEqual(len(faces), 2) def test_topo_explore_connected_faces_invalid(self): - # Test with an edge that is not connected to two faces - with self.assertRaises(RuntimeError): - topo_explore_connected_faces(self.unconnected_edge) - # No parent case with self.assertRaises(ValueError): topo_explore_connected_faces(Edge()) From 10a466f6453ef99c4c485d02985e5357f3f3076f Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 4 Mar 2025 10:01:49 -0500 Subject: [PATCH 215/518] Improving geometry eq/hash to enable sets --- src/build123d/build_common.py | 3 +- src/build123d/geometry.py | 57 +++++++++++++++++++++++--- src/build123d/topology/shape_core.py | 2 +- src/build123d/topology/two_d.py | 5 ++- tests/test_direct_api/test_axis.py | 13 ++++++ tests/test_direct_api/test_location.py | 17 ++++++++ tests/test_direct_api/test_plane.py | 15 +++++++ tests/test_direct_api/test_vector.py | 10 +++++ 8 files changed, 113 insertions(+), 9 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 755414a..947885d 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -1350,7 +1350,8 @@ class ContextComponentGetter(Protocol[T2_covar]): def __gen_context_component_getter( func: Callable[[Builder, Select], T2], -) -> ContextComponentGetter[T2]: + # ) -> ContextComponentGetter[T2]: +) -> Callable[[Select], T2]: """ Wraps a Builder method to automatically provide the Builder context. diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 455e0dc..434b028 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -42,7 +42,7 @@ import numpy as np import warnings from collections.abc import Iterable, Sequence -from math import degrees, pi, radians, isclose +from math import degrees, log10, pi, radians, isclose from typing import Any, overload, TypeAlias, TYPE_CHECKING import OCP.TopAbs as TopAbs_ShapeEnum @@ -88,6 +88,7 @@ logging.getLogger("build123d").addHandler(logging.NullHandler()) logger = logging.getLogger("build123d") TOLERANCE = 1e-6 +TOL_DIGITS = abs(int(log10(TOLERANCE))) TOL = 1e-2 DEG2RAD = pi / 180.0 RAD2DEG = 180 / pi @@ -445,11 +446,17 @@ class Vector: """Vectors equal operator ==""" if not isinstance(other, Vector): return NotImplemented - return self.wrapped.IsEqual(other.wrapped, 0.00001, 0.00001) + return self.wrapped.IsEqual(other.wrapped, TOLERANCE, TOLERANCE) def __hash__(self) -> int: """Hash of Vector""" - return hash((round(self.X, 6), round(self.Y, 6), round(self.Z, 6))) + return hash( + ( + round(self.X, TOL_DIGITS - 1), + round(self.Y, TOL_DIGITS - 1), + round(self.Z, TOL_DIGITS - 1), + ) + ) def __copy__(self) -> Vector: """Return copy of self""" @@ -690,6 +697,16 @@ class Axis(metaclass=AxisMeta): """Return deepcopy of self""" return Axis(self.position, self.direction) + def __hash__(self) -> int: + """Hash of Axis""" + return hash( + ( + round(v, TOL_DIGITS - 1) + for vector in [self.position, self.direction] + for v in vector + ) + ) + def __repr__(self) -> str: """Display self""" return f"({self.position.to_tuple()},{self.direction.to_tuple()})" @@ -1660,7 +1677,25 @@ class Location: radians(other.orientation.Y), radians(other.orientation.Z), ) - return self.position == other.position and quaternion1.IsEqual(quaternion2) + # Test quaternions with tolerance + q_values = [ + [get_value() for get_value in (q.X, q.Y, q.Z, q.W)] + for q in (quaternion1, quaternion2) + ] + quaternion_eq = all( + isclose(v1, v2, abs_tol=TOLERANCE) for v1, v2 in zip(*q_values) + ) + return self.position == other.position and quaternion_eq + + def __hash__(self) -> int: + """Hash of Location""" + return hash( + ( + round(v, TOL_DIGITS - 1) + for vector in [self.position, self.orientation] + for v in vector + ) + ) def __neg__(self) -> Location: """Flip the orientation without changing the position operator -""" @@ -2563,8 +2598,8 @@ class Plane(metaclass=PlaneMeta): return NotImplemented # equality tolerances - eq_tolerance_origin = 1e-6 - eq_tolerance_dot = 1e-6 + eq_tolerance_origin = TOLERANCE + eq_tolerance_dot = TOLERANCE return ( # origins are the same @@ -2575,6 +2610,16 @@ class Plane(metaclass=PlaneMeta): and abs(self.x_dir.dot(other.x_dir) - 1) < eq_tolerance_dot ) + def __hash__(self) -> int: + """Hash of Plane""" + return hash( + ( + round(v, TOL_DIGITS - 1) + for vector in [self.origin, self.x_dir, self.z_dir] + for v in vector + ) + ) + def __neg__(self) -> Plane: """Reverse z direction of plane operator -""" return Plane(self.origin, self.x_dir, -self.z_dir) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 934a193..1cf8ac1 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -866,7 +866,7 @@ class Shape(NodeMixin, Generic[TOPODS]): if self.wrapped is not None: memo[id(self.wrapped)] = downcast(BRepBuilderAPI_Copy(self.wrapped).Shape()) for key, value in self.__dict__.items(): - if key == 'topo_parent': + if key == "topo_parent": result.topo_parent = value else: setattr(result, key, copy.deepcopy(value, memo)) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 353fc39..05ba89a 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -563,7 +563,10 @@ class Face(Mixin2D, Shape[TopoDS_Face]): float: The signed value; positive indicates convexity, negative indicates concavity. Returns 0 if the geometry type is unsupported. """ - if self.geom_type == GeomType.CYLINDER: + if ( + self.geom_type == GeomType.CYLINDER + and type(self.geom_adaptor()) != Geom_RectangularTrimmedSurface + ): axis = self.axis_of_rotation if axis is None: raise ValueError("Can't find curvature of empty object") diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py index ed422d6..bdc921e 100644 --- a/tests/test_direct_api/test_axis.py +++ b/tests/test_direct_api/test_axis.py @@ -230,6 +230,19 @@ class TestAxis(unittest.TestCase): random_obj = object() self.assertNotEqual(Axis.X, random_obj) + def test_set(self): + a0 = Axis((0, 1, 2), (3, 4, 5)) + for i in range(1, 8): + for j in range(1, 8): + a1 = Axis( + (a0.position.X + 1.0 / (10**i), a0.position.Y, a0.position.Z), + (a0.direction.X + 1.0 / (10**j), a0.direction.Y, a0.direction.Z), + ) + if a0 == a1: + self.assertEqual(len(set([a0, a1])), 1) + else: + self.assertEqual(len(set([a0, a1])), 2) + def test_position_property(self): axis = Axis.X axis.position = 1, 2, 3 diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index 11ca288..baf640e 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -266,6 +266,23 @@ class TestLocation(unittest.TestCase): self.assertNotEqual(loc, diff_orientation) self.assertNotEqual(loc, object()) + def test_set(self): + l0 = Location((0, 1, 2), (3, 4, 5)) + for i in range(1, 8): + for j in range(1, 8): + l1 = Location( + (l0.position.X + 1.0 / (10**i), l0.position.Y, l0.position.Z), + ( + l0.orientation.X + 1.0 / (10**j), + l0.orientation.Y, + l0.orientation.Z, + ), + ) + if l0 == l1: + self.assertEqual(len(set([l0, l1])), 1) + else: + self.assertEqual(len(set([l0, l1])), 2) + def test_neg(self): loc = Location((1, 2, 3), (0, 35, 127)) n_loc = -loc diff --git a/tests/test_direct_api/test_plane.py b/tests/test_direct_api/test_plane.py index 3a2f899..df4f31b 100644 --- a/tests/test_direct_api/test_plane.py +++ b/tests/test_direct_api/test_plane.py @@ -408,6 +408,21 @@ class TestPlane(unittest.TestCase): Plane(origin=(0, 0, 0), x_dir=(1, 0, 0), z_dir=(0, 1, 1)), ) + def test_set(self): + p0 = Plane((0, 1, 2), (3, 4, 5), (6, 7, 8)) + for i in range(1, 8): + for j in range(1, 8): + for k in range(1, 8): + p1 = Plane( + (p0.origin.X + 1.0 / (10**i), p0.origin.Y, p0.origin.Z), + (p0.x_dir.X + 1.0 / (10**j), p0.x_dir.Y, p0.x_dir.Z), + (p0.z_dir.X + 1.0 / (10**k), p0.z_dir.Y, p0.z_dir.Z), + ) + if p0 == p1: + self.assertEqual(len(set([p0, p1])), 1) + else: + self.assertEqual(len(set([p0, p1])), 2) + def test_to_location(self): loc = Plane(origin=(1, 2, 3), x_dir=(0, 1, 0), z_dir=(0, 0, 1)).location self.assertAlmostEqual(loc.position, (1, 2, 3), 5) diff --git a/tests/test_direct_api/test_vector.py b/tests/test_direct_api/test_vector.py index a140f01..521c47c 100644 --- a/tests/test_direct_api/test_vector.py +++ b/tests/test_direct_api/test_vector.py @@ -156,6 +156,16 @@ class TestVector(unittest.TestCase): self.assertNotEqual(a, b) self.assertNotEqual(a, object()) + def test_vector_sets(self): + # Check that equal and hash work the same way to enable sets + a = Vector(1, 2, 3) + for i in range(1, 8): + v = Vector(a.X + 1.0 / (10**i), a.Y, a.Z) + if v == a: + self.assertEqual(len(set([a, v])), 1) + else: + self.assertEqual(len(set([a, v])), 2) + def test_vector_distance(self): """ Test line distance from plane. From 008530646165b932364c312101b3ca2564400ea3 Mon Sep 17 00:00:00 2001 From: Ami Fischman Date: Sat, 22 Feb 2025 22:22:54 -0800 Subject: [PATCH 216/518] TooTallToby tutorials: unbreak and test. - Unbreak the three broken tutorials (fixes #848) - This involved a rewrite of PPP-01-10 because I already had my own solution to that one and I couldn't easily tell what was going wrong with the previous solution. - Add assertions to all the tutorials so that non-raising means success - Add the TTT examples to `test_examples.py` added recently for #909 - Also added sympy to development dependencies since one of the TTT examples uses it. --- docs/assets/ttt/ttt-23-02-02-sm_hanger.py | 9 +- docs/assets/ttt/ttt-23-t-24-curved_support.py | 10 +- docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py | 9 +- docs/assets/ttt/ttt-ppp0101.py | 101 ++++++++------- docs/assets/ttt/ttt-ppp0102.py | 106 ++++++++------- docs/assets/ttt/ttt-ppp0103.py | 74 ++++++----- docs/assets/ttt/ttt-ppp0104.py | 121 +++++++++--------- docs/assets/ttt/ttt-ppp0105.py | 68 +++++----- docs/assets/ttt/ttt-ppp0106.py | 110 ++++++++-------- docs/assets/ttt/ttt-ppp0107.py | 111 ++++++++-------- docs/assets/ttt/ttt-ppp0108.py | 101 ++++++++------- docs/assets/ttt/ttt-ppp0109.py | 118 +++++++++-------- docs/assets/ttt/ttt-ppp0110.py | 111 ++++++++-------- pyproject.toml | 9 +- tests/test_examples.py | 4 +- 15 files changed, 576 insertions(+), 486 deletions(-) diff --git a/docs/assets/ttt/ttt-23-02-02-sm_hanger.py b/docs/assets/ttt/ttt-23-02-02-sm_hanger.py index b523175..309f61f 100644 --- a/docs/assets/ttt/ttt-23-02-02-sm_hanger.py +++ b/docs/assets/ttt/ttt-23-02-02-sm_hanger.py @@ -92,6 +92,13 @@ with BuildPart() as sm_hanger: mirror(about=Plane.YZ) mirror(about=Plane.XZ) -print(f"Mass: {sm_hanger.part.volume*7800*1e-6:0.1f} g") +got_mass = sm_hanger.part.volume*7800*1e-6 +want_mass = 1028 +tolerance = 10 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.1f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' + +assert abs(got_mass - 1028) < 10, f'{got_mass=}, want=1028, tolerance=10' show(sm_hanger) diff --git a/docs/assets/ttt/ttt-23-t-24-curved_support.py b/docs/assets/ttt/ttt-23-t-24-curved_support.py index 26b469b..d54f6ee 100644 --- a/docs/assets/ttt/ttt-23-t-24-curved_support.py +++ b/docs/assets/ttt/ttt-23-t-24-curved_support.py @@ -27,7 +27,7 @@ equations = [ (yl8 - 50) / (55 / 2 - xl8) - tan(radians(8)), # 8 degree slope ] # There are two solutions but we want the 2nd one -solution = sympy.solve(equations, dict=True)[1] +solution = {k: float(v) for k,v in sympy.solve(equations, dict=True)[1].items()} # Create the critical points c30 = Vector(x30, solution[y30]) @@ -58,5 +58,11 @@ with BuildPart() as curved_support: with Locations((0, 125)): Hole(20 / 2) -print(curved_support.part.volume * 7800e-6) +got_mass = curved_support.part.volume * 7800e-6 +want_mass = 1294 +delta = abs(got_mass - want_mass) +tolerance = 3 +print(f"Mass: {got_mass:0.1f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' + show(curved_support) diff --git a/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py b/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py index a54d77c..60c0fce 100644 --- a/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py +++ b/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py @@ -45,6 +45,13 @@ with BuildPart() as p: mirror(about=Plane.YZ) part = scale(p.part, IN) -print(f"\npart weight = {part.volume*7800e-6/LB:0.2f} lbs") + + +got_mass = part.volume*7800e-6/LB +want_mass = 3.923 +tolerance = 0.02 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.1f} lbs") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' show(p) diff --git a/docs/assets/ttt/ttt-ppp0101.py b/docs/assets/ttt/ttt-ppp0101.py index 8a78180..efd0a27 100644 --- a/docs/assets/ttt/ttt-ppp0101.py +++ b/docs/assets/ttt/ttt-ppp0101.py @@ -1,47 +1,54 @@ -""" -Too Tall Toby Party Pack 01-01 Bearing Bracket -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -with BuildPart() as p: - with BuildSketch() as s: - Rectangle(115, 50) - with Locations((5 / 2, 0)): - SlotOverall(90, 12, mode=Mode.SUBTRACT) - extrude(amount=15) - - with BuildSketch(Plane.XZ.offset(50 / 2)) as s3: - with Locations((-115 / 2 + 26, 15)): - SlotOverall(42 + 2 * 26 + 12, 2 * 26, rotation=90) - zz = extrude(amount=-12) - split(bisect_by=Plane.XY) - edgs = p.part.edges().filter_by(Axis.Y).group_by(Axis.X)[-2] - fillet(edgs, 9) - - with Locations(zz.faces().sort_by(Axis.Y)[0]): - with Locations((42 / 2 + 6, 0)): - CounterBoreHole(24 / 2, 34 / 2, 4) - mirror(about=Plane.XZ) - - with BuildSketch() as s4: - RectangleRounded(115, 50, 6) - extrude(amount=80, mode=Mode.INTERSECT) - # fillet does not work right, mode intersect is safer - - with BuildSketch(Plane.YZ) as s4: - with BuildLine() as bl: - l1 = Line((0, 0), (18 / 2, 0)) - l2 = PolarLine(l1 @ 1, 8, 60, length_mode=LengthMode.VERTICAL) - l3 = Line(l2 @ 1, (0, 8)) - mirror(about=Plane.YZ) - make_face() - extrude(amount=115/2, both=True, mode=Mode.SUBTRACT) - -show_object(p) -print(f"\npart mass = {p.part.volume*densa:0.2f}") +""" +Too Tall Toby Party Pack 01-01 Bearing Bracket +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +with BuildPart() as p: + with BuildSketch() as s: + Rectangle(115, 50) + with Locations((5 / 2, 0)): + SlotOverall(90, 12, mode=Mode.SUBTRACT) + extrude(amount=15) + + with BuildSketch(Plane.XZ.offset(50 / 2)) as s3: + with Locations((-115 / 2 + 26, 15)): + SlotOverall(42 + 2 * 26 + 12, 2 * 26, rotation=90) + zz = extrude(amount=-12) + split(bisect_by=Plane.XY) + edgs = p.part.edges().filter_by(Axis.Y).group_by(Axis.X)[-2] + fillet(edgs, 9) + + with Locations(zz.faces().sort_by(Axis.Y)[0]): + with Locations((42 / 2 + 6, 0)): + CounterBoreHole(24 / 2, 34 / 2, 4) + mirror(about=Plane.XZ) + + with BuildSketch() as s4: + RectangleRounded(115, 50, 6) + extrude(amount=80, mode=Mode.INTERSECT) + # fillet does not work right, mode intersect is safer + + with BuildSketch(Plane.YZ) as s4: + with BuildLine() as bl: + l1 = Line((0, 0), (18 / 2, 0)) + l2 = PolarLine(l1 @ 1, 8, 60, length_mode=LengthMode.VERTICAL) + l3 = Line(l2 @ 1, (0, 8)) + mirror(about=Plane.YZ) + make_face() + extrude(amount=115/2, both=True, mode=Mode.SUBTRACT) + +show_object(p) + + +got_mass = p.part.volume*densa +want_mass = 797.15 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' diff --git a/docs/assets/ttt/ttt-ppp0102.py b/docs/assets/ttt/ttt-ppp0102.py index df1df56..9670314 100644 --- a/docs/assets/ttt/ttt-ppp0102.py +++ b/docs/assets/ttt/ttt-ppp0102.py @@ -1,49 +1,57 @@ -""" -Too Tall Toby Party Pack 01-02 Post Cap -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - - -# TTT Party Pack 01: PPP0102, mass(abs) = 43.09g -with BuildPart() as p: - with BuildSketch(Plane.XZ) as sk1: - Rectangle(49, 48 - 8, align=(Align.CENTER, Align.MIN)) - Rectangle(9, 48, align=(Align.CENTER, Align.MIN)) - with Locations((9 / 2, 40)): - Ellipse(20, 8) - split(bisect_by=Plane.YZ) - revolve(axis=Axis.Z) - - with BuildSketch(Plane.YZ.offset(-15)) as xc1: - with Locations((0, 40 / 2 - 17)): - Ellipse(10 / 2, 4 / 2) - with BuildLine(Plane.XZ) as l1: - CenterArc((-15, 40 / 2), 17, 90, 180) - sweep(path=l1) - - fillet(p.edges().filter_by(GeomType.CIRCLE, reverse=True).group_by(Axis.X)[0], 1) - - with BuildLine(mode=Mode.PRIVATE) as lc1: - PolarLine( - (42 / 2, 0), 37, 94, length_mode=LengthMode.VERTICAL - ) # construction line - - pts = [ - (0, 0), - (42 / 2, 0), - ((lc1.line @ 1).X, (lc1.line @ 1).Y), - (0, (lc1.line @ 1).Y), - ] - with BuildSketch(Plane.XZ) as sk2: - Polygon(*pts, align=None) - fillet(sk2.vertices().group_by(Axis.X)[1], 3) - revolve(axis=Axis.Z, mode=Mode.SUBTRACT) - -show(p) -print(f"\npart mass = {p.part.volume*densa:0.2f}") +""" +Too Tall Toby Party Pack 01-02 Post Cap +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + + +# TTT Party Pack 01: PPP0102, mass(abs) = 43.09g +with BuildPart() as p: + with BuildSketch(Plane.XZ) as sk1: + Rectangle(49, 48 - 8, align=(Align.CENTER, Align.MIN)) + Rectangle(9, 48, align=(Align.CENTER, Align.MIN)) + with Locations((9 / 2, 40)): + Ellipse(20, 8) + split(bisect_by=Plane.YZ) + revolve(axis=Axis.Z) + + with BuildSketch(Plane.YZ.offset(-15)) as xc1: + with Locations((0, 40 / 2 - 17)): + Ellipse(10 / 2, 4 / 2) + with BuildLine(Plane.XZ) as l1: + CenterArc((-15, 40 / 2), 17, 90, 180) + sweep(path=l1) + + fillet(p.edges().filter_by(GeomType.CIRCLE, reverse=True).group_by(Axis.X)[0], 1) + + with BuildLine(mode=Mode.PRIVATE) as lc1: + PolarLine( + (42 / 2, 0), 37, 94, length_mode=LengthMode.VERTICAL + ) # construction line + + pts = [ + (0, 0), + (42 / 2, 0), + ((lc1.line @ 1).X, (lc1.line @ 1).Y), + (0, (lc1.line @ 1).Y), + ] + with BuildSketch(Plane.XZ) as sk2: + Polygon(*pts, align=None) + fillet(sk2.vertices().group_by(Axis.X)[1], 3) + revolve(axis=Axis.Z, mode=Mode.SUBTRACT) + +show(p) + + +got_mass = p.part.volume*densc +want_mass = 43.09 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' + diff --git a/docs/assets/ttt/ttt-ppp0103.py b/docs/assets/ttt/ttt-ppp0103.py index b021b9b..1465232 100644 --- a/docs/assets/ttt/ttt-ppp0103.py +++ b/docs/assets/ttt/ttt-ppp0103.py @@ -1,34 +1,40 @@ -""" -Too Tall Toby Party Pack 01-03 C Clamp Base -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - - -with BuildPart() as ppp0103: - with BuildSketch() as sk1: - RectangleRounded(34 * 2, 95, 18) - with Locations((0, -2)): - RectangleRounded((34 - 16) * 2, 95 - 18 - 14, 7, mode=Mode.SUBTRACT) - with Locations((-34 / 2, 0)): - Rectangle(34, 95, 0, mode=Mode.SUBTRACT) - extrude(amount=16) - with BuildSketch(Plane.XZ.offset(-95 / 2)) as cyl1: - with Locations((0, 16 / 2)): - Circle(16 / 2) - extrude(amount=18) - with BuildSketch(Plane.XZ.offset(95 / 2 - 14)) as cyl2: - with Locations((0, 16 / 2)): - Circle(16 / 2) - extrude(amount=23) - with Locations(Plane.XZ.offset(95 / 2 + 9)): - with Locations((0, 16 / 2)): - CounterSinkHole(5.5 / 2, 11.2 / 2, None, 90) - -show(ppp0103) -print(f"\npart mass = {ppp0103.part.volume*densb:0.2f}") +""" +Too Tall Toby Party Pack 01-03 C Clamp Base +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + + +with BuildPart() as ppp0103: + with BuildSketch() as sk1: + RectangleRounded(34 * 2, 95, 18) + with Locations((0, -2)): + RectangleRounded((34 - 16) * 2, 95 - 18 - 14, 7, mode=Mode.SUBTRACT) + with Locations((-34 / 2, 0)): + Rectangle(34, 95, 0, mode=Mode.SUBTRACT) + extrude(amount=16) + with BuildSketch(Plane.XZ.offset(-95 / 2)) as cyl1: + with Locations((0, 16 / 2)): + Circle(16 / 2) + extrude(amount=18) + with BuildSketch(Plane.XZ.offset(95 / 2 - 14)) as cyl2: + with Locations((0, 16 / 2)): + Circle(16 / 2) + extrude(amount=23) + with Locations(Plane.XZ.offset(95 / 2 + 9)): + with Locations((0, 16 / 2)): + CounterSinkHole(5.5 / 2, 11.2 / 2, None, 90) + +show(ppp0103) + +got_mass = ppp0103.part.volume*densb +want_mass = 96.13 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' diff --git a/docs/assets/ttt/ttt-ppp0104.py b/docs/assets/ttt/ttt-ppp0104.py index 685b483..88361fa 100644 --- a/docs/assets/ttt/ttt-ppp0104.py +++ b/docs/assets/ttt/ttt-ppp0104.py @@ -1,57 +1,64 @@ -""" -Too Tall Toby Party Pack 01-04 Angle Bracket -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -d1, d2, d3 = 38, 26, 16 -h1, h2, h3, h4 = 20, 8, 7, 23 -w1, w2, w3 = 80, 10, 5 -f1, f2, f3 = 4, 10, 5 -sloth1, sloth2 = 18, 12 -slotw1, slotw2 = 17, 14 - -with BuildPart() as p: - with BuildSketch() as s: - Circle(d1 / 2) - extrude(amount=h1) - with BuildSketch(Plane.XY.offset(h1)) as s2: - Circle(d2 / 2) - extrude(amount=h2) - with BuildSketch(Plane.YZ) as s3: - Rectangle(d1 + 15, h3, align=(Align.CENTER, Align.MIN)) - extrude(amount=w1 - d1 / 2) - # fillet workaround \/ - ped = p.part.edges().group_by(Axis.Z)[2].filter_by(GeomType.CIRCLE) - fillet(ped, f1) - with BuildSketch(Plane.YZ) as s3a: - Rectangle(d1 + 15, 15, align=(Align.CENTER, Align.MIN)) - Rectangle(d1, 15, mode=Mode.SUBTRACT, align=(Align.CENTER, Align.MIN)) - extrude(amount=w1 - d1 / 2, mode=Mode.SUBTRACT) - # end fillet workaround /\ - with BuildSketch() as s4: - Circle(d3 / 2) - extrude(amount=h1 + h2, mode=Mode.SUBTRACT) - with BuildSketch() as s5: - with Locations((w1 - d1 / 2 - w2 / 2, 0)): - Rectangle(w2, d1) - extrude(amount=-h4) - fillet(p.part.edges().group_by(Axis.X)[-1].sort_by(Axis.Z)[-1], f2) - fillet(p.part.edges().group_by(Axis.X)[-4].sort_by(Axis.Z)[-2], f3) - pln = Plane.YZ.offset(w1 - d1 / 2) - with BuildSketch(pln) as s6: - with Locations((0, -h4)): - SlotOverall(slotw1 * 2, sloth1, 90) - extrude(amount=-w3, mode=Mode.SUBTRACT) - with BuildSketch(pln) as s6b: - with Locations((0, -h4)): - SlotOverall(slotw2 * 2, sloth2, 90) - extrude(amount=-w2, mode=Mode.SUBTRACT) - -show(p) -print(f"\npart mass = {p.part.volume*densa:0.2f}") +""" +Too Tall Toby Party Pack 01-04 Angle Bracket +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +d1, d2, d3 = 38, 26, 16 +h1, h2, h3, h4 = 20, 8, 7, 23 +w1, w2, w3 = 80, 10, 5 +f1, f2, f3 = 4, 10, 5 +sloth1, sloth2 = 18, 12 +slotw1, slotw2 = 17, 14 + +with BuildPart() as p: + with BuildSketch() as s: + Circle(d1 / 2) + extrude(amount=h1) + with BuildSketch(Plane.XY.offset(h1)) as s2: + Circle(d2 / 2) + extrude(amount=h2) + with BuildSketch(Plane.YZ) as s3: + Rectangle(d1 + 15, h3, align=(Align.CENTER, Align.MIN)) + extrude(amount=w1 - d1 / 2) + # fillet workaround \/ + ped = p.part.edges().group_by(Axis.Z)[2].filter_by(GeomType.CIRCLE) + fillet(ped, f1) + with BuildSketch(Plane.YZ) as s3a: + Rectangle(d1 + 15, 15, align=(Align.CENTER, Align.MIN)) + Rectangle(d1, 15, mode=Mode.SUBTRACT, align=(Align.CENTER, Align.MIN)) + extrude(amount=w1 - d1 / 2, mode=Mode.SUBTRACT) + # end fillet workaround /\ + with BuildSketch() as s4: + Circle(d3 / 2) + extrude(amount=h1 + h2, mode=Mode.SUBTRACT) + with BuildSketch() as s5: + with Locations((w1 - d1 / 2 - w2 / 2, 0)): + Rectangle(w2, d1) + extrude(amount=-h4) + fillet(p.part.edges().group_by(Axis.X)[-1].sort_by(Axis.Z)[-1], f2) + fillet(p.part.edges().group_by(Axis.X)[-4].sort_by(Axis.Z)[-2], f3) + pln = Plane.YZ.offset(w1 - d1 / 2) + with BuildSketch(pln) as s6: + with Locations((0, -h4)): + SlotOverall(slotw1 * 2, sloth1, 90) + extrude(amount=-w3, mode=Mode.SUBTRACT) + with BuildSketch(pln) as s6b: + with Locations((0, -h4)): + SlotOverall(slotw2 * 2, sloth2, 90) + extrude(amount=-w2, mode=Mode.SUBTRACT) + +show(p) + + +got_mass = p.part.volume*densa +want_mass = 310 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' diff --git a/docs/assets/ttt/ttt-ppp0105.py b/docs/assets/ttt/ttt-ppp0105.py index bf5c020..f599736 100644 --- a/docs/assets/ttt/ttt-ppp0105.py +++ b/docs/assets/ttt/ttt-ppp0105.py @@ -1,30 +1,38 @@ -""" -Too Tall Toby Party Pack 01-05 Paste Sleeve -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -with BuildPart() as p: - with BuildSketch() as s: - SlotOverall(45, 38) - offset(amount=3) - with BuildSketch(Plane.XY.offset(133 - 30)) as s2: - SlotOverall(60, 4) - offset(amount=3) - loft() - - with BuildSketch() as s3: - SlotOverall(45, 38) - with BuildSketch(Plane.XY.offset(133 - 30)) as s4: - SlotOverall(60, 4) - loft(mode=Mode.SUBTRACT) - - extrude(p.part.faces().sort_by(Axis.Z)[0], amount=30) - -show(p) -print(f"\npart mass = {p.part.volume*densc:0.2f}") +""" +Too Tall Toby Party Pack 01-05 Paste Sleeve +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +with BuildPart() as p: + with BuildSketch() as s: + SlotOverall(45, 38) + offset(amount=3) + with BuildSketch(Plane.XY.offset(133 - 30)) as s2: + SlotOverall(60, 4) + offset(amount=3) + loft() + + with BuildSketch() as s3: + SlotOverall(45, 38) + with BuildSketch(Plane.XY.offset(133 - 30)) as s4: + SlotOverall(60, 4) + loft(mode=Mode.SUBTRACT) + + extrude(p.part.faces().sort_by(Axis.Z)[0], amount=30) + +show(p) + + +got_mass = p.part.volume*densc +want_mass = 57.08 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' + diff --git a/docs/assets/ttt/ttt-ppp0106.py b/docs/assets/ttt/ttt-ppp0106.py index 38aef2a..596a47b 100644 --- a/docs/assets/ttt/ttt-ppp0106.py +++ b/docs/assets/ttt/ttt-ppp0106.py @@ -1,52 +1,58 @@ -""" -Too Tall Toby Party Pack 01-06 Bearing Jig -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -r1, r2, r3, r4, r5 = 30 / 2, 13 / 2, 12 / 2, 10, 6 # radii used -x1 = 44 # lengths used -y1, y2, y3, y4, y_tot = 36, 36 - 22 / 2, 22 / 2, 42, 69 # widths used - -with BuildSketch(Location((0, -r1, y3))) as sk_body: - with BuildLine() as l: - c1 = Line((r1, 0), (r1, y_tot), mode=Mode.PRIVATE) # construction line - m1 = Line((0, y_tot), (x1 / 2, y_tot)) - m2 = JernArc(m1 @ 1, m1 % 1, r4, -90 - 45) - m3 = IntersectingLine(m2 @ 1, m2 % 1, c1) - m4 = Line(m3 @ 1, (r1, r1)) - m5 = JernArc(m4 @ 1, m4 % 1, r1, -90) - m6 = Line(m5 @ 1, m1 @ 0) - mirror(make_face(l.line), Plane.YZ) - fillet(sk_body.vertices().group_by(Axis.Y)[1], 12) - with Locations((x1 / 2, y_tot - 10), (-x1 / 2, y_tot - 10)): - Circle(r2, mode=Mode.SUBTRACT) - # Keyway - with Locations((0, r1)): - Circle(r3, mode=Mode.SUBTRACT) - Rectangle(4, 3 + 6, align=(Align.CENTER, Align.MIN), mode=Mode.SUBTRACT) - -with BuildPart() as p: - Box(200, 200, 22) # Oversized plate - # Cylinder underneath - Cylinder(r1, y2, align=(Align.CENTER, Align.CENTER, Align.MAX)) - fillet(p.edges(Select.NEW), r5) # Weld together - extrude(sk_body.sketch, amount=-y1, mode=Mode.INTERSECT) # Cut to shape - # Remove slot - with Locations((0, y_tot - r1 - y4, 0)): - Box( - y_tot, - y_tot, - 10, - align=(Align.CENTER, Align.MIN, Align.CENTER), - mode=Mode.SUBTRACT, - ) - -show(p) -print(f"\npart mass = {p.part.volume*densa:0.2f}") -print(p.part.bounding_box().size) +""" +Too Tall Toby Party Pack 01-06 Bearing Jig +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +r1, r2, r3, r4, r5 = 30 / 2, 13 / 2, 12 / 2, 10, 6 # radii used +x1 = 44 # lengths used +y1, y2, y3, y4, y_tot = 36, 36 - 22 / 2, 22 / 2, 42, 69 # widths used + +with BuildSketch(Location((0, -r1, y3))) as sk_body: + with BuildLine() as l: + c1 = Line((r1, 0), (r1, y_tot), mode=Mode.PRIVATE) # construction line + m1 = Line((0, y_tot), (x1 / 2, y_tot)) + m2 = JernArc(m1 @ 1, m1 % 1, r4, -90 - 45) + m3 = IntersectingLine(m2 @ 1, m2 % 1, c1) + m4 = Line(m3 @ 1, (r1, r1)) + m5 = JernArc(m4 @ 1, m4 % 1, r1, -90) + m6 = Line(m5 @ 1, m1 @ 0) + mirror(make_face(l.line), Plane.YZ) + fillet(sk_body.vertices().group_by(Axis.Y)[1], 12) + with Locations((x1 / 2, y_tot - 10), (-x1 / 2, y_tot - 10)): + Circle(r2, mode=Mode.SUBTRACT) + # Keyway + with Locations((0, r1)): + Circle(r3, mode=Mode.SUBTRACT) + Rectangle(4, 3 + 6, align=(Align.CENTER, Align.MIN), mode=Mode.SUBTRACT) + +with BuildPart() as p: + Box(200, 200, 22) # Oversized plate + # Cylinder underneath + Cylinder(r1, y2, align=(Align.CENTER, Align.CENTER, Align.MAX)) + fillet(p.edges(Select.NEW), r5) # Weld together + extrude(sk_body.sketch, amount=-y1, mode=Mode.INTERSECT) # Cut to shape + # Remove slot + with Locations((0, y_tot - r1 - y4, 0)): + Box( + y_tot, + y_tot, + 10, + align=(Align.CENTER, Align.MIN, Align.CENTER), + mode=Mode.SUBTRACT, + ) + +show(p) + + +got_mass = p.part.volume*densa +want_mass = 328.02 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' diff --git a/docs/assets/ttt/ttt-ppp0107.py b/docs/assets/ttt/ttt-ppp0107.py index ca13804..1ddc680 100644 --- a/docs/assets/ttt/ttt-ppp0107.py +++ b/docs/assets/ttt/ttt-ppp0107.py @@ -1,52 +1,59 @@ -""" -Too Tall Toby Party Pack 01-07 Flanged Hub -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -with BuildPart() as p: - with BuildSketch() as s: - Circle(130 / 2) - extrude(amount=8) - with BuildSketch(Plane.XY.offset(8)) as s2: - Circle(84 / 2) - extrude(amount=25 - 8) - with BuildSketch(Plane.XY.offset(25)) as s3: - Circle(35 / 2) - extrude(amount=52 - 25) - with BuildSketch() as s4: - Circle(73 / 2) - extrude(amount=18, mode=Mode.SUBTRACT) - pln2 = p.part.faces().sort_by(Axis.Z)[5] - with BuildSketch(Plane.XY.offset(52)) as s5: - Circle(20 / 2) - extrude(amount=-52, mode=Mode.SUBTRACT) - fillet( - p.part.edges() - .filter_by(GeomType.CIRCLE) - .sort_by(Axis.Z)[2:-2] - .sort_by(SortBy.RADIUS)[1:], - 3, - ) - pln = Plane(pln2) - pln.origin = pln.origin + Vector(20 / 2, 0, 0) - pln = pln.rotated((0, 45, 0)) - pln = pln.offset(-25 + 3 + 0.10) - with BuildSketch(pln) as s6: - Rectangle((73 - 35) / 2 * 1.414 + 5, 3) - zz = extrude(amount=15, taper=-20 / 2, mode=Mode.PRIVATE) - zz2 = split(zz, bisect_by=Plane.XY.offset(25), mode=Mode.PRIVATE) - zz3 = split(zz2, bisect_by=Plane.YZ.offset(35 / 2 - 1), mode=Mode.PRIVATE) - with PolarLocations(0, 3): - add(zz3) - with Locations(Plane.XY.offset(8)): - with PolarLocations(107.95 / 2, 6): - CounterBoreHole(6 / 2, 13 / 2, 4) - -show(p) -print(f"\npart mass = {p.part.volume*densb:0.2f}") +""" +Too Tall Toby Party Pack 01-07 Flanged Hub +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +with BuildPart() as p: + with BuildSketch() as s: + Circle(130 / 2) + extrude(amount=8) + with BuildSketch(Plane.XY.offset(8)) as s2: + Circle(84 / 2) + extrude(amount=25 - 8) + with BuildSketch(Plane.XY.offset(25)) as s3: + Circle(35 / 2) + extrude(amount=52 - 25) + with BuildSketch() as s4: + Circle(73 / 2) + extrude(amount=18, mode=Mode.SUBTRACT) + pln2 = p.part.faces().sort_by(Axis.Z)[5] + with BuildSketch(Plane.XY.offset(52)) as s5: + Circle(20 / 2) + extrude(amount=-52, mode=Mode.SUBTRACT) + fillet( + p.part.edges() + .filter_by(GeomType.CIRCLE) + .sort_by(Axis.Z)[2:-2] + .sort_by(SortBy.RADIUS)[1:], + 3, + ) + pln = Plane(pln2) + pln.origin = pln.origin + Vector(20 / 2, 0, 0) + pln = pln.rotated((0, 45, 0)) + pln = pln.offset(-25 + 3 + 0.10) + with BuildSketch(pln) as s6: + Rectangle((73 - 35) / 2 * 1.414 + 5, 3) + zz = extrude(amount=15, taper=-20 / 2, mode=Mode.PRIVATE) + zz2 = split(zz, bisect_by=Plane.XY.offset(25), mode=Mode.PRIVATE) + zz3 = split(zz2, bisect_by=Plane.YZ.offset(35 / 2 - 1), mode=Mode.PRIVATE) + with PolarLocations(0, 3): + add(zz3) + with Locations(Plane.XY.offset(8)): + with PolarLocations(107.95 / 2, 6): + CounterBoreHole(6 / 2, 13 / 2, 4) + +show(p) + + +got_mass = p.part.volume*densb +want_mass = 372.99 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' diff --git a/docs/assets/ttt/ttt-ppp0108.py b/docs/assets/ttt/ttt-ppp0108.py index e79d1f9..60280c5 100644 --- a/docs/assets/ttt/ttt-ppp0108.py +++ b/docs/assets/ttt/ttt-ppp0108.py @@ -1,47 +1,54 @@ -""" -Too Tall Toby Party Pack 01-08 Tie Plate -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -with BuildPart() as p: - with BuildSketch() as s1: - Rectangle(188 / 2 - 33, 162, align=(Align.MIN, Align.CENTER)) - with Locations((188 / 2 - 33, 0)): - SlotOverall(190, 33 * 2, rotation=90) - mirror(about=Plane.YZ) - with GridLocations(188 - 2 * 33, 190 - 2 * 33, 2, 2): - Circle(29 / 2, mode=Mode.SUBTRACT) - Circle(84 / 2, mode=Mode.SUBTRACT) - extrude(amount=16) - - with BuildPart() as p2: - with BuildSketch(Plane.XZ) as s2: - with BuildLine() as l1: - l1 = Polyline( - (222 / 2 + 14 - 40 - 40, 0), - (222 / 2 + 14 - 40, -35 + 16), - (222 / 2 + 14, -35 + 16), - (222 / 2 + 14, -35 + 16 + 30), - (222 / 2 + 14 - 40 - 40, -35 + 16 + 30), - close=True, - ) - make_face() - with Locations((222 / 2, -35 + 16 + 14)): - Circle(11 / 2, mode=Mode.SUBTRACT) - extrude(amount=20 / 2, both=True) - with BuildSketch() as s3: - with Locations(l1 @ 0): - Rectangle(40 + 40, 8, align=(Align.MIN, Align.CENTER)) - with Locations((40, 0)): - Rectangle(40, 20, align=(Align.MIN, Align.CENTER)) - extrude(amount=30, both=True, mode=Mode.INTERSECT) - mirror(about=Plane.YZ) - -show(p) -print(f"\npart mass = {p.part.volume*densa:0.2f}") +""" +Too Tall Toby Party Pack 01-08 Tie Plate +""" + +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +with BuildPart() as p: + with BuildSketch() as s1: + Rectangle(188 / 2 - 33, 162, align=(Align.MIN, Align.CENTER)) + with Locations((188 / 2 - 33, 0)): + SlotOverall(190, 33 * 2, rotation=90) + mirror(about=Plane.YZ) + with GridLocations(188 - 2 * 33, 190 - 2 * 33, 2, 2): + Circle(29 / 2, mode=Mode.SUBTRACT) + Circle(84 / 2, mode=Mode.SUBTRACT) + extrude(amount=16) + + with BuildPart() as p2: + with BuildSketch(Plane.XZ) as s2: + with BuildLine() as l1: + l1 = Polyline( + (222 / 2 + 14 - 40 - 40, 0), + (222 / 2 + 14 - 40, -35 + 16), + (222 / 2 + 14, -35 + 16), + (222 / 2 + 14, -35 + 16 + 30), + (222 / 2 + 14 - 40 - 40, -35 + 16 + 30), + close=True, + ) + make_face() + with Locations((222 / 2, -35 + 16 + 14)): + Circle(11 / 2, mode=Mode.SUBTRACT) + extrude(amount=20 / 2, both=True) + with BuildSketch() as s3: + with Locations(l1 @ 0): + Rectangle(40 + 40, 8, align=(Align.MIN, Align.CENTER)) + with Locations((40, 0)): + Rectangle(40, 20, align=(Align.MIN, Align.CENTER)) + extrude(amount=30, both=True, mode=Mode.INTERSECT) + mirror(about=Plane.YZ) + +show(p) + + +got_mass = p.part.volume*densa +want_mass = 3387.06 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' diff --git a/docs/assets/ttt/ttt-ppp0109.py b/docs/assets/ttt/ttt-ppp0109.py index 3426846..b00b0bc 100644 --- a/docs/assets/ttt/ttt-ppp0109.py +++ b/docs/assets/ttt/ttt-ppp0109.py @@ -1,56 +1,62 @@ -""" -Too Tall Toby Party Pack 01-09 Corner Tie -""" - -from math import sqrt -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -with BuildPart() as ppp109: - with BuildSketch() as one: - Rectangle(69, 75, align=(Align.MAX, Align.CENTER)) - fillet(one.vertices().group_by(Axis.X)[0], 17) - extrude(amount=13) - centers = [ - arc.arc_center - for arc in ppp109.edges().filter_by(GeomType.CIRCLE).group_by(Axis.Z)[-1] - ] - with Locations(*centers): - CounterBoreHole(radius=8 / 2, counter_bore_radius=15 / 2, counter_bore_depth=4) - - with BuildSketch(Plane.YZ) as two: - with Locations((0, 45)): - Circle(15) - with BuildLine() as bl: - c = Line((75 / 2, 0), (75 / 2, 60), mode=Mode.PRIVATE) - u = two.edge().find_tangent(75 / 2 + 90)[0] # where is the slope 75/2? - l1 = IntersectingLine( - two.edge().position_at(u), -two.edge().tangent_at(u), other=c - ) - Line(l1 @ 0, (0, 45)) - Polyline((0, 0), c @ 0, l1 @ 1) - mirror(about=Plane.YZ) - make_face() - with Locations((0, 45)): - Circle(12 / 2, mode=Mode.SUBTRACT) - extrude(amount=-13) - - with BuildSketch(Plane((0, 0, 0), x_dir=(1, 0, 0), z_dir=(1, 0, 1))) as three: - Rectangle(45 * 2 / sqrt(2) - 37.5, 75, align=(Align.MIN, Align.CENTER)) - with Locations(three.edges().sort_by(Axis.X)[-1].center()): - Circle(37.5) - Circle(33 / 2, mode=Mode.SUBTRACT) - split(bisect_by=Plane.YZ) - extrude(amount=6) - f = ppp109.faces().filter_by(Axis((0, 0, 0), (-1, 0, 1)))[0] - # extrude(f, until=Until.NEXT) # throws a warning - extrude(f, amount=10) - fillet(ppp109.edge(Select.NEW), 16) - - -show(ppp109) -print(f"\npart mass = {ppp109.part.volume*densb:0.2f}") +""" +Too Tall Toby Party Pack 01-09 Corner Tie +""" + +from math import sqrt +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +with BuildPart() as ppp109: + with BuildSketch() as one: + Rectangle(69, 75, align=(Align.MAX, Align.CENTER)) + fillet(one.vertices().group_by(Axis.X)[0], 17) + extrude(amount=13) + centers = [ + arc.arc_center + for arc in ppp109.edges().filter_by(GeomType.CIRCLE).group_by(Axis.Z)[-1] + ] + with Locations(*centers): + CounterBoreHole(radius=8 / 2, counter_bore_radius=15 / 2, counter_bore_depth=4) + + with BuildSketch(Plane.YZ) as two: + with Locations((0, 45)): + Circle(15) + with BuildLine() as bl: + c = Line((75 / 2, 0), (75 / 2, 60), mode=Mode.PRIVATE) + u = two.edge().find_tangent(75 / 2 + 90)[0] # where is the slope 75/2? + l1 = IntersectingLine( + two.edge().position_at(u), -two.edge().tangent_at(u), other=c + ) + Line(l1 @ 0, (0, 45)) + Polyline((0, 0), c @ 0, l1 @ 1) + mirror(about=Plane.YZ) + make_face() + with Locations((0, 45)): + Circle(12 / 2, mode=Mode.SUBTRACT) + extrude(amount=-13) + + with BuildSketch(Plane((0, 0, 0), x_dir=(1, 0, 0), z_dir=(1, 0, 1))) as three: + Rectangle(45 * 2 / sqrt(2) - 37.5, 75, align=(Align.MIN, Align.CENTER)) + with Locations(three.edges().sort_by(Axis.X)[-1].center()): + Circle(37.5) + Circle(33 / 2, mode=Mode.SUBTRACT) + split(bisect_by=Plane.YZ) + extrude(amount=6) + f = ppp109.faces().filter_by(Axis((0, 0, 0), (-1, 0, 1)))[0] + # extrude(f, until=Until.NEXT) # throws a warning + extrude(f, amount=10) + fillet(ppp109.edge(Select.NEW), 16) + + +show(ppp109) + +got_mass = ppp109.part.volume*densb +want_mass = 307.23 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.2f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' diff --git a/docs/assets/ttt/ttt-ppp0110.py b/docs/assets/ttt/ttt-ppp0110.py index f62c56f..9b3458f 100644 --- a/docs/assets/ttt/ttt-ppp0110.py +++ b/docs/assets/ttt/ttt-ppp0110.py @@ -1,52 +1,59 @@ -""" -Too Tall Toby Party Pack 01-10 Light Cap -""" - -from build123d import * -from ocp_vscode import * - -densa = 7800 / 1e6 # carbon steel density g/mm^3 -densb = 2700 / 1e6 # aluminum alloy -densc = 1020 / 1e6 # ABS - -with BuildPart() as p: - with BuildSketch(Plane.YZ.rotated((90, 0, 0))) as s: - with BuildLine() as l: - n2 = JernArc((0, 46), (1, 0), 40, -90) - n3 = Line(n2 @ 1, n2 @ 0) - make_face() - - with BuildLine() as l2: - m1 = Line((0, 0), (42, 0)) - m2 = Line((0, 0.01), (42, 0.01)) - m3 = Line(m1 @ 0, m2 @ 0) - m4 = Line(m1 @ 1, m2 @ 1) - make_face() - make_hull() - extrude(amount=100 / 2) - revolve(s.sketch, axis=Axis.Y.reverse(), revolution_arc=-90) - mirror(about=Plane(p.part.faces().sort_by(Axis.X)[-1])) - mirror(about=Plane.XY) - -with BuildPart() as p2: - add(p.part) - offset(amount=-8) - -with BuildPart() as pzzz: - add(p2.part) - split(bisect_by=Plane.XZ.offset(46 - 16), keep=Keep.BOTTOM) - fillet(pzzz.part.faces().filter_by(Axis.Y).sort_by(Axis.Y)[0].edges(), 12) - -with BuildPart() as p3: - with BuildSketch(Plane.XZ) as s2: - add(p.part.faces().sort_by(Axis.Y)[-1]) - offset(amount=-8) - loft([p2.part.faces().sort_by(Axis.Y)[-5], s2.sketch.faces()[0]]) - -with BuildPart() as ppp0110: - add(p.part) - add(pzzz.part, mode=Mode.SUBTRACT) - add(p3.part, mode=Mode.SUBTRACT) - -show(ppp0110) -print(f"\npart mass = {ppp0110.part.volume*densc:0.2f}") +""" +Too Tall Toby Party Pack 01-10 Light Cap +""" + +from math import sqrt, asin, pi +from build123d import * +from ocp_vscode import * + +densa = 7800 / 1e6 # carbon steel density g/mm^3 +densb = 2700 / 1e6 # aluminum alloy +densc = 1020 / 1e6 # ABS + +# The smaller cross-section is defined as having R40, height 46, +# and base width 84, so clearly it's not entirely a half-circle or +# similar; the base's extreme points need to connect via tangents +# to the R40 arc centered 6mm above the baseline. +# +# Compute the angle of the tangent line (working with the +# left/negativeX side, given symmetry) by observing the tangent +# point (T), the circle's center (O), and the baseline's edge (P) +# form a right triangle, so: + +OT=40 +OP=sqrt((-84/2)**2+(-6)**2) +TP=sqrt(OP**2-40**2) +OPT_degrees = asin(OT/OP) * 180/pi +# Correct for the fact that OP isn't horizontal. +OP_to_X_axis_degrees = asin(6/OP) * 180/pi +left_tangent_degrees = OPT_degrees + OP_to_X_axis_degrees +left_tangent_length = TP +with BuildPart() as outer: + with BuildSketch(Plane.XZ) as sk: + with BuildLine(): + l1 = PolarLine(start=(-84/2, 0), length=left_tangent_length, angle=left_tangent_degrees) + l2 = TangentArc(l1@1, (0, 46), tangent=l1%1) + l3 = offset(amount=-8, side=Side.RIGHT, closed=False, mode=Mode.ADD) + l4 = Line(l1@0, l3@1) + l5 = Line(l3@0, l2@1) + l6 = Line(l3@0, (0, 46-16)) + l7 = IntersectingLine(start=l6@1, direction=(-1,0), other=l3) + make_face() + revolve(axis=Axis.Z) +sk = sk.sketch & Plane.XZ*Rectangle(1000, 1000, align=[Align.CENTER, Align.MIN]) +positive_Z = Box(100, 100, 100, align=[Align.CENTER, Align.MIN, Align.MIN]) +p = outer.part & positive_Z +cross_section = sk + mirror(sk, about=Plane.YZ) +p += extrude(cross_section, amount=50) +p += mirror(p, about=Plane.XZ.offset(50)) +p += fillet(p.edges().filter_by(GeomType.LINE).filter_by(Axis.Y).group_by(Axis.Z)[-1], radius=8) +ppp0110 = p + +got_mass = ppp0110.volume*densc +want_mass = 211.30 +tolerance = 1 +delta = abs(got_mass - want_mass) +print(f"Mass: {got_mass:0.1f} g") +assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' + +show(ppp0110) diff --git a/pyproject.toml b/pyproject.toml index 0c93d5d..7dac117 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,13 +61,14 @@ ocp_vscode = [ # development dependencies development = [ - "wheel", + "black", + "mypy", + "pylint", "pytest", "pytest-cov", "pytest-xdist", - "pylint", - "mypy", - "black", + "sympy", + "wheel", ] # typing stubs for the OCP CAD kernel diff --git a/tests/test_examples.py b/tests/test_examples.py index e342f0d..5db4bf9 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -18,6 +18,7 @@ import unittest _examples_dir = Path(os.path.abspath(os.path.dirname(__file__))).parent / "examples" +_ttt_dir = Path(os.path.abspath(os.path.dirname(__file__))).parent / "docs/assets/ttt" _MOCK_OCP_VSCODE_CONTENTS = """ from pathlib import Path @@ -72,8 +73,7 @@ def generate_example_test(path: Path): class TestExamples(unittest.TestCase): """Tests build123d examples.""" - -for example in sorted(_examples_dir.iterdir()): +for example in sorted(list(_examples_dir.iterdir()) + list(_ttt_dir.iterdir())): if example.name.startswith("_") or not example.name.endswith(".py"): continue setattr( From 5a79f264f331f584b0035b97db649e5bf4a4fa6d Mon Sep 17 00:00:00 2001 From: Ami Fischman Date: Mon, 3 Mar 2025 12:51:33 -0800 Subject: [PATCH 217/518] test_benchmarks: drop the copies of the TTT examples in test code and instead use the versions from the docs/assets/ttt directory. --- .github/workflows/benchmark.yml | 1 - pyproject.toml | 7 +- tests/test_benchmarks.py | 649 ++------------------------------ 3 files changed, 35 insertions(+), 622 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 7332a56..a0568a4 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -22,5 +22,4 @@ jobs: python-version: ${{ matrix.python-version }} - name: benchmark run: | - pip install pytest-benchmark python -m pytest --benchmark-only diff --git a/pyproject.toml b/pyproject.toml index 7dac117..59e7db9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,6 +65,7 @@ development = [ "mypy", "pylint", "pytest", + "pytest-benchmark", "pytest-cov", "pytest-xdist", "sympy", @@ -76,11 +77,6 @@ stubs = [ "cadquery-ocp-stubs >= 7.8, < 7.9", ] -# dependency to run the pytest benchmarks -benchmark = [ - "pytest-benchmark", -] - # dependencies to build the docs docs = [ "sphinx==8.1.3", # pin for stability of docs builds @@ -95,7 +91,6 @@ docs = [ all = [ "build123d[ocp_vscode]", "build123d[development]", - "build123d[benchmark]", "build123d[docs]", # "build123d[stubs]", # excluded for now as mypy fails ] diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py index 7755ab2..23eac7c 100644 --- a/tests/test_benchmarks.py +++ b/tests/test_benchmarks.py @@ -1,684 +1,103 @@ import pytest -from math import sqrt +import sys from build123d import * +from pathlib import Path + +from unittest.mock import Mock +mock_module = Mock() +mock_module.show = Mock() +mock_module.show_object = Mock() +mock_module.show_all = Mock() +sys.modules["ocp_vscode"] = mock_module + +_ = pytest.importorskip("pytest_benchmark") -pytest_benchmark = pytest.importorskip("pytest_benchmark") +def _read_docs_ttt_code(name): + checkout_dir = Path(__file__).parent.parent + ttt_dir = checkout_dir / "docs/assets/ttt" + name = "ttt-" + name + ".py" + with open(ttt_dir / name, "r") as f: + return f.read() def test_ppp_0101(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-01 Bearing Bracket - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - with BuildPart() as p: - with BuildSketch() as s: - Rectangle(115, 50) - with Locations((5 / 2, 0)): - SlotOverall(90, 12, mode=Mode.SUBTRACT) - extrude(amount=15) - - with BuildSketch(Plane.XZ.offset(50 / 2)) as s3: - with Locations((-115 / 2 + 26, 15)): - SlotOverall(42 + 2 * 26 + 12, 2 * 26, rotation=90) - zz = extrude(amount=-12) - split(bisect_by=Plane.XY) - edgs = p.part.edges().filter_by(Axis.Y).group_by(Axis.X)[-2] - fillet(edgs, 9) - - with Locations(zz.faces().sort_by(Axis.Y)[0]): - with Locations((42 / 2 + 6, 0)): - CounterBoreHole(24 / 2, 34 / 2, 4) - mirror(about=Plane.XZ) - - with BuildSketch() as s4: - RectangleRounded(115, 50, 6) - extrude(amount=80, mode=Mode.INTERSECT) - # fillet does not work right, mode intersect is safer - - with BuildSketch(Plane.YZ) as s4: - with BuildLine() as bl: - l1 = Line((0, 0), (18 / 2, 0)) - l2 = PolarLine(l1 @ 1, 8, 60, length_mode=LengthMode.VERTICAL) - l3 = Line(l2 @ 1, (0, 8)) - mirror(about=Plane.YZ) - make_face() - extrude(amount=115 / 2, both=True, mode=Mode.SUBTRACT) - - print(f"\npart mass = {p.part.volume*densa:0.2f}") - assert p.part.volume * densa == pytest.approx(797.15, 0.01) - + exec(_read_docs_ttt_code("ppp0101")) benchmark(model) def test_ppp_0102(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-02 Post Cap - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - # TTT Party Pack 01: PPP0102, mass(abs) = 43.09g - with BuildPart() as p: - with BuildSketch(Plane.XZ) as sk1: - Rectangle(49, 48 - 8, align=(Align.CENTER, Align.MIN)) - Rectangle(9, 48, align=(Align.CENTER, Align.MIN)) - with Locations((9 / 2, 40)): - Ellipse(20, 8) - split(bisect_by=Plane.YZ) - revolve(axis=Axis.Z) - - with BuildSketch(Plane.YZ.offset(-15)) as xc1: - with Locations((0, 40 / 2 - 17)): - Ellipse(10 / 2, 4 / 2) - with BuildLine(Plane.XZ) as l1: - CenterArc((-15, 40 / 2), 17, 90, 180) - sweep(path=l1) - - fillet( - p.edges().filter_by(GeomType.CIRCLE, reverse=True).group_by(Axis.X)[0], - 1, - ) - - with BuildLine(mode=Mode.PRIVATE) as lc1: - PolarLine( - (42 / 2, 0), 37, 94, length_mode=LengthMode.VERTICAL - ) # construction line - - pts = [ - (0, 0), - (42 / 2, 0), - ((lc1.line @ 1).X, (lc1.line @ 1).Y), - (0, (lc1.line @ 1).Y), - ] - with BuildSketch(Plane.XZ) as sk2: - Polygon(*pts, align=None) - fillet(sk2.vertices().group_by(Axis.X)[1], 3) - revolve(axis=Axis.Z, mode=Mode.SUBTRACT) - - # print(f"\npart mass = {p.part.volume*densa:0.2f}") - assert p.part.volume * densc == pytest.approx(43.09, 0.01) - + exec(_read_docs_ttt_code("ppp0102")) benchmark(model) def test_ppp_0103(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-03 C Clamp Base - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - with BuildPart() as ppp0103: - with BuildSketch() as sk1: - RectangleRounded(34 * 2, 95, 18) - with Locations((0, -2)): - RectangleRounded((34 - 16) * 2, 95 - 18 - 14, 7, mode=Mode.SUBTRACT) - with Locations((-34 / 2, 0)): - Rectangle(34, 95, 0, mode=Mode.SUBTRACT) - extrude(amount=16) - with BuildSketch(Plane.XZ.offset(-95 / 2)) as cyl1: - with Locations((0, 16 / 2)): - Circle(16 / 2) - extrude(amount=18) - with BuildSketch(Plane.XZ.offset(95 / 2 - 14)) as cyl2: - with Locations((0, 16 / 2)): - Circle(16 / 2) - extrude(amount=23) - with Locations(Plane.XZ.offset(95 / 2 + 9)): - with Locations((0, 16 / 2)): - CounterSinkHole(5.5 / 2, 11.2 / 2, None, 90) - - assert ppp0103.part.volume * densb == pytest.approx(96.13, 0.01) - + exec(_read_docs_ttt_code("ppp0103")) benchmark(model) def test_ppp_0104(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-04 Angle Bracket - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - d1, d2, d3 = 38, 26, 16 - h1, h2, h3, h4 = 20, 8, 7, 23 - w1, w2, w3 = 80, 10, 5 - f1, f2, f3 = 4, 10, 5 - sloth1, sloth2 = 18, 12 - slotw1, slotw2 = 17, 14 - - with BuildPart() as p: - with BuildSketch() as s: - Circle(d1 / 2) - extrude(amount=h1) - with BuildSketch(Plane.XY.offset(h1)) as s2: - Circle(d2 / 2) - extrude(amount=h2) - with BuildSketch(Plane.YZ) as s3: - Rectangle(d1 + 15, h3, align=(Align.CENTER, Align.MIN)) - extrude(amount=w1 - d1 / 2) - # fillet workaround \/ - ped = p.part.edges().group_by(Axis.Z)[2].filter_by(GeomType.CIRCLE) - fillet(ped, f1) - with BuildSketch(Plane.YZ) as s3a: - Rectangle(d1 + 15, 15, align=(Align.CENTER, Align.MIN)) - Rectangle(d1, 15, mode=Mode.SUBTRACT, align=(Align.CENTER, Align.MIN)) - extrude(amount=w1 - d1 / 2, mode=Mode.SUBTRACT) - # end fillet workaround /\ - with BuildSketch() as s4: - Circle(d3 / 2) - extrude(amount=h1 + h2, mode=Mode.SUBTRACT) - with BuildSketch() as s5: - with Locations((w1 - d1 / 2 - w2 / 2, 0)): - Rectangle(w2, d1) - extrude(amount=-h4) - fillet(p.part.edges().group_by(Axis.X)[-1].sort_by(Axis.Z)[-1], f2) - fillet(p.part.edges().group_by(Axis.X)[-4].sort_by(Axis.Z)[-2], f3) - pln = Plane.YZ.offset(w1 - d1 / 2) - with BuildSketch(pln) as s6: - with Locations((0, -h4)): - SlotOverall(slotw1 * 2, sloth1, 90) - extrude(amount=-w3, mode=Mode.SUBTRACT) - with BuildSketch(pln) as s6b: - with Locations((0, -h4)): - SlotOverall(slotw2 * 2, sloth2, 90) - extrude(amount=-w2, mode=Mode.SUBTRACT) - - # print(f"\npart mass = {p.part.volume*densa:0.2f}") - assert p.part.volume * densa == pytest.approx(310.00, 0.01) - + exec(_read_docs_ttt_code("ppp0104")) benchmark(model) def test_ppp_0105(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-05 Paste Sleeve - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - with BuildPart() as p: - with BuildSketch() as s: - SlotOverall(45, 38) - offset(amount=3) - with BuildSketch(Plane.XY.offset(133 - 30)) as s2: - SlotOverall(60, 4) - offset(amount=3) - loft() - - with BuildSketch() as s3: - SlotOverall(45, 38) - with BuildSketch(Plane.XY.offset(133 - 30)) as s4: - SlotOverall(60, 4) - loft(mode=Mode.SUBTRACT) - - extrude(p.part.faces().sort_by(Axis.Z)[0], amount=30) - - # print(f"\npart mass = {p.part.volume*densc:0.2f}") - assert p.part.volume * densc == pytest.approx(57.08, 0.01) - + exec(_read_docs_ttt_code("ppp0105")) benchmark(model) def test_ppp_0106(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-06 Bearing Jig - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - r1, r2, r3, r4, r5 = 30 / 2, 13 / 2, 12 / 2, 10, 6 # radii used - x1 = 44 # lengths used - y1, y2, y3, y4, y_tot = 36, 36 - 22 / 2, 22 / 2, 42, 69 # widths used - - with BuildSketch(Location((0, -r1, y3))) as sk_body: - with BuildLine() as l: - c1 = Line((r1, 0), (r1, y_tot), mode=Mode.PRIVATE) # construction line - m1 = Line((0, y_tot), (x1 / 2, y_tot)) - m2 = JernArc(m1 @ 1, m1 % 1, r4, -90 - 45) - m3 = IntersectingLine(m2 @ 1, m2 % 1, c1) - m4 = Line(m3 @ 1, (r1, r1)) - m5 = JernArc(m4 @ 1, m4 % 1, r1, -90) - m6 = Line(m5 @ 1, m1 @ 0) - mirror(make_face(l.line), Plane.YZ) - fillet(sk_body.vertices().group_by(Axis.Y)[1], 12) - with Locations((x1 / 2, y_tot - 10), (-x1 / 2, y_tot - 10)): - Circle(r2, mode=Mode.SUBTRACT) - # Keyway - with Locations((0, r1)): - Circle(r3, mode=Mode.SUBTRACT) - Rectangle(4, 3 + 6, align=(Align.CENTER, Align.MIN), mode=Mode.SUBTRACT) - - with BuildPart() as p: - Box(200, 200, 22) # Oversized plate - # Cylinder underneath - Cylinder(r1, y2, align=(Align.CENTER, Align.CENTER, Align.MAX)) - fillet(p.edges(Select.NEW), r5) # Weld together - extrude(sk_body.sketch, amount=-y1, mode=Mode.INTERSECT) # Cut to shape - # Remove slot - with Locations((0, y_tot - r1 - y4, 0)): - Box( - y_tot, - y_tot, - 10, - align=(Align.CENTER, Align.MIN, Align.CENTER), - mode=Mode.SUBTRACT, - ) - - # print(f"\npart mass = {p.part.volume*densa:0.2f}") - assert p.part.volume * densa == pytest.approx(328.02, 0.01) - + exec(_read_docs_ttt_code("ppp0106")) benchmark(model) def test_ppp_0107(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-07 Flanged Hub - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - with BuildPart() as p: - with BuildSketch() as s: - Circle(130 / 2) - extrude(amount=8) - with BuildSketch(Plane.XY.offset(8)) as s2: - Circle(84 / 2) - extrude(amount=25 - 8) - with BuildSketch(Plane.XY.offset(25)) as s3: - Circle(35 / 2) - extrude(amount=52 - 25) - with BuildSketch() as s4: - Circle(73 / 2) - extrude(amount=18, mode=Mode.SUBTRACT) - pln2 = p.part.faces().sort_by(Axis.Z)[5] - with BuildSketch(Plane.XY.offset(52)) as s5: - Circle(20 / 2) - extrude(amount=-52, mode=Mode.SUBTRACT) - fillet( - p.part.edges() - .filter_by(GeomType.CIRCLE) - .sort_by(Axis.Z)[2:-2] - .sort_by(SortBy.RADIUS)[1:], - 3, - ) - pln = Plane(pln2) - pln.origin = pln.origin + Vector(20 / 2, 0, 0) - pln = pln.rotated((0, 45, 0)) - pln = pln.offset(-25 + 3 + 0.10) - with BuildSketch(pln) as s6: - Rectangle((73 - 35) / 2 * 1.414 + 5, 3) - zz = extrude(amount=15, taper=-20 / 2, mode=Mode.PRIVATE) - zz2 = split(zz, bisect_by=Plane.XY.offset(25), mode=Mode.PRIVATE) - zz3 = split(zz2, bisect_by=Plane.YZ.offset(35 / 2 - 1), mode=Mode.PRIVATE) - with PolarLocations(0, 3): - add(zz3) - with Locations(Plane.XY.offset(8)): - with PolarLocations(107.95 / 2, 6): - CounterBoreHole(6 / 2, 13 / 2, 4) - - # print(f"\npart mass = {p.part.volume*densb:0.2f}") - assert p.part.volume * densb == pytest.approx(372.99, 0.01) - + exec(_read_docs_ttt_code("ppp0107")) benchmark(model) def test_ppp_0108(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-08 Tie Plate - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - with BuildPart() as p: - with BuildSketch() as s1: - Rectangle(188 / 2 - 33, 162, align=(Align.MIN, Align.CENTER)) - with Locations((188 / 2 - 33, 0)): - SlotOverall(190, 33 * 2, rotation=90) - mirror(about=Plane.YZ) - with GridLocations(188 - 2 * 33, 190 - 2 * 33, 2, 2): - Circle(29 / 2, mode=Mode.SUBTRACT) - Circle(84 / 2, mode=Mode.SUBTRACT) - extrude(amount=16) - - with BuildPart() as p2: - with BuildSketch(Plane.XZ) as s2: - with BuildLine() as l1: - l1 = Polyline( - (222 / 2 + 14 - 40 - 40, 0), - (222 / 2 + 14 - 40, -35 + 16), - (222 / 2 + 14, -35 + 16), - (222 / 2 + 14, -35 + 16 + 30), - (222 / 2 + 14 - 40 - 40, -35 + 16 + 30), - close=True, - ) - make_face() - with Locations((222 / 2, -35 + 16 + 14)): - Circle(11 / 2, mode=Mode.SUBTRACT) - extrude(amount=20 / 2, both=True) - with BuildSketch() as s3: - with Locations(l1 @ 0): - Rectangle(40 + 40, 8, align=(Align.MIN, Align.CENTER)) - with Locations((40, 0)): - Rectangle(40, 20, align=(Align.MIN, Align.CENTER)) - extrude(amount=30, both=True, mode=Mode.INTERSECT) - mirror(about=Plane.YZ) - - # print(f"\npart mass = {p.part.volume*densa:0.2f}") - assert p.part.volume * densa == pytest.approx(3387.06, 0.01) - + exec(_read_docs_ttt_code("ppp0108")) benchmark(model) def test_ppp_0109(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-09 Corner Tie - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - with BuildPart() as ppp109: - with BuildSketch() as one: - Rectangle(69, 75, align=(Align.MAX, Align.CENTER)) - fillet(one.vertices().group_by(Axis.X)[0], 17) - extrude(amount=13) - centers = [ - arc.arc_center - for arc in ppp109.edges() - .filter_by(GeomType.CIRCLE) - .group_by(Axis.Z)[-1] - ] - with Locations(*centers): - CounterBoreHole( - radius=8 / 2, counter_bore_radius=15 / 2, counter_bore_depth=4 - ) - - with BuildSketch(Plane.YZ) as two: - with Locations((0, 45)): - Circle(15) - with BuildLine() as bl: - c = Line((75 / 2, 0), (75 / 2, 60), mode=Mode.PRIVATE) - u = two.edge().find_tangent(75 / 2 + 90)[ - 0 - ] # where is the slope 75/2? - l1 = IntersectingLine( - two.edge().position_at(u), -two.edge().tangent_at(u), other=c - ) - Line(l1 @ 0, (0, 45)) - Polyline((0, 0), c @ 0, l1 @ 1) - mirror(about=Plane.YZ) - make_face() - with Locations((0, 45)): - Circle(12 / 2, mode=Mode.SUBTRACT) - extrude(amount=-13) - - with BuildSketch( - Plane((0, 0, 0), x_dir=(1, 0, 0), z_dir=(1, 0, 1)) - ) as three: - Rectangle(45 * 2 / sqrt(2) - 37.5, 75, align=(Align.MIN, Align.CENTER)) - with Locations(three.edges().sort_by(Axis.X)[-1].center()): - Circle(37.5) - Circle(33 / 2, mode=Mode.SUBTRACT) - split(bisect_by=Plane.YZ) - extrude(amount=6) - f = ppp109.faces().filter_by(Axis((0, 0, 0), (-1, 0, 1)))[0] - # extrude(f, until=Until.NEXT) # throws a warning - extrude(f, amount=10) - fillet(ppp109.edge(Select.NEW), 16) - - # print(f"\npart mass = {ppp109.part.volume*densb:0.2f}") - assert ppp109.part.volume * densb == pytest.approx(307.23, 0.01) - + exec(_read_docs_ttt_code("ppp0109")) benchmark(model) def test_ppp_0110(benchmark): def model(): - """ - Too Tall Toby Party Pack 01-10 Light Cap - """ - - densa = 7800 / 1e6 # carbon steel density g/mm^3 - densb = 2700 / 1e6 # aluminum alloy - densc = 1020 / 1e6 # ABS - - with BuildPart() as p: - with BuildSketch() as s: - with BuildLine() as l: - n1 = JernArc((0, 46), (1, 0), 40, -95) - n2 = Line((0, 0), (42, 0)) - make_hull() - # hack to keep arc vertex off revolution axis - split(bisect_by=Plane.XZ.offset(-45.9999), keep=Keep.TOP) - - revolve(s.sketch, axis=Axis.Y, revolution_arc=90) - extrude(faces().sort_by(Axis.Z)[-1], amount=50) - mirror(about=Plane(faces().sort_by(Axis.Z)[-1])) - mirror(about=Plane.YZ) - - with BuildPart() as p2: - add(p.part) - offset(amount=-8) - - with BuildPart() as pzzz: - add(p2.part) - split(bisect_by=Plane.XZ.offset(-46 + 16), keep=Keep.TOP) - fillet(faces().sort_by(Axis.Y)[-1].edges(), 12) - - with BuildPart() as p3: - with BuildSketch(Plane.XZ) as s2: - add(p.part.faces().sort_by(Axis.Y)[0]) - offset(amount=-8) - loft([pzzz.part.faces().sort_by(Axis.Y)[0], s2.sketch.face()]) - - with BuildPart() as ppp0110: - add(p.part) - add(pzzz.part, mode=Mode.SUBTRACT) - add(p3.part, mode=Mode.SUBTRACT) - - # print(f"\npart mass = {ppp0110.part.volume*densc:0.2f}") # 211.30 g is correct - assert ppp0110.part.volume * densc == pytest.approx(211, 1.00) - + exec(_read_docs_ttt_code("ppp0110")) benchmark(model) def test_ttt_23_02_02(benchmark): def model(): - """ - Creation of a complex sheet metal part - - name: ttt_sm_hanger.py - by: Gumyr - date: July 17, 2023 - - desc: - This example implements the sheet metal part described in Too Tall Toby's - sm_hanger CAD challenge. - - Notably, a BuildLine/Curve object is filleted by providing all the vertices - and allowing the fillet operation filter out the end vertices. The - make_brake_formed operation is used both in Algebra and Builder mode to - create a sheet metal part from just an outline and some dimensions. - license: - - Copyright 2023 Gumyr - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - """ - densa = 7800 / 1e6 # carbon steel density g/mm^3 - sheet_thickness = 4 * MM - - # Create the main body from a side profile - with BuildPart() as side: - d = Vector(1, 0, 0).rotate(Axis.Y, 60) - with BuildLine(Plane.XZ) as side_line: - l1 = Line((0, 65), (170 / 2, 65)) - l2 = PolarLine( - l1 @ 1, length=65, direction=d, length_mode=LengthMode.VERTICAL - ) - l3 = Line(l2 @ 1, (170 / 2, 0)) - fillet(side_line.vertices(), 7) - make_brake_formed( - thickness=sheet_thickness, - station_widths=[40, 40, 40, 112.52 / 2, 112.52 / 2, 112.52 / 2], - side=Side.RIGHT, - ) - fe = side.edges().filter_by(Axis.Z).group_by(Axis.Z)[0].sort_by(Axis.Y)[-1] - fillet(fe, radius=7) - - # Create the "wings" at the top - with BuildPart() as wing: - with BuildLine(Plane.YZ) as wing_line: - l1 = Line((0, 65), (80 / 2 + 1.526 * sheet_thickness, 65)) - PolarLine( - l1 @ 1, 20.371288916, direction=Vector(0, 1, 0).rotate(Axis.X, -75) - ) - fillet(wing_line.vertices(), 7) - make_brake_formed( - thickness=sheet_thickness, - station_widths=110 / 2, - side=Side.RIGHT, - ) - bottom_edge = wing.edges().group_by(Axis.X)[-1].sort_by(Axis.Z)[0] - fillet(bottom_edge, radius=7) - - # Create the tab at the top in Algebra mode - tab_line = Plane.XZ * Polyline( - (20, 65 - sheet_thickness), (56 / 2, 65 - sheet_thickness), (56 / 2, 88) - ) - tab_line = fillet(tab_line.vertices(), 7) - tab = make_brake_formed(sheet_thickness, 8, tab_line, Side.RIGHT) - tab = fillet( - tab.edges().filter_by(Axis.X).group_by(Axis.Z)[-1].sort_by(Axis.Y)[-1], 5 - ) - tab -= Pos((0, 0, 80)) * Rot(0, 90, 0) * Hole(5, 100) - - # Combine the parts together - with BuildPart() as sm_hanger: - add([side.part, wing.part]) - mirror(about=Plane.XZ) - with BuildSketch(Plane.XY.offset(65)) as h1: - with Locations((20, 0)): - Rectangle(30, 30, align=(Align.MIN, Align.CENTER)) - fillet(h1.vertices().group_by(Axis.X)[-1], 7) - SlotCenterPoint((154, 0), (154 / 2, 0), 20) - extrude(amount=-40, mode=Mode.SUBTRACT) - with BuildSketch() as h2: - SlotCenterPoint((206, 0), (206 / 2, 0), 20) - extrude(amount=40, mode=Mode.SUBTRACT) - add(tab) - mirror(about=Plane.YZ) - mirror(about=Plane.XZ) - - # print(f"Mass: {sm_hanger.part.volume*7800*1e-6:0.1f} g") - assert sm_hanger.part.volume * densa == pytest.approx(1028, 10) - + exec(_read_docs_ttt_code("23-02-02-sm_hanger")) benchmark(model) - -# def test_ttt_23_T_24(benchmark): -# excluding because it requires sympy - +def test_ttt_23_T_24(benchmark): + def model(): + exec(_read_docs_ttt_code("23-t-24-curved_support")) + benchmark(model) def test_ttt_24_SPO_06(benchmark): def model(): - densa = 7800 / 1e6 # carbon steel density g/mm^3 - - with BuildPart() as p: - with BuildSketch() as xy: - with BuildLine(): - l1 = ThreePointArc((5 / 2, -1.25), (5.5 / 2, 0), (5 / 2, 1.25)) - Polyline(l1 @ 0, (0, -1.25), (0, 1.25), l1 @ 1) - make_face() - extrude(amount=4) - - with BuildSketch(Plane.YZ) as yz: - Trapezoid(2.5, 4, 90 - 6, align=(Align.CENTER, Align.MIN)) - _, arc_center, arc_radius = full_round( - yz.edges().sort_by(SortBy.LENGTH)[0] - ) - extrude(amount=10, mode=Mode.INTERSECT) - - # To avoid OCCT problems, don't attempt to extend the top arc, remove instead - with BuildPart(mode=Mode.SUBTRACT) as internals: - y = p.edges().filter_by(Axis.X).sort_by(Axis.Z)[-1].center().Z - - with BuildSketch(Plane.YZ.offset(4.25 / 2)) as yz: - Trapezoid(2.5, y, 90 - 6, align=(Align.CENTER, Align.MIN)) - with Locations(arc_center): - Circle(arc_radius, mode=Mode.SUBTRACT) - extrude(amount=-(4.25 - 3.5) / 2) - - with BuildSketch(Plane.YZ.offset(3.5 / 2)) as yz: - Trapezoid(2.5, 4, 90 - 6, align=(Align.CENTER, Align.MIN)) - extrude(amount=-3.5 / 2) - - with BuildSketch(Plane.XZ.offset(-2)) as xz: - with Locations((0, 4)): - RectangleRounded(4.25, 7.5, 0.5) - extrude(amount=4, mode=Mode.INTERSECT) - - with Locations( - p.faces(Select.LAST).filter_by(GeomType.PLANE).sort_by(Axis.Z)[-1] - ): - CounterBoreHole(0.625 / 2, 1.25 / 2, 0.5) - - with BuildSketch(Plane.YZ) as rib: - with Locations((0, 0.25)): - Trapezoid(0.5, 1, 90 - 8, align=(Align.CENTER, Align.MIN)) - full_round(rib.edges().sort_by(SortBy.LENGTH)[0]) - extrude(amount=4.25 / 2) - - mirror(about=Plane.YZ) - - # part = scale(p.part, IN) - # print(f"\npart weight = {part.volume*7800e-6/LB:0.2f} lbs") - assert p.part.scale(IN).volume * densa / LB == pytest.approx(3.92, 0.03) - + exec(_read_docs_ttt_code("24-SPO-06-Buffer_Stand")) benchmark(model) + @pytest.mark.parametrize("test_input", [100, 1000, 10000, 100000]) def test_mesher_benchmark(benchmark, test_input): # in the 100_000 case test should take on the order of 0.2 seconds From 789ff737449a170b5d4e731dd4aabce4cb564732 Mon Sep 17 00:00:00 2001 From: Ami Fischman Date: Tue, 4 Mar 2025 16:01:52 -0800 Subject: [PATCH 218/518] Exclude benchmarks from test github workflow. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f35c15f..b4321f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,4 +23,4 @@ jobs: python-version: ${{ matrix.python-version }} - name: test run: | - python -m pytest -n auto + python -m pytest -n auto --ignore=tests/test_benchmarks.py From 4027664a8c4991e392dfcad9afc11cd7d6e2434c Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 5 Mar 2025 09:56:39 -0600 Subject: [PATCH 219/518] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4321f4..6b1416d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,4 +23,4 @@ jobs: python-version: ${{ matrix.python-version }} - name: test run: | - python -m pytest -n auto --ignore=tests/test_benchmarks.py + python -m pytest -n auto --benchmark-disable From fcbd0271372b638f8284c5c9aaff0e60cc14654f Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 5 Mar 2025 18:35:23 -0500 Subject: [PATCH 220/518] Update object_*.py docstrings for more consistency and clarify how parameters work General improvements: - follow a similar opening structure - add specificity to description and args - remove plurality (sketch, part) - remove hanging end stops from lists - try to specify viable enums if mentioned and CAPITALIZE --- src/build123d/objects_curve.py | 210 +++++++++++++++-------------- src/build123d/objects_part.py | 150 ++++++++++----------- src/build123d/objects_sketch.py | 228 ++++++++++++++++---------------- 3 files changed, 299 insertions(+), 289 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index e293ac6..abd495f 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -31,7 +31,6 @@ from __future__ import annotations import copy as copy_module from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize -from typing import Union from collections.abc import Iterable @@ -46,8 +45,8 @@ def _add_curve_to_context(curve, mode: Mode): """Helper function to add a curve to the context. Args: - curve (Union[Wire, Edge]): curve to add to the context (either a Wire or an Edge). - mode (Mode): combination mode. + curve (Wire | Edge): curve to add to the context (either a Wire or an Edge) + mode (Mode): combination mode """ context: BuildLine | None = BuildLine._get_context(log=False) @@ -62,8 +61,8 @@ class BaseLineObject(Wire): """BaseLineObject specialized for Wire. Args: - curve (Wire): wire to create. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + curve (Wire): wire to create + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -78,8 +77,8 @@ class BaseEdgeObject(Edge): """BaseEdgeObject specialized for Edge. Args: - curve (Edge): edge to create. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + curve (Edge): edge to create + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -93,14 +92,14 @@ class BaseEdgeObject(Edge): class Bezier(BaseEdgeObject): """Line Object: Bezier Curve - Create a rational (with weights) or non-rational bezier curve. The first and last - control points represent the start and end of the curve respectively. If weights - are provided, there must be one provided for each control point. + Add a non-rational bezier curve defined by a sequence of points and include optional + weights to add a rational bezier curve. The number of weights must match the number + of control points. Args: cntl_pnts (sequence[VectorLike]): points defining the curve - weights (list[float], optional): control point weights list. Defaults to None. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + weights (list[float], optional): control point weights. Defaults to None + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -124,14 +123,14 @@ class Bezier(BaseEdgeObject): class CenterArc(BaseEdgeObject): """Line Object: Center Arc - Add center arc to the line. + Add a circular arc defined by a center point and radius. Args: center (VectorLike): center point of arc radius (float): arc radius - start_angle (float): arc staring angle - arc_size (float): arc size - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + start_angle (float): arc starting angle from x-axis + arc_size (float): angular size of arc + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -177,19 +176,19 @@ class CenterArc(BaseEdgeObject): class DoubleTangentArc(BaseEdgeObject): """Line Object: Double Tangent Arc - Create an arc defined by a point/tangent pair and another line which the other end - is tangent to. + Add a circular arc defined by a point/tangent pair and another line find a tangent to. + + The arc specified with TOP or BOTTOM depends on the geometry and isn't predictable. Contains a solver. Args: - pnt (VectorLike): starting point of tangent arc - tangent (VectorLike): tangent at starting point of tangent arc - other (Union[Curve, Edge, Wire]): reference line - keep (Keep, optional): selector for which arc to keep when two arcs are - possible. The arc generated with TOP or BOTTOM depends on the geometry - and isn't necessarily easy to predict. Defaults to Keep.TOP. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + pnt (VectorLike): start point + tangent (VectorLike): tangent at start point + other (Curve | Edge | Wire): line object to tangent + keep (Keep, optional): specify which arc if more than one, TOP or BOTTOM. + Defaults to Keep.TOP + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: RunTimeError: no double tangent arcs found @@ -276,21 +275,21 @@ class DoubleTangentArc(BaseEdgeObject): class EllipticalStartArc(BaseEdgeObject): """Line Object: Elliptical Start Arc - Makes an arc of an ellipse from the start point. + Add an elliptical arc defined by a start point, end point, x- and y- radii. Args: - start (VectorLike): initial point of arc - end (VectorLike): final point of arc - x_radius (float): semi-major radius - y_radius (float): semi-minor radius + start (VectorLike): start point + end (VectorLike): end point + x_radius (float): x radius of the ellipse (along the x-axis of plane) + y_radius (float): y radius of the ellipse (along the y-axis of plane) rotation (float, optional): the angle from the x-axis of the plane to the x-axis - of the ellipse. Defaults to 0.0. + of the ellipse. Defaults to 0.0 large_arc (bool, optional): True if the arc spans greater than 180 degrees. - Defaults to True. + Defaults to True sweep_flag (bool, optional): False if the line joining center to arc sweeps through - decreasing angles, or True if it sweeps through increasing angles. Defaults to True. - plane (Plane, optional): base plane. Defaults to Plane.XY. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + decreasing angles, or True if it sweeps through increasing angles. Defaults to True + plane (Plane, optional): base plane. Defaults to Plane.XY + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -382,19 +381,21 @@ class EllipticalStartArc(BaseEdgeObject): class EllipticalCenterArc(BaseEdgeObject): """Line Object: Elliptical Center Arc - Makes an arc of an ellipse from a center point. + Adds an elliptical arc defined by a center point, x- and y- radii. Args: center (VectorLike): ellipse center x_radius (float): x radius of the ellipse (along the x-axis of plane) y_radius (float): y radius of the ellipse (along the y-axis of plane) - start_angle (float, optional): Defaults to 0.0. - end_angle (float, optional): Defaults to 90.0. - rotation (float, optional): amount to rotate arc. Defaults to 0.0. + start_angle (float, optional): arc start angle from x-axis. + Defaults to 0.0 + end_angle (float, optional): arc end angle from x-axis. + Defaults to 90.0 + rotation (float, optional): angle to rotate arc. Defaults to 0.0 angular_direction (AngularDirection, optional): arc direction. - Defaults to AngularDirection.COUNTER_CLOCKWISE. - plane (Plane, optional): base plane. Defaults to Plane.XY. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + Defaults to AngularDirection.COUNTER_CLOCKWISE + plane (Plane, optional): base plane. Defaults to Plane.XY + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -438,17 +439,20 @@ class EllipticalCenterArc(BaseEdgeObject): class Helix(BaseEdgeObject): """Line Object: Helix - Add a helix to the line. + Add a helix defined by pitch, height, and radius. The helix may have a taper + defined by cone_angle. + Args: - pitch (float): distance between successive loops - height (float): helix size + pitch (float): distance between loops + height (float): helix height radius (float): helix radius center (VectorLike, optional): center point. Defaults to (0, 0, 0). direction (VectorLike, optional): direction of central axis. Defaults to (0, 0, 1). - cone_angle (float, optional): conical angle. Defaults to 0. - lefthand (bool, optional): left handed helix. Defaults to False. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + cone_angle (float, optional): conical angle from direction. + Defaults to 0 + lefthand (bool, optional): left handed helix. Defaults to False + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -475,16 +479,17 @@ class Helix(BaseEdgeObject): class FilletPolyline(BaseLineObject): - """Line Object: FilletPolyline + """Line Object: Fillet Polyline - Add a sequence of straight lines defined by successive points that - are filleted to a given radius. + Add a sequence of straight lines defined by successive points that are filleted + to a given radius. Args: - pts (Union[VectorLike, Iterable[VectorLike]]): sequence of two or more points - radius (float): radius of filleted corners - close (bool, optional): close by generating an extra Edge. Defaults to False. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + pts (VectorLike | Iterable[VectorLike]): sequence of two or more points + radius (float): fillet radius + close (bool, optional): close end points with extra Edge and corner fillets. + Defaults to False + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Two or more points not provided @@ -570,16 +575,16 @@ class FilletPolyline(BaseLineObject): class JernArc(BaseEdgeObject): - """JernArc + """Line Object: Jern Arc - Circular tangent arc with given radius and arc_size + Add a circular arc defined by a start point/tangent pair, radius and arc size. Args: start (VectorLike): start point tangent (VectorLike): tangent at start point radius (float): arc radius - arc_size (float): arc size in degrees (negative to change direction) - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + arc_size (float): angular size of arc (negative to change direction) + mode (Mode, optional): combination mode. Defaults to Mode.ADD Attributes: start (Vector): start point @@ -634,11 +639,11 @@ class JernArc(BaseEdgeObject): class Line(BaseEdgeObject): """Line Object: Line - Add a straight line defined by two end points. + Add a straight line defined by two points. Args: - pts (Union[VectorLike, Iterable[VectorLike]]): sequence of two points - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + pts (VectorLike | Iterable[VectorLike]): sequence of two points + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Two point not provided @@ -665,13 +670,13 @@ class Line(BaseEdgeObject): class IntersectingLine(BaseEdgeObject): """Intersecting Line Object: Line - Add a straight line that intersects another line at a given parameter and angle. + Add a straight line defined by a point/direction pair and another line to intersect. Args: start (VectorLike): start point direction (VectorLike): direction to make line - other (Edge): stop at the intersection of other - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + other (Edge): line object to intersect + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ @@ -706,15 +711,17 @@ class IntersectingLine(BaseEdgeObject): class PolarLine(BaseEdgeObject): """Line Object: Polar Line - Add line defined by a start point, length and angle. + Add a straight line defined by a start point, length, and angle. + The length can specify the DIAGONAL, HORIZONTAL, or VERTICAL component of the triangle + defined by the angle. Args: start (VectorLike): start point length (float): line length - angle (float): angle from the local "X" axis. - length_mode (LengthMode, optional): length value specifies a diagonal, horizontal - or vertical value. Defaults to LengthMode.DIAGONAL - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + angle (float, optional): angle from the local x-axis + length_mode (LengthMode, optional): how length defines the line. + Defaults to LengthMode.DIAGONAL + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Either angle or direction must be provided @@ -768,12 +775,12 @@ class PolarLine(BaseEdgeObject): class Polyline(BaseLineObject): """Line Object: Polyline - Add a sequence of straight lines defined by successive point pairs. + Add a sequence of straight lines defined by successive points. Args: - pts (Union[VectorLike, Iterable[VectorLike]]): sequence of two or more points - close (bool, optional): close by generating an extra Edge. Defaults to False. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + pts (VectorLike | Iterable[VectorLike]): sequence of two or more points + close (bool, optional): close by generating an extra Edge. Defaults to False + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Two or more points not provided @@ -809,15 +816,15 @@ class Polyline(BaseLineObject): class RadiusArc(BaseEdgeObject): """Line Object: Radius Arc - Add an arc defined by two end points and a radius + Add a circular arc defined by two points and a radius. Args: - start_point (VectorLike): start - end_point (VectorLike): end - radius (float): radius - short_sagitta (bool): If True selects the short sagitta, else the - long sagitta crossing the center. Defaults to True. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + start_point (VectorLike): start point + end_point (VectorLike): end point + radius (float): arc radius + short_sagitta (bool): If True selects the short sagitta (height of arc from + chord), else the long sagitta crossing the center. Defaults to True + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Insufficient radius to connect end points @@ -861,13 +868,13 @@ class RadiusArc(BaseEdgeObject): class SagittaArc(BaseEdgeObject): """Line Object: Sagitta Arc - Add an arc defined by two points and the height of the arc (sagitta). + Add a circular arc defined by two points and the sagitta (height of the arc from chord). Args: - start_point (VectorLike): start - end_point (VectorLike): end - sagitta (float): arc height - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + start_point (VectorLike): start point + end_point (VectorLike): end point + sagitta (float): arc height from chord between points + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -905,15 +912,16 @@ class SagittaArc(BaseEdgeObject): class Spline(BaseEdgeObject): """Line Object: Spline - Add a spline through the provided points optionally constrained by tangents. + Add a spline defined by a sequence of points, optionally constrained by tangents. + Tangents and tangent scalars must have length of 2 for only the end points or a length + of the number of points. Args: - pts (Union[VectorLike, Iterable[VectorLike]]): sequence of two or more points - tangents (Iterable[VectorLike], optional): tangents at end points. Defaults to None. - tangent_scalars (Iterable[float], optional): change shape by amplifying tangent. - Defaults to None. - periodic (bool, optional): make the spline periodic. Defaults to False. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + pts (VectorLike | Iterable[VectorLike]): sequence of two or more points + tangents (Iterable[VectorLike], optional): tangent directions. Defaults to None + tangent_scalars (Iterable[float], optional): tangent scales. Defaults to None + periodic (bool, optional): make the spline periodic (closed). Defaults to False + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildLine._tag] @@ -963,14 +971,14 @@ class Spline(BaseEdgeObject): class TangentArc(BaseEdgeObject): """Line Object: Tangent Arc - Add an arc defined by two points and a tangent. + Add a circular arc defined by two points and a tangent. Args: - pts (Union[VectorLike, Iterable[VectorLike]]): sequence of two points + pts (VectorLike | Iterable[VectorLike]): sequence of two points tangent (VectorLike): tangent to constrain arc - tangent_from_first (bool, optional): apply tangent to first point. Note, applying - tangent to end point will flip the orientation of the arc. Defaults to True. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + tangent_from_first (bool, optional): apply tangent to first point. Applying + tangent to end point will flip the orientation of the arc. Defaults to True + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Two points are required @@ -1005,11 +1013,11 @@ class TangentArc(BaseEdgeObject): class ThreePointArc(BaseEdgeObject): """Line Object: Three Point Arc - Add an arc generated by three points. + Add a circular arc defined by three points. Args: - pts (Union[VectorLike, Iterable[VectorLike]]): sequence of three points - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + pts (VectorLike | Iterable[VectorLike]): sequence of three points + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Three points must be provided diff --git a/src/build123d/objects_part.py b/src/build123d/objects_part.py index 9a3da0e..de3a332 100644 --- a/src/build123d/objects_part.py +++ b/src/build123d/objects_part.py @@ -44,10 +44,10 @@ class BasePartObject(Part): Args: solid (Solid): object to create - rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Align | tuple[Align, Align, Align] | None, optional): align min, center, - or max of object. Defaults to None. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0) + align (Align | tuple[Align, Align, Align] | None, optional): align MIN, CENTER, + or MAX of object. Defaults to None + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildPart._tag] @@ -103,16 +103,16 @@ class BasePartObject(Part): class Box(BasePartObject): """Part Object: Box - Create a box(es) and combine with part. + Add a box defined by length, width, and height. Args: - length (float): box size - width (float): box size - height (float): box size - rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Align | tuple[Align, Align, Align] | None, optional): align min, center, - or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). - mode (Mode, optional): combine mode. Defaults to Mode.ADD. + length (float): box length + width (float): box width + height (float): box height + rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0) + align (Align | tuple[Align, Align, Align] | None, optional): align MIN, CENTER, + or MAX of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER) + mode (Mode, optional): combine mode. Defaults to Mode.ADD """ _applies_to = [BuildPart._tag] @@ -147,17 +147,17 @@ class Box(BasePartObject): class Cone(BasePartObject): """Part Object: Cone - Create a cone(s) and combine with part. + Add a cone defined by bottom radius, top radius, and height. Args: - bottom_radius (float): cone size - top_radius (float): top size, could be zero - height (float): cone size - arc_size (float, optional): angular size of cone. Defaults to 360. - rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Align | tuple[Align, Align, Align] | None, optional): align min, center, - or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). - mode (Mode, optional): combine mode. Defaults to Mode.ADD. + bottom_radius (float): bottom radius + top_radius (float): top radius, may be zero + height (float): cone height + arc_size (float, optional): angular size of cone. Defaults to 360 + rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0) + align (Align | tuple[Align, Align, Align] | None, optional): align MIN, CENTER, + or MAX of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER) + mode (Mode, optional): combine mode. Defaults to Mode.ADD """ _applies_to = [BuildPart._tag] @@ -200,14 +200,14 @@ class Cone(BasePartObject): class CounterBoreHole(BasePartObject): """Part Operation: Counter Bore Hole - Create a counter bore hole in part. + Subtract a counter bore hole defined by radius, counter bore radius, counter bore and depth. Args: - radius (float): hole size - counter_bore_radius (float): counter bore size + radius (float): hole radius + counter_bore_radius (float): counter bore radius counter_bore_depth (float): counter bore depth - depth (float, optional): hole depth - None implies through part. Defaults to None. - mode (Mode, optional): combination mode. Defaults to Mode.SUBTRACT. + depth (float, optional): hole depth, through part if None. Defaults to None + mode (Mode, optional): combination mode. Defaults to Mode.SUBTRACT """ _applies_to = [BuildPart._tag] @@ -253,14 +253,15 @@ class CounterBoreHole(BasePartObject): class CounterSinkHole(BasePartObject): """Part Operation: Counter Sink Hole - Create a counter sink hole in part. + Subtract a countersink hole defined by radius, countersink radius, countersink + angle, and depth. Args: - radius (float): hole size - counter_sink_radius (float): counter sink size - depth (float, optional): hole depth - None implies through part. Defaults to None. - counter_sink_angle (float, optional): cone angle. Defaults to 82. - mode (Mode, optional): combination mode. Defaults to Mode.SUBTRACT. + radius (float): hole radius + counter_sink_radius (float): countersink radius + depth (float, optional): hole depth, through part if None. Defaults to None + counter_sink_angle (float, optional): cone angle. Defaults to 82 + mode (Mode, optional): combination mode. Defaults to Mode.SUBTRACT """ _applies_to = [BuildPart._tag] @@ -310,16 +311,16 @@ class CounterSinkHole(BasePartObject): class Cylinder(BasePartObject): """Part Object: Cylinder - Create a cylinder(s) and combine with part. + Add a cylinder defined by radius and height. Args: - radius (float): cylinder size - height (float): cylinder size + radius (float): cylinder radius + height (float): cylinder height arc_size (float, optional): angular size of cone. Defaults to 360. - rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Align | tuple[Align, Align, Align] | None, optional): align min, center, - or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). - mode (Mode, optional): combine mode. Defaults to Mode.ADD. + rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0) + align (Align | tuple[Align, Align, Align] | None, optional): align MIN, CENTER, + or MAX of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER) + mode (Mode, optional): combine mode. Defaults to Mode.ADD """ _applies_to = [BuildPart._tag] @@ -358,12 +359,12 @@ class Cylinder(BasePartObject): class Hole(BasePartObject): """Part Operation: Hole - Create a hole in part. + Subtract a hole defined by radius and depth. Args: - radius (float): hole size - depth (float, optional): hole depth - None implies through part. Defaults to None. - mode (Mode, optional): combination mode. Defaults to Mode.SUBTRACT. + radius (float): hole radius + depth (float, optional): hole depth, through part if None. Defaults to None + mode (Mode, optional): combination mode. Defaults to Mode.SUBTRACT """ _applies_to = [BuildPart._tag] @@ -405,17 +406,17 @@ class Hole(BasePartObject): class Sphere(BasePartObject): """Part Object: Sphere - Create a sphere(s) and combine with part. + Add a sphere defined by a radius. Args: - radius (float): sphere size - arc_size1 (float, optional): angular size of sphere. Defaults to -90. - arc_size2 (float, optional): angular size of sphere. Defaults to 90. - arc_size3 (float, optional): angular size of sphere. Defaults to 360. - rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Align | tuple[Align, Align, Align] | None, optional): align min, center, - or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). - mode (Mode, optional): combine mode. Defaults to Mode.ADD. + radius (float): sphere radius + arc_size1 (float, optional): angular size of bottom hemisphere. Defaults to -90. + arc_size2 (float, optional): angular size of top hemisphere. Defaults to 90. + arc_size3 (float, optional): angular revolution about pole. Defaults to 360. + rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0) + align (Align | tuple[Align, Align, Align] | None, optional): align MIN, CENTER, + or MAX of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER) + mode (Mode, optional): combine mode. Defaults to Mode.ADD """ _applies_to = [BuildPart._tag] @@ -457,18 +458,18 @@ class Sphere(BasePartObject): class Torus(BasePartObject): """Part Object: Torus - Create a torus(es) and combine with part. - + Add a torus defined by major and minor radii. Args: - major_radius (float): torus size - minor_radius (float): torus size - major_arc_size (float, optional): angular size of torus. Defaults to 0. - minor_arc_size (float, optional): angular size or torus. Defaults to 360. - rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Align | tuple[Align, Align, Align] | None, optional): align min, center, - or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). - mode (Mode, optional): combine mode. Defaults to Mode.ADD. + major_radius (float): major torus radius + minor_radius (float): minor torus radius + minor_start_angle (float, optional): angle to start minor arc. Defaults to 0 + minor_end_angle (float, optional): angle to end minor arc. Defaults to 360 + major_angle (float, optional): angle to revolve minor arc. Defaults to 360 + rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0) + align (Align | tuple[Align, Align, Align] | None, optional): align MIN, CENTER, + or MAX of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER) + mode (Mode, optional): combine mode. Defaults to Mode.ADD """ _applies_to = [BuildPart._tag] @@ -513,20 +514,21 @@ class Torus(BasePartObject): class Wedge(BasePartObject): """Part Object: Wedge - Create a wedge(s) and combine with part. + Add a wedge with a near face defined by xsize and z size, a far face defined by + xmin to xmax and zmin to zmax, and a depth of ysize. Args: - xsize (float): distance along the X axis - ysize (float): distance along the Y axis - zsize (float): distance along the Z axis - xmin (float): minimum X location - zmin (float): minimum Z location - xmax (float): maximum X location - zmax (float): maximum Z location - rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0). - align (Align | tuple[Align, Align, Align] | None, optional): align min, center, - or max of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER). - mode (Mode, optional): combine mode. Defaults to Mode.ADD. + xsize (float): length of near face along x-axis + ysize (float): length of part along y-axis + zsize (float): length of near face z-axis + xmin (float): minimum position far face along x-axis + zmin (float): minimum position far face along z-axis + xmax (float): maximum position far face along x-axis + zmax (float): maximum position far face along z-axis + rotation (RotationLike, optional): angles to rotate about axes. Defaults to (0, 0, 0) + align (Align | tuple[Align, Align, Align] | None, optional): align MIN, CENTER, + or MAX of object. Defaults to (Align.CENTER, Align.CENTER, Align.CENTER) + mode (Mode, optional): combine mode. Defaults to Mode.ADD """ _applies_to = [BuildPart._tag] diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 65771d2..2b031af 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -66,10 +66,10 @@ class BaseSketchObject(Sketch): Args: face (Face): face to create - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to None. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to None + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -109,13 +109,13 @@ class BaseSketchObject(Sketch): class Circle(BaseSketchObject): """Sketch Object: Circle - Add circle(s) to the sketch. + Add circle defined by radius. Args: - radius (float): circle size - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + radius (float): circle radius + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -139,15 +139,15 @@ class Circle(BaseSketchObject): class Ellipse(BaseSketchObject): """Sketch Object: Ellipse - Add ellipse(s) to sketch. + Add ellipse defined by x- and y- radii. Args: - x_radius (float): horizontal radius - y_radius (float): vertical radius - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + x_radius (float): x radius of the ellipse (along the x-axis of plane) + y_radius (float): y radius of the ellipse (along the y-axis of plane) + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -174,20 +174,19 @@ class Ellipse(BaseSketchObject): class Polygon(BaseSketchObject): """Sketch Object: Polygon - Add polygon(s) defined by given sequence of points to sketch. + Add polygon defined by given sequence of points. - Note that the order of the points define the normal of the Face that is created in - Algebra mode, where counter clockwise order creates Faces with their normal being up - while a clockwise order will have a normal that is down. In Builder mode, all Faces - added to the sketch are up. + Note: the order of the points defines the resulting normal of the Face in Algebra + mode, where counter-clockwise order creates an upward normal while clockwise order + a downward normal. In Builder mode, the Face is added with an upward normal. Args: - pts (Union[VectorLike, Iterable[VectorLike]]): sequence of points defining the + pts (VectorLike | Iterable[VectorLike]): sequence of points defining the vertices of the polygon - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -214,15 +213,15 @@ class Polygon(BaseSketchObject): class Rectangle(BaseSketchObject): """Sketch Object: Rectangle - Add rectangle(s) to sketch. + Add rectangle defined by width and height. Args: - width (float): horizontal size - height (float): vertical size - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + width (float): rectangle width + height (float): rectangle height + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -247,18 +246,18 @@ class Rectangle(BaseSketchObject): class RectangleRounded(BaseSketchObject): - """Sketch Object: RectangleRounded + """Sketch Object: Rectangle Rounded - Add rectangle(s) with filleted corners to sketch. + Add rectangle defined by width and height with filleted corners. Args: - width (float): horizontal size - height (float): vertical size + width (float): rectangle width + height (float): rectangle height radius (float): fillet radius - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -290,19 +289,18 @@ class RectangleRounded(BaseSketchObject): class RegularPolygon(BaseSketchObject): """Sketch Object: Regular Polygon - Add regular polygon(s) to sketch. + Add regular polygon defined by radius and side count. Use major_radius to define whether + the polygon circumscribes (along the vertices) or inscribes (along the sides) the radius circle. Args: - radius (float): distance from origin to vertices (major), or - optionally from the origin to side (minor) with major_radius = False - side_count (int): number of polygon sides - major_radius (bool): If True the radius is the major radius, else the - radius is the minor radius (also known as inscribed radius). - Defaults to True. - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + radius (float): construction radius + side_count (int): number of sides + major_radius (bool): If True the radius is the major radius (circumscribed circle), + else the radius is the minor radius (inscribed circle). Defaults to True + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -361,15 +359,15 @@ class RegularPolygon(BaseSketchObject): class SlotArc(BaseSketchObject): - """Sketch Object: Arc Slot + """Sketch Object: Slot Arc - Add slot(s) following an arc to sketch. + Add slot defined by a line and height. May be an arc, stright line, spline, etc. Args: - arc (Union[Edge, Wire]): center line of slot - height (float): diameter of end circles - rotation (float, optional): angles to rotate objects. Defaults to 0. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + arc (Edge | Wire): center line of slot + height (float): diameter of end arcs + rotation (float, optional): angle to rotate object. Defaults to 0 + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -393,18 +391,17 @@ class SlotArc(BaseSketchObject): class SlotCenterPoint(BaseSketchObject): - """Sketch Object: Center Point Slot + """Sketch Object: Slot Center Point - Add a slot(s) defined by the center of the slot and the center of one of the - circular arcs at the end. The other end will be generated to create a symmetric - slot. + Add a slot defined by the center of the slot and the center of one end arc. + The slot will be symmetric about the center point. Args: - center (VectorLike): slot center point - point (VectorLike): slot center of arc point - height (float): diameter of end circles - rotation (float, optional): angles to rotate objects. Defaults to 0. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + center (VectorLike): center point + point (VectorLike): center of arc point + height (float): diameter of end arcs + rotation (float, optional): angle to rotate object. Defaults to 0 + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -446,16 +443,15 @@ class SlotCenterPoint(BaseSketchObject): class SlotCenterToCenter(BaseSketchObject): - """Sketch Object: Center to Center points Slot + """Sketch Object: Slot Center To Center - Add slot(s) defined by the distance between the center of the two - end arcs. + Add slot defined by the distance between the centers of the two end arcs. Args: - center_separation (float): distance between two arc centers - height (float): diameter of end circles - rotation (float, optional): angles to rotate objects. Defaults to 0. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + center_separation (float): distance between arc centers + height (float): diameter of end arcs + rotation (float, optional): angle to rotate object. Defaults to 0 + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -490,17 +486,17 @@ class SlotCenterToCenter(BaseSketchObject): class SlotOverall(BaseSketchObject): - """Sketch Object: Center to Center points Slot + """Sketch Object: Slot Overall - Add slot(s) defined by the overall with of the slot. + Add slot defined by the overall width and height. Args: - width (float): overall width of the slot - height (float): diameter of end circles - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + width (float): overall width of slot + height (float): diameter of end arcs + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ _applies_to = [BuildSketch._tag] @@ -541,21 +537,24 @@ class SlotOverall(BaseSketchObject): class Text(BaseSketchObject): """Sketch Object: Text - Add text(s) to the sketch. + Add text defined by text string and font size. + May have difficulty finding non-system fonts depending on platform and render default. + font_path defines an exact path to a font file and overrides font. Args: - txt (str): text to be rendered + txt (str): text to render font_size (float): size of the font in model units - font (str, optional): font name. Defaults to "Arial". - font_path (str, optional): system path to font library. Defaults to None. - font_style (Font_Style, optional): style. Defaults to Font_Style.REGULAR. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - path (Union[Edge, Wire], optional): path for text to follow. Defaults to None. + font (str, optional): font name. Defaults to "Arial" + font_path (str, optional): system path to font file. Defaults to None + font_style (Font_Style, optional): font style, REGULAR, BOLD, or ITALIC. + Defaults to Font_Style.REGULAR + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + path (Edge | Wire, optional): path for text to follow. Defaults to None position_on_path (float, optional): the relative location on path to position the - text, values must be between 0.0 and 1.0. Defaults to 0.0. - rotation (float, optional): angles to rotate objects. Defaults to 0. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + text, values must be between 0.0 and 1.0. Defaults to 0.0 + rotation (float, optional): angle to rotate object. Defaults to 0 + mode (Mode, optional): combination mode. Defaults to Mode.ADD """ # pylint: disable=too-many-instance-attributes @@ -604,18 +603,18 @@ class Text(BaseSketchObject): class Trapezoid(BaseSketchObject): """Sketch Object: Trapezoid - Add trapezoid(s) to the sketch. + Add trapezoid defined by major width, height, and interior angle(s). Args: - width (float): horizontal width - height (float): vertical height + width (float): trapezoid major width + height (float): trapezoid height left_side_angle (float): bottom left interior angle right_side_angle (float, optional): bottom right interior angle. If not provided, - the trapezoid will be symmetric. Defaults to None. - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to (Align.CENTER, Align.CENTER). - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + the trapezoid will be symmetric. Defaults to None + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to (Align.CENTER, Align.CENTER) + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Give angles result in an invalid trapezoid @@ -685,21 +684,22 @@ class Trapezoid(BaseSketchObject): class Triangle(BaseSketchObject): """Sketch Object: Triangle - Add any triangle to the sketch by specifying the length of any side and any - two other side lengths or interior angles. Note that the interior angles are - opposite the side with the same designation (i.e. side 'a' is opposite angle 'A'). + Add a triangle defined by one side length and any of two other side lengths or interior + angles. The interior angles are opposite the side with the same designation + (i.e. side 'a' is opposite angle 'A'). Side 'a' is the bottom side, followed by 'b' + on the right, going counter-clockwise. Args: - a (float, optional): side 'a' length. Defaults to None. - b (float, optional): side 'b' length. Defaults to None. - c (float, optional): side 'c' length. Defaults to None. - A (float, optional): interior angle 'A' in degrees. Defaults to None. - B (float, optional): interior angle 'B' in degrees. Defaults to None. - C (float, optional): interior angle 'C' in degrees. Defaults to None. - rotation (float, optional): angles to rotate objects. Defaults to 0. - align (Union[Align, tuple[Align, Align]], optional): align min, center, or max of object. - Defaults to None. - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + a (float, optional): side 'a' length. Defaults to None + b (float, optional): side 'b' length. Defaults to None + c (float, optional): side 'c' length. Defaults to None + A (float, optional): interior angle 'A'. Defaults to None + B (float, optional): interior angle 'B'. Defaults to None + C (float, optional): interior angle 'C'. Defaults to None + rotation (float, optional): angle to rotate object. Defaults to 0 + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. + Defaults to None + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: One length and two other values were not provided From 76704663985b5b699c44493deeb17dc8387288d3 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 5 Mar 2025 12:08:03 -0500 Subject: [PATCH 221/518] PolarLine update: add direction to docstring, make direction unit vector, update tests for angle/direction parity Previously, when using direction, the result was a line made by direction and scaled by length. This doesn't seem like intuitive/expected behavior based on how length + angle works. Behavior is trivially accomplished by Line((0, 0), float * Vector) --- src/build123d/objects_curve.py | 7 +++-- tests/test_build_line.py | 52 ++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index e293ac6..b1c87a6 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -711,10 +711,11 @@ class PolarLine(BaseEdgeObject): Args: start (VectorLike): start point length (float): line length - angle (float): angle from the local "X" axis. + angle (float, optional): angle from the local "X" axis + direction (VectorLike, optional): point to determine angle length_mode (LengthMode, optional): length value specifies a diagonal, horizontal or vertical value. Defaults to LengthMode.DIAGONAL - mode (Mode, optional): combination mode. Defaults to Mode.ADD. + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Either angle or direction must be provided @@ -743,7 +744,7 @@ class PolarLine(BaseEdgeObject): ) if direction is not None: - direction_localized = WorkplaneList.localize(direction) + direction_localized = WorkplaneList.localize(direction).normalized() angle = Vector(1, 0, 0).get_angle(direction_localized) elif angle is not None: direction_localized = polar_workplane.x_dir.rotate( diff --git a/tests/test_build_line.py b/tests/test_build_line.py index 9211a26..d37e101 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -247,35 +247,37 @@ class BuildLineTests(unittest.TestCase): def test_polar_line(self): """Test 2D and 3D polar lines""" - with BuildLine() as bl: - PolarLine((0, 0), sqrt(2), 45) - self.assertTupleAlmostEquals((bl.edges()[0] @ 1).to_tuple(), (1, 1, 0), 5) + with BuildLine(): + a1 = PolarLine((0, 0), sqrt(2), 45) + d1 = PolarLine((0, 0), sqrt(2), direction=(1, 1)) + self.assertTupleAlmostEquals((a1 @ 1).to_tuple(), (1, 1, 0), 5) + self.assertTupleAlmostEquals((a1 @ 1).to_tuple(), (d1 @ 1).to_tuple(), 5) + self.assertTrue(isinstance(a1, Edge)) + self.assertTrue(isinstance(d1, Edge)) - with BuildLine() as bl: - PolarLine((0, 0), 1, 30) - self.assertTupleAlmostEquals( - (bl.edges()[0] @ 1).to_tuple(), (sqrt(3) / 2, 0.5, 0), 5 - ) + with BuildLine(): + a2 = PolarLine((0, 0), 1, 30) + d2 = PolarLine((0, 0), 1, direction=(sqrt(3), 1)) + self.assertTupleAlmostEquals((a2 @ 1).to_tuple(), (sqrt(3) / 2, 0.5, 0), 5) + self.assertTupleAlmostEquals((a2 @ 1).to_tuple(), (d2 @ 1).to_tuple(), 5) - with BuildLine() as bl: - PolarLine((0, 0), 1, 150) - self.assertTupleAlmostEquals( - (bl.edges()[0] @ 1).to_tuple(), (-sqrt(3) / 2, 0.5, 0), 5 - ) + with BuildLine(): + a3 = PolarLine((0, 0), 1, 150) + d3 = PolarLine((0, 0), 1, direction=(-sqrt(3), 1)) + self.assertTupleAlmostEquals((a3 @ 1).to_tuple(), (-sqrt(3) / 2, 0.5, 0), 5) + self.assertTupleAlmostEquals((a3 @ 1).to_tuple(), (d3 @ 1).to_tuple(), 5) - with BuildLine() as bl: - PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.HORIZONTAL) - self.assertTupleAlmostEquals( - (bl.edges()[0] @ 1).to_tuple(), (1, 1 / sqrt(3), 0), 5 - ) + with BuildLine(): + a4 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.HORIZONTAL) + d4 = PolarLine((0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.HORIZONTAL) + self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (1, 1 / sqrt(3), 0), 5) + self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (d4 @ 1).to_tuple(), 5) - with BuildLine(Plane.XZ) as bl: - PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.VERTICAL) - self.assertTupleAlmostEquals((bl.edges()[0] @ 1).to_tuple(), (sqrt(3), 0, 1), 5) - - l1 = PolarLine((0, 0), 10, direction=(1, 1)) - self.assertTupleAlmostEquals((l1 @ 1).to_tuple(), (10, 10, 0), 5) - self.assertTrue(isinstance(l1, Edge)) + with BuildLine(Plane.XZ): + a5 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.VERTICAL) + d5 = PolarLine((0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.VERTICAL) + self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (sqrt(3), 0, 1), 5) + self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (d5 @ 1).to_tuple(), 5) with self.assertRaises(ValueError): PolarLine((0, 0), 1) From c51410b1c83b6d54f84ac5bcf17910cb8845c573 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 6 Mar 2025 10:01:22 -0500 Subject: [PATCH 222/518] Polarline: update docstring --- src/build123d/objects_curve.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index b1c87a6..426a485 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -706,13 +706,13 @@ class IntersectingLine(BaseEdgeObject): class PolarLine(BaseEdgeObject): """Line Object: Polar Line - Add line defined by a start point, length and angle. + Add line defined by a start point, length and angle or direction. Args: start (VectorLike): start point length (float): line length angle (float, optional): angle from the local "X" axis - direction (VectorLike, optional): point to determine angle + direction (VectorLike, optional): vector direction to determine angle length_mode (LengthMode, optional): length value specifies a diagonal, horizontal or vertical value. Defaults to LengthMode.DIAGONAL mode (Mode, optional): combination mode. Defaults to Mode.ADD From 7595040416f23f3e31dd1bce2f570b8738587e03 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 7 Mar 2025 21:15:19 -0500 Subject: [PATCH 223/518] Change add/subtract to create --- src/build123d/objects_curve.py | 36 ++++++++++++++++----------------- src/build123d/objects_part.py | 20 +++++++++--------- src/build123d/objects_sketch.py | 26 ++++++++++++------------ 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index abd495f..bb84255 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -92,8 +92,8 @@ class BaseEdgeObject(Edge): class Bezier(BaseEdgeObject): """Line Object: Bezier Curve - Add a non-rational bezier curve defined by a sequence of points and include optional - weights to add a rational bezier curve. The number of weights must match the number + Create a non-rational bezier curve defined by a sequence of points and include optional + weights to create a rational bezier curve. The number of weights must match the number of control points. Args: @@ -123,7 +123,7 @@ class Bezier(BaseEdgeObject): class CenterArc(BaseEdgeObject): """Line Object: Center Arc - Add a circular arc defined by a center point and radius. + Create a circular arc defined by a center point and radius. Args: center (VectorLike): center point of arc @@ -176,7 +176,7 @@ class CenterArc(BaseEdgeObject): class DoubleTangentArc(BaseEdgeObject): """Line Object: Double Tangent Arc - Add a circular arc defined by a point/tangent pair and another line find a tangent to. + Create a circular arc defined by a point/tangent pair and another line find a tangent to. The arc specified with TOP or BOTTOM depends on the geometry and isn't predictable. @@ -275,7 +275,7 @@ class DoubleTangentArc(BaseEdgeObject): class EllipticalStartArc(BaseEdgeObject): """Line Object: Elliptical Start Arc - Add an elliptical arc defined by a start point, end point, x- and y- radii. + Create an elliptical arc defined by a start point, end point, x- and y- radii. Args: start (VectorLike): start point @@ -381,7 +381,7 @@ class EllipticalStartArc(BaseEdgeObject): class EllipticalCenterArc(BaseEdgeObject): """Line Object: Elliptical Center Arc - Adds an elliptical arc defined by a center point, x- and y- radii. + Create an elliptical arc defined by a center point, x- and y- radii. Args: center (VectorLike): ellipse center @@ -439,7 +439,7 @@ class EllipticalCenterArc(BaseEdgeObject): class Helix(BaseEdgeObject): """Line Object: Helix - Add a helix defined by pitch, height, and radius. The helix may have a taper + Create a helix defined by pitch, height, and radius. The helix may have a taper defined by cone_angle. @@ -481,7 +481,7 @@ class Helix(BaseEdgeObject): class FilletPolyline(BaseLineObject): """Line Object: Fillet Polyline - Add a sequence of straight lines defined by successive points that are filleted + Create a sequence of straight lines defined by successive points that are filleted to a given radius. Args: @@ -577,7 +577,7 @@ class FilletPolyline(BaseLineObject): class JernArc(BaseEdgeObject): """Line Object: Jern Arc - Add a circular arc defined by a start point/tangent pair, radius and arc size. + Create a circular arc defined by a start point/tangent pair, radius and arc size. Args: start (VectorLike): start point @@ -639,7 +639,7 @@ class JernArc(BaseEdgeObject): class Line(BaseEdgeObject): """Line Object: Line - Add a straight line defined by two points. + Create a straight line defined by two points. Args: pts (VectorLike | Iterable[VectorLike]): sequence of two points @@ -670,7 +670,7 @@ class Line(BaseEdgeObject): class IntersectingLine(BaseEdgeObject): """Intersecting Line Object: Line - Add a straight line defined by a point/direction pair and another line to intersect. + Create a straight line defined by a point/direction pair and another line to intersect. Args: start (VectorLike): start point @@ -711,7 +711,7 @@ class IntersectingLine(BaseEdgeObject): class PolarLine(BaseEdgeObject): """Line Object: Polar Line - Add a straight line defined by a start point, length, and angle. + Create a straight line defined by a start point, length, and angle. The length can specify the DIAGONAL, HORIZONTAL, or VERTICAL component of the triangle defined by the angle. @@ -775,7 +775,7 @@ class PolarLine(BaseEdgeObject): class Polyline(BaseLineObject): """Line Object: Polyline - Add a sequence of straight lines defined by successive points. + Create a sequence of straight lines defined by successive points. Args: pts (VectorLike | Iterable[VectorLike]): sequence of two or more points @@ -816,7 +816,7 @@ class Polyline(BaseLineObject): class RadiusArc(BaseEdgeObject): """Line Object: Radius Arc - Add a circular arc defined by two points and a radius. + Create a circular arc defined by two points and a radius. Args: start_point (VectorLike): start point @@ -868,7 +868,7 @@ class RadiusArc(BaseEdgeObject): class SagittaArc(BaseEdgeObject): """Line Object: Sagitta Arc - Add a circular arc defined by two points and the sagitta (height of the arc from chord). + Create a circular arc defined by two points and the sagitta (height of the arc from chord). Args: start_point (VectorLike): start point @@ -912,7 +912,7 @@ class SagittaArc(BaseEdgeObject): class Spline(BaseEdgeObject): """Line Object: Spline - Add a spline defined by a sequence of points, optionally constrained by tangents. + Create a spline defined by a sequence of points, optionally constrained by tangents. Tangents and tangent scalars must have length of 2 for only the end points or a length of the number of points. @@ -971,7 +971,7 @@ class Spline(BaseEdgeObject): class TangentArc(BaseEdgeObject): """Line Object: Tangent Arc - Add a circular arc defined by two points and a tangent. + Create a circular arc defined by two points and a tangent. Args: pts (VectorLike | Iterable[VectorLike]): sequence of two points @@ -1013,7 +1013,7 @@ class TangentArc(BaseEdgeObject): class ThreePointArc(BaseEdgeObject): """Line Object: Three Point Arc - Add a circular arc defined by three points. + Create a circular arc defined by three points. Args: pts (VectorLike | Iterable[VectorLike]): sequence of three points diff --git a/src/build123d/objects_part.py b/src/build123d/objects_part.py index de3a332..7054d7a 100644 --- a/src/build123d/objects_part.py +++ b/src/build123d/objects_part.py @@ -103,7 +103,7 @@ class BasePartObject(Part): class Box(BasePartObject): """Part Object: Box - Add a box defined by length, width, and height. + Create a box defined by length, width, and height. Args: length (float): box length @@ -147,7 +147,7 @@ class Box(BasePartObject): class Cone(BasePartObject): """Part Object: Cone - Add a cone defined by bottom radius, top radius, and height. + Create a cone defined by bottom radius, top radius, and height. Args: bottom_radius (float): bottom radius @@ -200,7 +200,7 @@ class Cone(BasePartObject): class CounterBoreHole(BasePartObject): """Part Operation: Counter Bore Hole - Subtract a counter bore hole defined by radius, counter bore radius, counter bore and depth. + Create a counter bore hole defined by radius, counter bore radius, counter bore and depth. Args: radius (float): hole radius @@ -253,8 +253,8 @@ class CounterBoreHole(BasePartObject): class CounterSinkHole(BasePartObject): """Part Operation: Counter Sink Hole - Subtract a countersink hole defined by radius, countersink radius, countersink - angle, and depth. + Create a countersink hole defined by radius, countersink radius, countersink + angle, and depth. Args: radius (float): hole radius @@ -311,7 +311,7 @@ class CounterSinkHole(BasePartObject): class Cylinder(BasePartObject): """Part Object: Cylinder - Add a cylinder defined by radius and height. + Create a cylinder defined by radius and height. Args: radius (float): cylinder radius @@ -359,7 +359,7 @@ class Cylinder(BasePartObject): class Hole(BasePartObject): """Part Operation: Hole - Subtract a hole defined by radius and depth. + Create a hole defined by radius and depth. Args: radius (float): hole radius @@ -406,7 +406,7 @@ class Hole(BasePartObject): class Sphere(BasePartObject): """Part Object: Sphere - Add a sphere defined by a radius. + Create a sphere defined by a radius. Args: radius (float): sphere radius @@ -458,7 +458,7 @@ class Sphere(BasePartObject): class Torus(BasePartObject): """Part Object: Torus - Add a torus defined by major and minor radii. + Create a torus defined by major and minor radii. Args: major_radius (float): major torus radius @@ -514,7 +514,7 @@ class Torus(BasePartObject): class Wedge(BasePartObject): """Part Object: Wedge - Add a wedge with a near face defined by xsize and z size, a far face defined by + Create a wedge with a near face defined by xsize and z size, a far face defined by xmin to xmax and zmin to zmax, and a depth of ysize. Args: diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 2b031af..6da3725 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -109,7 +109,7 @@ class BaseSketchObject(Sketch): class Circle(BaseSketchObject): """Sketch Object: Circle - Add circle defined by radius. + Create a circle defined by radius. Args: radius (float): circle radius @@ -139,7 +139,7 @@ class Circle(BaseSketchObject): class Ellipse(BaseSketchObject): """Sketch Object: Ellipse - Add ellipse defined by x- and y- radii. + Create an ellipse defined by x- and y- radii. Args: x_radius (float): x radius of the ellipse (along the x-axis of plane) @@ -174,7 +174,7 @@ class Ellipse(BaseSketchObject): class Polygon(BaseSketchObject): """Sketch Object: Polygon - Add polygon defined by given sequence of points. + Create a polygon defined by given sequence of points. Note: the order of the points defines the resulting normal of the Face in Algebra mode, where counter-clockwise order creates an upward normal while clockwise order @@ -213,7 +213,7 @@ class Polygon(BaseSketchObject): class Rectangle(BaseSketchObject): """Sketch Object: Rectangle - Add rectangle defined by width and height. + Create a rectangle defined by width and height. Args: width (float): rectangle width @@ -248,7 +248,7 @@ class Rectangle(BaseSketchObject): class RectangleRounded(BaseSketchObject): """Sketch Object: Rectangle Rounded - Add rectangle defined by width and height with filleted corners. + Create a rectangle defined by width and height with filleted corners. Args: width (float): rectangle width @@ -289,7 +289,7 @@ class RectangleRounded(BaseSketchObject): class RegularPolygon(BaseSketchObject): """Sketch Object: Regular Polygon - Add regular polygon defined by radius and side count. Use major_radius to define whether + Create a regular polygon defined by radius and side count. Use major_radius to define whether the polygon circumscribes (along the vertices) or inscribes (along the sides) the radius circle. Args: @@ -361,7 +361,7 @@ class RegularPolygon(BaseSketchObject): class SlotArc(BaseSketchObject): """Sketch Object: Slot Arc - Add slot defined by a line and height. May be an arc, stright line, spline, etc. + Create a slot defined by a line and height. May be an arc, stright line, spline, etc. Args: arc (Edge | Wire): center line of slot @@ -393,7 +393,7 @@ class SlotArc(BaseSketchObject): class SlotCenterPoint(BaseSketchObject): """Sketch Object: Slot Center Point - Add a slot defined by the center of the slot and the center of one end arc. + Create a slot defined by the center of the slot and the center of one end arc. The slot will be symmetric about the center point. Args: @@ -445,7 +445,7 @@ class SlotCenterPoint(BaseSketchObject): class SlotCenterToCenter(BaseSketchObject): """Sketch Object: Slot Center To Center - Add slot defined by the distance between the centers of the two end arcs. + Create a slot defined by the distance between the centers of the two end arcs. Args: center_separation (float): distance between arc centers @@ -488,7 +488,7 @@ class SlotCenterToCenter(BaseSketchObject): class SlotOverall(BaseSketchObject): """Sketch Object: Slot Overall - Add slot defined by the overall width and height. + Create a slot defined by the overall width and height. Args: width (float): overall width of slot @@ -537,7 +537,7 @@ class SlotOverall(BaseSketchObject): class Text(BaseSketchObject): """Sketch Object: Text - Add text defined by text string and font size. + Create text defined by text string and font size. May have difficulty finding non-system fonts depending on platform and render default. font_path defines an exact path to a font file and overrides font. @@ -603,7 +603,7 @@ class Text(BaseSketchObject): class Trapezoid(BaseSketchObject): """Sketch Object: Trapezoid - Add trapezoid defined by major width, height, and interior angle(s). + Create a trapezoid defined by major width, height, and interior angle(s). Args: width (float): trapezoid major width @@ -684,7 +684,7 @@ class Trapezoid(BaseSketchObject): class Triangle(BaseSketchObject): """Sketch Object: Triangle - Add a triangle defined by one side length and any of two other side lengths or interior + Create a triangle defined by one side length and any of two other side lengths or interior angles. The interior angles are opposite the side with the same designation (i.e. side 'a' is opposite angle 'A'). Side 'a' is the bottom side, followed by 'b' on the right, going counter-clockwise. From b1f0eedfcb417c3476e9fe6a7650d820ccc12f18 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 8 Mar 2025 09:24:47 -0500 Subject: [PATCH 224/518] Add very minimal support for CompSolid --- src/build123d/topology/composite.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 5be6a8f..767f6f9 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -203,6 +203,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): ta.TopAbs_SHELL: Shell, ta.TopAbs_SOLID: Solid, ta.TopAbs_COMPOUND: Compound, + ta.TopAbs_COMPSOLID: Compound, } shape_type = shapetype(obj) From 1b63aa346932b96780bd36f76a8f1508eab44e2e Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sun, 9 Mar 2025 23:57:33 -0400 Subject: [PATCH 225/518] Helix: clarify how cone_angle changes the radius to resolve #761 --- src/build123d/objects_curve.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 633cad3..4b1f1bb 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -442,13 +442,15 @@ class Helix(BaseEdgeObject): Create a helix defined by pitch, height, and radius. The helix may have a taper defined by cone_angle. + If cone_angle is not 0, radius is the initial helix radius at center. cone_angle > 0 + increases the final radius. cone_angle < 0 decreases the final radius. Args: pitch (float): distance between loops height (float): helix height radius (float): helix radius - center (VectorLike, optional): center point. Defaults to (0, 0, 0). - direction (VectorLike, optional): direction of central axis. Defaults to (0, 0, 1). + center (VectorLike, optional): center point. Defaults to (0, 0, 0) + direction (VectorLike, optional): direction of central axis. Defaults to (0, 0, 1) cone_angle (float, optional): conical angle from direction. Defaults to 0 lefthand (bool, optional): left handed helix. Defaults to False From f87cee3134638faccde6d0d38ac9747f9c1a138c Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 10 Mar 2025 00:21:09 -0400 Subject: [PATCH 226/518] Added plane_symbol() and better var names and typing to resolve #899 --- docs/location_arithmetic.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/location_arithmetic.rst b/docs/location_arithmetic.rst index 8f68a50..f26834e 100644 --- a/docs/location_arithmetic.rst +++ b/docs/location_arithmetic.rst @@ -11,8 +11,13 @@ For the following use the helper function: .. code-block:: python - def location_symbol(self, l=1) -> Compound: - return Compound.make_triad(axes_scale=l).locate(self) + def location_symbol(location: Location, scale: float = 1) -> Compound: + return Compound.make_triad(axes_scale=scale).locate(location) + + def plane_symbol(plane: Plane, scale: float = 1) -> Compound: + triad = Compound.make_triad(axes_scale=scale) + circle = Circle(scale * .8).edge() + return (triad + circle).locate(plane.location) 1. **Positioning at a location** From c618967e15290a691ee46782eec2238e7c33b097 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 10 Mar 2025 00:39:09 -0400 Subject: [PATCH 227/518] Remove outdated filter_by_normal reference --- docs/advantages.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/advantages.rst b/docs/advantages.rst index 690d871..51a6ac0 100644 --- a/docs/advantages.rst +++ b/docs/advantages.rst @@ -100,13 +100,13 @@ prompt users for valid options without having to refer to documentation. Selectors replaced by Lists =========================== String based selectors have been replaced with standard python filters and -sorting which opens up the full functionality of python lists. To aid the +sorting which opens up the full functionality of python lists. To aid the user, common operations have been optimized as shown here along with a fully custom selection: .. code-block:: python - top = rail.faces().filter_by_normal(Axis.Z)[-1] + top = rail.faces().filter_by(Axis.Z)[-1] ... outside_vertices = filter( lambda v: (v.Y == 0.0 or v.Y == height) and -width / 2 < v.X < width / 2, From 09b80243f9a67d8fc0789e3063d6a869b100f72d Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 10 Mar 2025 12:20:43 -0400 Subject: [PATCH 228/518] Add missing enum to cheat sheet: Select.NEW Keep.ALL is missing, but seems unused --- docs/cheat_sheet.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index b310a08..07466a0 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -249,7 +249,7 @@ Cheat Sheet +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.PrecisionMode` | LEAST, AVERAGE, GREATEST, SESSION | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ - | :class:`~build_enums.Select` | ALL, LAST | + | :class:`~build_enums.Select` | ALL, LAST, NEW | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.Side` | BOTH, LEFT, RIGHT | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ From 1140ebe9c3c8358a04beea09ab4410c79160b607 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 10 Mar 2025 13:14:20 -0400 Subject: [PATCH 229/518] Enable show_topology to display an Shape with a CompSolid --- src/build123d/topology/shape_core.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 1cf8ac1..905a5b3 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -267,6 +267,7 @@ class Shape(NodeMixin, Generic[TOPODS]): _ordered_shapes = [ TopAbs_ShapeEnum.TopAbs_COMPOUND, + TopAbs_ShapeEnum.TopAbs_COMPSOLID, TopAbs_ShapeEnum.TopAbs_SOLID, TopAbs_ShapeEnum.TopAbs_SHELL, TopAbs_ShapeEnum.TopAbs_FACE, From 2168fd054073a46299d76bc95ae588535c1a59d8 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 10 Mar 2025 13:33:27 -0400 Subject: [PATCH 230/518] Plane.rotated(): remove incorrect note about z rotation to resolve #900 --- src/build123d/geometry.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 434b028..7acd223 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -2722,19 +2722,16 @@ class Plane(metaclass=PlaneMeta): ) -> Plane: """Returns a copy of this plane, rotated about the specified axes - Since the z axis is always normal the plane, rotating around Z will - always produce a plane that is parallel to this one. - The origin of the workplane is unaffected by the rotation. Rotations are done in order x, y, z. If you need a different order, - manually chain together multiple rotate() commands. + manually chain together multiple rotated() commands. Args: rotation (VectorLike, optional): (xDegrees, yDegrees, zDegrees). - Defaults to (0, 0, 0). + Defaults to (0, 0, 0) ordering (Intrinsic | Extrinsic, optional): order of rotations in - Intrinsic or Extrinsic rotation mode, defaults to Intrinsic.XYZ + Intrinsic or Extrinsic rotation mode. Defaults to Intrinsic.XYZ Returns: Plane: a copy of this plane rotated as requested. From 96d9875a7b270fbc45b0b785b09e044367290c07 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 10 Mar 2025 13:40:35 -0400 Subject: [PATCH 231/518] Plane.rotated(): chaining rotated doesn't seem to affect final rotation. Rotation order should be set with ordering instead. --- src/build123d/geometry.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 7acd223..e557b1f 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -2725,10 +2725,11 @@ class Plane(metaclass=PlaneMeta): The origin of the workplane is unaffected by the rotation. Rotations are done in order x, y, z. If you need a different order, - manually chain together multiple rotated() commands. + specify ordering. e.g. Intrinsic.ZYX changes rotation to + (z angle, y angle, x angle) and rotates in that order. Args: - rotation (VectorLike, optional): (xDegrees, yDegrees, zDegrees). + rotation (VectorLike, optional): (x angle, y angle, z angle). Defaults to (0, 0, 0) ordering (Intrinsic | Extrinsic, optional): order of rotations in Intrinsic or Extrinsic rotation mode. Defaults to Intrinsic.XYZ From cbbf79ae924f36265aa5aaad7f2f5310f24f2d3f Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 10 Mar 2025 15:18:34 -0400 Subject: [PATCH 232/518] Fix alphabetical order and anchor links of circuit/canadian cards. --- docs/examples_1.rst | 182 ++++++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/docs/examples_1.rst b/docs/examples_1.rst index 55c7cd2..7da082c 100644 --- a/docs/examples_1.rst +++ b/docs/examples_1.rst @@ -1,9 +1,9 @@ ####################### The build123d Examples ####################### -.. |siren| replace:: 🚨 +.. |siren| replace:: 🚨 .. |Builder| replace:: 🔨 -.. |Algebra| replace:: ✏️ +.. |Algebra| replace:: ✏️ Overview -------------------------------- @@ -24,17 +24,17 @@ Most of the examples show the builder and algebra modes. :link: examples-benchy :link-type: ref - .. grid-item-card:: Circuit Board With Holes |Builder| |Algebra| - :img-top: assets/examples/thumbnail_circuit_board_01.png + .. grid-item-card:: Canadian Flag Blowing in The Wind |Builder| |Algebra| + :img-top: assets/examples/example_canadian_flag_01.png :link: examples-canadian_flag :link-type: ref - - .. grid-item-card:: Canadian Flag Blowing in The Wind |Builder| |Algebra| - :img-top: assets/examples/example_canadian_flag_01.png + + .. grid-item-card:: Circuit Board With Holes |Builder| |Algebra| + :img-top: assets/examples/thumbnail_circuit_board_01.png :link: examples-circuit_board :link-type: ref - .. grid-item-card:: Clock Face |Builder| |Algebra| + .. grid-item-card:: Clock Face |Builder| |Algebra| :img-top: assets/examples/clock_face.png :link: clock_face :link-type: ref @@ -58,43 +58,43 @@ Most of the examples show the builder and algebra modes. :img-top: assets/examples/thumbnail_build123d_logo_01.png :link: examples-build123d_logo :link-type: ref - - .. grid-item-card:: Maker Coin |Builder| + + .. grid-item-card:: Maker Coin |Builder| :img-top: assets/examples/maker_coin.png :link: maker_coin :link-type: ref - .. grid-item-card:: Multi-Sketch Loft |Builder| |Algebra| + .. grid-item-card:: Multi-Sketch Loft |Builder| |Algebra| :img-top: assets/examples/loft.png :link: multi_sketch_loft :link-type: ref - .. grid-item-card:: Peg Board J Hook |Builder| |Algebra| + .. grid-item-card:: Peg Board J Hook |Builder| |Algebra| :img-top: assets/examples/peg_board_hook.png :link: peg_board_hook :link-type: ref - .. grid-item-card:: Platonic Solids |Algebra| + .. grid-item-card:: Platonic Solids |Algebra| :img-top: assets/examples/platonic_solids.png :link: platonic_solids :link-type: ref - .. grid-item-card:: Playing Cards |Builder| + .. grid-item-card:: Playing Cards |Builder| :img-top: assets/examples/playing_cards.png :link: playing_cards :link-type: ref - .. grid-item-card:: Stud Wall |Algebra| + .. grid-item-card:: Stud Wall |Algebra| :img-top: assets/examples/stud_wall.png :link: stud_wall :link-type: ref - .. grid-item-card:: Tea Cup |Builder| |Algebra| + .. grid-item-card:: Tea Cup |Builder| |Algebra| :img-top: assets/examples/tea_cup.png :link: tea_cup :link-type: ref - .. grid-item-card:: Vase |Builder| |Algebra| + .. grid-item-card:: Vase |Builder| |Algebra| :img-top: assets/examples/vase.png :link: vase :link-type: ref @@ -106,7 +106,7 @@ Most of the examples show the builder and algebra modes. :img-top: assets/examples/thumbnail_{name-of-your-example}_01.{extension} :link: examples-{name-of-your-example} :link-type: ref - + .. ---------------------------------------------------------------------------------------------- .. Details Section .. ---------------------------------------------------------------------------------------------- @@ -119,10 +119,10 @@ Benchy :align: center -The Benchy examples shows how to import a STL model as a `Solid` object with the class `Mesher` and +The Benchy examples shows how to import a STL model as a `Solid` object with the class `Mesher` and modify it by replacing chimney with a BREP version. -.. note +.. note *Attribution:* The low-poly-benchy used in this example is by `reddaugherty`, see @@ -138,7 +138,7 @@ modify it by replacing chimney with a BREP version. .. image:: assets/examples/example_benchy_03.png :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/benchy.py :start-after: [Code] @@ -156,17 +156,17 @@ Former build123d Logo This example creates the former build123d logo (new logo was created in the end of 2023). -Using text and lines to create the first build123d logo. +Using text and lines to create the first build123d logo. The builder mode example also generates the SVG file `logo.svg`. -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/build123d_logo.py :start-after: [Code] :end-before: [End] - -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) + +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/build123d_logo_algebra.py :start-after: [Code] @@ -196,18 +196,18 @@ This example also demonstrates building complex lines that snap to existing feat :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/canadian_flag.py :start-after: [Code] :end-before: [End] - -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) + +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/canadian_flag_algebra.py :start-after: [Code] :end-before: [End] - + .. _examples-circuit_board: @@ -232,13 +232,13 @@ This example demonstrates placing holes around a part. :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/circuit_board.py :start-after: [Code] :end-before: [End] - -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) + +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/circuit_board_algebra.py :start-after: [Code] @@ -252,22 +252,22 @@ Clock Face .. image:: assets/examples/clock_face.png :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/clock.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/clock_algebra.py :start-after: [Code] :end-before: [End] -The Python code utilizes the build123d library to create a 3D model of a clock face. -It defines a minute indicator with arcs and lines, applying fillets, and then -integrates it into the clock face sketch. The clock face includes a circular outline, -hour labels, and slots at specified positions. The resulting 3D model represents +The Python code utilizes the build123d library to create a 3D model of a clock face. +It defines a minute indicator with arcs and lines, applying fillets, and then +integrates it into the clock face sketch. The clock face includes a circular outline, +hour labels, and slots at specified positions. The resulting 3D model represents a detailed and visually appealing clock design. :class:`~build_common.PolarLocations` are used to position features on the clock face. @@ -280,13 +280,13 @@ Handle .. image:: assets/examples/handle.png :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/handle.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/handle_algebra.py :start-after: [Code] @@ -301,13 +301,13 @@ Heat Exchanger .. image:: assets/examples/heat_exchanger.png :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/heat_exchanger.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/heat_exchanger_algebra.py :start-after: [Code] @@ -325,13 +325,13 @@ Key Cap .. image:: assets/examples/key_cap.png :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/key_cap.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/key_cap_algebra.py :start-after: [Code] @@ -350,14 +350,14 @@ Maker Coin This example creates the maker coin as defined by Angus on the Maker's Muse YouTube channel. There are two key features: -#. the use of :class:`~objects_curve.DoubleTangentArc` to create a smooth +#. the use of :class:`~objects_curve.DoubleTangentArc` to create a smooth transition from the central dish to the outside arc, and #. embossing the text into the top of the coin not just as a simple extrude but from a projection which results in text with even depth. -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/maker_coin.py :start-after: [Code] @@ -375,13 +375,13 @@ Multi-Sketch Loft This example demonstrates lofting a set of sketches, selecting the top and bottom by type, and shelling. -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/loft.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/loft_algebra.py :start-after: [Code] @@ -395,20 +395,20 @@ Peg Board Hook .. image:: assets/examples/peg_board_hook.png :align: center -This script creates a a J-shaped pegboard hook. These hooks are commonly used for -organizing tools in garages, workshops, or other spaces where tools and equipment +This script creates a a J-shaped pegboard hook. These hooks are commonly used for +organizing tools in garages, workshops, or other spaces where tools and equipment need to be stored neatly and accessibly. The hook is created by defining a complex path and then sweeping it to define the hook. The sides of the hook are flattened to aid 3D printing. -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/pegboard_j_hook.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/pegboard_j_hook_algebra.py :start-after: [Code] @@ -424,17 +424,17 @@ Platonic Solids This example creates a custom Part object PlatonicSolid. -Platonic solids are five three-dimensional shapes that are highly symmetrical, -known since antiquity and named after the ancient Greek philosopher Plato. -These solids are unique because their faces are congruent regular polygons, -with the same number of faces meeting at each vertex. The five Platonic solids -are the tetrahedron (4 triangular faces), cube (6 square faces), octahedron -(8 triangular faces), dodecahedron (12 pentagonal faces), and icosahedron -(20 triangular faces). Each solid represents a unique way in which identical -polygons can be arranged in three dimensions to form a convex polyhedron, +Platonic solids are five three-dimensional shapes that are highly symmetrical, +known since antiquity and named after the ancient Greek philosopher Plato. +These solids are unique because their faces are congruent regular polygons, +with the same number of faces meeting at each vertex. The five Platonic solids +are the tetrahedron (4 triangular faces), cube (6 square faces), octahedron +(8 triangular faces), dodecahedron (12 pentagonal faces), and icosahedron +(20 triangular faces). Each solid represents a unique way in which identical +polygons can be arranged in three dimensions to form a convex polyhedron, embodying ideals of symmetry and balance. -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/platonic_solids.py :start-after: [Code] @@ -447,12 +447,12 @@ Playing Cards .. image:: assets/examples/playing_cards.png :align: center -This example creates a customs Sketch objects: Club, Spade, Heart, Diamond, -and PlayingCard in addition to a two part playing card box which has suit -cutouts in the lid. The four suits are created with Bézier curves that were -imported as code from an SVG file and modified to the code found here. +This example creates a customs Sketch objects: Club, Spade, Heart, Diamond, +and PlayingCard in addition to a two part playing card box which has suit +cutouts in the lid. The four suits are created with Bézier curves that were +imported as code from an SVG file and modified to the code found here. -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/playing_cards.py :start-after: [Code] @@ -469,14 +469,14 @@ This example demonstrates creatings custom `Part` objects and putting them into assemblies. The custom object is a `Stud` used in the building industry while the assembly is a `StudWall` created from copies of `Stud` objects for efficiency. Both the `Stud` and `StudWall` objects use `RigidJoints` to define snap points which -are used to position all of objects. +are used to position all of objects. -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/stud_wall.py :start-after: [Code] :end-before: [End] - + .. _tea_cup: Tea Cup @@ -484,32 +484,32 @@ Tea Cup .. image:: assets/examples/tea_cup.png :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/tea_cup.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/tea_cup_algebra.py :start-after: [Code] :end-before: [End] -This example demonstrates the creation a tea cup, which serves as an example of +This example demonstrates the creation a tea cup, which serves as an example of constructing complex, non-flat geometrical shapes programmatically. The tea cup model involves several CAD techniques, such as: -* Revolve Operations: There is 1 occurrence of a revolve operation. This is used - to create the main body of the tea cup by revolving a profile around an axis, +* Revolve Operations: There is 1 occurrence of a revolve operation. This is used + to create the main body of the tea cup by revolving a profile around an axis, a common technique for generating symmetrical objects like cups. * Sweep Operations: There are 2 occurrences of sweep operations. The handle are created by sweeping a profile along a path to generate non-planar surfaces. * Offset/Shell Operations: the bowl of the cup is hollowed out with the offset - operation leaving the top open. -* Fillet Operations: There is 1 occurrence of a fillet operation which is used to - round the edges for aesthetic improvement and to mimic real-world objects more + operation leaving the top open. +* Fillet Operations: There is 1 occurrence of a fillet operation which is used to + round the edges for aesthetic improvement and to mimic real-world objects more closely. .. _vase: @@ -519,37 +519,37 @@ Vase .. image:: assets/examples/vase.png :align: center -.. dropdown:: |Builder| Reference Implementation (Builder Mode) +.. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/vase.py :start-after: [Code] :end-before: [End] -.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/vase_algebra.py :start-after: [Code] :end-before: [End] -This example demonstrates the build123d techniques involving the creation of a vase. -Specifically, it showcases the processes of revolving a sketch, shelling -(creating a hollow object by removing material from its interior), and -selecting edges by position range and type for the application of fillets +This example demonstrates the build123d techniques involving the creation of a vase. +Specifically, it showcases the processes of revolving a sketch, shelling +(creating a hollow object by removing material from its interior), and +selecting edges by position range and type for the application of fillets (rounding off the edges). -* Sketching: Drawing a 2D profile or outline that represents the side view of +* Sketching: Drawing a 2D profile or outline that represents the side view of the vase. -* Revolving: Rotating the sketch around an axis to create a 3D object. This +* Revolving: Rotating the sketch around an axis to create a 3D object. This step transforms the 2D profile into a 3D vase shape. -* Offset/Shelling: Removing material from the interior of the solid vase to +* Offset/Shelling: Removing material from the interior of the solid vase to create a hollow space, making it resemble a real vase more closely. -* Edge Filleting: Selecting specific edges of the vase for filleting, which +* Edge Filleting: Selecting specific edges of the vase for filleting, which involves rounding those edges. The edges are selected based on their position and type. .. NOTE 02: insert new example thumbnails above this line - + .. TODO: Copy this block to add your example details here .. _examples-{name-of-your-example}: @@ -564,15 +564,15 @@ selecting edges by position range and type for the application of fillets .. dropdown:: info - TODO: add more information about your example + TODO: add more information about your example - .. dropdown:: |Builder| Reference Implementation (Builder Mode) + .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/boxes_on_faces.py :start-after: [Code] :end-before: [End] - .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) + .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/boxes_on_faces_algebra.py :start-after: [Code] From c14f922647e0af4f2c85a797d0e1e7a828ab658e Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 10 Mar 2025 15:45:40 -0400 Subject: [PATCH 233/518] Add links to available example imports to resolve #809 Unavailable imports: - import_export.rst: example.3mf (produced earlier) - build_line.rst: club.svg --- docs/examples_1.rst | 3 +++ docs/tutorial_joints.rst | 2 ++ 2 files changed, 5 insertions(+) diff --git a/docs/examples_1.rst b/docs/examples_1.rst index 7da082c..4cb0f89 100644 --- a/docs/examples_1.rst +++ b/docs/examples_1.rst @@ -122,6 +122,9 @@ Benchy The Benchy examples shows how to import a STL model as a `Solid` object with the class `Mesher` and modify it by replacing chimney with a BREP version. +- Benchy STL model: :download:`low_poly_benchy.stl <../examples/low_poly_benchy.stl>` + + .. note *Attribution:* diff --git a/docs/tutorial_joints.rst b/docs/tutorial_joints.rst index f3b90cd..47a4026 100644 --- a/docs/tutorial_joints.rst +++ b/docs/tutorial_joints.rst @@ -185,6 +185,8 @@ Step 6: Import a Screw and bind a Joint to it :class:`~topology.Joint`'s can be bound to simple objects the a :class:`~topology.Compound` imported - in this case a screw. +- screw STEP model: :download:`M6-1x12-countersunk-screw.step ` + .. image:: assets/tutorial_joint_m6_screw.svg :align: center From 23d723783da88ed774eac0162f9004de1612a970 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 11 Mar 2025 14:08:47 -0500 Subject: [PATCH 234/518] Update action.yml --- .github/actions/setup/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 9b459bb..7f7443d 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -8,10 +8,10 @@ runs: using: "composite" steps: - name: Setup Python - uses: actions/setup-python@v5 + uses: astral-sh/setup-uv@v5 with: python-version: ${{ inputs.python-version }} - name: Install Requirements shell: bash run: | - pip install .[development] + uv install .[development] From e5fe5db6b47f7da2eea4253ddf988a9dbba8455b Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 11 Mar 2025 14:09:24 -0500 Subject: [PATCH 235/518] Update action.yml --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 7f7443d..8da37f9 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -14,4 +14,4 @@ runs: - name: Install Requirements shell: bash run: | - uv install .[development] + uv pip install .[development] From 518d773be573c026e7362a97ab2f8bd5e3dedee4 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 12 Mar 2025 10:29:58 -0500 Subject: [PATCH 236/518] action.yml -> test explicit cache disable --- .github/actions/setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 8da37f9..2af009a 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -10,6 +10,7 @@ runs: - name: Setup Python uses: astral-sh/setup-uv@v5 with: + enable-cache: false python-version: ${{ inputs.python-version }} - name: Install Requirements shell: bash From 32a1ea1d39ade8691b692ee15a95c6ded5112d83 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 15 Mar 2025 14:09:58 -0400 Subject: [PATCH 237/518] Removed legacy code --- src/build123d/operations_part.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index b843c1e..b9f398b 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -251,7 +251,7 @@ def loft( # Try to recover an invalid loft if not new_solid.is_valid(): - new_solid = Solid.make_solid(Shell.make_shell(new_solid.faces() + section_list)) + new_solid = Solid(Shell(new_solid.faces() + section_list)) if clean: new_solid = new_solid.clean() if not new_solid.is_valid(): From 400b1d7fe49f2a24823d6339d22dd34355b334fb Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 18 Mar 2025 17:49:37 -0400 Subject: [PATCH 238/518] Add tangent objects. (see https://github.com/jwagenet/bd_mixins for history) --- src/build123d/objects_curve.py | 485 ++++++++++++++++++++++++++++++++- 1 file changed, 484 insertions(+), 1 deletion(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 633cad3..6b83d29 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -31,14 +31,16 @@ from __future__ import annotations import copy as copy_module from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize +import sympy from collections.abc import Iterable from build123d.build_common import WorkplaneList, flatten_sequence, validate_inputs -from build123d.build_enums import AngularDirection, GeomType, Keep, LengthMode, Mode +from build123d.build_enums import AngularDirection, GeomType, Keep, LengthMode, Mode, Side from build123d.build_line import BuildLine from build123d.geometry import Axis, Plane, Vector, VectorLike, TOLERANCE from build123d.topology import Edge, Face, Wire, Curve +from build123d.topology.shape_core import ShapeList def _add_curve_to_context(curve, mode: Mode): @@ -1037,3 +1039,484 @@ class ThreePointArc(BaseEdgeObject): arc = Edge.make_three_point_arc(*points_localized) super().__init__(arc, mode=mode) + + +class PointArcTangentLine(BaseEdgeObject): + """Line Object: Point Arc Tangent Line + + Create a straight, tangent line from a point to a circular arc. + + Args: + point (VectorLike): intersection point for tangent + arc (Curve | Edge | Wire): circular arc to tangent, must be GeomType.CIRCLE + side (Side, optional): side of arcs to place tangent arc center, LEFT or RIGHT. + Defaults to Side.LEFT + mode (Mode, optional): combination mode. Defaults to Mode.ADD + """ + + _applies_to = [BuildLine._tag] + + def __init__( + self, + point: VectorLike, + arc: Curve | Edge | Wire, + side: Side = Side.LEFT, + mode: Mode = Mode.ADD, + ): + + side_sign = { + Side.LEFT: -1, + Side.RIGHT: 1, + } + + context: BuildLine | None = BuildLine._get_context(self) + validate_inputs(context, self) + + if arc.geom_type != GeomType.CIRCLE: + raise ValueError("Arc must have GeomType.CIRCLE") + + tangent_point = WorkplaneList.localize(point) + if context is None: + # Making the plane validates points and arc are coplanar + coplane = Edge.make_line(tangent_point, arc.arc_center).common_plane( + *arc.edges() + ) + if coplane is None: + raise ValueError("PointArcTangentLine only works on a single plane") + + workplane = Plane(coplane.origin, z_dir=arc.normal()) + else: + workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) + + arc_center = arc.arc_center + radius = arc.radius + midline = tangent_point - arc_center + + if midline.length < radius: + raise ValueError("Cannot find tangent for point inside arc.") + + # Find angle phi between midline and x + # and angle theta between midplane length and radius + # add the resulting angles with a sign on theta to pick a direction + # This angle is the tangent location around the circle from x + phi = midline.get_signed_angle(workplane.x_dir) + other_leg = sqrt(midline.length ** 2 - radius ** 2) + theta = WorkplaneList.localize((radius, other_leg)).get_signed_angle(workplane.x_dir) + angle = side_sign[side] * theta + phi + intersect = WorkplaneList.localize(( + radius * cos(radians(angle)), + radius * sin(radians(angle))) + ) + arc_center + + tangent = Edge.make_line(intersect, tangent_point) + super().__init__(tangent, mode) + + +class PointArcTangentArc(BaseEdgeObject): + """Line Object: Point Arc Tangent Arc + + Create an arc defined by a point/tangent pair and another line which the other end + is tangent to. + + Args: + point (VectorLike): starting point of tangent arc + direction (VectorLike): direction at starting point of tangent arc + arc (Union[Curve, Edge, Wire]): ending arc, must be GeomType.CIRCLE + side (Side, optional): select which arc to keep Defaults to Side.LEFT + mode (Mode, optional): combination mode. Defaults to Mode.ADD + + Raises: + ValueError: Arc must have GeomType.CIRCLE + RuntimeError: Point is already tangent to arc + RuntimeError: No tangent arc found + """ + + _applies_to = [BuildLine._tag] + + def __init__( + self, + point: VectorLike, + direction: VectorLike, + arc: Curve | Edge | Wire, + side: Side = Side.LEFT, + mode: Mode = Mode.ADD, + use_sympy: bool = False + ): + context: BuildLine | None = BuildLine._get_context(self) + validate_inputs(context, self) + + if arc.geom_type != GeomType.CIRCLE: + raise ValueError("Arc must have GeomType.CIRCLE") + + arc_point = WorkplaneList.localize(point) + wp_tangent = WorkplaneList.localize(direction).normalized() + + if context is None: + # Making the plane validates point, tangent, and arc are coplanar + coplane = Edge.make_line(arc_point, arc_point + wp_tangent).common_plane( + *arc.edges() + ) + if coplane is None: + raise ValueError("PointArcTangentArc only works on a single plane") + + workplane = Plane(coplane.origin, z_dir=arc.normal()) + else: + workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) + + arc_tangent = Vector(direction).transform( + workplane.reverse_transform, is_direction=True + ).normalized() + + # Determine where arc_point is located relative to arc + # ref forms a bisecting line parallel to arc tangent with same distance from arc + # center as arc point in direction of arc tangent + tangent_perp = arc_tangent.cross(workplane.z_dir) + ref_scale = (arc.arc_center - arc_point).dot(-arc_tangent) + ref = ref_scale * arc_tangent + arc.arc_center + ref_to_point = (arc_point - ref).dot(tangent_perp) + + keep_sign = -1 if side == Side.LEFT else 1 + # Tangent radius to infinity (and beyond) + if keep_sign * ref_to_point == arc.radius: + raise RuntimeError("Point is already tangent to arc, use tangent line") + + if not use_sympy: + # Use magnitude and sign of ref to arc point along with keep to determine + # which "side" angle the arc center will be on + # - the arc center is the same side if the point is further from ref than arc radius + # - minimize type determines near or far side arc to minimize to + side_sign = 1 if ref_to_point < 0 else -1 + if abs(ref_to_point) < arc.radius: + # point/tangent pointing inside arc, both arcs near + arc_type = 1 + angle = keep_sign * -90 + if ref_scale > 1: + angle = -angle + else: + # point/tangent pointing outside arc, one near arc one far + angle = side_sign * -90 + if side == side.LEFT: + arc_type = -side_sign + else: + arc_type = side_sign + + # Protect against massive circles that are effectively straight lines + max_size = 1000 * arc.bounding_box().add(arc_point).diagonal + + # Function to be minimized - note radius is a numpy array + def func(radius, perpendicular_bisector, minimize_type): + center = arc_point + perpendicular_bisector * radius[0] + separation = (arc.arc_center - center).length - arc.radius + + if minimize_type == 1: + # near side arc + target = abs(separation - radius) + elif minimize_type == -1: + # far side arc + target = abs(separation - radius + arc.radius * 2) + return target + + # Find arc center by minimizing func result + rotation_axis = Axis(workplane.origin, workplane.z_dir) + perpendicular_bisector = arc_tangent.rotate(rotation_axis, angle) + result = minimize( + func, + x0=0, + args=(perpendicular_bisector, arc_type), + method="Nelder-Mead", + bounds=[(0.0, max_size)], + tol=TOLERANCE, + ) + tangent_radius = result.x[0] + tangent_center = arc_point + perpendicular_bisector * tangent_radius + + # Check if minimizer hit max size + if tangent_radius == max_size: + raise RuntimeError("Arc radius very large. Can tangent line be used?") + + else: + # Method: + # - Draw line perpendicular to direction with length of arc radius away from arc + # - Draw line from this point (ref_perp) to arc center, find angle with ref_perp + # - Find length of segment along this line from ref_perp to direction intercept + # - This segment is + or - from length ref_prep to arc center to find ref_radius + # - Find intersections arcs with ref_radius from ref_center and arc center + # - The intercept of this line with perpendicular is the tangent arc center + # Side.LEFT is always the arc further ccw per right hand rule + + # ref_radius and ref_center determined by table below + # Position Arc Ref_radius Ref_center + # outside near -seg +perp + # outside far +seg -perp + # inside to near +seg +perp + # inside from near +seg -perp + + pos_sign = 1 if round(ref_to_point, 6) < 0 else -1 + if abs(ref_to_point) <= arc.radius: + arc_type = -1 + if ref_scale > 1: + # point/tangent pointing from inside arc, two near arcs + other_sign = pos_sign * keep_sign + else: + # point/tangent pointing to inside arc, two near arcs + other_sign = -pos_sign * keep_sign + else: + # point/tangent pointing outside arc, one near arc one far + other_sign = 1 + arc_type = keep_sign * pos_sign + + # Find perpendicular and located it to ref_perp and ref_center + perpendicular = -pos_sign * arc_tangent.cross(workplane.z_dir).normalized() * arc.radius + ref_perp = perpendicular + arc_point + ref_center = other_sign * arc_type * perpendicular + arc_point + + # Find ref_radius + angle = perpendicular.get_angle(ref_perp - arc.arc_center) + center_dist = (ref_perp - arc.arc_center).length + segment = arc.radius / cos(radians(angle)) + if arc_type == 1: + ref_radius = center_dist - segment + elif arc_type == -1: + ref_radius = center_dist + segment + + # Use ref arc intersections to find perp intercept as tangent_center + local = [workplane.to_local_coords(p) for p in [ref_center, arc.arc_center, arc_point]] + ref_circles = [sympy.Circle(sympy.Point(local[i].X, local[i].Y), ref_radius) for i in range(2)] + ref_intersections = sympy.intersection(*ref_circles) + + line1 = sympy.Line(sympy.Point(local[2].X, local[2].Y), sympy.Point(local[0].X, local[0].Y)) + line2 = sympy.Line(*ref_intersections) + intercept = line1.intersect(line2) + intercept = sympy.N(intercept.args[0]) + + tangent_center = workplane.from_local_coords((float(intercept.x), float(intercept.y))) + tangent_radius = (tangent_center - arc_point).length + + # dir needs to be flipped for far arc + tangent_normal = (arc.arc_center - tangent_center).normalized() + tangent_dir = arc_type * tangent_normal.cross(workplane.z_dir) + tangent_point = tangent_radius * tangent_normal + tangent_center + + # Sanity Checks + # Confirm tangent point is on arc + if abs(arc.radius - (tangent_point - arc.arc_center).length) > TOLERANCE: + raise RuntimeError("No tangent arc found, no tangent point found") + + # Confirm new tangent point is colinear with point tangent on arc + arc_dir = arc.tangent_at(tangent_point) + if tangent_dir.cross(arc_dir).length > TOLERANCE: + raise RuntimeError("No tangent arc found, found tangent out of tolerance") + + arc = TangentArc(arc_point, tangent_point, tangent=arc_tangent) + super().__init__(arc, mode=mode) + + +class ArcArcTangentLine(BaseEdgeObject): + """Line Object: Arc Arc Tangent Line + + Create a straight line tangent to two arcs. + + Args: + start_arc (Curve | Edge | Wire): starting arc, must be GeomType.CIRCLE + end_arc (Curve | Edge | Wire): ending arc, must be GeomType.CIRCLE + side (Side): side of arcs to place tangent arc center, LEFT or RIGHT. + Defaults to Side.LEFT + keep (Keep): which tangent arc to keep, INSIDE or OUTSIDE. + Defaults to Keep.INSIDE + mode (Mode, optional): combination mode. Defaults to Mode.ADD + """ + + _applies_to = [BuildLine._tag] + + def __init__( + self, + start_arc: Curve | Edge | Wire, + end_arc: Curve | Edge | Wire, + side: Side = Side.LEFT, + keep: Keep = Keep.INSIDE, + mode: Mode = Mode.ADD, + ): + + context: BuildLine | None = BuildLine._get_context(self) + validate_inputs(context, self) + + if start_arc.geom_type != GeomType.CIRCLE: + raise ValueError("Start arc must have GeomType.CIRCLE") + + if end_arc.geom_type != GeomType.CIRCLE: + raise ValueError("End arc must have GeomType.CIRCLE") + + if context is None: + # Making the plane validates start arc and end arc are coplanar + coplane = start_arc.edge().common_plane( + *end_arc.edges() + ) + if coplane is None: + raise ValueError("ArcArcTangentLine only works on a single plane.") + + workplane = Plane(coplane.origin, z_dir=start_arc.normal()) + else: + workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) + + side_sign = 1 if side == Side.LEFT else -1 + arcs = [start_arc, end_arc] + points = [arc.arc_center for arc in arcs] + radii = [arc.radius for arc in arcs] + midline = points[1] - points[0] + + if midline.length == 0: + raise ValueError("Cannot find tangent for concentric arcs.") + + if (keep == Keep.INSIDE or keep == Keep.BOTH): + if midline.length < sum(radii): + raise ValueError("Cannot find INSIDE tangent for overlapping arcs.") + + if midline.length == sum(radii): + raise ValueError("Cannot find INSIDE tangent for tangent arcs.") + + # Method: + # https://en.wikipedia.org/wiki/Tangent_lines_to_circles#Tangent_lines_to_two_circles + # - angle to point on circle of tangent incidence is theta + phi + # - phi is angle between x axis and midline + # - OUTSIDE theta is angle formed by triangle legs (midline.length) and (r0 - r1) + # - INSIDE theta is angle formed by triangle legs (midline.length) and (r0 + r1) + # - INSIDE theta for arc1 is 180 from theta for arc0 + + phi = midline.get_signed_angle(workplane.x_dir) + radius = radii[0] + radii[1] if keep == Keep.INSIDE else radii[0] - radii[1] + other_leg = sqrt(midline.length ** 2 - radius ** 2) + theta = WorkplaneList.localize((radius, other_leg)).get_signed_angle(workplane.x_dir) + angle = side_sign * theta + phi + + intersect = [] + for i in range(len(arcs)): + angle = i * 180 + angle if keep == Keep.INSIDE else angle + intersect.append(WorkplaneList.localize(( + radii[i] * cos(radians(angle)), + radii[i] * sin(radians(angle))) + ) + points[i]) + + tangent = Edge.make_line(intersect[0], intersect[1]) + super().__init__(tangent, mode) + + +class ArcArcTangentArc(BaseEdgeObject): + """Line Object: Arc Arc Tangent Arc + + Create an arc tangent to two arcs and a radius. + + Args: + start_arc (Curve | Edge | Wire): starting arc, must be GeomType.CIRCLE + end_arc (Curve | Edge | Wire): ending arc, must be GeomType.CIRCLE + radius (float): radius of tangent arc + side (Side): side of arcs to place tangent arc center, LEFT or RIGHT. + Defaults to Side.LEFT + keep (Keep): which tangent arc to keep, INSIDE or OUTSIDE. + Defaults to Keep.INSIDE + mode (Mode, optional): combination mode. Defaults to Mode.ADD + """ + + _applies_to = [BuildLine._tag] + + def __init__( + self, + start_arc: Curve | Edge | Wire, + end_arc: Curve | Edge | Wire, + radius: float, + side: Side = Side.LEFT, + keep: Keep = Keep.INSIDE, + mode: Mode = Mode.ADD, + use_sympy: bool = False + ): + + context: BuildLine | None = BuildLine._get_context(self) + validate_inputs(context, self) + + if start_arc.geom_type != GeomType.CIRCLE: + raise ValueError("Start arc must have GeomType.CIRCLE") + + if end_arc.geom_type != GeomType.CIRCLE: + raise ValueError("End arc must have GeomType.CIRCLE") + + if context is None: + # Making the plane validates start arc and end arc are coplanar + coplane = start_arc.edge().common_plane(end_arc.edge()) + if coplane is None: + raise ValueError("ArcArcTangentArc only works on a single plane") + + workplane = Plane(coplane.origin, z_dir=start_arc.normal()) + else: + workplane = copy_module.copy( + WorkplaneList._get_context().workplanes[0] + ) + + side_sign = 1 if side == Side.LEFT else -1 + keep_sign = 1 if keep == Keep.INSIDE else -1 + arcs = [start_arc, end_arc] + points = [arc.arc_center for arc in arcs] + radii = [arc.radius for arc in arcs] + + # make a normal vector for sorting intersections + midline = points[1] - points[0] + normal = side_sign * midline.cross(workplane.z_dir) + + # The range midline.length / 2 < tangent radius < math.inf should be valid + # Sometimes fails if min_radius == radius, so using >= + min_radius = (midline.length - keep_sign * (radii[0] + radii[1])) / 2 + if min_radius >= radius: + raise ValueError(f"The arc radius is too small. Should be greater than {min_radius}.") + + if not use_sympy: + net_radius = radius + keep_sign * (radii[0] + radii[1]) / 2 + + # Technically the range midline.length / 2 < radius < math.inf should be valid + if net_radius <= midline.length / 2: + raise ValueError(f"The arc radius is too small. Should be greater than {(midline.length - keep_sign * (radii[0] + radii[1])) / 2} (and probably larger).") + + # Current intersection method doesn't work out to expected range and may return 0 + # Workaround to catch error midline.length / net_radius needs to be less than 1.888 or greater than .666 from testing + max_ratio = 1.888 + min_ratio = .666 + if midline.length / net_radius > max_ratio: + raise ValueError(f"The arc radius is too small. Should be greater than {midline.length / max_ratio - keep_sign * (radii[0] + radii[1]) / 2}.") + + if midline.length / net_radius < min_ratio: + raise ValueError(f"The arc radius is too large. Should be less than {midline.length / min_ratio - keep_sign * (radii[0] + radii[1]) / 2}.") + + # Method: + # https://www.youtube.com/watch?v=-STj2SSv6TU + # - the centerpoint of the inner arc is found by the intersection of the + # arcs made by adding the inner radius to the point radii + # - the centerpoint of the outer arc is found by the intersection of the + # arcs made by subtracting the outer radius from the point radii + # - then it's a matter of finding the points where the connecting lines + # intersect the point circles + + if not use_sympy: + ref_arcs = [CenterArc(points[i], keep_sign * radii[i] + radius, start_angle=0, arc_size=360) for i in range(len(arcs))] + ref_intersections = ref_arcs[0].edge().intersect(ref_arcs[1].edge()) + + try: + arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] + except AttributeError as exception: + raise RuntimeError("Arc radius thought to be okay, but is too big or small to find intersection.") + + else: + local = [workplane.to_local_coords(p) for p in points] + ref_circles = [sympy.Circle(sympy.Point2D(local[i].X, local[i].Y), keep_sign * radii[i] + radius) for i in range(len(arcs))] + ref_intersections = ShapeList([workplane.from_local_coords(Vector(float(sympy.N(p.x)), float(sympy.N(p.y)))) for p in sympy.intersection(*ref_circles)]) + arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] + + intersect = [points[i] + keep_sign * radii[i] * (Vector(arc_center) - points[i]).normalized() for i in range(len(arcs))] + + if side == Side.LEFT: + intersect.reverse() + + arc = RadiusArc(*intersect, radius=radius) + super().__init__(arc, mode) From 4a21536f0135c90afb483baca3c72bde172d52bb Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 18 Mar 2025 17:57:08 -0400 Subject: [PATCH 239/518] Commit to sympy for ArcArcTangentArc, minimizer for PointArcTangentArc based on performance --- src/build123d/objects_curve.py | 193 +++++++++------------------------ 1 file changed, 52 insertions(+), 141 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 6b83d29..fcf6fd6 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1062,7 +1062,7 @@ class PointArcTangentLine(BaseEdgeObject): arc: Curve | Edge | Wire, side: Side = Side.LEFT, mode: Mode = Mode.ADD, - ): + ): side_sign = { Side.LEFT: -1, @@ -1142,7 +1142,6 @@ class PointArcTangentArc(BaseEdgeObject): arc: Curve | Edge | Wire, side: Side = Side.LEFT, mode: Mode = Mode.ADD, - use_sympy: bool = False ): context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) @@ -1184,117 +1183,58 @@ class PointArcTangentArc(BaseEdgeObject): if keep_sign * ref_to_point == arc.radius: raise RuntimeError("Point is already tangent to arc, use tangent line") - if not use_sympy: - # Use magnitude and sign of ref to arc point along with keep to determine - # which "side" angle the arc center will be on - # - the arc center is the same side if the point is further from ref than arc radius - # - minimize type determines near or far side arc to minimize to - side_sign = 1 if ref_to_point < 0 else -1 - if abs(ref_to_point) < arc.radius: - # point/tangent pointing inside arc, both arcs near - arc_type = 1 - angle = keep_sign * -90 - if ref_scale > 1: - angle = -angle - else: - # point/tangent pointing outside arc, one near arc one far - angle = side_sign * -90 - if side == side.LEFT: - arc_type = -side_sign - else: - arc_type = side_sign - - # Protect against massive circles that are effectively straight lines - max_size = 1000 * arc.bounding_box().add(arc_point).diagonal - - # Function to be minimized - note radius is a numpy array - def func(radius, perpendicular_bisector, minimize_type): - center = arc_point + perpendicular_bisector * radius[0] - separation = (arc.arc_center - center).length - arc.radius - - if minimize_type == 1: - # near side arc - target = abs(separation - radius) - elif minimize_type == -1: - # far side arc - target = abs(separation - radius + arc.radius * 2) - return target - - # Find arc center by minimizing func result - rotation_axis = Axis(workplane.origin, workplane.z_dir) - perpendicular_bisector = arc_tangent.rotate(rotation_axis, angle) - result = minimize( - func, - x0=0, - args=(perpendicular_bisector, arc_type), - method="Nelder-Mead", - bounds=[(0.0, max_size)], - tol=TOLERANCE, - ) - tangent_radius = result.x[0] - tangent_center = arc_point + perpendicular_bisector * tangent_radius - - # Check if minimizer hit max size - if tangent_radius == max_size: - raise RuntimeError("Arc radius very large. Can tangent line be used?") - + # Use magnitude and sign of ref to arc point along with keep to determine + # which "side" angle the arc center will be on + # - the arc center is the same side if the point is further from ref than arc radius + # - minimize type determines near or far side arc to minimize to + side_sign = 1 if ref_to_point < 0 else -1 + if abs(ref_to_point) < arc.radius: + # point/tangent pointing inside arc, both arcs near + arc_type = 1 + angle = keep_sign * -90 + if ref_scale > 1: + angle = -angle else: - # Method: - # - Draw line perpendicular to direction with length of arc radius away from arc - # - Draw line from this point (ref_perp) to arc center, find angle with ref_perp - # - Find length of segment along this line from ref_perp to direction intercept - # - This segment is + or - from length ref_prep to arc center to find ref_radius - # - Find intersections arcs with ref_radius from ref_center and arc center - # - The intercept of this line with perpendicular is the tangent arc center - # Side.LEFT is always the arc further ccw per right hand rule - - # ref_radius and ref_center determined by table below - # Position Arc Ref_radius Ref_center - # outside near -seg +perp - # outside far +seg -perp - # inside to near +seg +perp - # inside from near +seg -perp - - pos_sign = 1 if round(ref_to_point, 6) < 0 else -1 - if abs(ref_to_point) <= arc.radius: - arc_type = -1 - if ref_scale > 1: - # point/tangent pointing from inside arc, two near arcs - other_sign = pos_sign * keep_sign - else: - # point/tangent pointing to inside arc, two near arcs - other_sign = -pos_sign * keep_sign + # point/tangent pointing outside arc, one near arc one far + angle = side_sign * -90 + if side == side.LEFT: + arc_type = -side_sign else: - # point/tangent pointing outside arc, one near arc one far - other_sign = 1 - arc_type = keep_sign * pos_sign + arc_type = side_sign - # Find perpendicular and located it to ref_perp and ref_center - perpendicular = -pos_sign * arc_tangent.cross(workplane.z_dir).normalized() * arc.radius - ref_perp = perpendicular + arc_point - ref_center = other_sign * arc_type * perpendicular + arc_point + # Protect against massive circles that are effectively straight lines + max_size = 1000 * arc.bounding_box().add(arc_point).diagonal - # Find ref_radius - angle = perpendicular.get_angle(ref_perp - arc.arc_center) - center_dist = (ref_perp - arc.arc_center).length - segment = arc.radius / cos(radians(angle)) - if arc_type == 1: - ref_radius = center_dist - segment - elif arc_type == -1: - ref_radius = center_dist + segment + # Function to be minimized - note radius is a numpy array + def func(radius, perpendicular_bisector, minimize_type): + center = arc_point + perpendicular_bisector * radius[0] + separation = (arc.arc_center - center).length - arc.radius - # Use ref arc intersections to find perp intercept as tangent_center - local = [workplane.to_local_coords(p) for p in [ref_center, arc.arc_center, arc_point]] - ref_circles = [sympy.Circle(sympy.Point(local[i].X, local[i].Y), ref_radius) for i in range(2)] - ref_intersections = sympy.intersection(*ref_circles) + if minimize_type == 1: + # near side arc + target = abs(separation - radius) + elif minimize_type == -1: + # far side arc + target = abs(separation - radius + arc.radius * 2) + return target - line1 = sympy.Line(sympy.Point(local[2].X, local[2].Y), sympy.Point(local[0].X, local[0].Y)) - line2 = sympy.Line(*ref_intersections) - intercept = line1.intersect(line2) - intercept = sympy.N(intercept.args[0]) + # Find arc center by minimizing func result + rotation_axis = Axis(workplane.origin, workplane.z_dir) + perpendicular_bisector = arc_tangent.rotate(rotation_axis, angle) + result = minimize( + func, + x0=0, + args=(perpendicular_bisector, arc_type), + method="Nelder-Mead", + bounds=[(0.0, max_size)], + tol=TOLERANCE, + ) + tangent_radius = result.x[0] + tangent_center = arc_point + perpendicular_bisector * tangent_radius - tangent_center = workplane.from_local_coords((float(intercept.x), float(intercept.y))) - tangent_radius = (tangent_center - arc_point).length + # Check if minimizer hit max size + if tangent_radius == max_size: + raise RuntimeError("Arc radius very large. Can tangent line be used?") # dir needs to be flipped for far arc tangent_normal = (arc.arc_center - tangent_center).normalized() @@ -1339,7 +1279,7 @@ class ArcArcTangentLine(BaseEdgeObject): side: Side = Side.LEFT, keep: Keep = Keep.INSIDE, mode: Mode = Mode.ADD, - ): + ): context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) @@ -1432,8 +1372,7 @@ class ArcArcTangentArc(BaseEdgeObject): side: Side = Side.LEFT, keep: Keep = Keep.INSIDE, mode: Mode = Mode.ADD, - use_sympy: bool = False - ): + ): context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) @@ -1472,23 +1411,6 @@ class ArcArcTangentArc(BaseEdgeObject): if min_radius >= radius: raise ValueError(f"The arc radius is too small. Should be greater than {min_radius}.") - if not use_sympy: - net_radius = radius + keep_sign * (radii[0] + radii[1]) / 2 - - # Technically the range midline.length / 2 < radius < math.inf should be valid - if net_radius <= midline.length / 2: - raise ValueError(f"The arc radius is too small. Should be greater than {(midline.length - keep_sign * (radii[0] + radii[1])) / 2} (and probably larger).") - - # Current intersection method doesn't work out to expected range and may return 0 - # Workaround to catch error midline.length / net_radius needs to be less than 1.888 or greater than .666 from testing - max_ratio = 1.888 - min_ratio = .666 - if midline.length / net_radius > max_ratio: - raise ValueError(f"The arc radius is too small. Should be greater than {midline.length / max_ratio - keep_sign * (radii[0] + radii[1]) / 2}.") - - if midline.length / net_radius < min_ratio: - raise ValueError(f"The arc radius is too large. Should be less than {midline.length / min_ratio - keep_sign * (radii[0] + radii[1]) / 2}.") - # Method: # https://www.youtube.com/watch?v=-STj2SSv6TU # - the centerpoint of the inner arc is found by the intersection of the @@ -1497,21 +1419,10 @@ class ArcArcTangentArc(BaseEdgeObject): # arcs made by subtracting the outer radius from the point radii # - then it's a matter of finding the points where the connecting lines # intersect the point circles - - if not use_sympy: - ref_arcs = [CenterArc(points[i], keep_sign * radii[i] + radius, start_angle=0, arc_size=360) for i in range(len(arcs))] - ref_intersections = ref_arcs[0].edge().intersect(ref_arcs[1].edge()) - - try: - arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] - except AttributeError as exception: - raise RuntimeError("Arc radius thought to be okay, but is too big or small to find intersection.") - - else: - local = [workplane.to_local_coords(p) for p in points] - ref_circles = [sympy.Circle(sympy.Point2D(local[i].X, local[i].Y), keep_sign * radii[i] + radius) for i in range(len(arcs))] - ref_intersections = ShapeList([workplane.from_local_coords(Vector(float(sympy.N(p.x)), float(sympy.N(p.y)))) for p in sympy.intersection(*ref_circles)]) - arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] + local = [workplane.to_local_coords(p) for p in points] + ref_circles = [sympy.Circle(sympy.Point2D(local[i].X, local[i].Y), keep_sign * radii[i] + radius) for i in range(len(arcs))] + ref_intersections = ShapeList([workplane.from_local_coords(Vector(float(sympy.N(p.x)), float(sympy.N(p.y)))) for p in sympy.intersection(*ref_circles)]) + arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] intersect = [points[i] + keep_sign * radii[i] * (Vector(arc_center) - points[i]).normalized() for i in range(len(arcs))] From 8c171837ee97f90351d9f21a516f310ad2c0bba1 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 21 Mar 2025 11:04:13 -0400 Subject: [PATCH 240/518] Fixed Issue #944 --- src/build123d/operations_part.py | 3 ++- tests/test_build_part.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index b9f398b..a8209bc 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -516,7 +516,8 @@ def section( else: raise ValueError("No object to section") - max_size = to_section.bounding_box(optimal=False).diagonal + bbox = to_section.bounding_box(optimal=False) + max_size = max(abs(v) for v in list(bbox.min) + list(bbox.max)) + bbox.diagonal if section_by is not None: section_planes = ( diff --git a/tests/test_build_part.py b/tests/test_build_part.py index 0ebc40d..ec4fe0d 100644 --- a/tests/test_build_part.py +++ b/tests/test_build_part.py @@ -442,6 +442,12 @@ class TestSection(unittest.TestCase): s = section(section_by=Plane.XZ) self.assertAlmostEqual(s.area, 100 * pi, 5) + def test_moved_object(self): + sec = section(Pos(-100, 100) * Sphere(10), Plane.XY) + self.assertEqual(len(sec.faces()), 1) + self.assertAlmostEqual(sec.face().edge().radius, 10, 5) + self.assertAlmostEqual(sec.face().center(), (-100, 100, 0), 5) + class TestSplit(unittest.TestCase): def test_split(self): From 0624bff82e820f53cc9453fb525c1326ca8c3171 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 21 Mar 2025 15:29:27 -0400 Subject: [PATCH 241/518] Replacing location_at(planar) with (x_dir) --- src/build123d/topology/one_d.py | 59 +++++++++++++++++++++++--- tests/test_direct_api/test_mixin1_d.py | 53 ++++++++++++++++++++++- 2 files changed, 104 insertions(+), 8 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 08c1cd4..aae9cb9 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -120,7 +120,11 @@ from OCP.HLRAlgo import HLRAlgo_Projector from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds from OCP.ShapeFix import ShapeFix_Shape, ShapeFix_Wireframe -from OCP.Standard import Standard_Failure, Standard_NoSuchObject +from OCP.Standard import ( + Standard_Failure, + Standard_NoSuchObject, + Standard_ConstructionError, +) from OCP.TColStd import ( TColStd_Array1OfReal, TColStd_HArray1OfBoolean, @@ -511,7 +515,8 @@ class Mixin1D(Shape): distance: float, position_mode: PositionMode = PositionMode.PARAMETER, frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, + planar: bool | None = None, + x_dir: VectorLike | None = None, ) -> Location: """Locations along curve @@ -522,8 +527,18 @@ class Mixin1D(Shape): position_mode (PositionMode, optional): position calculation mode. Defaults to PositionMode.PARAMETER. frame_method (FrameMethod, optional): moving frame calculation method. + The FRENET frame can “twist” or flip unexpectedly, especially near flat + spots. The CORRECTED frame behaves more like a “camera dolly” or + sweep profile would — it's smoother and more stable. Defaults to FrameMethod.FRENET. - planar (bool, optional): planar mode. Defaults to False. + planar (bool, optional): planar mode. Defaults to None. + x_dir (VectorLike, optional): override the x_dir to help with plane + creation along a 1D shape. Must be perpendicalar to shapes tangent. + Defaults to None. + + .. deprecated:: + The `planar` parameter is deprecated and will be removed in a future release. + Use `x_dir` to specify orientation instead. Returns: Location: A Location object representing local coordinate system @@ -550,23 +565,45 @@ class Mixin1D(Shape): pnt = curve.Value(param) transformation = gp_Trsf() - if planar: + if planar is not None: + warnings.warn( + "The 'planar' parameter is deprecated and will be removed in a future version. " + "Use 'x_dir' to control orientation instead.", + DeprecationWarning, + stacklevel=2, + ) + if planar is not None and planar: transformation.SetTransformation( gp_Ax3(pnt, gp_Dir(0, 0, 1), gp_Dir(normal.XYZ())), gp_Ax3() ) + elif x_dir is not None: + try: + + transformation.SetTransformation( + gp_Ax3(pnt, gp_Dir(tangent.XYZ()), Vector(x_dir).to_dir()), gp_Ax3() + ) + except Standard_ConstructionError: + raise ValueError( + f"Unable to create location with given x_dir {x_dir}. " + f"x_dir must be perpendicular to shape's tangent " + f"{tuple(Vector(tangent))}." + ) + else: transformation.SetTransformation( gp_Ax3(pnt, gp_Dir(tangent.XYZ()), gp_Dir(normal.XYZ())), gp_Ax3() ) + loc = Location(TopLoc_Location(transformation)) - return Location(TopLoc_Location(transformation)) + return loc def locations( self, distances: Iterable[float], position_mode: PositionMode = PositionMode.PARAMETER, frame_method: FrameMethod = FrameMethod.FRENET, - planar: bool = False, + planar: bool | None = None, + x_dir: VectorLike | None = None, ) -> list[Location]: """Locations along curve @@ -579,13 +616,21 @@ class Mixin1D(Shape): frame_method (FrameMethod, optional): moving frame calculation method. Defaults to FrameMethod.FRENET. planar (bool, optional): planar mode. Defaults to False. + x_dir (VectorLike, optional): override the x_dir to help with plane + creation along a 1D shape. Must be perpendicalar to shapes tangent. + Defaults to None. + + .. deprecated:: + The `planar` parameter is deprecated and will be removed in a future release. + Use `x_dir` to specify orientation instead. Returns: list[Location]: A list of Location objects representing local coordinate systems at the specified distances. """ return [ - self.location_at(d, position_mode, frame_method, planar) for d in distances + self.location_at(d, position_mode, frame_method, planar, x_dir) + for d in distances ] def normal(self) -> Vector: diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index ebd1744..106c805 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -29,8 +29,16 @@ license: import math import unittest -from build123d.build_enums import CenterOf, GeomType, PositionMode, Side, SortBy +from build123d.build_enums import ( + CenterOf, + FrameMethod, + GeomType, + PositionMode, + Side, + SortBy, +) from build123d.geometry import Axis, Location, Plane, Vector +from build123d.objects_curve import Polyline from build123d.objects_part import Box, Cylinder from build123d.topology import Compound, Edge, Face, Wire @@ -201,6 +209,18 @@ class TestMixin1D(unittest.TestCase): self.assertAlmostEqual(loc.position, (0, 1, 0), 5) self.assertAlmostEqual(loc.orientation, (0, -90, -90), 5) + def test_location_at_x_dir(self): + path = Polyline((-50, -40), (50, -40), (50, 40), (-50, 40), close=True) + l1 = path.location_at(0) + l2 = path.location_at(0, x_dir=(0, 1, 0)) + self.assertAlmostEqual(l1.position, l2.position, 5) + self.assertAlmostEqual(l1.z_axis, l2.z_axis, 5) + self.assertNotEqual(l1.x_axis, l2.x_axis, 5) + self.assertAlmostEqual(l2.x_axis, Axis(path @ 0, (0, 1, 0)), 5) + + with self.assertRaises(ValueError): + path.location_at(0, x_dir=(1, 0, 0)) + def test_locations(self): locs = Edge.make_circle(1).locations([i / 4 for i in range(4)]) self.assertAlmostEqual(locs[0].position, (1, 0, 0), 5) @@ -212,6 +232,37 @@ class TestMixin1D(unittest.TestCase): self.assertAlmostEqual(locs[3].position, (0, -1, 0), 5) self.assertAlmostEqual(locs[3].orientation, (0, 90, 90), 5) + def test_location_at_corrected_frenet(self): + # A polyline with sharp corners — problematic for classic Frenet + path = Polyline((0, 0), (10, 0), (10, 10), (0, 10)) + + # Request multiple locations along the curve + locations = [ + path.location_at(t, frame_method=FrameMethod.CORRECTED) + for t in [0.0, 0.25, 0.5, 0.75, 1.0] + ] + # Ensure all locations were created and have consistent orientation + self.assertTrue( + all( + locations[0].x_axis.direction == l.x_axis.direction + for l in locations[1:] + ) + ) + + # Check that Z-axis is approximately orthogonal to X-axis + for loc in locations: + self.assertLess(abs(loc.z_axis.direction.dot(loc.x_axis.direction)), 1e-6) + + # Check continuity of rotation (not flipping wildly) + # Check angle between x_axes doesn't flip more than ~90 degrees + angles = [] + for i in range(len(locations) - 1): + a1 = locations[i].x_axis.direction + a2 = locations[i + 1].x_axis.direction + angle = a1.get_angle(a2) + angles.append(angle) + self.assertTrue(all(abs(angle) < 90 for angle in angles)) + def test_project(self): target = Face.make_rect(10, 10, Plane.XY.rotated((0, 45, 0))) circle = Edge.make_circle(1).locate(Location((0, 0, 10))) From c4080e1231c3e8e8a6956c08724dd5d74adcc570 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 21 Mar 2025 15:46:25 -0400 Subject: [PATCH 242/518] Fixed DoubleTangentArc to create Edge --- src/build123d/objects_curve.py | 11 +++++++---- tests/test_build_line.py | 22 ++++++++++++++-------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 633cad3..3a34085 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -207,6 +207,9 @@ class DoubleTangentArc(BaseEdgeObject): context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) + if keep not in [Keep.TOP, Keep.BOTTOM]: + raise ValueError(f"Only the TOP or BOTTOM options are supported not {keep}") + arc_pt = WorkplaneList.localize(pnt) arc_tangent = WorkplaneList.localize(tangent).normalized() if WorkplaneList._get_context() is not None: @@ -269,7 +272,7 @@ class DoubleTangentArc(BaseEdgeObject): _, p1, _ = other.distance_to_with_closest_points(center) TangentArc(arc_pt, p1, tangent=arc_tangent) - super().__init__(double.wire(), mode=mode) + super().__init__(double.edge(), mode=mode) class EllipticalStartArc(BaseEdgeObject): @@ -719,7 +722,7 @@ class PolarLine(BaseEdgeObject): start (VectorLike): start point length (float): line length angle (float, optional): angle from the local x-axis - direction (VectorLike, optional): vector direction to determine angle + direction (VectorLike, optional): vector direction to determine angle length_mode (LengthMode, optional): how length defines the line. Defaults to LengthMode.DIAGONAL mode (Mode, optional): combination mode. Defaults to Mode.ADD @@ -863,7 +866,7 @@ class RadiusArc(BaseEdgeObject): else: arc = SagittaArc(start, end, -sagitta, mode=Mode.PRIVATE) - super().__init__(arc, mode=mode) + super().__init__(arc.edge(), mode=mode) class SagittaArc(BaseEdgeObject): @@ -907,7 +910,7 @@ class SagittaArc(BaseEdgeObject): sag_point = mid_point + sagitta_vector arc = ThreePointArc(start, sag_point, end, mode=Mode.PRIVATE) - super().__init__(arc, mode=mode) + super().__init__(arc.edge(), mode=mode) class Spline(BaseEdgeObject): diff --git a/tests/test_build_line.py b/tests/test_build_line.py index d37e101..94f7766 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -134,14 +134,16 @@ class BuildLineTests(unittest.TestCase): tuple(l5.tangent_at(p1)), tuple(l6.tangent_at(p2) * -1), 5 ) - l7 = Spline((15, 5), (5, 0), (15, -5), tangents=[(-1, 0), (1, 0)]) - l8 = DoubleTangentArc((0, 0, 0), (1, 0, 0), l7, keep=Keep.BOTH) - self.assertEqual(len(l8.edges()), 2) + # l7 = Spline((15, 5), (5, 0), (15, -5), tangents=[(-1, 0), (1, 0)]) + # l8 = DoubleTangentArc((0, 0, 0), (1, 0, 0), l7, keep=Keep.BOTH) + # self.assertEqual(len(l8.edges()), 2) l9 = EllipticalCenterArc((15, 0), 10, 5, start_angle=90, end_angle=270) - l10 = DoubleTangentArc((0, 0, 0), (1, 0, 0), l9, keep=Keep.BOTH) - self.assertEqual(len(l10.edges()), 2) - self.assertTrue(isinstance(l10, Edge)) + # l10 = DoubleTangentArc((0, 0, 0), (1, 0, 0), l9, keep=Keep.BOTH) + # self.assertEqual(len(l10.edges()), 2) + # self.assertTrue(isinstance(l10, Edge)) + with self.assertRaises(ValueError): + l10 = DoubleTangentArc((0, 0, 0), (1, 0, 0), l9, keep=Keep.BOTH) with self.assertRaises(ValueError): DoubleTangentArc((0, 0, 0), (0, 0, 1), l9) @@ -269,13 +271,17 @@ class BuildLineTests(unittest.TestCase): with BuildLine(): a4 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.HORIZONTAL) - d4 = PolarLine((0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.HORIZONTAL) + d4 = PolarLine( + (0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.HORIZONTAL + ) self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (1, 1 / sqrt(3), 0), 5) self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (d4 @ 1).to_tuple(), 5) with BuildLine(Plane.XZ): a5 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.VERTICAL) - d5 = PolarLine((0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.VERTICAL) + d5 = PolarLine( + (0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.VERTICAL + ) self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (sqrt(3), 0, 1), 5) self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (d5 @ 1).to_tuple(), 5) From 7ed50f9429e8a65dc94047588fbe6f4467cf5b86 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 21 Mar 2025 15:55:42 -0400 Subject: [PATCH 243/518] Fixing edge() typing check --- src/build123d/objects_curve.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 3a34085..e1e01fc 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -272,7 +272,9 @@ class DoubleTangentArc(BaseEdgeObject): _, p1, _ = other.distance_to_with_closest_points(center) TangentArc(arc_pt, p1, tangent=arc_tangent) - super().__init__(double.edge(), mode=mode) + double_edge = double.edge() + assert isinstance(double_edge, Edge) + super().__init__(double_edge, mode=mode) class EllipticalStartArc(BaseEdgeObject): @@ -866,7 +868,9 @@ class RadiusArc(BaseEdgeObject): else: arc = SagittaArc(start, end, -sagitta, mode=Mode.PRIVATE) - super().__init__(arc.edge(), mode=mode) + arc_edge = arc.edge() + assert isinstance(arc_edge, Edge) + super().__init__(arc_edge, mode=mode) class SagittaArc(BaseEdgeObject): @@ -910,7 +914,9 @@ class SagittaArc(BaseEdgeObject): sag_point = mid_point + sagitta_vector arc = ThreePointArc(start, sag_point, end, mode=Mode.PRIVATE) - super().__init__(arc.edge(), mode=mode) + arc_edge = arc.edge() + assert isinstance(arc_edge, Edge) + super().__init__(arc_edge, mode=mode) class Spline(BaseEdgeObject): From cda424175a137f1f68f389021903d406f7cbb1f0 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 21 Mar 2025 16:43:10 -0400 Subject: [PATCH 244/518] Add Tangent Objects to __init__, minor updates Objects --- src/build123d/__init__.py | 4 ++++ src/build123d/objects_curve.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index 197fb43..e044aa5 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -93,6 +93,10 @@ __all__ = [ "TangentArc", "JernArc", "ThreePointArc", + "PointArcTangentLine", + "ArcArcTangentLine", + "PointArcTangentArc", + "ArcArcTangentArc", # 2D Sketch Objects "ArrowHead", "Arrow", diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index fcf6fd6..a7d116e 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1075,7 +1075,7 @@ class PointArcTangentLine(BaseEdgeObject): if arc.geom_type != GeomType.CIRCLE: raise ValueError("Arc must have GeomType.CIRCLE") - tangent_point = WorkplaneList.localize(point) + tangent_point = WorkplaneList.localize(point) if context is None: # Making the plane validates points and arc are coplanar coplane = Edge.make_line(tangent_point, arc.arc_center).common_plane( @@ -1110,7 +1110,7 @@ class PointArcTangentLine(BaseEdgeObject): radius * sin(radians(angle))) ) + arc_center - tangent = Edge.make_line(intersect, tangent_point) + tangent = Edge.make_line(tangent_point, intersect) super().__init__(tangent, mode) @@ -1129,7 +1129,7 @@ class PointArcTangentArc(BaseEdgeObject): Raises: ValueError: Arc must have GeomType.CIRCLE - RuntimeError: Point is already tangent to arc + ValueError: Point is already tangent to arc RuntimeError: No tangent arc found """ @@ -1181,7 +1181,7 @@ class PointArcTangentArc(BaseEdgeObject): keep_sign = -1 if side == Side.LEFT else 1 # Tangent radius to infinity (and beyond) if keep_sign * ref_to_point == arc.radius: - raise RuntimeError("Point is already tangent to arc, use tangent line") + raise ValueError("Point is already tangent to arc, use tangent line") # Use magnitude and sign of ref to arc point along with keep to determine # which "side" angle the arc center will be on From 7e33864e8ea28b128ca3097e1a9b2ef2fae7282a Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sat, 22 Mar 2025 10:59:17 -0400 Subject: [PATCH 245/518] Add tangent object tests. These are pretty extensive, but not exhaustive. Testing once in algebraic mode with a tangency/coincident checks, testing on at a few different start points, comparing lengths to first test and L/R INSIDE/OUTSIDE output, finally do error checks locally. --- tests/test_build_line.py | 367 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 367 insertions(+) diff --git a/tests/test_build_line.py b/tests/test_build_line.py index d37e101..d8ed37d 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -367,6 +367,373 @@ class BuildLineTests(unittest.TestCase): self.assertEqual(len(test.edges()), 4) self.assertAlmostEqual(test.wires()[0].length, 4) + def test_point_arc_tangent_line(self): + """Test tangent line between point and arc + + Considerations: + - Should produce a GeomType.LINE located on and tangent to arc + - Should start on point + - Lines should always have equal length as long as point is same distance + - LEFT lines should always end on end arc left of midline (angle > 0) + - Arc should be GeomType.CIRCLE + - Point and arc must be coplanar + - Cannot make tangent from point inside arc + """ + # Test line properties in algebra mode + point = (0, 0) + separation = 10 + end_point = (0, separation) + end_r = 5 + end_arc = CenterArc(end_point, end_r, 0, 360) + + lines = [] + for side in [Side.LEFT, Side.RIGHT]: + l1 = PointArcTangentLine(point, end_arc, side=side) + self.assertEqual(l1.geom_type, GeomType.LINE) + + self.assertTupleAlmostEquals(tuple(point), tuple(l1 @ 0), 5) + + _, p1, p2 = end_arc.distance_to_with_closest_points(l1 @ 1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + end_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + lines.append(l1) + + self.assertAlmostEqual(lines[0].length, lines[1].length, 5) + + # Test in off-axis builder mode at multiple angles and compare to prev result + workplane = Plane.XY.rotated((45, 45, 45)) + with BuildLine(workplane): + end_center = workplane.from_local_coords(end_point) + point_arc = CenterArc(end_center, separation, 0, 360) + end_arc = CenterArc(end_center, end_r, 0, 360) + + points = [1, 2, 3, 5, 7, 11, 13] + for point in points: + start_point = point_arc @ (point/16) + mid_vector = end_center - start_point + mid_perp = mid_vector.cross(workplane.z_dir) + for side in [Side.LEFT, Side.RIGHT]: + l2 = PointArcTangentLine(start_point, end_arc, side=side) + self.assertAlmostEqual(lines[0].length, l2.length, 5) + + # Check side + coincident_dir = mid_perp.dot(l2 @ 1 - end_center) + if side == Side.LEFT: + self.assertLess(coincident_dir, 0) + + elif side == Side.RIGHT: + self.assertGreater(coincident_dir, 0) + + # Error Handling + bad_type = Line((0, 0), (0, 10)) + with self.assertRaises(ValueError): + PointArcTangentLine(start_point, bad_type) + + with self.assertRaises(ValueError): + PointArcTangentLine(start_point, CenterArc((0, 1, 1), end_r, 0, 360)) + + with self.assertRaises(ValueError): + PointArcTangentLine(start_point, CenterArc((0, 1), end_r, 0, 360)) + + def test_point_arc_tangent_arc(self): + """Test tangent arc between point and arc + + Considerations: + - Should produce a GeomType.CIRCLE located on and tangent to arc + - Should start on point tangent to direction + - LEFT lines should always end on end arc left of midline (angle > 0) + - Tangent should be GeomType.CIRCLE + - Point and arc must be coplanar + - Cannot make tangent arc from point/direction already tangent with arc + - (Due to minimizer limit) Cannot make tangent with very large radius + """ + # Test line properties in algebra mode + start_point = (0, 0) + direction = (0, 1) + separation = 10 + end_point = (0, separation) + end_r = 5 + end_arc = CenterArc(end_point, end_r, 0, 360) + lines = [] + for side in [Side.LEFT, Side.RIGHT]: + l1 = PointArcTangentArc(start_point, direction, end_arc, side=side) + self.assertEqual(l1.geom_type, GeomType.CIRCLE) + + self.assertTupleAlmostEquals(tuple(start_point), tuple(l1 @ 0), 5) + self.assertAlmostEqual(Vector(direction).cross(l1 % 0).length, 0, 5) + + _, p1, p2 = end_arc.distance_to_with_closest_points(l1 @ 1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + end_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + lines.append(l1) + + # Test in off-axis builder mode at multiple angles and compare to prev result + workplane = Plane.XY.rotated((45, 45, 45)) + with BuildLine(workplane): + end_center = workplane.from_local_coords(end_point) + end_arc = CenterArc(end_center, end_r, 0, 360) + + # Assortment of points in different regimes + flip = separation * 2 + value = (flip - end_r) + points = [start_point, (end_r - .1, 0), (-end_r - .1, 0), + (end_r + .1, flip), (-end_r + .1, flip), + (0, flip), (flip, flip), + (-flip, -flip), + (value, -value), (-value, value)] + for point in points: + mid_vector = end_center - point + mid_perp = mid_vector.cross(workplane.z_dir) + centers = {} + for side in [Side.LEFT, Side.RIGHT]: + l2 = PointArcTangentArc(point, direction, end_arc, side=side) + + centers[side] = l2.center() + if point == start_point: + self.assertAlmostEqual(lines[0].length, l2.length, 5) + + # Rudimentary side check. Somewhat surprised this works + center_dif = centers[Side.RIGHT] - centers[Side.LEFT] + self.assertGreater(mid_perp.dot(center_dif), 0) + + # Error Handling + end_arc = CenterArc(end_point, end_r, 0, 360) + + # GeomType + bad_type = Line((0, 0), (0, 10)) + with self.assertRaises(ValueError): + PointArcTangentArc(start_point, direction, bad_type) + + # Coplanar + with self.assertRaises(ValueError): + arc = CenterArc((0, 1, 1), end_r, 0, 360) + PointArcTangentArc(start_point, direction, arc) + + # Positional + with self.assertRaises(ValueError): + PointArcTangentArc((end_r, 0), direction, end_arc, side=Side.RIGHT) + + with self.assertRaises(RuntimeError): + PointArcTangentArc((end_r-.00001, 0), direction, end_arc, side=Side.RIGHT) + + def test_arc_arc_tangent_line(self): + """Test tangent line between arcs + + Considerations: + - Should produce a GeomType.LINE located on and tangent to arcs + - INSIDE arcs cross midline of arc centers + - INSIDE lines should always have equal length as long as arcs are same distance + - OUTSIDE lines should always have equal length as long as arcs are same distance + - LEFT lines should always start on start arc left of midline (angle > 0) + - Tangent should be GeomType.CIRCLE + - Arcs must be coplanar + - Cannot make tangent for concentric arcs + - Cannot make INSIDE tangent from overlapping or tangent arcs + """ + # Test line properties in algebra mode + start_r = 2 + end_r = 5 + separation = 10 + start_point = (0, 0) + end_point = (0, separation) + + start_arc = CenterArc(start_point, start_r, 0, 360) + end_arc = CenterArc(end_point, end_r, 0, 360) + lines = [] + for keep in [Keep.INSIDE, Keep.OUTSIDE]: + for side in [Side.LEFT, Side.RIGHT]: + l1 = ArcArcTangentLine(start_arc, end_arc, side=side, keep=keep) + self.assertEqual(l1.geom_type, GeomType.LINE) + + # Check coincidence, tangency with each arc + _, p1, p2 = start_arc.distance_to_with_closest_points(l1 @ 0) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + start_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + _, p1, p2 = end_arc.distance_to_with_closest_points(l1 @ 1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + end_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + lines.append(l1) + + self.assertAlmostEqual(lines[-2].length, lines[-1].length, 5) + + # Test in off-axis builder mode at multiple angles and compare to prev result + workplane = Plane.XY.rotated((45, 45, 45)) + with BuildLine(workplane): + end_center = workplane.from_local_coords(end_point) + point_arc = CenterArc(end_center, separation, 0, 360) + end_arc = CenterArc(end_center, end_r, 0, 360) + + points = [1, 2, 3, 5, 7, 11, 13] + for point in points: + start_center = point_arc @ (point/16) + start_arc = CenterArc(start_center, start_r, 0, 360) + midline = Line(start_center, end_center) + mid_vector = end_center - start_center + mid_perp = mid_vector.cross(workplane.z_dir) + for keep in [Keep.INSIDE, Keep.OUTSIDE]: + for side in [Side.LEFT, Side.RIGHT]: + l2 = ArcArcTangentLine(start_arc, end_arc, side=side, keep=keep) + + # Check length and cross/does not cross midline + d1 = midline.distance_to(l2) + if keep == Keep.INSIDE: + self.assertAlmostEqual(d1, 0, 5) + self.assertAlmostEqual(lines[0].length, l2.length, 5) + + elif keep == Keep.OUTSIDE: + self.assertNotAlmostEqual(d1, 0, 5) + self.assertAlmostEqual(lines[2].length, l2.length, 5) + + # Check side of midline + _, _, p2 = start_arc.distance_to_with_closest_points(l2) + coincident_dir = mid_perp.dot(p2 - start_center) + if side == Side.LEFT: + self.assertLess(coincident_dir, 0) + + elif side == Side.RIGHT: + self.assertGreater(coincident_dir, 0) + + ## Error Handling + start_arc = CenterArc(start_point, start_r, 0, 360) + end_arc = CenterArc(end_point, end_r, 0, 360) + + # GeomType + bad_type = Line((0, 0), (0, 10)) + with self.assertRaises(ValueError): + ArcArcTangentLine(start_arc, bad_type) + + with self.assertRaises(ValueError): + ArcArcTangentLine(bad_type, end_arc) + + # Coplanar + with self.assertRaises(ValueError): + ArcArcTangentLine(CenterArc((0, 0, 1), 5, 0, 360), end_arc) + + # Position conditions + with self.assertRaises(ValueError): + ArcArcTangentLine(CenterArc(end_point, start_r, 0, 360), end_arc) + + with self.assertRaises(ValueError): + arc = CenterArc(start_point, separation - end_r, 0, 360) + ArcArcTangentLine(arc, end_arc, keep=Keep.INSIDE) + + with self.assertRaises(ValueError): + arc = CenterArc(start_point, separation - end_r + 1, 0, 360) + ArcArcTangentLine(arc, end_arc, keep=Keep.INSIDE) + + + def test_arc_arc_tangent_arc(self): + """Test tangent arc between arcs + + Considerations: + - Should produce a GeomType.CIRCLE located on and tangent to arcs + - Tangent arcs that share a side have arc centers on the same side of the midline + - LEFT arcs have centers to right of midline + - INSIDE lines should always have equal length as long as arcs are same distance + - OUTSIDE lines should always have equal length as long as arcs are same distance + - Tangent should be GeomType.CIRCLE + - Arcs must be coplanar + - Cannot make tangent for radius under certain size + - Cannot make tangent for concentric arcs + """ + # Test line properties in algebra mode + start_r = 2 + end_r = 5 + separation = 10 + start_point = (0, 0) + end_point = (0, separation) + + start_arc = CenterArc(start_point, start_r, 0, 360) + end_arc = CenterArc(end_point, end_r, 0, 360) + radius = 15 + lines = [] + for keep in [Keep.INSIDE, Keep.OUTSIDE]: + for side in [Side.LEFT, Side.RIGHT]: + l1 = ArcArcTangentArc(start_arc, end_arc, radius, side=side, keep=keep) + self.assertEqual(l1.geom_type, GeomType.CIRCLE) + self.assertAlmostEqual(l1.radius, radius) + + # Check coincidence, tangency with each arc + _, p1, p2 = start_arc.distance_to_with_closest_points(l1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + start_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + _, p1, p2 = end_arc.distance_to_with_closest_points(l1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + end_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + lines.append(l1) + + self.assertAlmostEqual(lines[-2].length, lines[-1].length, 5) + + # Test in off-axis builder mode at multiple angles and compare to prev result + workplane = Plane.XY.rotated((45, 45, 45)) + with BuildLine(workplane): + end_center = workplane.from_local_coords(end_point) + point_arc = CenterArc(end_center, separation, 0, 360) + end_arc = CenterArc(end_center, end_r, 0, 360) + + points = [1, 2, 3, 5, 7, 11, 13] + for point in points: + start_center = point_arc @ (point/16) + start_arc = CenterArc(point_arc @ (point/16), start_r, 0, 360) + mid_vector = end_center - start_center + mid_perp = mid_vector.cross(workplane.z_dir) + for keep in [Keep.INSIDE, Keep.OUTSIDE]: + for side in [Side.LEFT, Side.RIGHT]: + l2 = ArcArcTangentArc(start_arc, end_arc, radius, side=side, keep=keep) + + # Check length against algebraic length + if keep == Keep.INSIDE: + self.assertAlmostEqual(lines[0].length, l2.length, 5) + side_sign = 1 + elif keep == Keep.OUTSIDE: + self.assertAlmostEqual(lines[2].length, l2.length, 5) + side_sign = -1 + + # Check side of midline + _, _, p2 = start_arc.distance_to_with_closest_points(l2) + coincident_dir = mid_perp.dot(p2 - start_center) + center_dir = mid_perp.dot(l2.arc_center - start_center) + if side == Side.LEFT: + self.assertLess(side_sign * coincident_dir, 0) + self.assertLess(center_dir, 0) + + elif side == Side.RIGHT: + self.assertGreater(side_sign * coincident_dir, 0) + self.assertGreater(center_dir, 0) + + ## Error Handling + start_arc = CenterArc(start_point, start_r, 0, 360) + end_arc = CenterArc(end_point, end_r, 0, 360) + # GeomType + bad_type = Line((0, 0), (0, 10)) + with self.assertRaises(ValueError): + ArcArcTangentArc(start_arc, bad_type, radius) + + with self.assertRaises(ValueError): + ArcArcTangentArc(bad_type, end_arc, radius) + + # Coplanar + with self.assertRaises(ValueError): + ArcArcTangentArc(CenterArc((0, 0, 1), 5, 0, 360), end_arc, radius) + + # Radius size + with self.assertRaises(ValueError): + r = (separation - (start_r + end_r)) / 2 - 1 + ArcArcTangentArc(CenterArc((0, 0, 1), 5, 0, 360), end_arc, r) + + def test_line_with_list(self): """Test line with a list of points""" l = Line([(0, 0), (10, 0)]) From 1a062724c7f31ec33d3d15008c13b1e02cac06b8 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sat, 22 Mar 2025 12:06:06 -0400 Subject: [PATCH 246/518] Create doc svgs. Replace DoubleTangentArc svg to use spline instead of arc. --- docs/assets/double_tangent_line_example.svg | 12 ++-- docs/assets/example_arc_arc_tangent_arc.svg | 12 ++++ docs/assets/example_arc_arc_tangent_line.svg | 12 ++++ docs/assets/example_point_arc_tangent_arc.svg | 13 ++++ .../assets/example_point_arc_tangent_line.svg | 12 ++++ docs/objects_1d.py | 63 +++++++++++++++++-- 6 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 docs/assets/example_arc_arc_tangent_arc.svg create mode 100644 docs/assets/example_arc_arc_tangent_line.svg create mode 100644 docs/assets/example_point_arc_tangent_arc.svg create mode 100644 docs/assets/example_point_arc_tangent_line.svg diff --git a/docs/assets/double_tangent_line_example.svg b/docs/assets/double_tangent_line_example.svg index 61895bb..4c33f81 100644 --- a/docs/assets/double_tangent_line_example.svg +++ b/docs/assets/double_tangent_line_example.svg @@ -1,13 +1,13 @@ - + - - + + - - - + + + \ No newline at end of file diff --git a/docs/assets/example_arc_arc_tangent_arc.svg b/docs/assets/example_arc_arc_tangent_arc.svg new file mode 100644 index 0000000..9d92be8 --- /dev/null +++ b/docs/assets/example_arc_arc_tangent_arc.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/assets/example_arc_arc_tangent_line.svg b/docs/assets/example_arc_arc_tangent_line.svg new file mode 100644 index 0000000..0e52e00 --- /dev/null +++ b/docs/assets/example_arc_arc_tangent_line.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/assets/example_point_arc_tangent_arc.svg b/docs/assets/example_point_arc_tangent_arc.svg new file mode 100644 index 0000000..ed3ef63 --- /dev/null +++ b/docs/assets/example_point_arc_tangent_arc.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/assets/example_point_arc_tangent_line.svg b/docs/assets/example_point_arc_tangent_line.svg new file mode 100644 index 0000000..54d9f48 --- /dev/null +++ b/docs/assets/example_point_arc_tangent_line.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/objects_1d.py b/docs/objects_1d.py index 7d029cd..f927aae 100644 --- a/docs/objects_1d.py +++ b/docs/objects_1d.py @@ -176,7 +176,6 @@ svg.write("assets/polyline_example.svg") with BuildLine(Plane.YZ) as filletpolyline: FilletPolyline((0, 0, 0), (0, 10, 2), (0, 10, 10), (5, 20, 10), radius=2) -show(filletpolyline) scene = Compound(filletpolyline.line) + Compound.make_triad(2) visible, _hidden = scene.project_to_viewport((0, 0, 1), (0, 1, 0)) s = 100 / max(*Compound(children=visible).bounding_box().size) @@ -248,17 +247,71 @@ svg.add_shape(dot.moved(Location(Vector((1, 0))))) svg.write("assets/intersecting_line_example.svg") with BuildLine() as double_tangent: - l2 = JernArc(start=(0, 20), tangent=(0, 1), radius=5, arc_size=-300) - l3 = DoubleTangentArc((6, 0), tangent=(0, 1), other=l2) + p1 = (6, 0) + d1 = (0, 1) + l2 = Spline((0, 10), (3, 8), (7, 7), (10, 10)) + show_object([p1, l2]) + l3 = DoubleTangentArc(p1, tangent=d1, other=l2) s = 100 / max(*double_tangent.line.bounding_box().size) svg = ExportSVG(scale=s) svg.add_layer("dashed", line_type=LineType.ISO_DASH_SPACE) svg.add_shape(l2, "dashed") svg.add_shape(l3) -svg.add_shape(dot.scale(5).moved(Pos(6, 0))) -svg.add_shape(Edge.make_line((6, 0), (6, 5)), "dashed") +svg.add_shape(dot.scale(5).moved(Pos(p1))) +svg.add_shape(PolarLine(p1, 1, direction=d1), "dashed") svg.write("assets/double_tangent_line_example.svg") +with BuildLine() as point_arc_tangent_line: + p1 = (10, 3) + l1 = CenterArc((0, 5), 5, -90, 180) + l2 = PointArcTangentLine(p1, l1, Side.RIGHT) +s = 100 / max(*point_arc_tangent_line.line.bounding_box().size) +svg = ExportSVG(scale=s) +svg.add_layer("dashed", line_type=LineType.ISO_DASH_SPACE) +svg.add_shape(l1, "dashed") +svg.add_shape(l2) +svg.add_shape(dot.scale(5).moved(Pos(p1))) +svg.write("assets/example_point_arc_tangent_line.svg") + +with BuildLine() as point_arc_tangent_arc: + p1 = (10, 3) + d1 = (-3, 1) + l1 = CenterArc((0, 5), 5, -90, 180) + l2 = PointArcTangentArc(p1, d1, l1, Side.RIGHT) +s = 100 / max(*point_arc_tangent_arc.line.bounding_box().size) +svg = ExportSVG(scale=s) +svg.add_layer("dashed", line_type=LineType.ISO_DASH_SPACE) +svg.add_shape(l1, "dashed") +svg.add_shape(l2) +svg.add_shape(dot.scale(5).moved(Pos(p1))) +svg.add_shape(PolarLine(p1, 1, direction=d1), "dashed") +svg.write("assets/example_point_arc_tangent_arc.svg") + +with BuildLine() as arc_arc_tangent_line: + l1 = CenterArc((7, 3), 3, 0, 360) + l2 = CenterArc((0, 8), 2, -90, 180) + l3 = ArcArcTangentLine(l1, l2, Side.RIGHT, Keep.OUTSIDE) +s = 100 / max(*arc_arc_tangent_line.line.bounding_box().size) +svg = ExportSVG(scale=s) +svg.add_layer("dashed", line_type=LineType.ISO_DASH_SPACE) +svg.add_shape(l1, "dashed") +svg.add_shape(l2, "dashed") +svg.add_shape(l3) +svg.write("assets/example_arc_arc_tangent_line.svg") + +with BuildLine() as arc_arc_tangent_arc: + l1 = CenterArc((7, 3), 3, 0, 360) + l2 = CenterArc((0, 8), 2, -90, 180) + radius = 12 + l3 = ArcArcTangentArc(l1, l2, radius, Side.LEFT, Keep.OUTSIDE) +s = 100 / max(*arc_arc_tangent_arc.line.bounding_box().size) +svg = ExportSVG(scale=s) +svg.add_layer("dashed", line_type=LineType.ISO_DASH_SPACE) +svg.add_shape(l1, "dashed") +svg.add_shape(l2, "dashed") +svg.add_shape(l3) +svg.write("assets/example_arc_arc_tangent_arc.svg") + # show_object(example_1.line, name="Ex. 1") # show_object(example_2.line, name="Ex. 2") # show_object(example_3.line, name="Ex. 3") From a4d1da2c1dcf556e16061331359f90338863f8b2 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sat, 22 Mar 2025 19:12:24 -0400 Subject: [PATCH 247/518] Add error messages for positional cases to tangent objects --- src/build123d/objects_curve.py | 43 ++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index a7d116e..2eb3cde 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1073,7 +1073,7 @@ class PointArcTangentLine(BaseEdgeObject): validate_inputs(context, self) if arc.geom_type != GeomType.CIRCLE: - raise ValueError("Arc must have GeomType.CIRCLE") + raise ValueError("Arc must have GeomType.CIRCLE.") tangent_point = WorkplaneList.localize(point) if context is None: @@ -1082,7 +1082,7 @@ class PointArcTangentLine(BaseEdgeObject): *arc.edges() ) if coplane is None: - raise ValueError("PointArcTangentLine only works on a single plane") + raise ValueError("PointArcTangentLine only works on a single plane.") workplane = Plane(coplane.origin, z_dir=arc.normal()) else: @@ -1094,8 +1094,8 @@ class PointArcTangentLine(BaseEdgeObject): radius = arc.radius midline = tangent_point - arc_center - if midline.length < radius: - raise ValueError("Cannot find tangent for point inside arc.") + if midline.length <= radius: + raise ValueError("Cannot find tangent for point on or inside arc.") # Find angle phi between midline and x # and angle theta between midplane length and radius @@ -1158,7 +1158,7 @@ class PointArcTangentArc(BaseEdgeObject): *arc.edges() ) if coplane is None: - raise ValueError("PointArcTangentArc only works on a single plane") + raise ValueError("PointArcTangentArc only works on a single plane.") workplane = Plane(coplane.origin, z_dir=arc.normal()) else: @@ -1170,6 +1170,13 @@ class PointArcTangentArc(BaseEdgeObject): workplane.reverse_transform, is_direction=True ).normalized() + midline = arc_point - arc.arc_center + if midline.length == arc.radius: + raise ValueError("Cannot find tangent for point on arc.") + + if midline.length <= arc.radius: + raise NotImplementedError("Point inside arc not yet implemented.") + # Determine where arc_point is located relative to arc # ref forms a bisecting line parallel to arc tangent with same distance from arc # center as arc point in direction of arc tangent @@ -1181,7 +1188,7 @@ class PointArcTangentArc(BaseEdgeObject): keep_sign = -1 if side == Side.LEFT else 1 # Tangent radius to infinity (and beyond) if keep_sign * ref_to_point == arc.radius: - raise ValueError("Point is already tangent to arc, use tangent line") + raise ValueError("Point is already tangent to arc, use tangent line.") # Use magnitude and sign of ref to arc point along with keep to determine # which "side" angle the arc center will be on @@ -1244,12 +1251,12 @@ class PointArcTangentArc(BaseEdgeObject): # Sanity Checks # Confirm tangent point is on arc if abs(arc.radius - (tangent_point - arc.arc_center).length) > TOLERANCE: - raise RuntimeError("No tangent arc found, no tangent point found") + raise RuntimeError("No tangent arc found, no tangent point found.") # Confirm new tangent point is colinear with point tangent on arc arc_dir = arc.tangent_at(tangent_point) if tangent_dir.cross(arc_dir).length > TOLERANCE: - raise RuntimeError("No tangent arc found, found tangent out of tolerance") + raise RuntimeError("No tangent arc found, found tangent out of tolerance.") arc = TangentArc(arc_point, tangent_point, tangent=arc_tangent) super().__init__(arc, mode=mode) @@ -1285,10 +1292,10 @@ class ArcArcTangentLine(BaseEdgeObject): validate_inputs(context, self) if start_arc.geom_type != GeomType.CIRCLE: - raise ValueError("Start arc must have GeomType.CIRCLE") + raise ValueError("Start arc must have GeomType.CIRCLE.") if end_arc.geom_type != GeomType.CIRCLE: - raise ValueError("End arc must have GeomType.CIRCLE") + raise ValueError("End arc must have GeomType.CIRCLE.") if context is None: # Making the plane validates start arc and end arc are coplanar @@ -1310,8 +1317,8 @@ class ArcArcTangentLine(BaseEdgeObject): radii = [arc.radius for arc in arcs] midline = points[1] - points[0] - if midline.length == 0: - raise ValueError("Cannot find tangent for concentric arcs.") + if midline.length <= abs(radii[1] - radii[0]): + raise ValueError("Cannot find tangent when one arc contains the other.") if (keep == Keep.INSIDE or keep == Keep.BOTH): if midline.length < sum(radii): @@ -1378,16 +1385,16 @@ class ArcArcTangentArc(BaseEdgeObject): validate_inputs(context, self) if start_arc.geom_type != GeomType.CIRCLE: - raise ValueError("Start arc must have GeomType.CIRCLE") + raise ValueError("Start arc must have GeomType.CIRCLE.") if end_arc.geom_type != GeomType.CIRCLE: - raise ValueError("End arc must have GeomType.CIRCLE") + raise ValueError("End arc must have GeomType.CIRCLE.") if context is None: # Making the plane validates start arc and end arc are coplanar coplane = start_arc.edge().common_plane(end_arc.edge()) if coplane is None: - raise ValueError("ArcArcTangentArc only works on a single plane") + raise ValueError("ArcArcTangentArc only works on a single plane.") workplane = Plane(coplane.origin, z_dir=start_arc.normal()) else: @@ -1405,6 +1412,12 @@ class ArcArcTangentArc(BaseEdgeObject): midline = points[1] - points[0] normal = side_sign * midline.cross(workplane.z_dir) + if midline.length == 0: + raise ValueError("Cannot find tangent for concentric arcs.") + + if midline.length <= abs(radii[1] - radii[0]): + raise NotImplementedError("Arc inside arc not yet implemented.") + # The range midline.length / 2 < tangent radius < math.inf should be valid # Sometimes fails if min_radius == radius, so using >= min_radius = (midline.length - keep_sign * (radii[0] + radii[1])) / 2 From 66e8315973fe227f6d0de230bac6628c1e72803f Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sat, 22 Mar 2025 20:07:39 -0400 Subject: [PATCH 248/518] Add tangent objects to 1D Objects --- docs/objects.rst | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/docs/objects.rst b/docs/objects.rst index 2c1eff1..186ae18 100644 --- a/docs/objects.rst +++ b/docs/objects.rst @@ -188,6 +188,33 @@ The following objects all can be used in BuildLine contexts. Note that +++ Curve define by three points + .. grid-item-card:: :class:`~objects_curve.ArcArcTangentLine` + + .. image:: assets/example_arc_arc_tangent_line.svg + + +++ + Line tangent defined by two arcs + + .. grid-item-card:: :class:`~objects_curve.ArcArcTangentArc` + + .. image:: assets/example_arc_arc_tangent_arc.svg + + +++ + Arc tangent defined by two arcs + + .. grid-item-card:: :class:`~objects_curve.PointArcTangentLine` + + .. image:: assets/example_point_arc_tangent_line.svg + + +++ + Line tangent defined by a point and arc + + .. grid-item-card:: :class:`~objects_curve.PointArcTangentArc` + + .. image:: assets/example_point_arc_tangent_arc.svg + + +++ + Arc tangent defined by a point, direction, and arc Reference ^^^^^^^^^ @@ -210,6 +237,10 @@ Reference .. autoclass:: Spline .. autoclass:: TangentArc .. autoclass:: ThreePointArc +.. autoclass:: ArcArcTangentLine +.. autoclass:: ArcArcTangentArc +.. autoclass:: PointArcTangentLine +.. autoclass:: PointArcTangentArc 2D Objects ---------- From 0d5aa13afa6e4c69fc4ca98992ed2235bc6c86cf Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sun, 23 Mar 2025 12:41:48 -0400 Subject: [PATCH 249/518] Add sympy to project, run mypy/pylint/black on changes --- pyproject.toml | 2 +- src/build123d/objects_curve.py | 122 ++++++++++++++++++++------------- tests/test_build_line.py | 47 ++++++++----- 3 files changed, 104 insertions(+), 67 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 59e7db9..d888355 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,6 +45,7 @@ dependencies = [ "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", "trianglesolver", + "sympy", ] [project.urls] @@ -68,7 +69,6 @@ development = [ "pytest-benchmark", "pytest-cov", "pytest-xdist", - "sympy", "wheel", ] diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 2eb3cde..8a46854 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -29,14 +29,20 @@ license: from __future__ import annotations import copy as copy_module +from collections.abc import Iterable from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize -import sympy - -from collections.abc import Iterable +import sympy # type: ignore from build123d.build_common import WorkplaneList, flatten_sequence, validate_inputs -from build123d.build_enums import AngularDirection, GeomType, Keep, LengthMode, Mode, Side +from build123d.build_enums import ( + AngularDirection, + GeomType, + LengthMode, + Keep, + Mode, + Side, +) from build123d.build_line import BuildLine from build123d.geometry import Axis, Plane, Vector, VectorLike, TOLERANCE from build123d.topology import Edge, Face, Wire, Curve @@ -721,7 +727,7 @@ class PolarLine(BaseEdgeObject): start (VectorLike): start point length (float): line length angle (float, optional): angle from the local x-axis - direction (VectorLike, optional): vector direction to determine angle + direction (VectorLike, optional): vector direction to determine angle length_mode (LengthMode, optional): how length defines the line. Defaults to LengthMode.DIAGONAL mode (Mode, optional): combination mode. Defaults to Mode.ADD @@ -1049,7 +1055,7 @@ class PointArcTangentLine(BaseEdgeObject): Args: point (VectorLike): intersection point for tangent arc (Curve | Edge | Wire): circular arc to tangent, must be GeomType.CIRCLE - side (Side, optional): side of arcs to place tangent arc center, LEFT or RIGHT. + side (Side, optional): side of arcs to place tangent arc center, LEFT or RIGHT. Defaults to Side.LEFT mode (Mode, optional): combination mode. Defaults to Mode.ADD """ @@ -1079,16 +1085,14 @@ class PointArcTangentLine(BaseEdgeObject): if context is None: # Making the plane validates points and arc are coplanar coplane = Edge.make_line(tangent_point, arc.arc_center).common_plane( - *arc.edges() + arc ) if coplane is None: raise ValueError("PointArcTangentLine only works on a single plane.") workplane = Plane(coplane.origin, z_dir=arc.normal()) else: - workplane = copy_module.copy( - WorkplaneList._get_context().workplanes[0] - ) + workplane = copy_module.copy(WorkplaneList._get_context().workplanes[0]) arc_center = arc.arc_center radius = arc.radius @@ -1102,13 +1106,17 @@ class PointArcTangentLine(BaseEdgeObject): # add the resulting angles with a sign on theta to pick a direction # This angle is the tangent location around the circle from x phi = midline.get_signed_angle(workplane.x_dir) - other_leg = sqrt(midline.length ** 2 - radius ** 2) - theta = WorkplaneList.localize((radius, other_leg)).get_signed_angle(workplane.x_dir) + other_leg = sqrt(midline.length**2 - radius**2) + theta = WorkplaneList.localize((radius, other_leg)).get_signed_angle( + workplane.x_dir + ) angle = side_sign[side] * theta + phi - intersect = WorkplaneList.localize(( - radius * cos(radians(angle)), - radius * sin(radians(angle))) - ) + arc_center + intersect = ( + WorkplaneList.localize( + (radius * cos(radians(angle)), radius * sin(radians(angle))) + ) + + arc_center + ) tangent = Edge.make_line(tangent_point, intersect) super().__init__(tangent, mode) @@ -1155,20 +1163,20 @@ class PointArcTangentArc(BaseEdgeObject): if context is None: # Making the plane validates point, tangent, and arc are coplanar coplane = Edge.make_line(arc_point, arc_point + wp_tangent).common_plane( - *arc.edges() + arc ) if coplane is None: raise ValueError("PointArcTangentArc only works on a single plane.") workplane = Plane(coplane.origin, z_dir=arc.normal()) else: - workplane = copy_module.copy( - WorkplaneList._get_context().workplanes[0] - ) + workplane = copy_module.copy(WorkplaneList._get_context().workplanes[0]) - arc_tangent = Vector(direction).transform( - workplane.reverse_transform, is_direction=True - ).normalized() + arc_tangent = ( + Vector(direction) + .transform(workplane.reverse_transform, is_direction=True) + .normalized() + ) midline = arc_point - arc.arc_center if midline.length == arc.radius: @@ -1270,9 +1278,9 @@ class ArcArcTangentLine(BaseEdgeObject): Args: start_arc (Curve | Edge | Wire): starting arc, must be GeomType.CIRCLE end_arc (Curve | Edge | Wire): ending arc, must be GeomType.CIRCLE - side (Side): side of arcs to place tangent arc center, LEFT or RIGHT. + side (Side): side of arcs to place tangent arc center, LEFT or RIGHT. Defaults to Side.LEFT - keep (Keep): which tangent arc to keep, INSIDE or OUTSIDE. + keep (Keep): which tangent arc to keep, INSIDE or OUTSIDE. Defaults to Keep.INSIDE mode (Mode, optional): combination mode. Defaults to Mode.ADD """ @@ -1299,17 +1307,13 @@ class ArcArcTangentLine(BaseEdgeObject): if context is None: # Making the plane validates start arc and end arc are coplanar - coplane = start_arc.edge().common_plane( - *end_arc.edges() - ) + coplane = start_arc.common_plane(end_arc) if coplane is None: raise ValueError("ArcArcTangentLine only works on a single plane.") workplane = Plane(coplane.origin, z_dir=start_arc.normal()) else: - workplane = copy_module.copy( - WorkplaneList._get_context().workplanes[0] - ) + workplane = copy_module.copy(WorkplaneList._get_context().workplanes[0]) side_sign = 1 if side == Side.LEFT else -1 arcs = [start_arc, end_arc] @@ -1320,7 +1324,7 @@ class ArcArcTangentLine(BaseEdgeObject): if midline.length <= abs(radii[1] - radii[0]): raise ValueError("Cannot find tangent when one arc contains the other.") - if (keep == Keep.INSIDE or keep == Keep.BOTH): + if keep == Keep.INSIDE: if midline.length < sum(radii): raise ValueError("Cannot find INSIDE tangent for overlapping arcs.") @@ -1337,17 +1341,21 @@ class ArcArcTangentLine(BaseEdgeObject): phi = midline.get_signed_angle(workplane.x_dir) radius = radii[0] + radii[1] if keep == Keep.INSIDE else radii[0] - radii[1] - other_leg = sqrt(midline.length ** 2 - radius ** 2) - theta = WorkplaneList.localize((radius, other_leg)).get_signed_angle(workplane.x_dir) + other_leg = sqrt(midline.length**2 - radius**2) + theta = WorkplaneList.localize((radius, other_leg)).get_signed_angle( + workplane.x_dir + ) angle = side_sign * theta + phi intersect = [] for i in range(len(arcs)): angle = i * 180 + angle if keep == Keep.INSIDE else angle - intersect.append(WorkplaneList.localize(( - radii[i] * cos(radians(angle)), - radii[i] * sin(radians(angle))) - ) + points[i]) + intersect.append( + WorkplaneList.localize( + (radii[i] * cos(radians(angle)), radii[i] * sin(radians(angle))) + ) + + points[i] + ) tangent = Edge.make_line(intersect[0], intersect[1]) super().__init__(tangent, mode) @@ -1362,9 +1370,9 @@ class ArcArcTangentArc(BaseEdgeObject): start_arc (Curve | Edge | Wire): starting arc, must be GeomType.CIRCLE end_arc (Curve | Edge | Wire): ending arc, must be GeomType.CIRCLE radius (float): radius of tangent arc - side (Side): side of arcs to place tangent arc center, LEFT or RIGHT. + side (Side): side of arcs to place tangent arc center, LEFT or RIGHT. Defaults to Side.LEFT - keep (Keep): which tangent arc to keep, INSIDE or OUTSIDE. + keep (Keep): which tangent arc to keep, INSIDE or OUTSIDE. Defaults to Keep.INSIDE mode (Mode, optional): combination mode. Defaults to Mode.ADD """ @@ -1392,15 +1400,13 @@ class ArcArcTangentArc(BaseEdgeObject): if context is None: # Making the plane validates start arc and end arc are coplanar - coplane = start_arc.edge().common_plane(end_arc.edge()) + coplane = start_arc.common_plane(end_arc) if coplane is None: raise ValueError("ArcArcTangentArc only works on a single plane.") workplane = Plane(coplane.origin, z_dir=start_arc.normal()) else: - workplane = copy_module.copy( - WorkplaneList._get_context().workplanes[0] - ) + workplane = copy_module.copy(WorkplaneList._get_context().workplanes[0]) side_sign = 1 if side == Side.LEFT else -1 keep_sign = 1 if keep == Keep.INSIDE else -1 @@ -1422,7 +1428,9 @@ class ArcArcTangentArc(BaseEdgeObject): # Sometimes fails if min_radius == radius, so using >= min_radius = (midline.length - keep_sign * (radii[0] + radii[1])) / 2 if min_radius >= radius: - raise ValueError(f"The arc radius is too small. Should be greater than {min_radius}.") + raise ValueError( + f"The arc radius is too small. Should be greater than {min_radius}." + ) # Method: # https://www.youtube.com/watch?v=-STj2SSv6TU @@ -1433,14 +1441,30 @@ class ArcArcTangentArc(BaseEdgeObject): # - then it's a matter of finding the points where the connecting lines # intersect the point circles local = [workplane.to_local_coords(p) for p in points] - ref_circles = [sympy.Circle(sympy.Point2D(local[i].X, local[i].Y), keep_sign * radii[i] + radius) for i in range(len(arcs))] - ref_intersections = ShapeList([workplane.from_local_coords(Vector(float(sympy.N(p.x)), float(sympy.N(p.y)))) for p in sympy.intersection(*ref_circles)]) + ref_circles = [ + sympy.Circle( + sympy.Point(local[i].X, local[i].Y), keep_sign * radii[i] + radius + ) + for i in range(len(arcs)) + ] + ref_intersections = ShapeList( + [ + workplane.from_local_coords( + Vector(float(sympy.N(p.x)), float(sympy.N(p.y))) + ) + for p in sympy.intersection(*ref_circles) + ] + ) arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] - intersect = [points[i] + keep_sign * radii[i] * (Vector(arc_center) - points[i]).normalized() for i in range(len(arcs))] + intersect = [ + points[i] + + keep_sign * radii[i] * (Vector(arc_center) - points[i]).normalized() + for i in range(len(arcs)) + ] if side == Side.LEFT: intersect.reverse() - arc = RadiusArc(*intersect, radius=radius) + arc = RadiusArc(intersect[0], intersect[1], radius=radius) super().__init__(arc, mode) diff --git a/tests/test_build_line.py b/tests/test_build_line.py index d8ed37d..35d2994 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -269,13 +269,17 @@ class BuildLineTests(unittest.TestCase): with BuildLine(): a4 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.HORIZONTAL) - d4 = PolarLine((0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.HORIZONTAL) + d4 = PolarLine( + (0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.HORIZONTAL + ) self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (1, 1 / sqrt(3), 0), 5) self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (d4 @ 1).to_tuple(), 5) with BuildLine(Plane.XZ): a5 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.VERTICAL) - d5 = PolarLine((0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.VERTICAL) + d5 = PolarLine( + (0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.VERTICAL + ) self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (sqrt(3), 0, 1), 5) self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (d5 @ 1).to_tuple(), 5) @@ -411,7 +415,7 @@ class BuildLineTests(unittest.TestCase): points = [1, 2, 3, 5, 7, 11, 13] for point in points: - start_point = point_arc @ (point/16) + start_point = point_arc @ (point / 16) mid_vector = end_center - start_point mid_perp = mid_vector.cross(workplane.z_dir) for side in [Side.LEFT, Side.RIGHT]: @@ -479,12 +483,19 @@ class BuildLineTests(unittest.TestCase): # Assortment of points in different regimes flip = separation * 2 - value = (flip - end_r) - points = [start_point, (end_r - .1, 0), (-end_r - .1, 0), - (end_r + .1, flip), (-end_r + .1, flip), - (0, flip), (flip, flip), - (-flip, -flip), - (value, -value), (-value, value)] + value = flip - end_r + points = [ + start_point, + (end_r - 0.1, 0), + (-end_r - 0.1, 0), + (end_r + 0.1, flip), + (-end_r + 0.1, flip), + (0, flip), + (flip, flip), + (-flip, -flip), + (value, -value), + (-value, value), + ] for point in points: mid_vector = end_center - point mid_perp = mid_vector.cross(workplane.z_dir) @@ -518,7 +529,9 @@ class BuildLineTests(unittest.TestCase): PointArcTangentArc((end_r, 0), direction, end_arc, side=Side.RIGHT) with self.assertRaises(RuntimeError): - PointArcTangentArc((end_r-.00001, 0), direction, end_arc, side=Side.RIGHT) + PointArcTangentArc( + (end_r - 0.00001, 0), direction, end_arc, side=Side.RIGHT + ) def test_arc_arc_tangent_line(self): """Test tangent line between arcs @@ -528,7 +541,7 @@ class BuildLineTests(unittest.TestCase): - INSIDE arcs cross midline of arc centers - INSIDE lines should always have equal length as long as arcs are same distance - OUTSIDE lines should always have equal length as long as arcs are same distance - - LEFT lines should always start on start arc left of midline (angle > 0) + - LEFT lines should always start on start arc left of midline (angle > 0) - Tangent should be GeomType.CIRCLE - Arcs must be coplanar - Cannot make tangent for concentric arcs @@ -573,7 +586,7 @@ class BuildLineTests(unittest.TestCase): points = [1, 2, 3, 5, 7, 11, 13] for point in points: - start_center = point_arc @ (point/16) + start_center = point_arc @ (point / 16) start_arc = CenterArc(start_center, start_r, 0, 360) midline = Line(start_center, end_center) mid_vector = end_center - start_center @@ -629,7 +642,6 @@ class BuildLineTests(unittest.TestCase): arc = CenterArc(start_point, separation - end_r + 1, 0, 360) ArcArcTangentLine(arc, end_arc, keep=Keep.INSIDE) - def test_arc_arc_tangent_arc(self): """Test tangent arc between arcs @@ -685,13 +697,15 @@ class BuildLineTests(unittest.TestCase): points = [1, 2, 3, 5, 7, 11, 13] for point in points: - start_center = point_arc @ (point/16) - start_arc = CenterArc(point_arc @ (point/16), start_r, 0, 360) + start_center = point_arc @ (point / 16) + start_arc = CenterArc(point_arc @ (point / 16), start_r, 0, 360) mid_vector = end_center - start_center mid_perp = mid_vector.cross(workplane.z_dir) for keep in [Keep.INSIDE, Keep.OUTSIDE]: for side in [Side.LEFT, Side.RIGHT]: - l2 = ArcArcTangentArc(start_arc, end_arc, radius, side=side, keep=keep) + l2 = ArcArcTangentArc( + start_arc, end_arc, radius, side=side, keep=keep + ) # Check length against algebraic length if keep == Keep.INSIDE: @@ -733,7 +747,6 @@ class BuildLineTests(unittest.TestCase): r = (separation - (start_r + end_r)) / 2 - 1 ArcArcTangentArc(CenterArc((0, 0, 1), 5, 0, 360), end_arc, r) - def test_line_with_list(self): """Test line with a list of points""" l = Line([(0, 0), (10, 0)]) From 7bd037aeed4c9da22831e56ab69f376a82abc5e5 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 25 Mar 2025 23:38:42 -0400 Subject: [PATCH 250/518] Add Intrinsic and Extrinsic enums to cheat sheet (and Keep ALL) --- docs/cheat_sheet.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index 07466a0..c9a6e39 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -223,15 +223,19 @@ Cheat Sheet +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.CenterOf` | GEOMETRY, MASS, BOUNDING_BOX | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ + | :class:`~build_enums.Extrinsic` | XYZ, XZY, YZX, YXZ, ZXY, ZYX, XYX, XZX, YZY, YXY, ZXZ, ZYZ | + +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.FontStyle` | REGULAR, BOLD, ITALIC | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.FrameMethod` | CORRECTED, FRENET | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.GeomType` | BEZIER, BSPLINE, CIRCLE, CONE, CYLINDER, ELLIPSE, EXTRUSION, HYPERBOLA, LINE, OFFSET, OTHER, PARABOLA, PLANE, REVOLUTION, SPHERE, TORUS | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ + | :class:`~build_enums.Intrinsic` | XYZ, XZY, YZX, YXZ, ZXY, ZYX, XYX, XZX, YZY, YXY, ZXZ, ZYZ | + +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.HeadType` | CURVED, FILLETED, STRAIGHT | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ - | :class:`~build_enums.Keep` | TOP, BOTTOM, BOTH, INSIDE, OUTSIDE | + | :class:`~build_enums.Keep` | ALL, TOP, BOTTOM, BOTH, INSIDE, OUTSIDE | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.Kind` | ARC, INTERSECTION, TANGENT | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ @@ -249,7 +253,7 @@ Cheat Sheet +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.PrecisionMode` | LEAST, AVERAGE, GREATEST, SESSION | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ - | :class:`~build_enums.Select` | ALL, LAST, NEW | + | :class:`~build_enums.Select` | ALL, LAST, NEW | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.Side` | BOTH, LEFT, RIGHT | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ From 56e9858fefd0f10e61c5398c3df07c08cbb588fd Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 26 Mar 2025 09:24:13 -0400 Subject: [PATCH 251/518] Add operations_generic.project to resolve #833 --- docs/cheat_sheet.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index c9a6e39..a4d0d4b 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -75,6 +75,7 @@ Cheat Sheet | :func:`~operations_generic.bounding_box` | :func:`~operations_generic.mirror` | :func:`~operations_generic.offset` + | :func:`~operations_generic.project` | :func:`~operations_generic.scale` | :func:`~operations_generic.split` @@ -88,6 +89,7 @@ Cheat Sheet | :func:`~operations_sketch.make_hull` | :func:`~operations_generic.mirror` | :func:`~operations_generic.offset` + | :func:`~operations_generic.project` | :func:`~operations_generic.scale` | :func:`~operations_generic.split` | :func:`~operations_generic.sweep` @@ -103,6 +105,7 @@ Cheat Sheet | :func:`~operations_part.make_brake_formed` | :func:`~operations_generic.mirror` | :func:`~operations_generic.offset` + | :func:`~operations_generic.project` | :func:`~operations_part.revolve` | :func:`~operations_generic.scale` | :func:`~operations_part.section` From 08527188c976157e6f1cac360221cea164e56544 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 26 Mar 2025 09:52:39 -0400 Subject: [PATCH 252/518] Fix bullets in docstrings for is_skew and axes_of_symmetry to fixs sphinx rendering and build errors --- src/build123d/geometry.py | 4 +++- src/build123d/topology/two_d.py | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index e557b1f..af254dd 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -811,8 +811,10 @@ class Axis(metaclass=AxisMeta): and never intersect. Mathematically, this means: + - The axes are **not parallel** (the cross product of their direction vectors is nonzero). + - The axes are **not coplanar** (the vector between their positions is not aligned with the plane spanned by their directions). @@ -2725,7 +2727,7 @@ class Plane(metaclass=PlaneMeta): The origin of the workplane is unaffected by the rotation. Rotations are done in order x, y, z. If you need a different order, - specify ordering. e.g. Intrinsic.ZYX changes rotation to + specify ordering. e.g. Intrinsic.ZYX changes rotation to (z angle, y angle, x angle) and rotates in that order. Args: diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 05ba89a..1f372d2 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -393,18 +393,23 @@ class Face(Mixin2D, Shape[TopoDS_Face]): The method determines potential symmetry axes by analyzing the face’s geometry: + - It first validates that the face is non-empty and planar. + - For faces with inner wires (holes), it computes the centroid of the holes and the face's overall center (COG). - If the holes' centroid significantly deviates from the COG (beyond - a specified tolerance), the symmetry axis is taken along the line - connecting these points; otherwise, each hole’s center is used to - generate a candidate axis. + + - If the holes' centroid significantly deviates from the COG (beyond + a specified tolerance), the symmetry axis is taken along the line + connecting these points; otherwise, each hole’s center is used to + generate a candidate axis. + - For faces without holes, candidate directions are derived by sampling midpoints along the outer wire's edges. - If curved edges are present, additional candidate directions are - obtained from an oriented bounding box (OBB) constructed around the - face. + + - If curved edges are present, additional candidate directions are + obtained from an oriented bounding box (OBB) constructed around the + face. For each candidate direction, the face is split by a plane (defined using the candidate direction and the face’s normal). The top half of the face From 5c2be0fa703ec977e0ed5e373e68a4975ea1e2c8 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 26 Mar 2025 14:43:03 -0400 Subject: [PATCH 253/518] Fix Buffer Stand drawing image link --- docs/tttt.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/tttt.rst b/docs/tttt.rst index 2376506..8379142 100644 --- a/docs/tttt.rst +++ b/docs/tttt.rst @@ -5,13 +5,13 @@ Too Tall Toby (TTT) Tutorials .. image:: assets/ttt.png :align: center -To enhance users' proficiency with Build123D, this section offers a series of challenges. -In these challenges, users are presented with a CAD drawing and tasked with designing the +To enhance users' proficiency with Build123D, this section offers a series of challenges. +In these challenges, users are presented with a CAD drawing and tasked with designing the part. Their goal is to match the part's mass to a specified target. -These drawings were skillfully crafted and generously provided to Build123D by Too Tall Toby, -a renowned figure in the realm of 3D CAD. Too Tall Toby is the host of the World Championship -of 3D CAD Speedmodeling. For additional 3D CAD challenges and content, be sure to +These drawings were skillfully crafted and generously provided to Build123D by Too Tall Toby, +a renowned figure in the realm of 3D CAD. Too Tall Toby is the host of the World Championship +of 3D CAD Speedmodeling. For additional 3D CAD challenges and content, be sure to visit `Toby's youtube channel `_. Feel free to click on the parts below to embark on these engaging challenges. @@ -266,13 +266,12 @@ Party Pack 01-10 Light Cap .. literalinclude:: assets/ttt/ttt-23-t-24-curved_support.py - .. _ttt-24-spo-06: 24-SPO-06 Buffer Stand ---------------------- -.. image:: assets/ttt/ttt-24-SPO-06-Buffer_Stand_object.png +.. image:: assets/ttt/ttt-24-SPO-06-Buffer_Stand.png :align: center .. dropdown:: Object Mass From bf6206377ded3792bf0916e083399457337e5ba0 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 5 Apr 2025 11:05:48 -0400 Subject: [PATCH 254/518] Added Toy Truck example --- docs/assets/examples/toy_truck.png | Bin 0 -> 67773 bytes docs/assets/examples/toy_truck_picture.jpg | Bin 0 -> 537001 bytes docs/examples_1.rst | 29 +++++++++++++++++++++ src/build123d/jupyter_tools.py | 6 +++-- src/build123d/topology/__init__.py | 2 +- 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 docs/assets/examples/toy_truck.png create mode 100644 docs/assets/examples/toy_truck_picture.jpg diff --git a/docs/assets/examples/toy_truck.png b/docs/assets/examples/toy_truck.png new file mode 100644 index 0000000000000000000000000000000000000000..bc70175a82fde010e1e27dfdd01c79efab3f0fb4 GIT binary patch literal 67773 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
    ;8)R?)U#MaXD%Hd1cOe@As>#k=u7Y z_!D8#IDf*oJE?_A7U_m1vTNrRdn{F$${-%Xp#7RHjQ_%2u{4Plx~aFFH8}MwLW)HX zFM6Wz@IgY`(%(-Xdam}IZ&;ih&3kCWeA&3??wjr`w@{w&^RwFiXD#--Pkp$|?^$wcWh zf7pJ%k~Ou-M#$I))!u$8+yLTS$j(>i_M!ZD)*}asyRloGFb%h251O$9A zxuN>GhqLC(ES&}K>z{pCy#MXT#q;wLOXW}g*_|)meb$?)n0p$-|I_~;uK)0GYxA10 z2dh4c^(?=8XThoBg9j~|S7jBPJNf(GR*7A_9hVIy?*4pooo!WQwNOst7lv$|o@Ec0 zPWmaMqx{)q&WV~gM#9q=FYVdVRFk`Va#_`tABN^L#io4tAhFJzN$~sWB|jIgT^6sU z{I>Y;IaMcl;kbtk)e#@F72YG&4i{IPTG{)K!}AyK z`?%~2%f3U`;|u?Mu+A4T`p>i>gZ1Cy>ry?bE-!elOF2$u@7OTw;P0oc4QsSkENd(c z`EzSKUsyEHZLz=GSjBm+cIlY)9GqOic{lju>d1mm*-E=Vbk&%>aWa<{5B)uHcjh_$ z{tsVeZ=O`!ek0}UN*%vaw<(6Eq>F%wy{N~Wi{rsnMjYx`e9Jbdx>&5zyfb3dLfm#TTp+xfn} zy0`rPx^vsEvi7&T3Rk4d-nhKvraa5@JALtXlPZ^P$lJ%1E>q%vH`~X4!PWH#&95)H zXP$jxRigk`LWAU|N7tX;QePA==aFJJDX;IyD&d*@_rC5v@n`Skc;%VP%_}NCt==zD z_+&M|Y*ErDZ5avS$b+x*)MwvG5a1PTawlzm3%%c` z`SEXj%){UJ!mE4nUEPF!;4_@i*kpl4?d5?(~j*mwLw znZzx=9>zs^i;VQAG)cV3Hkfxt|7KG0{zunco-IGR{`cQcnG4&?Hyv!*AX?W zd7+K`N7w6!>_1nsX=nJy?1-?#QNbKFj*gCw2Pb-@+)GWlckp4eK9AjxN8W!v-p^rR z*#Av8v@3qTpqTH2gApn&{TCXZrFa}&&%8rm-;YqI6I@?^alLuf8}Y~MyllyJM~}{| zt;?QV-?glp!T0F;YdX7snEpDK-W|WUysqsGyZG6?lj9%1h@G2r%xreM>i)jv%l*vw zwd+c+9g6ZjvbV)t6ci>l9KXBbPk#IPP+ZFX+tKxIyId*oODzuorC z!a|$knos{)6!p&VnBo+s=L^Ip-^&xWy7}d{bcA!~!m1YwR(0u^o#ndI?#jxPza@4{ zyxsB2?)c9y^`d@UZjhfXw!f|E+KnP3p5HIa#r9We`)btjviw{3==vG&cu-aiD5!d) zU1$2^*laHQKj*Y-KEGv)uWk+cQzC>i(kC>!(Q`O z^uyu!y4Ldht3JMqJ|(_i%xHg#&TXg9J_hen4l7P&o4)YJR;R654`d9s=(fG(Eiq@v z<9?o3^C|n&Y39q1u0K`VZnLkb-^`QZIEoAw8NdOiKe zwR$He#~+lK_*3i0Q`V5pZE{vTx21V=wAMATky6nf*$v=}eYJz-R z5jEw>b?+lZoPW;ePxw7=zGS();*Z7c>zd`*JX~uZwN44S^Xpr90&hZ_nDg#NQ@+F7 zS})qVxSm|UDXzJg?Rn0dl;j@$x>${w_c^@l{Ryj^DcZB&rWm_Fi+#43 zKjq$1rrQcD{O?WPb$vi7Ebzn@%R z=X#$p%=*jaC)Zc8t!8+w^YiKa*iWxLg!kXp@85mmPi);!1KmBZzgX%#J@&X9 zyNN$T{+ybi`Dy8otqT?`Sn$B};iiRG3YrQ#``63XeLo)0#P{Qubk3wdyR=gNb#5qN z%0J*BctH8kHzxzHx>T8>1%75d#Vb}Fs=9hW(&2lqPu<(QVt3D)?(jIdUPLKmQvCPd zPcv`%eOeu_vMwoh8d2ld&u%8#9>rmmE4e-7j*^Y3rK?GaQ|@I1ShWLw9r? zT`%>w?D5}Enm@Omn-srvTHM6_f1X@-ITZPA$NnFs`{V86-KzpsKD(Df%ERX(KOG*- zRR48cb-x&>*b%YO`%^jf;}jjeY>ul840bn*{=Bcx{J30xdx6{I>i5!r9^5|gec#d# z@1n0(n*Wtdy2(;^=gaN`${L?{$#*Q!7M&cQs=Hv8sOr8l^9!-;cgrrs@+-1l$>Kd{ z`SaO)$4{>x9$nvOa#zIbOE-U)!Occsr5(&n`2~yg&UuPwCh4N#WIo>s!o+hk0^#AL6oqtab>+bs=*Z+OrrN{FB z_DbEa@Sgj-ztSwitnoXCQrba@kQW>g{?A%3Eq)SywI)^l=hpiHEt^(lZMtzqdj;19 zv(inGRi9p0cEx{w`P=&Dn_0zae?DD)blq~l&F-~7u1LFBRDSG`PyOg`onp7f zxcAQ0lgC`^r#t)1JlmO3`;7s5N5J1t=PFB;f}buwx;|&sk>q6$O0CZPE!KpTRTiS( zR=-V|`!TE9BkKDRTcOJQ+@+Tdn3I{DG$OJ;?EmZ9E&q4R;q`TsAKU*4eZamy#N&_i zh6twr|CV2`OLy30CC*kakfc7FZ{Lrr<(mYVHmwR=8&<$4VU^{*ayR3-+>7~UD}R)# z{k$s0oP8##_IkVM{#`3>^_Q)*?uyTxx;y1x=A`(|FV8XRsO;ZW!YDW?{^1^__g;{U ze2_6=UQV@B-GWU2x>YYo_ZRJFJx7_p3+g~0?v6|aI zH+jM;rs+(}-hY_fANA+k`&j04qN@MqMd&oDi#-3WDLCclLhqEiIe&IF$yM>Z$d$c4gL=lsC?&(>~;U^>6EM<`?A z$K~z{pQ|JkmNHdL`}6CX^@jELJWsBlc4*O>cQv10XPN!{YILIJ*+l;BzrTs>?_2Su zFWyf5bNkPy@57#L-fLU3{-9m8ui3uKC)1+-ygCr`LRY>kzVpm7rTtUZQT1lLD48n)U0ENH&}@2_-(@q_FC&)xR_Ju${Y z%=Dn_2VH32`4H*FSkp0B$9+pMm5=TF&}C&cf|H7sekYNooss4dGkF>uW?KeJ8K zH;CUndCc#G&1aSA9lus~$L9w>TmEd$i?zaNP zm^f3tikSC%!&qvo!esX=G^8P)`>b~rHuc*?#CW|A~@fvT- zlIyW8@peCM%dh=0^-;RebP^g&It@+DAKD$co67HIZSd|uDr;WVpOfxV|L@PQ@3{Zt_xpM8 zK35)#&};mju>CD3tAAI*QHf7a!r3_PpLE;%^_EdD|xo*)@5sMX#BjI z#l3dA_cML%pQiEs^LMYGeAZ>@e$$^yytGa)i?60?MQ~vzo+O+DRMYFNkr3ps)TUvK& z7}@LAu?Bs5{jxj0->dFx>yF3GEARhH*go^E@%-wi!ZX{qUu=1FeG=G-A6g_I1 zsiyqeef3*m)4u^*Ym3S)4lX?|SXe%D?UkdI*D?we6L%hX?#x+cCDN_>LB96l{Ayt? zJ{O-l))hZOHD9F|d)8gG72W@89lPrOUyrW;;@Y(GpoC55^b332iW?+<9sRZLd3XH8 ziIw@`JN-XuKRfy7vD$vWz_BcMrdP{D$h=j;!6>m;d}( zaLRgZ^4~lDb_V=E*2Ia4c|VXm{cXY_W<9oZH?N#boApPkJH9$1*PtZ&Mcsi5wR}6L zCd_eM8|Sz}%1NVvu}Z-3=hPz)QnmK1{2|(T=D6&P^uwKJ*pqCPKI_D*``&myoj;%T z&BxQ}r~Yg_x&F-W=a0K=HQiM{)GdDeX%8f?&0(3Bao;$Z_l|o%oy z?Ay}+PWirfuKFdpw&oL$6XrHgFtUFrdZ+QI(2p-)-|xPsy+h^5lk0UKau-{)EP8VN zYxMgAQU`cs+rCMiW2(J$}DBZR(-5`?uTr_2rHa?wde{Da)!V{-^QY?@HQ&Bk_Fv-I`+(cuw<|6yumAtN z^?-cSQ=uOd8<#z>Oq%lNm9E)#)%{l7JhR3Arg0x@Jhgo(i*l>I%Ko5_uQx;lRb+pB z?KwGqGpoV%lWZ>=-v0dMr#`ztQ;@sJ*tBlZk^aA*EI0ORACLK@4XI}Inc7#peO%W6 zJ@~fqCAsB_v*+jf-&zy-X2o0UCAMephu)60T6ccs+sppP^QFbJ-W#!Ua;tqfkQ-le z@bjS^lX+G57fId<3i`NuYeU}l7q@jwt{>)Mt0`tyvv?KiRmaL;d}78Qsr;L|0>wwy zPx-^8V$?4l)QrM7hZ}IA8fT^Lr^@!k!XE z8v#%evENLh{JlnnCdbM35~BOP4D?p~*cy3|r`D(DYApNRz)#xZOsjS_t$97;k5|_p zR`LBxGE2UT?Ef|KjPB#>)2GdOpJJ@|dGgK0U++6TJAQKgf_tAQp4r@~G(R@=$D$ik zpl$Mb+|RClb9hvK<(p6B@(ZeWf^+?Y&Ocu9_T2yK8MpSOb2Bi=@4e=}?_FxrMwWkz z^-XuIdHmyqTfm2;30?8k1&S-1d;RNjUvZuL`Q&=9f8E_}FK+X#Qd)GrwPBTZ#L}Qo zuMc&{U(P*oxGR3L-h1)A;UBZ@{!W|}uRcxs*^MLmkXD?Yta{Mx&5!F8Ub9!;E;f?y z|M`3Sx0tNoHW|*Y$NqACOWw$`Z-GL4F`pZM$e&s2`?>fQuA1`aR_?;xx@#EQwl&K| zai|8GhEFJEJ|?+l>Q1>$1f z59X>fRbF4*#KbT|Z9msi#VOxGgVWxpY_=`g@%^^$ud{4E1}obBeCj!`x<4-C<7;Kr z{c1+%FMSg3?v3YqndgwUu`~MNqe)v7g`M`d-xjA|pf0+Jt>+`5{ zjWU_=vvU8Q?)<4Cl|B9vGmYxYKWUepwB|OO_2D~fsC|x1_vxumKz-NG2Ufo|OnCY6 z%C}7QnYXWe>)HSQLBLkqNoD)b^xcvR|6*}GeAi>I`Jo5zMi?~u?_1Z@(F-qb&@-1GG7<_144-umyxlk1O9 z>{;I>EBxcd^z+^E&H2z=!={#Heg3xnv#j4cc%Qt@s$RC@ec=230- zQ6c|#^6IzM=CdA7o_)N2_45W+;U7&+zm@&#Qh5Zt95py2Lnk;nm}$@0=e&RKLY5o3 z+kUCE}Mdmde%bLM>crjsq-)&1(uUY|VQ#HiJd@A)g6iT{2+3J(V-m3Qp^ zXYxaD7jHUe6jaBT|66Wrt=Fx~n|@y@vsU}&-&0|i%CrCL|C+x1J)sZT_uqJMy>4O2 z(wT>oIBlBL*DQG8QgALXQJX=`>ZXU4!|GLscIB;@ur>c;K4Zl5$?@h1a~yv@2|xD2 zLHN+3xRQ_B&VGL{Gj05FHTz4jk-UuIJ+aN^Kd-J&wEHP)e7WfAyyQ85tiu1i68pVZ zR7Au^)oANnLj$wG+m`)Ls;3=juY9ObzUG$P^W|@E&NMm5ce8H7t-89^iSHW!-<7Xr z)XVYi!WWDmMWz%KbmuLN+vL)Ft z>$hFY`S4Xz54iq6imz)tze_5<{^-Z-{Q+~UKZ~`d3jLUWKcU8Y?}7&(1t!NgM*Ptd zS*gEi)q+`UyWT(Saom6R$CK-P4UMb91I|jV%2Svh`RVl+y@*TK4Anm0>~VPZ-1?@^ zi9add5>w=qFYTNC=aqm^9KUzn+?OffLSUYyP3H5)CG1=0F3l8Qyp4U*yW@|F8gJ+a z=gx29<~+s_8MUgypn%0Q4 zgd_wxnQFgioD|<)=6!PgZN63O6lROIOqfvWD$XcA>Cdk9Kc-sUeDmw6@!J!hAD?lo zFZh^kS8G30-k&eUF6Us##N#d#}ST=7xul=($>JOJn=)b^8@y3t*l6B6tdu!RAJu~%3j*a?f3xl6mBQ3oO;+`XTu54nu>EGt80FodlK$=5ee1( zMtqSgBmQWGu!aiHylyMH|Jlj)J&adD{h-B<7Hn;hJabyR&Q~&W*S4hv=xkfb=)aQuMn86>dv~{jA;~n?h`Kqra1MNL>{XhG^&8^ScdiRCg zHJ-XTsrCG|%hFyX?v)TdVIw^0#Ew;yZ>>{V5>&wU;&wLAZ0QJQp1W*LT35nLo=06Z zz3IR9;D)ysw_o@CsNWHx)3{uA|Ag;NPY+pI2mjGJXxaSX==#b}uP+3DT)jrhfgyCS z+f|bdr<`6r5B@Vt$E?n5uhyiW$9?N;m;4Z|KKUnNB0tMK#a~Y&!EP1%Q>gk{skr>c zrFDnq34h;vuWZ`KNw=?jd%1*D&o!5SiKW2L4QC%Go7JkR6c{Ldu3|`*iP0!{w%}TL z!kMPx&Tn6*OWfkCda>Y@cEQ05dp@eYx~gr!_@ZvX&#DIFE5B|^^&Vm`-5N zEBEo3Ppd_JOp(OL4p9+gV{uwTQyEt`%{w8+!)o&k4RGV%6 ztJia~rmUc?R4gy!;@ymh%LiXD2CePfVV-RgzCIv!FRPx!(^WGVcS$d>=FR50DP}4E zckcW8D&9Y*%>90Z$D4_HKDht?i&X1Y@ff9LC)Y2!{_)$wkgl$H-GHx^pR&0ZSHE8# z?;OS(ayIExw!-J>p?_vg{&`%hZmz~>$(i!2KV1%g`nvFD&`c-$=hKhpf`%Nz!L^fL zf8|!&2|sRMEtBi~QKSET`toho*$>w2bj`KT%KeyMdQ+A!o9EW+>kY*c+oTKh7OrAz zXuYc2^X$T3f%Ao%KO8+QUw7|r@$Gr)VqOpO|A>CxxqZok2mek?j{mBAa{aDs!xElz z7GGwI-95_|b3lFnx<9Ap1%J|B1`W|g!@R!!qy;MDY+ zGp|kl=5dM9zDba%V$_${WfvayQ|-B z|9N-dW7cm+G06vITj#ccDy}|m{{`FHKOS#A-6qi@zz{s)tJEBCi}V8r6lXA}%b3YX zOZuYL3g((Tn>oTSZc5&A z%VvwnR_;8XxjW!@$gk<0u0j>ZSdUp3Dt=}?FASP-o8egP^nP-Dxb};Ehd10kkk!2~ z`{H)lkWj~K+F7SV&#LVIc6#fLH`;YepIk3FboXt_WQ&hKT&&-A8PvbAQ28l(g7vq< zv%f2AmpAhs3!Bxsx6M+_|IF^A>kq~SPm1T}V%q4(=-pm@dnK=m+_G)`QyMKEn`Bi7 z-1z)3Cinc>YV|`~6uxF&`DQ2~{vgI7Oq(M#c+sjg2P~Q=D9Qc$+v{oZ@IX(?Ri>(p z#I>!(GiRJ$alFRykP_#f5Yq#DoFY$DALMojh;vexUMX_GVQx-H>(%J@6E3}*96$H# z$@SOQD=u-^x~pkLR>8T4F;al0JnPU5Qt=V4VS*KgE(qiqcc}!E)9#>!eHfO1QNUr?txN}Rl&0nVQ zwJxEjv5<42lt*Y|H&<3E>oH4<hj;(~yw>ze>9I?%cLoTYJIJfMb+L%h!*$Ps z&L=-Vq{L|>s#VguOMH)q#dOvE-i&Co8cyGR5?;CT==u%9 zM(_K7=}i3TQ?Wl?eYW%D_`@mF)cWQfK9pxum;PzBa*~ip<+R@k-k-7$7Po}o-l=b6 z8!CK#`No4)Zx0i&MilBh;+*1)w2DNkST zar!>Lgk$@(pcB2zrcJzd;Vxs)Tgw>}1pFAUE!h2&XVpF?hMF%&FaOW=KBmO^=iOVK z1wWj*w{Jh67N^>YEqW$4+vC~i-HgUZ*Q6~{bBkn?#>NVnJXl?T7qn2Y>K`BJge z?XVG_o{GeCfmLn0f8LqT+|a+TCQACkrHvj;=bzPuK5Ys8a7fVlCPPBc@r->-HCsqPShNHWVn9Y{kfB@LT{_vefM}U zapi|Ebqs2sFKugCzWZvKg3!A~+xi`{s##Y`Rjuza4-`b!4qqLSGLZk8jlhTZ5^~d$sE_l$YRI=$}Ex!TVO05%K zK}>7>>q2YW>psuwsDF`ixh;=jiqPq$EfWs?7LYx&Kz#Kns*Qs0LOUx!*Jym^6(n9=0ymGCH z*v4;Nv$U32v$i+ItyWB7y_^3xO~h$NGN`w4{?ECS0aunbHAM@ok#N55^qptZs)G^= zTAY!ZD}H5f5L>ZJthSo>a`ufx=4{iHy8+gxRZJ=#>O!c~R&ptir34f|(C{VS7-WF)3esf>OXAvTA7-ir2pZ-4&ivsHVq zB7E{^iA3hDIk9S+FUYRmc0X_8$Nsv1Cz$20mc6c@_wAyGb%V#9^9#2b>m6uq3Aw@) zbS1lBV$K|$yAmh&yk+jWc7^NaP4?3L8;?1J^3J$@fbqxAWir=`bS51LUKRDxN>oIK z`FW=e!-jdztGJwk!r4Q^16Hq}Xmly};`ZwssvPoVew`JIVcHbscy*uebYr`Fw+=|K zuWmmY=W{>y57&|>*Mr6PU)r)~GVkZ+gMz|uK6=)k7y0J!uDqj8;qyEjm)X8~D;2Ny zyE4tUx^D6Mc;JbegO8gH{jV)PUK^gvpSf~#R&`qC&6#D>Z@r6e-=MR}HLbvE>)m%^ z+vhPn54-JL+Z50nen)#n+S}!mWxGCqv9$K~e0t*Wf3m7zA~ii ztl2w%``-u&+lJLzIUg49yS_AWB8%M)56<6tEuiS(PS^c)?RJjD#LCEvjI*^{v$ig4 zx}FDG^Ln;nU+%(Hvwr=#X1XerIh}{i_CO}{?t=X_Ay@r^{=8bAzUlAZN%7w`KU-!l zFJ-wp*P=S;NoPV!;&$UR2PR)Vw$tTV?x$0`|CF+_{+__9%Q~A!DUiQ*-}$B6`Zu0e zat^+evG8x!?r!lz=fiWCH-)IFggm`kcJQDo`+56!4tLt++-6U%xZU5ldD^=VDdOd< zEv`a8Hd=)R1bmPvIJfA16pt*X`2JN-riZT#3{#uAk-c|9qiMET06#gERV{rRM9ByV-or#oIYK~ray$o_o^cUErmKk@76 z%C|Q^a0lLQ%~D8ZRTEwHiz~*XA^qOBB}xY}nA3eiZp)v(T_+#0`s2lP>6*uLzwR_o z6^u}6RNwGNJvJcV153fVq!-aVc0WT`a>W!D%F7u{cF zl+Vumc5=M_t{-0;Pp<#+zAV*FZU3_AN4}Te%M!NvbTaA1CF$dSX2q{+{`urju)0|> zn|IIg>D)cmH>W(hKE3hrm2Vqo*~uPT!!%znM|fiY^B)r47 z#8 zQ!q`(?8Drgl&4cG{hz(w`aWgz-39mW9muJk5!dX^sb&$f*XgQB!PG`WwrdeH9!~0t z7d&aBx}Ry{nae&ZTtyKdU(Yz>Z&EJSZo|p{IbzO+?UQ{~-UpZ7lP+F%bp6jyNACPJ zVE6j?y4x}6Du3YZ=IejWw$}EmK6BXmH>~^2kAwbuoO8=7t4~Z{wC(zoNm?r=^E_s9 z;wm`!`Spqw+iv^hmWM6pp2yl`*k)h7|EPZ5+7%xTIC1`AkC$-JDZ0$X6{oUnZqA7` zWrZazSyC&mN-cZ8;I{4-xrAMehqtw^5m|aTtW@Rmt#()4d;0x7XWW?{o&0liQhcWE z?!>^HkUy{X^tR>6sL22Acu?IWyytV^)cIojcLn|Vwda6P;`7b}_x*Fvi+p2W@wWeE zZoSXeyOEEDozJh|c6t@#^wKr{PA{&Xn^FJmcFu~;+*kEqBF`io&5W0yZHVzZR;IBOy~crIJw^XvRhr{{k}^dgZ@-K zw1~;&zuZ`xRqglWZ;eG=}P zB`A2V@Z;*M-s+zlWsGB7KE1vYx7qp2-22=1{4kyH(`RD;le#&7yk6C4*2T(5Fgpj_ zc2#+^#s5j?O5sr3-5#?1%Dlh7%CFvb-|J4f$fu{P-kSW|a&+#=+kTDSS6_+l2zfB4 zx%0zbCL4=KHD0Ss6?0C;Hr(3BUn28#6Pv_w_Ui}Q>tB6vxBo3H+Qh3OC-?-OE(r+O5W*5Fr!X}|{b%XkrmYQm(O=$Xzc_dBi&*XL#^ScD zr<3C)e;S=NaNw6Z_i&Td%{fLtMaw5vPMbDABFF8Ct<?8^-sqtD}UM4GLGLNx#y>TwcIM3%;f*Rc*d=N3i-Rez0a+Bdvo8nn5$*y zSa)P8?7gKoJ3PV1!9(fYKDDWJPsQSRJhOf$x9grgC}ovbT*(x4mSM5A0fW=kmorYW z+Eu*$VE=D(_MZQht@S_dn(q4@_xZ#3-2$LSP*Z}V<3ZI&+n$6+h6k)(Kl%UO?2Eba z$uD^4ux{A7@X2*G)%{Ej?^3<$N>8h{79U;TS#p0dXpVcc#%AScc3hE3>T5rPNzIW|~v{N8kS4$AitznWQ(rSf(w%k!Lllg}6& zkYdk1w|txR>RR*JVt)JvX&=Pjv+df=nC$Xk_1D`1S6|(GKl$6s0`Zgk?Im`s`KbS| ztig2s$NB%QdG7zc_E|qKR;AIOy)Vbf@}9UzjLDqh7rVvQET24K#VSyV(2})o!EfEI zOWs74G#|TAT6eGOR`|LstH79$Pud3Yf2>qLJF0$fw{H8bzW><8WUHG`QtllzEQ|S+ zt?>5plkoJ%t&W;?wt{|Zx20d35tHk$^72SlwaVLng^pRjZ{D)!Vii0zZI=0gsZ7t$ z#Lu|ce!BJl%F3;^ocGF}>#SKArLpUW`X)J!J;i+Iq$KVp->75!@$buVrThCkjwtWu zC{6HbI4M>C#gYG8_4<$V|3$yMsr|8A`Gb7zwvV9uw>=#l4<jC>Ne#O{8Rs*dB^ZCj39f9sD`wxj4)his!+ASgYb;Y*dhpu{Da(8*odG*_m zQn9VI@;fF7Y+AM?B-A;CH`1wvK{#b1r}>>Zr}w;VZj?K>c-#8}kp~#(cw5{E;Xf>! zz$&9NN3>wtp+9ZkObuD)MQ+D{?V=Cx-0r1*X}w+rrB)oSal z^)oiB+U?Tg+}Vq^*{gLd(DuKhy`qYDomPPFGJmhH@yxl}32k!61TyWH-`dx_;XNm3 z%cE}v&w2YkX(T+H(fWBi|D3HC?w+;fsA)KS!bw=q>hQjkmP?`@_TSsz`1|kmANkyk z^;sgn;sQQgGVrSFO$?lO#@zHu6>ECq!rP1P#~j|mJcsQ7XoXp%WYB81nX3Ee#T~R3 zO`9CA%=-Ok)XXgT6JPv3Y6~0(Z$m2HZcI71 zPwsuovs_}U@Wy^0tDn;QD}K`~l|B@R^`(~I-|=;uG;du-Lb}T9F9P?9YaVu1^gN1j z2+98QWU^fSx4Pds)|YkW91vHE5BMN7@zA0PrJDq=EIoER=gft}e9XVfgeS+Z-o<9I z;FYQBel6y;>|9-!(r(sOrlizG{poVJ2b%4XskBm_@bl-RaQo}?S@^%7mY?;ftLI2{ zYu%%{>3x^0-{{uWI-Xp=edXJU9q$8gr%x?kl9;f`XU2DiM|BHs*+uEq{r{(T#yI?T ztIF27+^k!xm}5LP9jn+XtB}8YsRe8NlvR6g>pV~5o%gJNKSJ4vplk2M_7PQO#-PXJ&YlYeu->~ymKTWTn%~UA9 zARqH*mVbTAlj{yIjEwr{%<%txX8(dm;Yu%*N+&(!IS^y`DkS%NykFdkUpKO<|GYSU zr1rRy@O0j+>L35!&NyIiymhXj+mXA=mw3&rysbL1Y~n>}>0jGsD;Vh)A6oW$H}j&Xvv2MfCjU`u<6g{F|6?=XpZ|Lg*8lD2YOEKs z$ljz~RDS@Je?D@g*s1L|a?s#>IXQkUtIu}V`}YDqz3y$@Dzz!d<;Cj@QD@ZmOED+w zt^HAI4xSD>v*J_ToNF`P^$LtqMk2&vOk^5}0 z)po)x+pOw5YX>R2*6n`{w*LLHMAl;eExk})J?)^|v$YFW9$?^j`F>f&^Y(JygD>RV zs`Gbm-Qa&G`(MVHHwuOIb9UaI))r}YZu9*utTz@W=`OxDYtyNBY8Ss;-1Z~$oTX6B zEA2lI&zt?&JU{p2-Tb@zTb~MT^k9+?$f$O7JSgLKa=mQ(my_#r)PI(GpQ^Dxz{6I1 zyRopX$~7^Nr@?UPkFN%)^OinsuIT6=9<9u&IZ*P8ee9<<0yF=w_d$-44&Gvs#Yq;vc1Ihip_sVuB zE##WN)AFN}Bj>{=qiK_(U3O=>7*!!WFC^UOaI_ zf4;83)So*ytl09V=2LcszeO-A6H+{ z7X{6+$|iy~6{_9vtXrGS@pN+hYpG3<2fx_f%-$ybrHUaxdc`V6VV+fyfuB~JUa9{V zslHzgwCK_Iy3X&DfBsI2KYnz5wf~PsnP(|=Mn0`YE)tKkoz$hRzn-4od?uZBg^lV` zzpLL2ax1fTd&m4`*gCgP{(N+9`kdx-GhY0Dq7)~6IPw4=bI-;N#}4tF zcgUU3*#CR$|E2Fmwx$2}`)0jt{-=lgeb2FeTm3fqlArR!zJ<)>`(sp_41?eB|mp+$-BRw{iiG1>ShW{{iC(MiGh`$vR}B$bNmq&-|x27 zR{8DDTXuohLCe=})X&&nbvyEx+k4kL&##o(=ep;fZ;NlZb#7-vfa#7E2U1zD#yEO# z8o1pnW0<#}iSNR#15(0Q%T~RNe(~{9z?~o&!>mlHzoq{ymsu%Ksub%Fth=|cT*+wB zKL1>KUE{_8(SINEZ>K+PjhAWs|MK|t8Fh^BH2HS1va+5RI;YOcSNTbsJw;XVHP_cy z*&FyS*!{fP@+ADS^HtuE%}r~h3*2NkwbeE3KJn=KoHP2WKTRk8T(Utq_}TZB<;g+@ zYM(1Jru06!Wa(U2Y2)_swP4ooDF@E4e7iHY%`T+p#2?Qq-~PPc@0(lx(N%e??XTO* zUsqX7TfA+(LMW@`-nS`}AI{+laz5F)dCS>jH*TQv$C@GHwS*ow&&{>Ds9!C4;si` zp#1c1B*Sc7iSmHerZ;mf78(72)EzHb^lHA?0mYN+JO8WZ*SftaF52(>#n{L`=wVVnc1wTf)$a>ITG63 z%9blYJDRra@c*qb47UB3%^gcXk;UC*Xzk>&Gj@~XP1t$!=>e=DzidvF?y_*%FAmD{Y-6TUE{ zf0exYjVtDwK+wXhxT7T@b|1G{ch7k7C+O-oS%YWM3z!<0sCHlfp(N{(V)yrns^qH_&5pMg4SuKT7va=AGNQc-^MOr>ceKRTj)M`B{3UNoe=08ku?8 zbx$Q5zu(Q>!9VR$=K=Zk+p3rT3A*y_N2<-dTYiuIZ+lJr>8G|S%JGEMrnpKb{XeZU z|Np88x_#E*hhKuXdv0$Ignj)}jT-2KJCdcQ}%`2BWS{`ao8H+MH*yy(vH z=c)Sn$JQ|ljq=)dtgNi8&z*egz9t6tEPZl))lVs(d4IA@cFpFUV=6GUX;p{9hAu`u z@4BsgWd~FK*&SVfphv6!!>>&B*_KBCTTZSQHnP{NI~%0**SbJ4agVE#*ebcT+ti)x zR&TREaC=_GsX4da$$ww@R=N62aro_Qj?mxx-sUs)G#5WJR*txJS9ZZ}o1B&HriUlz ze_nJ@;%iE|=EFuc|L?N#XRH>V*}Y@GY+L7o`qNE6_s!?EJYdCrjP>7#<^KEm?byWJ zA2d4M=jP&?)+!*z%CIJRLa41*UFd4jIm~Tu#hj~oFY|A>)%5ep^(@!Kz#hh9QZxQp zitT^)D_Sb?r$qt7O#aK|`A5~ip3|;A=rwu&XT_827eBi0P;mU{`h!Xb4k$>dYhUTP zWycq>Yx%8tf^$CZxxG)Cp?p%ARNcfZ>&GHHLQDl#wXIpFuw+q^Tl|Ds<&zp)_n){X zu}iL@`rf^7>F2R1{pz=m`3wvG8r|{yeKNkj@%`UR z(aUeQ87CC7{Clkb`(*B6P!;g>fTj7j)2q2`wCmPh)3#uKQP-VU%zHW8;_-#{C)cgK z>q__i__|YNf7+_r3s2=ue_q{x|Kz0jnTxrFC#1Gj*Y7UAHrcW)YHO{_9r;z;c7Oaa z^GaEERYdmr_1nB(-Huxucd=C>{Xx>B+;W#&v4OYy8JM3Ny$vtaGWZ+IeB<-&vVw0N z-HUI^yC}UV&Z@SXp#Aque8&HS`)`Rb)o1PbANj3$zjGsK*QJH}oUJc*i@osp7+h-V zRTp}e%SyXW_7>ycZK|g8j8|N(n)BzC!`vLPoQ;e|;IkGUeU3A-w|aQFr8ecC=Hz(E z#s99|*)CsrZIb;xsXNQIy`S*K`s%mcp4Go<-UZ!OPkGvT<(ul3`jnU>i$WGky)RsU zpp`+mX3e(WpV*9f4BVW*+Xn1;%dQ;5a`B_){tUG@dmoE^FPwk6z@>2i+39x!Z$J06 z)}8hK`4{WNIfof1glZ<)+D2FjJZJx(niT{}^DNJs;^%S93lepCIyru+%hqL2t|wOW zW}B4UPJUtK)tVcY5aV!FbdHiy{mGN-KObG+vSO`ql}GKuy++%^_ny8!apKRDZ~o5B zF;M!vU3Gs@LcanN2j6KPna2hXbI-lYjqkfvx9(d%gXSwIGl5l20j42)&s`~-SIa+d z%WKAK77@``zAc`ZDmP)S&V}zsZhoqcKhSc<{otH~ul}t_jyjPevHD;6>bJ>L?RYP@ z{&nhK>7G!@BIj`NE;kpKp6Efg%jLQe=M_R_!8<*8Pp;qVU$?dG&$cU@Hg%p{f2<<) zp1{oO)1OS|7n@uyy1%V-*~FbpJ3oFAR^89^z^Rhyz2}051^b+570=|dcfa*`&j(AN ze=8Pkv*-A-SHmN;`83z6xaMxI2RuQl-98&Kths00Tm3ecf5)P2@~rojrWSH)eNlUA z`|sT2)?e>jKfjYTS339o>;C@e1$}Ja1irs%GFx*nX!}b4xcEB7*N-@Ck|!%yempEL zA`+u9r}*>9^*XBit+;vKvN>;G=qD@9o)hI&mwPQBl=qnA8Z&{YDp$Lb?>j_{^2<-u zSbSuD>9$ASvf&K#?o)r5C&$}%KDXOAaguc99^CL0*W{m% z6*<1@J?G>5j0GLH=EXnwWx22KdGmSw`uYf&#`*4wA6Z#hr}qX%h%DYVMf2xY$GvgY zsde6`YThTDW$Vd3z}mb<^XJu{Pr{8oUU++g);8QbsV266mj{>Iw39J=xgYQFoyjlG z68Opcw7-s-@~3&d#S2$>bEXT}HBOE^AjN0!a_{bcw(hJem#e&W@Qb*^C&`&&yX2%@ z`qo&dRc(LXe!W$1FEgk6%68eAx8_yep1alm-rr|C8`te#nccHBEk$v$K0`v^!AeuR ztA~EvpT>NanR!j;@2eMQ?EWm0_9poD-I9IH#X3<9dZ4;L#WSV+UYd@EhQ^MNmTglW zKM7a*yzs|W%Y=;l3;E^}RlK$m9n(Czv#te{GDikRi0JA5G?jS}sr2sgf0q@_C)46T zYOkHF_U7|x_0)d``)ww=vFSBj(CugK-v6w?=}^?%ZTVXqzpKCdEH=~N?b8)+6<>z2 zTv{i!N-*(B?s98oow(0Or(AiITQ6dfofyM!yoKZLyi0dYrt`L^_Z;8sU9>B^qW`fl z_wl|rPG1?e&i&VV{pX{b0%E^-?tt80%>H2MJvBXz3QmK+V&_yGePJ9*KS##mKinc*e87Z*gU^t`>lEJ;%;~(%-eiRZc3S& zYDg)o-pNxcPu6Xhowq|g|M%lVk_d{5B1nBf1*qkX_?C5wfc=7(9GOPAAU6g%uf$5y%@5xm!D$h!=3k$`BF)-+@ zy0LfhgSvuiNg2^E`kJ{J^;nlonK0Gq>J@{uNq=_TJP^ej8aknRQvBLji<#%IK4ll* z|14$RQcvqc6Qox@-)VH-(xW!KVMWHB42Q$oAHTi4QugZ{Q{((K&si*X-#W)Ck$my? zy0Cl)j$IY1`PTB)w-?`fxA(1c;B9$n$2}XvF0-0(->nszSiX4MD&bFZIVSuz|6bH_ zYhDS=`u*m9vaUq(k1xMI>3GOL%O-sQ0 zul_rbm-tI}@3ij^HZdhDRfTiU+%G?8v%#%HFBoSTo=7zRDa!Zawr<-uwq5cGTUc+G zB`B%xZ<^R7c4Cj=yF=aan{R)ccP9PN?}>ABj7sf;pGmUsP+?mC%H_peWhH;p0=?H( z#($+BT{w5-_sX}+)!!a)x>6R}$jKSGb}z$$$FdV%%qnWQ$aXG5;_cqI`~k(>eeA+Q z8>Fs1QJGi$=-kHQhqg)|ZT<(|k>0htG3VZajak1%&Vd`9N1rZ#qt|z!{zEI9aA@EI zZmxL(VdejJvOj0~y1KmPREDtV_Xoyh=MM77u94hhl$;b&rSQ3@+v%BqOEjpvc~whw z|F_%OHyRfjOMj_xP7Ewn`g~1dMx0aj+pCq;lP14TPT2Ru^u%3$ox0Q$E9+w#Zao!D zoGvO@p~!fb`Pz@?w!bbFW>v3K*k`ac)^x(Aww!eeB3oal+_``8GjEp!^P2G6YuCTs za7<+DU!Mm~2QAs}#vMM`KFd|;yzR<#$(8&^?z!Ka$COv&W8so}pZ}ZAIrnbm4+RJ9 z4sV*hl$DjWpLMnMj5=<)&TU<}Upg9uBa`;EuP+u$U^*n2x!tWg^n01ndDjiMM2za= zP2>xvK8Ra*_CfGjy0KCyPH<6|6|xNal7pcW`+kE zzYj=C?|oacJ%6V7OnpwLu!2=>FY^<67rI=QRlT?Rqf^zx=OuYu;&uA&E8bQM=Dm%v znCAY#eG}&g87^Kfu4!D>TbAtN_Izl1=y-pz;K}NMb0@TYwn-k-?7tJqt*1N3sNkR2 z>WeRz%${6%y3>Zm=sc@z9oNkL@=l+$8*ZF*(_n0HTpKp!&#mB(t0mc9^i7JFEM5`6 zm-CqAs%4F#ZHJcVDgHE_aNk|4?rELTd5%46GHNnT`Uzh*R~0zE>g~iHpKHZTI?lPE zwN4YRp16IkR$VfxZyNtw`MIVSoC9x9=ZcJHJm>g*_LZ)Q)&?yLjM>krw%X18wd39G zW%HgS=|z3fljc_W@NhxRySEw|755CBxy`pEI61DE#kb4p*S}Lr+lrNy-g8ep@UY@q z{jFOs+)MqMIJxz-Ef#zBnoC{d+u-JYK1%^K*HpqWHz&gVxPNH)ls~IPmIN_8z7X48 zSKPbsE`zyrgzb?l*Ka-vf87zH8?w?W_tR?i&jlMVx+#301+pb^Pzc;SAkW-P>LcQDPUGDZ<6V`f5-`~D>#ar+8oVd#P-LexC)KnxQ zY}U<}`@ZqioA~R+2bef*KE&AFX=++}=u7mCg{r18m)5@ZxU)0--ru)@Vt#x07A)Z7 zI?TXu+(z@E(yGtrJS{R6*L-a`)*=O43$RLWA}3eq#fxddUGe_?4m`iN^@5gX2YGg^ zIutrteZQ4g-PQveau4p11q}!qpIGywbmyr*g(uf<7ujERNVev~D#lr+38kCPpV{|3 zZtLC2eeOZGU-C_l?YQM|LW(EPBlJ}=^!;WN%I^$&BnKCao? zur=XY12^Y#DW&&SAC9gUyY?#R&#w-Slj|7_N{mmg56}K|db{qfx7j=H9h{{rar@Yl z@T(>a54bto&)l1^bfO*)zh_8wxRu{i;wFE;wKM3?uNgDE>qIBLTX$ktQ`SDd=N>cPZ#TcNx9uw5;csjYctSU; zt@eG|9lv$wh9}`FM)Ll58YeO*?q9asS?gv_#it|e_ulVm|9dB^`o~@y)noU*NnQQL zyK4T!E00VjEV^@h9s8yWFZZ#}(ax$qxOc%TQNPM1g#|xeZ06nf@!ZpUz7aBw`WhM) zHa9L@uYFSfeBOiulV!Uda&k6YDquXPdSGvtWYykEqw{|(xEESXyuxyRkB95pbB7|m z3QA9@tlzUR?rE@5d{?}G_uMDpu632i7;c&btTqMB0NDO|D;D)#;#MEW9+3y3tyOz> zZFq9M=gjfd{@bJfWJ%6hI&ESYa}`5tdS+Jki%0dpKV2!i>ac<>hU3Jqu03zNnvMCM z)pzl%RM@)WE$i}@tzs4r74KWNgBMTy(fr6?m)N`iN5)R|#-=9kwzuXXIZsYnORVhM z*=5nx_)*T0!2u$9DeZ{OK@a{a0}Mp5OaoADm%volI1 z%Qtb>Rc6~(zHh8^&Q%=>lCK)mkO7BZ{l83b?-s$ zb*Z!$54&!~6?o0rvSX%gx7yQg7fj^1x6afd%$P@flk`=m{;e%m93Z9hJ*ZcIM&`>CvqN2mJJOFzC% zVT#dG(s7*l{jFwm`aY5U^W?6Ca!A}VQ`>LE$Dw*MX|qyyZ{GHMNyZ1Vx)X0tJbFxh zzmZ>J;NvIPpHBL@^HF%Z%$h_AtAyXPre&}1yddrT%I2=8)!tij*RoAlUQ5gH-}TQ~ zVDH;iY|oiiRkEt>*&h4m<2LE%`@b*RCT_#zcXq4({N2nE3XT8G|KFRP;PasTUrO`- zKQ|t3{x-Ab5-V$Zo9r!@l9}O0`a?~bW^QjY;n7Q2+YvVB!p^k5Gneb%{rx1e>2b}O zZN)Ml-fAXidqp-@KQ;WaRqyEf{{9JnxER)WpIqOwbi)dppI0*%>@Iv^E^S~q`Hxk= z$JL)x-f!``^-_RiXR*tr_GulvO_v;aeNOws!v5bY@86Hw_4&!1`fUj@N^Q2bi@IF* zOL7$muW|!T6KNG3>)O8efuz!YuDvljeFvBi1niTStB&}%aQhvLWX8oOwa+`RPgnY)m{jfZ?D?NhA6V=}*o$84 z>z(L%vxfD#(7CI2KTRWYygt27PFDZ9Rmo_+`u?_UQ~rKqTPFQr%h!~7i=zV7r6VPS zKCsW66#rZ&n!B<1Nu@dS1>-6{`{~Cm-tR6DKlQofn5u+KY3ZqK_f7B2motb9Ib9P7 zbv|#$@3f+zymy-Ry>CrTPZKAy$T8fjj()gzyXe2(_Y!{&-VeBV&cANi$LI2|oStxV z^|eSwecDrPRDEm1lqoy17RTG^*YW=RJoCE6_tVcG=JH+C=YRg7roQsX0S$SPRO9Tk z^Zd+~{`k73Ku`H|_U|I^>Uou_j0-RljXcYjX{3oSqYye=WV%wY3oZSN;Z zo>C9E4mf>cQei!PX|~8RxhEeMAFglt$9a>#ZsXra>a+R^ZghR%XV<)X^={R>RqNKgs!mG(om^$Ld6kj&dE3gm z=RJHEu87`2^Sm#ZhP@%DL?nM7g^D};8+a9Q%uyNF6jqOY5Vw@s*V9MbFxf21eeAf4}&v{*S zd$rFk<83{r>*hp?ovE+gvoC%p@0WQ8$}g&Zw*P4}`Dag0s$ghAXU`tB+lMrb-alv# zk6ZNo(1+~yGwSPeeKx%`*)OCpamu~(Ci}a*A{lP6Kf34fWZveTKT8kK$gJZ{4O~7e zUNS>1+2pFl9z7>M-<5$px1NQk%hp^zu(^5jZN<;VPxaD2wjO!2zD{o9CC8fg5y^)h ziC#=PqBWsX|5Q!;o#i_x7U*qRX|X9^i>FmP)@ioT(HCJB_XOL{r@Af**}!3Vh+)&& ztZKLY8^Yet`m?Sgyexd<=IZ$;Yut`~O1SPYRe9t29lCeSc$zB<#9UNd?!9zSGU>3c z`}t&MzOGsK%?xJO2Ia_&4fsMcnxlB`4FOGF!7EDKVS7 zOgOHN2_aX15;wNudm!6rQN<@!V?kE?;ejjcfGWTP4aKN!+p6g zMea@d-%oE2Gwp29JoTh-dUC8s_4V8DYE|A^da6BcYf$mnG+)@_baFapjd=HoKlA@a zc>Ga6Za4X74^NtBuOjQjBipwr7yZ8PdBdz)^hELN>C4x}{|ot?ZGO^iR{Z3p4nNHn zU8>$-7ErhD=hvQ18VZwtmL>&$UTswPW2=i{O=MfVwq)Jct*p^*wlf<<(q_faWQ=~j z?dR0!)}K}rdE#Fyd|cA>OMUyNnG#22TK;-GQ>^zdW|_Y-^rrK1CzW?DB2huA%jZww z+WFS$&Sc-V=IwW{6_{1uHZEhZ^!g<7t?59y;K@JJ_rLh?@j0J;<-1QGvXAw)$DFu& z)V^YFLf{_;%`1vag&OC}*6rQ#b81ukKJRBUdw)E*>3wCX-Ytn!3(o0JPH{e1HRa@= zrv-7Jvo|jId9`#_{8Xkh2_~2SaP5Ei@cL)HH-(BTr|3B8?_|vF+Azb;_m=;}$`5aj zd%UUq_InA>siKxo4;;K^9I~oNTl?5KZ}<6o-+E^E-A(^c?fyWy)+_k$xdOoX70FmzV9Z* zOA2d0e|RlraQ{!#6xA&kFQncy+kfry1pWI9va+sB*6ecRjOAO?(42Buk&RtBLpl3iLTCH-Nyp!>%`d(^ z@#?pp*u%eUKkW8<^nKca@{3z<)O?wFwA^mR$H(b%=a0$R|2XpK=8ok{)RdEX3w%Xw z>K#A6wie^rzv-IeQu9fs`%6A&2R!wh75^}~aVk?aTQzSGTTadD6UQS?{b1)SDEv_> zFsZ~OasDSUugjm4EOpC2{IYGXukn{FQ~NAw&bV)- zlaEZ}-#*#U7O)0a<3Q1&$QsJs;=WV46Au0mf-`dfl> z;goaN7|uuM9NV-mz-sbOQ^#5H(XWF9+u|L$j(W7k?`3~e(o^+^$=6iS`s@;>%mY)H zMGgygxMXe%mEH5Hp}0)D?x)@p3Dzwa4N^JN4>JjyC?A|$BmD99<|p%%kMiGtyroS- zhNqxnyNltJ^|QG)h^;ur`|6~M$)2>Ww#v#*lV)?w?=9y0b1q46=Ksy|(KTk@D$GCy z`y19Jb6oqLzD>`G7iw%dDX?m4Rk?=e)d03GlNl>iKL={Po#M(llfR_H>GSGO4<=+Z zXUyl^`svmQhBf6|Z{)6x|IY}dM<#k1o@ANY1HO(}DF*6j5@hBtqp7RnBpFB@oSw9?^X&S2^U^mioXO8!-&F8S zriCYtd6&SWxM`{q4RierZ0+2PXCA8VK6r5MxrR)RE!@Y|%0qts*zVCbYucIDP7hzi zbspaBV9BC(+`*PjO2)^#OTULDjW2~dvhvJIA^A5gtocjNk^rBPD z9w~OhKYL^OZC2 z*>23cah=@Z+guDnGy9#pXP$}Ydn5bmB+J_AG!3RBqU93B#R`@lXES!9@+U=Oof*A$d z4xeE8CsU$pHt|gQ{+eU!6x}>N)dl?!TdBjv?hT6?=54$+9@`T2y8=}{pWLL}lw^>p|;n3{kzi2ewaSGGSkTXj#tOEE!S?x z@pzqFvtDh+z6!?o5?`N4a1_pLUcCE4RBP+P)?%J-cXvC<^7~4i;k&l|$@J+dvld;j z*s-{vBK+UqkA?=7?*e7#r+k`Mn7Tpubmab7Ue{~?-ukPZG(T=`oHGCZv^RQAMyGvu zZ8-igJiT@O@rU8LODB_>swgLm@0DWurm+;dk0O)6(+hOtXS>t-Fm`Om%L#ns(NDUz)_wU>!EAf^LHLLEBI`d~3KM_Y z{F!x;eMc2fFb@;w-M8kewHHT=zR%67wl)2;Dyi@O93%V7f23Z$nH+DYa+5`WPq~@O zO`at=8j(4A3ZE-~d_6V8a}#HZo$3BQHw}Ki#MfNwG6Vek9?oL(HEh*nzrdPUV9;`% z>mK7h$sY^${62Q*8t)$Fn70Yp{Z&OeYgcs{SXdnSa7}gsm+!`F-M8*pC?1xb!1b5q z?)!u6A8qgbeYx!JmRG+MmKaz}F|D+n`ef#-imuWnDaSuI$2KpMVt#YDPr^K~Oev(V`%J}x-+M<=})#cx(?PYglxe@E8_95FzrluFvm`wY^ zD$>=zXa7T%ecWjqHct|^Gyk({3a8}f#2=-Blg_Suc6~z1;+78+E@@5+s^otr6tm-k zS@h`-t2cKlJbifmtiq(9%O>$P%t%?>)27Egh24F_RhF+`Sm(?=5ZSajNjl-aO1w3L zX7?sOhGvoGy{?r8lUyX%GJGqzcj)@(tlx)hz3cv&r7v^!zMUL3>5r~pfLze28u@y@ zE7?K!mmXQeG$V1grbR{jEys6K_pTZ=JI^>681}eaGBI&QH)DyRhpE&NhAC(M33N|* zki)wFo5+mQ3AHj^H=8}ao_W0As;v5bbr&dF#aE;(y_>uKzT3uxAE9$^|KU=ZeYWPa zw)Vzb6DDj(cy5SKDHvC0L(4yk6>@f06fv8jnq$Vzc}{uP#rJ{_}}@R(zw)pIvbVF~NsT9fC7?`1uy}G-`^LaQ2*H zEMYWIdFYm1IDtXdzNTR64z>+bb$IS{E%iL}sCE8dWAh!i6h9wn&=mD4SZ{Lq$MRjb zE(`Mh7mzQ}F9vwzOn z%D7U&L!(JaNdC{v@`>xj7wRUiz47(PGM@+Q1uK7;KK^x4b+)AU<3rEFS^ZiAEsRg9 zsr_H7BE597QvZrm)%;;>TIT!XtZ!JGlrkUAz2p{n>h$^^m2(=c6O@=0mR#Jyw!t(( z`atXT%%yLQwg+!i+_xo^D@!Vpd5{~ zt99!h6}~>S#(kOK-Xk)F>FE!fT+iQ@a$yPQS-7P{WxStuX8YOo zae6!UHRjK{);?!;ym`wvCplNkr3}K{Jh}2?<<3n0wjrQo zThsi_WroH%wu}ahf(J#ECm05ta+vPSz;azDk^Oe&n{U;rY9FHAZy&Zkw_YPIgzLfXr z!|PoIJHOx5o*#K;QrZoNpR{&Bm`bWQS-n5x}` ziXY!*e9hax`A|7yA)mV5r{-Jd{_SymC3dD~+03RjO=hkUTfe>7wXrca^Dsx5_{;;} zIVyjcCeJPSDiJliMA|O-tcB~d+t0$6nsk)xaP`(U-S1?0V*AD^A|8|Y#H3TRH*EiK z?c9&2jW&OFX=V6|e<=MkZ;F@j$v-~X8+3k2Jk)a#w)ydG(!VFHzh}QmxcjF3*@gNG zs-Ia3wlsONGbsxH$Ue@r_3rZTZBM5bbFGX%C8Dr&p|Aht)@y#-o_??WRMRv)um9Sg z-Rs$B9{4T-N}Q`any0%I?Y2uUj=1n=mD6W!hk(^4`!}&q^xHT^WbvOH&2!mTPT-m} zEB^Hq+xhMB`rW4|Gv8{knQR-xpIlIYp% z%w9~}$dooaUejd%ri*i*T|atwy~C65pUs+^cAv8{Kh&)M~F9^~fL?Uh;QalpJr z+-}lO3y!yU+45E$ecbnChqq+Y#50dgX7;P>^Y`oCd(=1hws;aVyHxd?P5gGkKV+Td z>dr<;-ScLPJ60xeYSEHA7uqJR5b#{dBNC|aDP85}k!RrwKc7DSkl?k+^Xz&)udQd- zznLwxns#y8rgeSBIUFok11~u<`L>@iE{-r^dF1EVd;g=vzI)1h z;_m)99(uKm>(sAHS=By@T)qc?&o$a|d-eI+y3}t{poF05vQ<2?@xIm!XYSSBbw9WL zH2v|^v-AE=;|n*`ZkDw32qv+8-FbGsRa8#X*5kX?I+p9sJb!ro?pEKutAl6URq!ZL zWxr~x_Havd-z%H*Kb~4{w^`3Ge#BnyZ}t?=C9(%vvvvzqt9CO#f3TBNDZoGD(Jl9# zQLi7ZTcp0;=UC{3_IP74MK_OU;rr7quKtk2)4t7O|wzmOMGxv3$Wq^W6k;2hunMZU{zcK@8}yl>B>#E5T68x!9%PV?}} zUM&zgvpqh&;Nr`oF87?^qtS=Abvp5+teGhEAx3#kL}mu#%=E~fv^9OYE8pIIJAE;; z2=mX%Zw#3orsu^!EORloZG3-FcG}nZsgvG(Ir)6@*8k65JE?uB?y>n(Rs3+4)`UIM zPP@J_&Q+1-TJq}B+4XN+ZF#Rro##u?7f*Wcc*|j?-^r%GSB@{8k)2rpe6j3 zl*gO2d+S|m*_9SH)@b$Xi$%2N2i@vla9LP?e$AwdN#0q%|9tB-nWC3EZS(A?RVtUl zHaZ6TZkR9TW4X%y*O|OZd%b?22l*VIKD<8Ll&xm4jK$;b1eRHqQrk`+FV;9y`0vcK zaGkqm7ZRH2=9pqsvxYjgv()P&)?ZWrHCE~0Yz6t7-8??KB-?mqM zx|`YubDqi{U(+0<9FO|H{qC#S{VK5C?CgXSD;$pNPhPX5`S>@lv+Fb3V;PTRIQ%qS z=sEdT&^(U|2N(Xl+8rM!$^K35-t~m+hjZpC{;B-2wfUa$cW!~cmDk?huWHg<%XVJr z^P}nR`8JnqUHz|o`&s+pUZX&nc+dOIZHdjD(oa{fc54ZHT2n@{BY z!|NtjcQ<)Me*4*PtSV*`J-mXO7?fAI$n59gUBTe6prC%n<>Ps)j`1Zn#@}-f{deVq zw%_d>r_Za;$e$`!d}=%QS$JANz+F@E2Zx+ZO=sxtDK)OERN&vwbmN}owzjufu^fW@ z^S<4T-zhV*e~H23X1SGbKezhdt^IJ;T}!)&2@JPW#no|tg7?3$&wcfGWGgvmN# zmo1l#lV%=BXEFVzH%Mt}V7&jg@vJ+nta%%m( z+SGlsQ-s^&qm}gQewv+Z3u@}s_`EjWZd+d0*0w2pXV(kWYOdWNmt(Uh-|FmoJ{gX` ze*F9Am3Muxw0BOg+bFr_ufbBkW9IGuZz;aK$$met=9s?xZw@0C+u+;!S~W>&JC-$N zYegu%NMeYUbI4|Hdv(3$u$$k;IZl%|ri0wb5Y!N4J-=96#d-S?TcK}$AxgzNPE_#A zzqe`Ou;JRq5V&k=gsn!}`qS^H-)DXEM!Hg_?rRuV<&;+we$L1+o}F^}>*?hxvxCpB zXPE4LRPT+fh&cDG_}Wv`?w@^l{pq=h`{sDYZay8lV2j%x<*9Yy4~*~HNX`1VqueNq zqoAyuo#A?$-0HWhMeG_)ZWMP+{~E9>qUwIR=$y2UGU1sA(&u#B{MofwLA2xMyM1m0n8TXM+BC~^ z)4@tlGw#{(q3H*gq|b`?lzcHGWpmEw?EI5|p6Wlk;&n~?-(l}N`{J)BdM?^`{Lr!$ zdltXm-^vnfc&_xE)3Yj(wL>-U_``h9DA{o4rhi}!MW^Gx8ZIX3CU;q|*&1H-SL z6RP0aHsOYkl&ooL z{(sr&7emxPtaCH2V|*_qayU9csp9?QDt?A_nGb4sy;`<1X|e|QF=X9J5!XFsqw(wM zUY=h+WmP|O&x%i;)SJ>U|Lz|zV^6b;_bmZ2K9!xbJ}>-vHG6~J!l2KqUz_Z=I>H(u zQ`g(QJdS67oackx^KO3#FRE&dobc^y&%^r**K{)Wy_dfGw)A98#<~=?J-K;p|M&K1 zReMal8Ncv_xevO3;*cRR^;FRjsITQg@p$vmm56tZB6OXTjai1S87wj z{R3giS01Mq__7*Xw8+VDcrLw>aO+k^he(gzgy*VD(lypU@a0TD9*or~W=`Kc`P`*!0Z*3|my$Ln&1Tzk+5P9igvDJ^e`IF%a~$rk z?k!#MHt}Fd=+?ihxZ9_0pWik)+53Ij!@Ix4yI$tqyz~2v`uX#DX|*rEWxV}eD4N1F zf1}xxhu7;ISWj~_%nd%_vAwKo%J0*K1y@V2d}mv?@`8{5f)dVDwu4NInIDGe{(K`; z8KAU6P2|Q82Q^!l&^~eRAl4~nm!f7($>Qz2z1VNk**>}JbDxDzkTJig?{B!V{nm3q z!-Xmnu6>>rpWfE9ms_ja`p>Ia;XR+D?w{>FRbHd_OG4zn5S39Su!&Idaux;AmGGWG2D4O&t@>5TUq51&ner??vVoA-5z z{8;laT%jg^+t1LDD%qM{Z$D)FZ0{)M(LA}#_{XlV53hH3FrBT5cr`zVMMV6yw?muc zgIQen%ssd_xLn)meDC7M;H~wKHmue;G);Z8b>j!Sg1EF_NB1X(V0;*wusg8X0fAbqaF9G4$hObZeMYVx$;Np z7Goy?xw06gYis-}U!dEU&w)B7hGpqW~uD^ehZlo!R zC$M!$+%q$1W)6JT%h|kMs=MasZtrK-9Cbe}e$1K`->I_5>^*Z}2|*#xMPc=z*vcHkz!#JPW%OOB@YY6Ha~WH`^38nUya=HzE7y z<5?dr8pRm5u2o;nzj57%&t92#D&NYvZBLoM%J9RZblzp^^W*C< zg<#EHK`--d(q_um1UEC7EZqNSQ^&VO$Jfg|*t@^5#r?bYo{y7`T@GKLzAxc>%C4Td zu5xvI)mnId#5P@9_H}ME!;f>Ut@B~R6RvsGq4na;i_{@iLq_X3N*HPB>8$VyW-{Y`TTsxxW*$YjX8>YNk!I4tsOZFmc7^3v;)6p1qlQ zAu8*}{J4m>GUozrhoAPj@4L0O?zanPfVfLjl;^Z7o0uYbuAU-`H|_qGN9%me8;td&1XH!q0on!v+c z7I?OATe;WTRf=z0_TIV1bEG+~=-&Ee+u~V*dxRF2pJgfF(cq20zSe4Oci7Z$tvkLM zlXJ@Ie|#Jjk@HCmJZ8i&+vfA#XW?=zuKRBPxix8x$Fooc zy>QP>k*5QlwoF>IPi)PG$6k^a;f&{4KfM#~>|YYMCg9FSSJp>;I|ObYOcsw=eQVtm zG3~q4u6+BkuY9VCw8IJY%%*Zau}^iUW;w;X{P`Hrx4rqpHnxrjxvI77XEvOD7N&ge z+J`qE=e{?#`?ZEq;>W4WXD9ved0@P)&*#~7_Uj>zKDT9A|GS6{G+^f z19R&`uaYU>Ojo>JtsqpHcA%17RF5xbwn2+_^ZGlTi|?F%cKzLl*E`RyU)!3TIElC2 zm2VHv!CyE2ygGQwp>X+6Q=a|jem`Z*F*~VtZGMvKxjktyZz}?qF>G$mJ!Z^RV|`yC zu0rr$v;I5|5w@7}PZ_bzxAvX;;r>7<>-VfH|9;j^c$U^s%eIc|PSI(~o6MdOkb;?vy^|*|S|ZNlwq=VOV|5;ctFy&yN)Eh}>E$I%DR; z>rxwd3RJf*bzWzqse5?C?`wZ<$=1c*__NCTR9^YQt5G>gkyCiIv<(Wix|7lrB69bX z2b^*!&ZsL5dv~nl&zI?vb+K0^H~)D4^3491(k_-^MS4dcrnn}oD4V9dH%`a-(e95I zqSi#_?(cF{eS28+%D2^OH)Bj@WY5;zqPeh?GjvL3v!Rq?XqS_pS+{s z?%`{N3y+@p@$q@j{a<_iKb-$}adB_1zVMHpdy8hLdw*#TdjH7*O@Q?@G%p zNfuQWC3Xe13n!#MH9ZVTSe*4+tK;z0Z4=poBDhalq?!hWk08KET5F~?1W9R^kq)fFas~<^+M{awzQjZPx+GUu;Ry#nybk4?|Dm9) zWxul~v#~`B^Mf4KlSX_DA`V<@o|H~>Eww(fOPJ%g<@%EQDO+n-9`*K6FY;ww#gSGZ zuxRVH3pzD?Q!W*7&#J!}x$^hstv~K=y|*GXO|XMw2~SBx&e7e+>OVAV?)&~&{D(Au zes0R{nFrFp$gRI`Tw%+39Ep z7#{7vuv_s)Siq7Nk(M*RJYGHj`^nn(ng3MRwYUCwF_dib_xzll@$~Cly9NPmuT>36 zKkrm?Zxd>Nxp#8Cz4@P2-HKE69HW>6P8YuaT(=^5?akJ3@0U!k9_ShTlyT8AU1by@ z7UgyN{EVdAyQ>VJUHx|Yh<#G~)o;Q3zMYP2-Nh|Ff$uM$t@W()8<=-iF;%c%VmoIl z#9!L`+hs|@Da8^)j&5Bq-JLE{`@f6NPi2}vkuhceAJ>Fuag%RXx;RZgl-_XQVsp8v zP}D6$Q-cRrK4{x`NbX2ua+TU8(RE6Ob5Eah7MIALPb)8EslRwAqj&kwt`0d{$=jRw-Ogen-)aUjeGD@}gwRXOc(o5`Oig={C@5{v*ZIw?q zo~n!e6($?3jFL}CK!(Aac zp=%kq)Jl-UE-&;AkMDZQxM$b1s zl2^GhCg(`pt6uUfJpXCZ0`Co3qLmsOUEjKY){ZiIuX`d=V}ecC-E+=!uK&?8T$vGG z?W1rlLG;tpy_}wAll1ky9sTMmE99$OIk(L_U>00q&6LPuAD|F>;K3Z0**jgNc6Io+ zN53r$u;xqt%*830`LU?V{F`+3if!?#|2_s~{hqU3Zb!w#1NT&&ZgC4dST%WO+m-Cw zCYl<#mt?h!En2$XpG};`sn}&4)xW1WF@7`C{D~V)^1gk@_Q<)%$~6DeVQUwaqM*Lg zduRP@rma?}>diG~+{1o@ab4qf-mZg=vkli$GahJlvch2iuzb9_kx6(|{?(6fZCr?Be z=iU0SI(yZZv`gjdD}2;DQ*@TPvz<4u?qn}nXK$D```F8e;hA-3*dNKZDP%Py8`ee2VK?)thI`_A{~AI`6w#U7>d%k0C$nu-$ll7u0!Ar8rR(fvZoyx6qcS-$SQ?tIiam$jpA74KB?OUb2Fg@#cYVFh4H|lP+ zhl=w}_t>NubfI-Z%{MtE7R57eUzp!XDeLa;+O6k)VHr!Nu-Cd<#nK0#Nv7w_S^IEr z>+01BpKrgZOJkZ}s9YfY=hN9QmR&_EVzXEaqidVICU(93uJpd=8hgv0_p>|ReOR5V zX2i0}WX|ftA6_%qRXka|%X^9H-Dhql`^(zncOS8=yS2@8S#l3Ug{m<}-^00WMyfHf zoPnH|lJ^+wKKA(N`Q-{qBFw!H*D~G8Fc7}cZZES)|FFGZIiJ{yw-+zpf9JDfzChm5 z_*2~X-da?1=zATofYFEC!_Sj_D%y{bJ!ae`nu4U)5UD|#jBrz@By5l;7b!^ha zYFC#>>&_}@zVnh6WYf6U+ie!gpX4XF?Vjm|Qr5KTI;FGiY>gYw?ifxEedGSp&>yu2t&A>Dy!vhHlVidQC3r4ZZ=AxQHGyr5xzn@Puhl`vbg=&Zp4+ zZl~GpFS{ag^Z!?UlL=kMU>f>f{9d?Q*zNRvd%A9|3%RXac=IiD!!^|dn*@5x*M`hF z8shy;WesOwZvT~UgmV$?YIh~+fTqpv5s-=2#$xvC=T{5&Ud@$dPZ zHEwPWmu{ zfmgoGF+8+q18dG&2dyVxZ!i0Lg?V$zzR#t9YC^aE)p@g)YyQ=5TUWe&eW&gYdk|Lw z|LrStJ??LNDfLEmYi4uDw7IW?ZZoQ^o_LM*%L4{0k=;wbXfHi1`_^pV^;=RO_y*O8GKS6_?t4Do%4In4IGpdp)&BX9%l|Jq_TU3U{h!60;F!zi-KMqDd#(HI zORQW6-c9evX_trmeb>*A)5&3yrYZJbTh~I3jTk$sh?!QH~3Q85T97I*O$T^6% z-jVGUGmJjG`|OSMnimcq)~zPu^NN=G zBlr1vd5lvyYut`mzKF{CH7`Y&JO7uA`Sn}rw-lWhY~59CZug1pvCh`NN_#%udh7Dy z|F_G}e>A_J|KM?Q@BDhZgY5S6A5{jQFci|d>^k#$QYzP}n(XQC-xrpsCFv~P{2|Oy zl0BEpVETm#=NO9`zBTAE3Rlf8QTf8c;QYbDjDa~;wJtX6cVxh_2_`Fxf=9t9C>j0x$vI{ z>B2U%Ckd!zaZj0I)VcXx)o1O^{G3u^$Eq2cw?q_1dF(N2&}>X%c%dXSnWrNBz%||( zyK6FPvwllj@A)IUMQ-x<(v@$gOPx4!Rh;kll5P6gqDg5x(zxF1OqrILyXIrwJF_cg z4!7oR)m+#uw9FzW*XUr-iYZHi&hjkZ#dhzSvE{qkTJ|$6cFK>1Uflk$db?e)O-sb*(6}e;0t$ke2PX3Xvsqc}u|6Wn{=0o#*|Bq{e5`S#Xty^lF zS(o}e;jhXZab*T6FV4j8aUm783MzJj6=n%;0Sf-Y-%BTb`=ZHkNv)#)eEq!N$L_1f z$1jRs@0%O%-o^bbIyc_yVcdp-DE7+xvu@2Zx}$ph?iBU_S4~Z$jgu95=LB!c{Was^ zy(`wn^;1E~N%Ug-!|*`Ar)T$^7n54*)A97xgb5jUIdsc{)?B`Se1qPa;M{oDSfl@k z_uCzOU;m!<-;=|dcGl}Y?AcUd)@rhU)wvJaZ_7Sw8y~)Q`NLHYwiwd@p4KD$><*Sp z9;Y|HuzfJMu~=`y%gXLEXTqo7T=?zsx&H^9o=l58@U8QRb@V~g$xk_>!ftP0w(Wd= z{Zp0M+#6)K+TJiO)$IDMkg`MjWI_0@4BK}Xw@HdgcouG-o#A&kM=J)DMzRl?wa4Ey zUyvj*WpbU?2jjP^9e%r=V)#A5?(pxs`>JHKerr|yd8H_~zp7(>-5(kGe>FYw_TfJ! z^ZS1|cwVjIp2UHb6Qo4CwItC}&F zYsNuF57C2C5?${a!U~uB1%^so5Ph_d@#x&gKll8Lmz@X-cD91Ihu5ERy!vXgo;i15 zY3hW6wmt1%X6DI$-Io}h^?TEcRiEPj{;=Hld9OGqaZf(KT=Asa8rg{zD>Jq(yzyt3 zbzNn+fAcSE7hBbk|>$b%wJuF!HHooDtPV}ty8|z#O&6}GG%EQ|&wS_tMxLLh!@_4c~ zB4y3m1Lex&T$@iTO`+0kXsInB=SMEg3Na+u9@Rbs|G2KL|w56lX@8MiUL;tcR_TxOK9 zN;H41{>p8~|GxZlxLEW@u=kRA1+{CrH*7Xu_1a2TYkKJI>l0Io1G`RF-exyjye+@x z_wxt4PEXq<(5U6+I8B4CeZhlr@&4Uk795#kY|yTj#h;$NVe^KEk4@j?2K_N_^?6`y zv`%ogRNc}UCvOCQ^7axjX!&-vlGRS=M{U6U-|M!mZwfxVzTWa!zy0?gZ;m`wpjEy|Ozza_9e+ z-1p+=tLK+B4>z?|Je;}HJnMJr-miu7deJ|oT>WOMJmJ%#DceGfEgCMdI#|UwL+c*v-E+=n-@TEt!UdF`qYqWJ$8)y)t4a_36i~kJres|2JkNU<|9p=Py&Zn= z%!k+KkNr4T9{<4pPexC=y6C*?c0BuMna!Hi^mWPdZm<089lP9uc?0|#PjWA?V&r?r z(9V9~37ZDX(wyPkk@^)!H{pZVAtni4j5X@4j2{_O(Z$ zW7uu;)*rL9R6C81epnGZ<*3>F6+4(63(G%TJ5aKYm0! z?60qAlK)fFBtCWO(OH@cLm2tCZ~D!a<`&$WcuL4O;NkJ}jf4S2 za?1U@OLt?YiL`w9Wm>SVF?*S(#4WxTJ?F23mOU6%wVdYJzv~stG6{yR1N-V-Ja2`o zKHK!VKK%%b6nok3%lm$PnacQ1Hfzu4j28Fr-O|pt#1jKQzxMAl-S_{aME%#B5;<)F z%Q%F>{+H-{bAw>06=ZX)LH3Q@ro(f3FoI1WrKsw^O_3l;M|LSa&J)?UyecuhY z%Z~HK-!7kU_1l_l@eE43|H@(y@VEu2>77Zr);5LfaU4sV$+BgiRIhuqRmZPWX36>W zR}Yli<}LDmR{vw=(f4)h5B1x9t+4z0EEskjF?bd(IHnB<1OXIHEDVL+Mtv?dGoEM%+sMsKW^zLuAZTA91 zp4_bNvD?%C_Q1{g6DNNBvG1V$-&Z;_|6exv^J{tiN(YsnuWDVSEj!8O z+_w9+yW$^w^SJU&U4MGTfAPHB>gi=n_p6?#)_mM|aR1+TEdRgh$30lTyunD-LwxUU zZZbfwmwVTYERbKPo*0z^_ymokZMZuK^@qgVPEIzM2 z$3$+GhGNWC`Ss@2{L$eBXBlTntvKfN=&CH|)(fqF6lI&{)u`O*_V~@TwYF_bd0mq0 z)>_41WvB8Ta`$Ux##KHvSiUXZ_3i#Qc5gP{;#0~9cFI&XoN#K%q8(v{(|4C%e5_|S z^MlPTEsgh|%X5A&?21=6YCM19Mxf0;{pIiXIyZm(>}MU+Z!r1qJ;nE$wQaYHdUGFN z{Hrvvj3F{NUU=W%)%_ozHK+gB`~K>W>Gf8}I$5Vke(5^0ds)+F_JXZX_WSoY7AYKG zd8y&rr->eii>F(}Y`%4`e|ffHhts3>_fv1}yL9NGQPywCCAC*;Z)9(kRVnO`y7H~4 zf_q76^gb66C%!|aJx})}oiFf{3eGhaWv%P9R{!hRv+WKK*qMno*6ThzOy|+MqEq>T z^9gVC`DN!7Zl%{qCET4>n--UQeo3vdfT85seY#|rrh4fXE4j+W!=d(6JwHU@=TV$G+TNj6QjHO#@cI+!l*y;dsn zBll+drd#`D|6G4x&)6UTOJx67cKr{R4Ovz9$say_FUlfZO?2NphFvXZI@%wHYqOqS ze)ZeTpk=&Ow||$naqr1aSp6|*Uy;J^))7C)2(~_HJ`n|A7rTe&F}x=W9J0(_uKp*x!USI)Je!*Fpr6q`JUp> z!rMF{_vYQYxBjvW!!#+byW4KPE_ir)(lO0Q32wNqAp%=2ga{xbgk-~Y1N z|GDz$=ai2Z)3*s5?zCNDd}{Wy+u`PK>(6IZ|NpR7|1P`W!}?$5`UZu6Jpw+RYm$8+ z^FV3=r_71ShS~>b3s>lEn~syX!&iiZU7hIIRy)R0F5iKlv?n0=5)`+j!I z`n0Wk|NnS)`}>E7={@y7(}U;i5Zd!}k$PWqF`s9vI#UjFh5UP&qw~Lhocy-(cD2hr z&1O7IrQ1rtF?cw_4;|L zfyW|mR9#A*eWqx^1}(#7BHWX=|Cp_B{O_N>+@s!be)C;#K`#Hs(f?lh&*k-{pC0Xx ze&}DXlt1CR=dE7GgTWhBtyyJV!UWnt|wcDY$1=mcx z%iCiZ8Zt2*5&zNz3wjLzLqP%~8VjF#7Dxm9mpE4>XW zP~TpcW6LPG^!d|YijJJdxhr=yT#{1I-R$S3-rXZm&SrDil0AQR!sL(KpKh0P7ZzSp zeYajVtm4xv-I}+Z$F|?A{CVq}DyW{ebq71Ke80B%QIBWlj!$+!^^Khw5aKgmuP1!t z`IN1-_8+bt-u**=zs<4#|Bj2v&v&u^GmWDtL4M+q`9in0>r__1z7WpD?;vHO|7YQv zZS%Vw?!*SSPYc|>*ELt&w{41>p-t1J)-z@+Egrk9ebkrW`k5!a_0Fv{uKS0ly$uzV zU(CgARwlMyHl*UuE5UvLZaj$I|K-xw_raicr8!5pj@j#Pr-N6V@O!)ZqyC}w-y9!K z>b{h9`*hatx<}Xd{}HJAAo=fiy)CQg;UzYC!p70d&$aLS5mv@)8+`k@IA3kRZBCZ^ zAs_C=MO$50Qkm^z=nyE^=Fp@xMZdJO`unnwFWXK#ooGFNk$L&esR~EtF4)S~y@zc* z&#{VMALRD^;`s43erMeyIdG?k_vo<`H6bYtk@6{C@&!g6TMwbi8)I>?$y6@ zXuX}pgWLOe*+Sgob}XtrK6J-jtH<@n-+a)rX1_j1UVi4)Z?oI$znpHV2W{!J+~%}z z+mb_{=j5hcTD!&h-=`Yiu6`?h|DR>T`-1{oZMFVu?yuF2ju6!JUDguB zmR2DVQYL)D+A;HLm_p0{&C~ysWqRNJYci8%((zSO7!N-_sN0|RNv8h0_`Ap4&b|5j zf1ld+-9QnPn0h2*N`I6t+oM^xSz7+3OQU^vXUf*U&mP@=Z+Gy)gW^Bs`;8m*+zYP1 znfo;4R7-Kkr*9lJ>!TkxN&#FTkfuYLG_Zt>Lr_R)gAu$?{@iz{eOQO z+SwIeUw^3l#P5}B*;L~)TWbZSuX8Q(Ub=&!dd)WV{M}Eses{_ZSDT_IIpYz-sVSKX zray0|UrG_U@-6S>rFY9us<6DCaLKLX_e59Y+Q$2TPOV;XT=d@mqqiCI@~id5mB1my zy>U%^TwD0n9*>!CjOTs}y>8ODVfB)2_LV!2OrCyy%99BjFaJ2ZzURaF`gEq?o(Jou z>V97NmFaBl84KQxM}Mx_#(w1IJc|>a4}upREnPJGZr&;83}b;ua#zb1nVIr1T>5Q# zIGR&t!?yRCMyr>GA7xTo$|JDGXr0vK`FpDQuX^_8@2eF*aF_S(>#7N$A=P7E7X4@b ze_e9m#@VCpWv6C8kd?cq#`B)%!@0$R^Y+A~ZMA(Ya{DZm^aa)IUp!k@}qS z?|$upA0N37-B{$ifODyZJL`kB$F9$psQLKMG3>VSxuf=#-v$2viSJKra~J2cSQ|@NMj15~)?Y1aTk9vVSH13ZmUZi!vRIx4rvpzFsxO-GR!-c|gQ(e2ViqGp3JHI-=ZsfOnAj!ACAs~+> z+UH@U__xs9=|{UN{?!`u26o-vGQDMCh;pV;T7gDp!mS1mM`>oK58KY)mn`MGS6z|) zUE7!KF3)$Sd!`A|j}PV^TU^a{zhd(nf$w)+_RUI5Nm(P?U-rA!aIyN2^Y`^W?Ee$U zo7;B%vEsLVp*x;SM?|yj|M@q9>F*70#)(JxCMi{S~G`TnnyG|mhy7+I42h-WP!Tl@%2d`)|USgWv&cOVVXa2 z;>3v;z4v_mp!e_EY59l!bxDp(uDh6>YumE1Y~QiWrO~X>$F6Otowr56%ll)Lp+(F) z`5cE_^`)wO1-u^jzWrk1;dHvc%2!S8WJ}Z1qymmup6I2P0^cRdr8eKbd3<5Wfokq( zf9tGjfBt2n7lq1sHym$PW{;lx;QhZxwl+3FKeoo#Ri3WiAqjIz^q$|Y$K>l?EI57e ztLw+JK3#0zdA>T-%zqwz``-M}i{)GI?w%6#XqM-R-23+&vaa7==hL~!#v`lRXNKp} z%7c$YkE?JoA?T6}13v+ct-om-e2!Zz&?e^l3V|Iew~kjI?+{=TcLwgk1zPn6O1ITd?<@?`eWv(;H?x+))PSx)Uc}n9ALmC>EdECVlqCvnTd5esf!W?tXnV z#>h`!T)6ni+?&mN{j+{=n)&hLG#=hG_Z1)o*m;tXF*e^_S_rt?qZVz-LCVB!2zJ z*Z9hY{|~>{apgpXJ~=9v_^R%WYW6!$t0%Ur-rl?V;apy9F1y6JQ~LxMwjcSI!*}s^ zoL63TrGj1gQpVH;z0>ZL?Nzw1s&aAzx8Q_pd8Le-I0JHKG%a~6P;Im0>BHRC?dU|^9J${(`KwZD$F{^vcD`CfI%l)Zr=Qmd`n9}t9woz?~ z!g;k# zeifMck^i1$OSVnj+v)jzuFsTUNw#{=?+u6c|0r%UW472Gx!PfqW`bd?dQh~of2~YP z>bHdF)hoAYyG}Z^$#g=>6K&?$DF)5Tno&W80ioV3DH~3d#3#I$yvJ2ozO8Nh*?TMB zI(*sQ{--Q$$Ff6*ty`|Y&#HOs+kE}KSjFpyxeVL4?_Isu3Dl~Sl$6|iykl8Hd`^k9 z@u50%uT75^-mIFEB5r$A{JqqTtUab%WzT$gW0mSXN5|-PWLl@I8sCB};|9I93(I(V zw|eY+YkXwy>TT8h@Bhr=o_=BaIaNl_;8jL$ZL@Qmujf_nsq=rl*PM6X&u@Ek-zTmI zwcXs@+}z%OoVx#~R^972EncQxQ<*2eeSf%kWUATHZPodX3Kh|Zcc#5& zUO7o5xoQ6013df-N>$!+ostmX@L~*@TQ43RBrPqJdT4HsZFd99p}VUmZ1s<7o>7=0 zC9{I7Ki=}d^?5J$X8YU~fhAwtdsP+U?N5tyQol?%_rr#nLB%ljT-cV(d~0j=bZvpa zQgrCb_|t#dbebyz>q>*Md*y5uktK`pz%S@SZn@&9vmzS&*1cStMEg!_jJ~`Y#jPFQqAeYns7a zA135`Xj;vY+KqbpESXc97n;m`_4SOFOOW){vJJP_t!?3Ok@Cva2wor|<1}-VtXHUG zYM9X!PubZ#zx!^uD*zz@h!Q;mHn-2%evqe}pZ>{y%@@A2Q9OI0wW$|M7Zcp37Y#VS}bc>nh z_E>Re#kY#CZl&#kD>v`szE_qn8xwN-r_|MNt^KUh5uB&=d(0%)`fg&fwb`^{`SFTh z5BTuhYoLsEmpISW_+IrP+75y#4=L1}u57Z9@Jb!}qqSm)`R~yZY_z z%vdx94tc`2Jzu_id`CN>8_I^D0Sd)fGr5 zO|FbuWHs}_?e}T*zjr~?=`p_tCs!*Q3x-AGY7u|IlmBz2|?~ zmg7(UeDhTRw?2D%<~IJgV*Y|Hoy}PH&Y^3%Ce=;*R=#!7x{=5;#Ym&gU6CuOox|tj zzR7&%_J;~5um#O+EtXri?!cSxM*j>K%~oT6e?ZaqSXi>n&qsp${>}Jsw)|awwRt`Z zJPqEl)M3n-CR55Dk?vu0w&uhRma3)OjyHy^U3ivZnN5SyvdNG2j>xif*7xYwSZKK9 zrdyoea5iPVr?tWTX+9c#WV=iYkU{>M`0E5W_{zfaAXyweX_T5S}rc>OR|z}G+B zW*z65;-3@e`X~21+4lGOoPXP;UrfIxr(?9N;Sy_!VS}by=LTobCZ1Li$*YxfU2~^5 zhP=0Z;~Q{$su%m58!0w7%zhl2cyw_!>%Na^o!8%=s+@T_Wt}{@?U|DDhUdomjbZ=J z^qyHO_)BZ|_lg-?{j;jKoX7}nn!?At()C34^#Hfi!IH(dtrPk$be)=X`(8-3@2y6^ zSv{Hu&M^th_A$0RcA35WS*-TrOd;BX~ zs^YtB<%bVuk1zfeim#7aF!RcfUj6&Ke~72XaKoZOvgYHwWAp!?aTYpmelSfuI)g#w zXtZXpZ`wnh?tLBa_XghXbl?z^3|^$c@640JcxCiGzS{<~+s zWjmPrx@9vvTuRv|;5B{U$7>Al|38}h;j*RgGJjYBkbdCJ!GM6M{Bx%Sn(~zD-*X4P zoBZRR{MNnFe>EodKm8D<71>qq?xOi?;*<%c3z8>(WH@iS7DxYhmE4@acXE5s?;cpDW82Plu(w?rDQd1l7H$^Pz`_e!R6=sy|NZ0jQ%P z@#EWWOSU3$Xj|skxd$I>o9+J;6vw5wJ@`;u__^fOg8DUXNb$=vHf+mI0lCRU*=M*b4U1}GZna17!_?O^$!L{51Ck@^mzTI;8 z(!;s#&NenWAG7!Wc{T03(c?|!VsAIeOu%A zGViSF>(}F)GMR(r+V+%9y%l)$ab1-{Xj|Y?)hpKgx346L-~9Z;-ND1U*^yz25YzkF znsRqORs3~q%(uB(@i$L!({1B2NqCOo^WLAxz32T8JwNUbkDBkVmpHj^#aqqwvEmB3 z0aMtGW=K6&==Gde_DbXJCxs)|^)B|yty_1{T)|aM@kYuPvrPes$He(`V@jKj^Y?%F zYF;Aeb=Me{>5VHMUlly?^_iK$`aSGR7{eHre0{d9p7Gkr`@a`#^VZwVb<|67{av1> z`*$5OS(lb5y}hU;e0tk05lQ}h**TjvUDNIh&JMCPSt`W5Z{^2Zx|v?J?=w5IY>sWe ze|D+&Z+Pj>#nX@xtYvY&#)9?MlWpexKYtuwyW*`&;*Bj0W~^Hz9i}ff=#bj;)G#L}gV*z1GOzD)Fx0QEVk6Za2>t$oN-aTN= zp45MxPj}W!&UrNtIo{jqemuMVee3*lzAMc+VNon{V|VY;%_^z&@2;zF+7rsQUt`8U zlWnWFm3!_M(Vh8Faf;RlUROp_(E&xNu6FfPl#omG9iC(B`% zL!g|;qMlAyZ>}YrBAnIVJ)iWgpPL+4&0D5-wCWy9$4(=G^iTy9tihbAIW~k<7YMtTE_L<>cRKwFtZ`ZVb z7hAV-+v08Rm)4m~d1tcNExU({(`Z+3ZO_GTo|)T=%w0d-n*D$O-s;!AudU8o{EN?i zYileMDCRnGnToa5j7>}?8IR{(5a?LKu=X~?uGhz3=f11D?0-Sce6Pl>-6k2678PWv zmoj;F>V7t;eqZ|HXjFBYN9QDsj|&9n%Nslkc$AZOlIhEt)#ZEh<^ER8i%R)*uPph~ z`_QHvrZM|j*yDj|pn)&sv*Sx>hke2Q~IpxVzjRV~sC!BU# zSnZUnNVxyvP@KHS^6r*V3*O;jAt@f>=(5_7>nib~)SK79JJG4tGS>ab-_UVc1ezwhiAD{Ai+tY*P zA-U5RL&E&i+S7gY|4S{;NX7m8>OMJc%i)*2`g6T*`>Jf2{PO$fxA$hp{j87(e%5pS z#;Rjil~)}MTDd2DXH|~uwWnUY-`?)Z;e59-<%Zk1iL+T&ny zk7}v#x;USjg0(rGcQ@Xeq_y4`61;hPSNP{lc~UG~6JI<3{~ytPwOq2C&0D8kFkKpY z?D6i)^G?>y_{%+Q&FZ4~>Z#LpC9^k9Jv>FLx?W)G{Qmh#bu988ibBdi%>G+F4s`y_ zImgq^cUgX~V*f=G6{qV3Z<7>Cc+JL$MSTs}N@v_@?Yd2eNnEp+o zI-$wu%g*(-$6E4l+0@(3Tklo>uM}^1cy@wC$e%*HZ zBP4W<0i6lcIt(D+XRFkzPUef&aTLAo*k>&L^=%()+ry} za{SnDQ~r0~u71m(`}XW9YkzPQp86ET>tivKVg5Y%d(YjJ-R?hqsr6QF;rcD*KLcLP ze16Mr%lWOxuN*eqCN<^M?!%VT`4`?|p8D-l^Stegj@`K}r(Abws@Lzx|BueO)hk>L zWe(z*F-4tqEnoDp(kIr}v+ZKqO!C(p%SA`TLe-mw&wMX_S6OqGzK-a{AP7OTQajoBGsi=c&B6IR}Flec2|z zW{ZFIEo+a?2j}xM{8f0KY@GRocV+hJ&KqWX>Q_GdH@DXUpZq+P~gCwb&0Ff>%zm{J3&G z?zCpu{Vg^>{|HWgTNCj04AZ;D3vpMK?%(v6eeaLe)0w)KH$BaIQKC=JF zj6Qc~>HM019e3A9^{lpBY0lej#Fp(P?GyTVm0;e5@LTK=$p*Dc_s*9qF7Wbe3aGl3 z+*307l3ekU3;PZ*--A!pcqr{qHLUhcYLf@!mEmKT@`|W!=M9 zwo_+yA{QY+xqOQ!0ASs>g6gmCG01eRq}H z9JJcAf-BF&=Dw?(clieUshF$fmJ7m7n=cw|Teb1pM4r?)i;qrYUQt_MUMwAW`H$n3 z+Nou&-{zHu%KewL37=*YyZP|et%l#tvuC}{J)1MVbqRyMk`njx^=A4Xew%&FxV~X; z`JM3jUk@%9IT#U>Id|h#hUDCNVMa2>68qh|Iv=Pnk?1%$*-2q)_K{5sML#KeIv?60 zmFzR`Y#hI#+J4O$VYjqTEj+dJfM4hTm#$O46WYYDr8>kNyZ27}ueJN{-&DKmH$Oj~|J-)P?u@+YiSyq#ET6Qg*81R- zlLpr!gEn2}stIkDZdko=)h7%0*J%gq$~Ml~*?gWkpsD>rW4>bPgOk5kI%zDlRjYa2 zX*l6oRN=YRk@3~DzHa^9w^VDx6PxV!u5vZiE}P$0?%4Y6PEi{U}gH9xYaxU z{!MMjobmtaWSK|tre~I$$WOccCHVtyX40v2W+Aa`or_J~J6Gk&hBW^vP(8!EvsKN3 zBSGo|r_yGH_tGD750wkvFL|1fV^hHY{Jin!Tfs_89o|TVxy!y^A980`(vHHDA6}}5 zpI#ky?n9reUpv#Dj*dN(sU)73JO>`;Ro4WVLgZ?uYk&I8Xty+` zm%sMv-qv+z#AIA9SGJM)*GZpEmCM%4I`hbSpEFK5^m{e4+?|*1_TN6=D%A*e z0hPh$mLBHY|L@Vpqu~#-*lu5M%a*kJ^sUw-zg$oEdUs|o=H%bL zZhH92^|2}QKmj$U`m?Ut{$I6Ey4OE6xBd`0{m0$^g$hgNyCm6Li2S>|Nq@`kt|>}w zE^kil`KD#Cj){Mt?X20?_tmwP>wGE;ZV(p~oLQWGwPm-m!SR1N?sx4e?+{^jVsSyctbSzQ~?WamfhXV`Z$F**52 z^VzP>XIs1Xn6Xv}3QiP{xMNZ4)iX11UTLZPE#8CM*YqpL?mm8O>MZ#?vIakwJ$!hL z{b}p;bMNN4ip>G}V5Y|O_J)-HVi@cwqm(xV@m`?Gg>K5DPO_JW zBU{uv&-_{Ebf>i26l_{kqd<{dcKvfd1NIkm(Qp&FxCt{rF+neWk^RS19FkgLNcNS@yrub@_y6>Fj|gqXUyyZrLt;?HK3% zcST=Mb+F4{_t`h|L&58+%B8nbT<*C+{mpF?b!b|3f1Ub`Yx1XB_xsbDS5)V$;oG@Ca^)qxPkoR?b>veJ zugUW7yz!|IeB^KS9+fg)yKDJ_&fLSVCaM3N)~nt8{L7a0bDrGoKA{O}%?er`nSU?x zvHSmTssEnn++P|q0|{$YtNeR(!;ejzpq8`d+vVhW=UU4`Z@Jzxg?Mwv?}w>o zdbZC#&a*8EedYPI>T{Nry~*WUvxFgVkFsXZajVUYlTn$ z%ZeSPOZP-AjD4~P?7_;$_GtM)-hEHx|0mC0|HtT>RnJz5Do2aJzNcqDVcM1zL5A5|VexR^w+3}7!?huE3EU&NYmDv9v{{Qt4Kf|ki{!FNf zNY<4QHawQZyTnCr^Lg7}tE&GOue4dym~rq(%SJ(Ag_3y_b9V-~x;dY3UHJ6gvZv2p zP1r5}Eio44GULpN+e11!I_7Mu|MC3(r`PMX%l1A!d1T}B>=@Gpt9ZAa;(vZ1gv~m9 zroSQk_Y0~{4KI@G?p3;NON?Q?rZ2UxRI~82(VYm>;)Ss;DQ@8OZTjbYe)-Rn`f4>F zrzS2pjtKu;!MoIr{vTivYZ;lC8CV2ag%k}P*@OcV*_8@Kj2b5{E zCr+Nabot8FYu9hwy!G(W<0ns_J%91?)yGetzkL1n{m0K=Ab&A3FoS&sA|M_^^Oqn4 z6C)D~3o{El$X|?1N5fetN; zrgbrRX=a!(ObK*l0I3rRbY(_zZ3D;;PF)(P)*jGU)a3wG4bo-8p|Plo4JyEdtes0^ z5!l1e7JYM2P2tU>@KBdB96!Q6oqXtE#RDk5`me6oba1 zE*7X&24Jh8f@~sFwoCyz1leUE*P-|atOF7o5OYO>K%qK?Vdv6imp41Gilp^iVD$8! z<&^<)TB4VxCOBMRo&tM@(^Vu06i=RFK zPf$F2fXu;%!HRLk{-Q3;22gwkb$LNj&7o#jwg#at%|ejbeHx4!OBXeAy6TEBOxZGJ z3jgHTtLW`~z%#sZc_U7FxPk8<|* z$PfSmaEQ3J3fgIAQHD}&;rt|%`CCk>fPpfV-s(F8=SL45|w zh74YQQ?>|tuq;uU*2SP95}?7Dv8W3aKp?yTl-dO@IzkE`k$?;lDF;J|%B!p*L7)PmK;yuIq(JXRR|c~#jRn~Kq_LQ(L8vQ+%K(%JkHQli%t#OoGZtR< zfr6J+BoLM-mcc>?rC?gRWKkoxtK?!6hJcK-FmoLiupX6I)Ws&TSR@c!Sc0@N1-goG z1iCW8Jq+@+1d;`yvSk@KX~2>mx?eyxgYz*cLxZqDkW`ej1H;lKB3nSEC=7#BkjA1e zCs2@rLJE|xV1+hgbx_cy0E45ts=5q{i<(_wr3EBOfkeT@s#la3DA_7Njev&=$S7#Y zfO0h)H-XYwPoQ_B180|4sTwPTn#NM4Nic1*KxQ#>1$ugcvk`i!IRRuMxY%tK3D8); zDiUCQ=|Ql>l%NNJjSify5{nu^UT0XcbO|VsmN0sEc||c8x@jzG;0a2CR!E>QM#f+r zi@G#mcEJJ%MuQWirmHHXOotY1ki-W`DFP7dd6zEvx^w~4l%Sw41}BZ9Y+VqGg}Q=0 zJ)pW!GY}~AfD#mgNT3%exgA){G^1tFbf%sF=8Q#M&Y%Dl163+4B8w(XLDh;YKSITs zf-VJJW>~sp=>iszd0e23DUyI<1kBgMAZxh1qP#$_0Oj&2fv(^}gUirWSCLgD=mJxq7o^x^fK?5Ft|B0VCSXh9 zOpkg3U72|TK{n&T=$Qf@=b&(h*srkⓈC73W|Ne#UIE&LZE`mC(s*IQ+jDKB%#^_ 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 +iFpH`h;p>X`Y|I_d{ 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
    RhyCmvXROd3aWtCXeG$ zy*C$oF0isH7Q1CSEIq1tBlE1fS7i*duTrClY^EXT_^7nT8+n?AUap!Cg4xVP_%zhj3s9+OC$n9(iDoXEmxZ59wn@FO?!s;y~aFSsb%sN zwOLMEeg=jWY5lDDy1cP#!dkUkxs%@K>N}6o3ymWCckC0IBmN!8`nu<%( zX1IGz`MONdN5z0EV9Nu|1Hp<)(Rr%z$9CoFzdQWnx@n$$jos8sFXxvjeg*d=W6#d1 zd-KmU_J@6IP2aF=mQw+%p~zNtCblQF z@1q{+`@IeGFS4InT6JW%Zp_EST~A_uPCs*}_@C%j(f2Z6@3nUPXSjN4!;^qL44NMA z;YZda{9T+onl|VDUUKXdiJyMT%6TjxSUHT-n285^Qb~j&~sDWB{FB*9(yeiW0_a{ z+G~Y>a+u;qqfK)+6;(9`ymIBA6r^O=eJ=B4uFhPg2@k$SUEg+b>bFU$^5#o(qcQ`J zEq`9W_uj^p9bN9eIySrJyxliblXr&N+dpbsk4@kFFY=V}+vt~ho%3gW4%)T)@%(E$ z)Vp$Typ5>Vp5t<{GUbE&nW`?=7h2yIG^GFiwP=sjo8{U^o~@MT?vV;I+Ol|7;I)+k z9Vd>O%$nF9ztrWfYXJ8wpJ2!3&5lY%dw2Z~bG<#`{J)?7wyxKH=nqf`}51H-+Na+__}yX&5@gD6;0fV{4ce={Be1MB~MnOQT36G12MRZ@O^v;8oG;;1E%j`k(yg0YH+i*Fd6S5cYIU34RPhmxhS6%teiUfAmoGIh! zGJfx-vBW@WvdGRQXT`Y{j%tX^TzXcVThTqLz~l~3;H9ZI*4Xu2cGGz6dLyDha&eb~ z0k6q6&6}+kHFDCXpGgeVmaAC)^>s*#WqQHg{er>VlaFhMMo;{4nQ`&l1y6nU>Ggk~ zw#0i8$Ir=Y)5MnYxM^K=b6(cFW%q;Lmp?DJo|mtzw>s*{aa`1VPVH*ffX-kuvDfR* z%%7VPeP^ZmbH908Pj{YQu-Y)rX!4;i3(w4RUM;jR@bh~AD5JH1oM#>C`q^jUH*ag6 z^)`iqtu_Zw#iz0@Okm4g^kCv2`?)Tk|1<0kdZI3PY*y7}n>W9Lrye}7w0uTb>gn>| zSF=mgT@|Ev%I>~8(fsn~RY9`7uMIe#|DI~HZq@#Z(ywbySD)Q+?A(-1cO^yor_b8m z

    Sh!rm##Kf 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
    !eyGC4;$mRF$aKSR6e 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%0DYK>-$v4zOGb-t3kk+i_M@JuCCI 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 z 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 literal 0 HcmV?d00001 diff --git a/docs/examples_1.rst b/docs/examples_1.rst index 4cb0f89..987a870 100644 --- a/docs/examples_1.rst +++ b/docs/examples_1.rst @@ -94,6 +94,11 @@ Most of the examples show the builder and algebra modes. :link: tea_cup :link-type: ref + .. grid-item-card:: Toy Truck |Builder| + :img-top: assets/examples/toy_truck.png + :link: toy_truck + :link-type: ref + .. grid-item-card:: Vase |Builder| |Algebra| :img-top: assets/examples/vase.png :link: vase @@ -515,6 +520,30 @@ The tea cup model involves several CAD techniques, such as: round the edges for aesthetic improvement and to mimic real-world objects more closely. + +.. _toy_truck: + +Toy Truck +--------- +.. image:: assets/examples/toy_truck.png + :align: center + +.. image:: assets/examples/toy_truck_picture.jpg + :align: center + +.. dropdown:: |Builder| Reference Implementation (Builder Mode) + + .. literalinclude:: ../examples/toy_truck.py + :start-after: [Code] + :end-before: [End] + +This example demonstrates how to design a toy truck using BuildPart and +BuildSketch in Builder mode. The model includes a detailed body, cab, grill, +and bumper, showcasing techniques like sketch reuse, symmetry, tapered +extrusions, selective filleting, and the use of joints for part assembly. +Ideal for learning complex part construction and hierarchical modeling in +build123d. + .. _vase: Vase diff --git a/src/build123d/jupyter_tools.py b/src/build123d/jupyter_tools.py index ce05a73..9e3600b 100644 --- a/src/build123d/jupyter_tools.py +++ b/src/build123d/jupyter_tools.py @@ -66,8 +66,10 @@ def shape_to_html(shape: Any) -> HTML: ) # A new div with a unique id, plus the JS code templated with the id - div_id = 'shape-' + uuid.uuid4().hex[:8] - code = Template(TEMPLATE_JS).substitute(data=dumps(payload), div_id=div_id, ratio=0.5) + div_id = "shape-" + uuid.uuid4().hex[:8] + code = Template(TEMPLATE_JS).substitute( + data=dumps(payload), div_id=div_id, ratio=0.5 + ) html = HTML(f"

    ") return html diff --git a/src/build123d/topology/__init__.py b/src/build123d/topology/__init__.py index 2bf01d3..11d00d9 100644 --- a/src/build123d/topology/__init__.py +++ b/src/build123d/topology/__init__.py @@ -5,7 +5,7 @@ name: __init__.py by: Gumyr date: January 07, 2025 -desc: +desc: This package contains modules for representing and manipulating 3D geometric shapes, including operations on vertices, edges, faces, solids, and composites. The package provides foundational classes to work with 3D objects, and methods to From 91034a6745a3091a90640340ef0ec0e59b84ab0c Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 5 Apr 2025 11:15:45 -0400 Subject: [PATCH 255/518] Adding toy truck code --- examples/toy_truck.py | 185 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 examples/toy_truck.py diff --git a/examples/toy_truck.py b/examples/toy_truck.py new file mode 100644 index 0000000..840e3f1 --- /dev/null +++ b/examples/toy_truck.py @@ -0,0 +1,185 @@ +""" + +name: toy_truck.py +by: Gumyr +date: April 4th 2025 + +desc: + + This example demonstrates how to design a toy truck using BuildPart and + BuildSketch in Builder mode. The model includes a detailed body, cab, grill, + and bumper, showcasing techniques like sketch reuse, symmetry, tapered + extrusions, selective filleting, and the use of joints for part assembly. + Ideal for learning complex part construction and hierarchical modeling in + build123d. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# [Code] +import pathlib +from build123d import * +from ocp_vscode import ImageFace, show, show_object + +# Create an ocp_vscode image object to use as a design reference +project_root = pathlib.Path(__file__).resolve().parents[1] +reference_image_path = ( + project_root / "docs" / "assets" / "examples" / "toy_truck_picture.jpg" +) +image = ImageFace( + str(reference_image_path), + scale=0.012, + location=Location((0, 0, -1), (0, 0, 90)), +) +show_object(image) + + +# Toy Truck Blue +truck_color = Color(0x4683CE) + +# Create the main truck body — from bumper to bed, excluding the cab +with BuildPart() as body: + # The body has two axes of symmetry, so we start with a centered sketch. + # The default workplane is Plane.XY. + with BuildSketch() as body_skt: + Rectangle(20, 35) + # Fillet all the corners of the sketch. + # Alternatively, you could use RectangleRounded. + fillet(body_skt.vertices(), 1) + + # Extrude the body shape upward + extrude(amount=10, taper=4) + # Reuse the sketch by accessing it explicitly + extrude(body_skt.sketch, amount=8, taper=2) + + # Create symmetric fenders on Plane.YZ + with BuildSketch(Plane.YZ) as fender: + # The trapezoid has asymmetric angles (80°, 88°) + Trapezoid(18, 6, 80, 88, align=Align.MIN) + # Fillet top edge vertices (Y-direction highest group) + fillet(fender.vertices().group_by(Axis.Y)[-1], 1.5) + + # Extrude the fender in both directions + extrude(amount=10.5, both=True) + + # Create wheel wells with a shifted sketch on Plane.YZ + with BuildSketch(Plane.YZ.shift_origin((0, 3.5, 0))) as wheel_well: + Trapezoid(12, 4, 70, 85, align=Align.MIN) + fillet(wheel_well.vertices().group_by(Axis.Y)[-1], 2) + + # Subtract the wheel well geometry + extrude(amount=10.5, both=True, mode=Mode.SUBTRACT) + + # Fillet the top edges of the body + fillet(body.edges().group_by(Axis.Z)[-1], 1) + + # Isolate a set of body edges and preview before filleting + body_edges = body.edges().group_by(Axis.Z)[-6] + fillet(body_edges, 0.1) + + # Combine edge groups from both sides of the fender and fillet them + fender_edges = body.edges().group_by(Axis.X)[0] + body.edges().group_by(Axis.X)[-1] + fender_edges = fender_edges.group_by(Axis.Z)[1:] + fillet(fender_edges, 0.4) + + # Create a sketch on the front of the truck for the grill + with BuildSketch( + Plane.XZ.offset(-body.vertices().sort_by(Axis.Y)[-1].Y - 0.5) + ) as grill: + Rectangle(16, 8.5, align=(Align.CENTER, Align.MIN)) + fillet(grill.vertices().group_by(Axis.Y)[-1], 1) + + # Add headlights (subtractive circles) + with Locations((0, 6.5)): + with GridLocations(12, 0, 2, 1): + Circle(1, mode=Mode.SUBTRACT) + + # Add air vents (subtractive slots) + with Locations((0, 3)): + with GridLocations(0, 0.8, 1, 4): + SlotOverall(10, 0.5, mode=Mode.SUBTRACT) + + # Extrude the grill forward + extrude(amount=2) + + # Fillet only the outer grill edges (exclude headlight/vent cuts) + grill_perimeter = body.faces().sort_by(Axis.Y)[-1].outer_wire() + fillet(grill_perimeter.edges(), 0.2) + + # Create the bumper as a separate part inside the body + with BuildPart() as bumper: + # Find the midpoint of a front edge and shift slightly to position the bumper + front_cnt = body.edges().group_by(Axis.Z)[0].sort_by(Axis.Y)[-1] @ 0.5 - (0, 3) + + with BuildSketch() as bumper_plan: + # Use BuildLine to draw an elliptical arc and offset + with BuildLine(): + EllipticalCenterArc(front_cnt, 20, 4, start_angle=60, end_angle=120) + offset(amount=1) + make_face() + + # Extrude the bumper symmetrically + extrude(amount=1, both=True) + fillet(bumper.edges(), 0.25) + + # Define a joint on top of the body to connect the cab later + RigidJoint("body_top", joint_location=Location((0, -7.5, 10))) + body.part.color = truck_color + +# Create the cab as an independent part to mount on the body +with BuildPart() as cab: + with BuildSketch() as cab_plan: + RectangleRounded(16, 16, 1) + # Split the sketch to work on one symmetric half + split(bisect_by=Plane.YZ) + + # Extrude the cab forward and upward at an angle + extrude(amount=7, dir=(0, 0.15, 1)) + fillet(cab.edges().group_by(Axis.Z)[-1].group_by(Axis.X)[1:], 1) + + # Rear window + with BuildSketch(Plane.XZ.shift_origin((0, 0, 3))) as rear_window: + RectangleRounded(8, 4, 0.75) + extrude(amount=10, mode=Mode.SUBTRACT) + + # Front window + with BuildSketch(Plane.XZ) as front_window: + RectangleRounded(15.2, 11, 0.75) + extrude(amount=-10, mode=Mode.SUBTRACT) + + # Side windows + with BuildSketch(Plane.YZ) as side_window: + with Locations((3.5, 0)): + with GridLocations(10, 0, 2, 1): + Trapezoid(9, 5.5, 80, 100, align=(Align.CENTER, Align.MIN)) + fillet(side_window.vertices().group_by(Axis.Y)[-1], 0.5) + extrude(amount=12, both=True, mode=Mode.SUBTRACT) + + # Mirror to complete the cab + mirror(about=Plane.YZ) + + # Define joint on cab base + RigidJoint("cab_base", joint_location=Location((0, 0, 0))) + cab.part.color = truck_color + +# Attach the cab to the truck body using joints +body.joints["body_top"].connect_to(cab.joints["cab_base"]) + +# Show the result +show(image, body.part, cab.part) +# [End] From e658a786d2ec2424211aa3722e59b353e0a54abf Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 5 Apr 2025 11:36:36 -0400 Subject: [PATCH 256/518] Removing ocp image to enable tests --- examples/toy_truck.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/examples/toy_truck.py b/examples/toy_truck.py index 840e3f1..c5747bd 100644 --- a/examples/toy_truck.py +++ b/examples/toy_truck.py @@ -32,22 +32,8 @@ license: """ # [Code] -import pathlib from build123d import * -from ocp_vscode import ImageFace, show, show_object - -# Create an ocp_vscode image object to use as a design reference -project_root = pathlib.Path(__file__).resolve().parents[1] -reference_image_path = ( - project_root / "docs" / "assets" / "examples" / "toy_truck_picture.jpg" -) -image = ImageFace( - str(reference_image_path), - scale=0.012, - location=Location((0, 0, -1), (0, 0, 90)), -) -show_object(image) - +from ocp_vscode import show # Toy Truck Blue truck_color = Color(0x4683CE) From bde03f40e7226c394ee4b815993974f3181607eb Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 5 Apr 2025 11:45:12 -0400 Subject: [PATCH 257/518] Removing ocp image to enable tests --- examples/toy_truck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/toy_truck.py b/examples/toy_truck.py index c5747bd..bbbf8f2 100644 --- a/examples/toy_truck.py +++ b/examples/toy_truck.py @@ -167,5 +167,5 @@ with BuildPart() as cab: body.joints["body_top"].connect_to(cab.joints["cab_base"]) # Show the result -show(image, body.part, cab.part) +show(body.part, cab.part) # [End] From ee11c3517da940733cb089974738c9df73d72bab Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sun, 6 Apr 2025 20:10:00 -0400 Subject: [PATCH 258/518] Add new docs section "Selectors and Operators" - Expand ideas and concepts from key concepts section - Provide minimal usage examples in front matter - Add structure for examples of low to medium complexity for different criteria types --- .../filter_all_edges_circle.png | Bin 0 -> 49590 bytes .../selectors_operators/filter_axisplane.png | Bin 0 -> 40864 bytes .../filter_dot_axisplane.png | Bin 0 -> 40767 bytes .../filter_geomtype_cylinder.png | Bin 0 -> 29761 bytes .../filter_geomtype_line.png | Bin 0 -> 31043 bytes .../filter_inner_wire_count.png | Bin 0 -> 43492 bytes .../filter_inner_wire_count_linear.png | Bin 0 -> 44840 bytes .../selectors_operators/filter_nested.png | Bin 0 -> 17960 bytes .../filter_shape_properties.png | Bin 0 -> 71319 bytes .../selectors_operators/group_axis_with.png | Bin 0 -> 76268 bytes .../group_axis_without.png | Bin 0 -> 61324 bytes .../selectors_operators/group_hole_area.png | Bin 0 -> 35166 bytes .../selectors_operators/group_length_key.png | Bin 0 -> 113361 bytes .../selectors_operators/group_radius_key.png | Bin 0 -> 25572 bytes .../operators_filter_z_normal.png | Bin 0 -> 15628 bytes .../operators_group_area.png | Bin 0 -> 15678 bytes .../selectors_operators/operators_sort_x.png | Bin 0 -> 15286 bytes .../selectors_select_all.png | Bin 0 -> 69875 bytes .../selectors_select_last.png | Bin 0 -> 49285 bytes .../selectors_select_new.png | Bin 0 -> 43359 bytes .../selectors_select_new_fillet.png | Bin 0 -> 29833 bytes .../selectors_select_new_none.png | Bin 0 -> 38895 bytes .../selectors_operators/sort_along_wire.png | Bin 0 -> 21281 bytes docs/assets/selectors_operators/sort_axis.png | Bin 0 -> 89970 bytes .../sort_distance_from_largest.png | Bin 0 -> 61195 bytes .../sort_distance_from_origin.png | Bin 0 -> 61130 bytes .../sort_not_along_wire.png | Bin 0 -> 21205 bytes .../sort_sortby_distance.png | Bin 0 -> 29094 bytes .../sort_sortby_length.png | Bin 0 -> 29935 bytes .../thumb_filter_all_edges_circle.png | Bin 0 -> 44432 bytes .../thumb_filter_axisplane.png | Bin 0 -> 12425 bytes .../thumb_filter_geomtype.png | Bin 0 -> 27225 bytes .../thumb_filter_inner_wire_count.png | Bin 0 -> 25245 bytes .../thumb_filter_nested.png | Bin 0 -> 7001 bytes .../thumb_filter_shape_properties.png | Bin 0 -> 49623 bytes .../selectors_operators/thumb_group_axis.png | Bin 0 -> 58493 bytes .../thumb_group_hole_area.png | Bin 0 -> 35586 bytes .../thumb_group_properties_with_keys.png | Bin 0 -> 46276 bytes .../thumb_sort_along_wire.png | Bin 0 -> 17180 bytes .../selectors_operators/thumb_sort_axis.png | Bin 0 -> 36767 bytes .../thumb_sort_distance.png | Bin 0 -> 41709 bytes .../selectors_operators/thumb_sort_sortby.png | Bin 0 -> 27185 bytes docs/index.rst | 5 +- docs/selectors_operators.rst | 393 ++++++++++++++++++ .../examples/filter_all_edges_circle.py | 50 +++ .../examples/filter_axisplane.py | 47 +++ .../examples/filter_geomtype.py | 23 + .../examples/filter_inner_wire_count.py | 38 ++ .../examples/filter_nested.py | 39 ++ .../examples/filter_shape_properties.py | 25 ++ .../examples/group_axis.py | 28 ++ .../examples/group_hole_area.py | 31 ++ .../examples/group_properties_with_keys.py | 61 +++ .../examples/selectors_operators.py | 93 +++++ .../examples/sort_along_wire.py | 31 ++ .../selectors_operators/examples/sort_axis.py | 28 ++ .../examples/sort_distance_from.py | 21 + .../examples/sort_sortby.py | 45 ++ docs/selectors_operators/filter_examples.rst | 195 +++++++++ docs/selectors_operators/group_examples.rst | 116 ++++++ docs/selectors_operators/sort_examples.rst | 144 +++++++ 61 files changed, 1411 insertions(+), 2 deletions(-) create mode 100644 docs/assets/selectors_operators/filter_all_edges_circle.png create mode 100644 docs/assets/selectors_operators/filter_axisplane.png create mode 100644 docs/assets/selectors_operators/filter_dot_axisplane.png create mode 100644 docs/assets/selectors_operators/filter_geomtype_cylinder.png create mode 100644 docs/assets/selectors_operators/filter_geomtype_line.png create mode 100644 docs/assets/selectors_operators/filter_inner_wire_count.png create mode 100644 docs/assets/selectors_operators/filter_inner_wire_count_linear.png create mode 100644 docs/assets/selectors_operators/filter_nested.png create mode 100644 docs/assets/selectors_operators/filter_shape_properties.png create mode 100644 docs/assets/selectors_operators/group_axis_with.png create mode 100644 docs/assets/selectors_operators/group_axis_without.png create mode 100644 docs/assets/selectors_operators/group_hole_area.png create mode 100644 docs/assets/selectors_operators/group_length_key.png create mode 100644 docs/assets/selectors_operators/group_radius_key.png create mode 100644 docs/assets/selectors_operators/operators_filter_z_normal.png create mode 100644 docs/assets/selectors_operators/operators_group_area.png create mode 100644 docs/assets/selectors_operators/operators_sort_x.png create mode 100644 docs/assets/selectors_operators/selectors_select_all.png create mode 100644 docs/assets/selectors_operators/selectors_select_last.png create mode 100644 docs/assets/selectors_operators/selectors_select_new.png create mode 100644 docs/assets/selectors_operators/selectors_select_new_fillet.png create mode 100644 docs/assets/selectors_operators/selectors_select_new_none.png create mode 100644 docs/assets/selectors_operators/sort_along_wire.png create mode 100644 docs/assets/selectors_operators/sort_axis.png create mode 100644 docs/assets/selectors_operators/sort_distance_from_largest.png create mode 100644 docs/assets/selectors_operators/sort_distance_from_origin.png create mode 100644 docs/assets/selectors_operators/sort_not_along_wire.png create mode 100644 docs/assets/selectors_operators/sort_sortby_distance.png create mode 100644 docs/assets/selectors_operators/sort_sortby_length.png create mode 100644 docs/assets/selectors_operators/thumb_filter_all_edges_circle.png create mode 100644 docs/assets/selectors_operators/thumb_filter_axisplane.png create mode 100644 docs/assets/selectors_operators/thumb_filter_geomtype.png create mode 100644 docs/assets/selectors_operators/thumb_filter_inner_wire_count.png create mode 100644 docs/assets/selectors_operators/thumb_filter_nested.png create mode 100644 docs/assets/selectors_operators/thumb_filter_shape_properties.png create mode 100644 docs/assets/selectors_operators/thumb_group_axis.png create mode 100644 docs/assets/selectors_operators/thumb_group_hole_area.png create mode 100644 docs/assets/selectors_operators/thumb_group_properties_with_keys.png create mode 100644 docs/assets/selectors_operators/thumb_sort_along_wire.png create mode 100644 docs/assets/selectors_operators/thumb_sort_axis.png create mode 100644 docs/assets/selectors_operators/thumb_sort_distance.png create mode 100644 docs/assets/selectors_operators/thumb_sort_sortby.png create mode 100644 docs/selectors_operators.rst create mode 100644 docs/selectors_operators/examples/filter_all_edges_circle.py create mode 100644 docs/selectors_operators/examples/filter_axisplane.py create mode 100644 docs/selectors_operators/examples/filter_geomtype.py create mode 100644 docs/selectors_operators/examples/filter_inner_wire_count.py create mode 100644 docs/selectors_operators/examples/filter_nested.py create mode 100644 docs/selectors_operators/examples/filter_shape_properties.py create mode 100644 docs/selectors_operators/examples/group_axis.py create mode 100644 docs/selectors_operators/examples/group_hole_area.py create mode 100644 docs/selectors_operators/examples/group_properties_with_keys.py create mode 100644 docs/selectors_operators/examples/selectors_operators.py create mode 100644 docs/selectors_operators/examples/sort_along_wire.py create mode 100644 docs/selectors_operators/examples/sort_axis.py create mode 100644 docs/selectors_operators/examples/sort_distance_from.py create mode 100644 docs/selectors_operators/examples/sort_sortby.py create mode 100644 docs/selectors_operators/filter_examples.rst create mode 100644 docs/selectors_operators/group_examples.rst create mode 100644 docs/selectors_operators/sort_examples.rst diff --git a/docs/assets/selectors_operators/filter_all_edges_circle.png b/docs/assets/selectors_operators/filter_all_edges_circle.png new file mode 100644 index 0000000000000000000000000000000000000000..1d82993254024d8dc8d97cf90a375b22c848b2d3 GIT binary patch literal 49590 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 K%EB7m=tcP7!hx5;OKRijz@L3t3Wv=?F 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 R1q=)f44$rjF6*2UngFMnyDR_z literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/filter_axisplane.png b/docs/assets/selectors_operators/filter_axisplane.png new file mode 100644 index 0000000000000000000000000000000000000000..88090f2a6a87dd8a493362055f538a25aafaf133 GIT binary patch literal 40864 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 Y#@sjJ#x4C1ND*=s^V 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 z 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 literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/selectors_select_new.png b/docs/assets/selectors_operators/selectors_select_new.png new file mode 100644 index 0000000000000000000000000000000000000000..d24aa93e3297fa197933df363e08c5df3567c6d2 GIT binary patch literal 43359 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 HoD!M<1p;#y literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/selectors_select_new_fillet.png b/docs/assets/selectors_operators/selectors_select_new_fillet.png new file mode 100644 index 0000000000000000000000000000000000000000..d8cced6e9ba4cb0a8dbafda0e83ae1648f9785e8 GIT binary patch literal 29833 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 I&MBb@06bD*G5`Po literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/selectors_select_new_none.png b/docs/assets/selectors_operators/selectors_select_new_none.png new file mode 100644 index 0000000000000000000000000000000000000000..92b46c12d2fd34ee513c6075c73bc4722c72586b GIT binary patch literal 38895 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ℜ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πAOpgMP;`upioNv9jk-?@Y60 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

    }fb(J2D2JQKY?a^x@4cyvE_ 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 pxg$6g{^;H4EM$&aBb@w` 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

    _X$ti*}&Um=I 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

    u`TcWpc8H;aq>avM5hLpc|lB(?42IU*7- zax5uFW@BuT#9LFRlN`)x>`n((CViYKpeQkG;U)`(BMM1|_S~v{KbNjxOOskL!)izD z5~m+$`9m(HPq5FkcbPInWaq5EE4uwY8y-^CKLd$#i={V6X!_w0XIe|A{M zvIN)gBdJ@be-qwr72wiXEzG;AF6rvGRd0^X{=0A9de@`7{^jiVaN~=0Wl*2@ex6ls z!QD5VFMY-3Ojn4CY(2bWmz#^4)|y!xwpz-qy1n?p3q{id65Ecu1|?bY`#$ZN76o`-GRA@yYYf zk&kzD7rok;eJaf-vDN$M{pl_DJ|DB?uVD~8A0+(0 z9GSq{XaCdog^9l_p7>{4hL9lq(#o3rELlR#c!HuY?`)4S%??*FP+ z&rr1c?h1>H{oUQqp8FeqICGNC&fs)9M||v)nTn~7j^dGzj~FGgGG-Q7Ca@Zw-XHSf za(#d0hqyrJeJc9>KKiY-9W(z%UR}>H(78RqsKBMEY=-Z73xhbsQ zD;}N5PL15N#`5d2`r5hwoSq)%UhQ(~`sVX|@yP;OUnO{+e%f$j{g#lH+m<^%&;2=f zoizW)nLmSPOq=lR zPyQ2bZqFd&_VAea<5jII}kU+p{N|H%SM* z$>LrX?S5_H4KsC>>qi%!n^?ESH1GJbR||Rh?J93S?sqP5n#-}-{Zh*z4_B@#mW#U+ zdr#FGz5LWE{Y-vd@cxRBF80zNA_X@EYc{FAYyQ4H#pcU1?(GrDPxH1%YwGFodAF)v z?9dk!&s^VT(!={(@0<0vTa}jVKQ5F8uPjPsdYTZi@*zhJ^DpiByB}QK{;uYO@J4^n zIL?`IR&(2aSFk=30FCxJ%{{a^Z-#AJ#_rscjj|upmFG5{c;?r5@Ya=ilfHhm<=+?e z=SNZDp7i#MtN$$gTk)ZaC;WKQ^6h*K)5V_qd#>->UzHI2>!#J!gHMYcre8X|y3O1s zeD1Zn@|R!FPuY2}_w=VzPbzl0T&jP#Vu?zBOI1ce*` zPwQ#Uve&)hDkiJ=P_*?ahvogFb?IldZGJZWbp5&Txl)O&-fzy?Z~o-*y_mGf^0L@@ zy_n*=q1@Bv6+T{ba^c&SzlWX{yeaDOf3{jYHrV8E)1jTuzq9`CeE;_E-S8djZN9$J z?kb$fG5Ud=ULwEW)e=P$VDZhc^yYPdJ!;7HlrpKAZC``(w`@e1G-v5Bzdgr=x4` z?s=~M^seE#TZR(89NP^#k8NGg@#Msxqc4laME3nTcXj&f+;`d*@g?&d#pkA*>|Fog ze|hP?=g$r`wfoPBHrW-R-vfrgukKx$~^k{;fG!yMXyl`Wy9^(kCYLEGdtAYcF$=<8Dlh&Zdow zDZ1q`mB+H5`=891Tbbha*s(b|+NH>9vXLt%Phc?DjLCY+eE06oy7e=#^wVK~o1#x^ z8Qgy#vayp1`>m^~x6SCI`uQ^Vxyi5Rn7SJ4&0Y0s@uo9!2{J4CCR~ja;>-)-S>juG zD7r5C_wu^ivFGh1O4S=u>$fbq-t*63tFw)c@IAYqEaLjHS^p}pt@)8?7Jad??r9UV zPpL!F^mD#PW_Ah+x-Tot6Ka{7ww!CeMei+Bsn}27o3sBhUiQwkIDXyP*}CY`Y!|Lw zDsxy`3NCql-P9a!Rp{h(`>i@po~*IWO4f#7ni5=Mp$gU8zs*tZ6K!S`2)Z|qZT|Hm zbz5tyFE#ty7v^amaAb4Q5I>_o%ZzLG`8jXDJmq1O54gO*?m*a)1o7XD1=1W7l~Q!e z4{hJ|>tK;{?T2{&yWiDZ4ASFl->>Ox`}O4I-K?Zd{f(Z!ua0+oDXVn;cG)6bLO4il z@qzFo-(N~e7w@mhPY_z-BILJZf%hTKQ}fOBtq*(NWnWf$?#Jf?UI!K!C(JPJJ9$2| zPMELL!@pm2GUK+1`mZlNoP25r|E<3%f&J^&RKHl*{)OX1n9lo4_wU%4cpWzPztl6C zU(IfMvt-BY>G7|?DY@_Sv$N8VLvm7|_usO6Jmq03PqSjs++>C?o0Ieea#h_LR;&~< z;4xDz);?{&;8R5C*7a8=zE!z6qpdLJNBQz4OI&XBZ{J!fn`|W`eXiukdCQ3amT7)_@%~6U*KgMSi{q8n@fP;^1o|DCwe6G1 z{J&q6ttZ}H7Q9Y)!<+VRhw9>36CYi^DHyxJ$252OtvB2FyPlnu*0!^rBkZj@v0J3X z^Tvu7J${y%9+OuuV}324Bi9hMr_ASy!K&!9u zxTAgg-(O#+G42vfng7J-qnd2Z`5GDU9 zR^q99Zbu4e6o!YfL;5Onjp--p({rc%=5X5ffaAxzH{xgN*!9>F5?bQBmhTC^{@4AN zY53OWrGEmC>reb6p!s6bhKp}D&YpQrukOkNsX6byEDSg2Z_>}Y^t?;h#2sJh$HmcNqM z)6|8BSRS=I-q_IM&Yzdeo@c9{ zF12Q{S%)J}U$D)!|6B#x)*ojIcz$!f_TS)Sb3%*!K`-@YBkT5N8;MIi48n)c$@OU* zQJxljC0k}+X@Q5S;FGe%4TTJ?-9;N4ID{peR408Y~hB5rhI(oGa6i`AJ_VP@#W@&yOy#1*rh0WPA-abCZ{Yz8`GI13dio0o4>mk z&$+UleS+$Z^i_8Qj)vTDFpY4{E!gm=IVUAb(_@xoWByFpZN{ws)|5DNEpxDJl5-GH zy|m5oiC|Rzip35be^==7Sex)kzva1R$)Hwcuw({<8dHX%OqiwXSBVDY-GVONmy8%5 z9A(g&YTTpx(4A}7690rwL-zwbqL*UiJi6aCp4I*M;ny@7iP=~3T5n|Uj+r2Qo0XM) z-R5tJb!TtoKi{>6L*82W@P4^I1#Za+izPnDZa%oXjhj!Q?)6u-bq5L-9p0GL|8(W= zqbctm?3#=K`>{n!c-8Khf`d1F7j$kcRW7*cw#a>-dW%K(g`E!= z-n0kK;(I?!FXJhTUZC|67lRLM_xno(|7*7Rwp4H*s}|t-s9a&));O8@&rWBN2|xeU zX4-qkJ9F(?a$eA*n)QGWtI2G6w&P`t2YF1+G91ok7j0h}aidPMt>2x;NU&8WrHQvN z<9WorFV&g*^LPaEnNp-qNcoH3b>A;h%>VhLr;2_1p6#l&VjJ(poVj>Ok}bI6ZBpCr zFQ>jsDcT%bEOL3>QI4G(=7=ob>wd$lXL`5&%c<kTJl%rw{Xw})x_qYGomhQOCSG!Q{G*&VUF>+$|Gx-pUKQ%n)6T0u-jpiq~FnW zrH|Zl#LLcD{)cskLdhV-sFOFGK*p+9QKpZx>omFd78&JKFt@C?B`s%6r^^lj<2LF zuVSmt!Lj#_>|{*sl8)@{t@;i%a?zD z-cva3?;N%NU*g}sxVk;C$v0Hw5rg0Nuo+EGM@$3TTmnC~+l19FZr;CY)}PA>v2W{M zuk6lNj&OL|-5>h*@YIi8Nx>mG$qq-?^zPj{e@BohTTd3(zj&SFrz_82F04y#-Y|d1 zvHuOh6Ftfn-mf;Cw9o(E)9Z8R&W^OVH(&mC!$!}w3@6g3`lU7qhLvjMdu^GvR@QtA zm(PCR7BkC0-^qr)y7|40I{exH&L4XQkwV^=s;u1UGK;>Pu{`3Z&gX3B z(0FO3QuE5GtnZACAC$;1tXMEPdE(;s+YN!v7pM4IrR7Vl`}$h+`k71B?|v{T_1Y** z=hfPkFh^Y1>dxvOpYMSW)E3v}to_ie!S=z^q&-A=1KZv1H5aUcT^+5PJZEwrbT|7S zo*nyV)Aqc2jR^{lN}R%%oTs-42a54d|M&M>_%o6J%HQuzJ$%0E$?ZhZ(77vFLfQ<> z$~g~npO1A^QJN;+XR_pX<9oL|abNyzY`6b^ME89{i_UpbC6>ZFC%J`hUH#pe{bE@b^3C?HyeNP5<0iq-ANhw% zw+Iv)RtaW)b6)B&f8XnS&*g%x`+qDy9sj{?O5|OMwSv}CG`~qIb53;o3zfO7JQ*IZxioA|#h=gXwEJWBKAFMDyZOJ# zj)O0Ywro24)idCtU~ixN)|q8xOEphtJ=!z>x{Cep+~7BR-`myS4l5MA|D^2kqeqWy zMWue1waoto{w zN^V1b>v*rHt?j&YY2rrtQ>RZKUikjp z-famFROD?+TEcCgGQ>7otY>`hZai-lv;1rK0MYEj_XYQUvY!2MyL-~v_60vSzAL!x zuf(ay8ha_+K~+`t$DEg!brXMmX1(4!chXhE|0m`wJ1vxJ_2xy9L)juu`Ml2BuV2?j z>eqa6`uKXU)TIral_y^W^>r~nKI>$<-2Z=^%%RNv#?SO-SVb=7E;7AeqOTOjI7#Ku zgVObn@A~h#6)SIB_x-ryZ{5gEE<76T$Lmy=@~}=j!CcNfFK(K+SfcpEzDqAJfBf>G zJihAdpXB!61sAW#l{oF?U8obN&|z4id@Sah=(5ez?)|>7Yp(1`Rd1JniI%%#l_q-B z9ned>-<=j$eQa&_`dbC3OE+tAafzK_`EkRmZOZ)l>)%~{v-AE-iKE}!=fzB@zxz`B zd`wB*i=DUMiXGj4s4Qpi{@;t54h4&gi>}+ZbVI^d(a+E0C93|OJn*sosl?IuVUwnd zYb<1ExV%2b=IbL%ZhwB;^4-N#3*@5TKcB8UqxzBQXYr6bR_hC1E)CbWQ2tW&;rn#H zi7rYL-`xFC;Bdoz&Mt$hpnI|#1#%n@Tb|QCVs)jf-}>#n!tF8k&p&RTZ!x?6Pygm0 zzTMBJ`Pe<}Gu&%?p}_Rlw7*SdR_~g)V;<{k6t%Kw-}%OEJFjf!?+4cF_P)A5|8D8L z@0)j@d+fbVv*OPQ?>vd`%)cFH9Qx1_y)=s9)B3$;VokCZiI+WQr7KMIP}$$jz#`x7 zte`8XqshtP^GdOQ>6zKvALPHct4u5Z-oA5Az16&rsmYnotKC0OVn6>jCd6WS#S_l$ z%i0fpcqr0v!SMfuY4rxvcwIbVZ6pi-@hY#|Uv;lJ|4xzO=l_38&i$|Bd0ubbR%%9UOP25Rwobda+^Jy?e>2Bd-f*3&HpEF%e$7AINg}8Q@Gf`cMjM5 zzf7<9HfQg)-1T9VYrUn?!mn+anRger-H?(DI3jsGVhQ`96H6KlR~jZgyt}KVi+`5z zyNaJ5t>^BR*(@+pgJC&J%ye#oo6(>{Njs%YJp zl8>`u>xDaAJ~=O0;H_fs=wUH$kFx%@HF}Tp)qB=hKHhQhYgf}Qi5U_S>OY=q?dME% z?oV$h_I=Dy>|DD+^>G`{8}loGx&v!xc-cpE1Tbbyc{IeXJruCU*^=# zIVFKl;(yG3H=T{nN-Omj-Z`E8;S$^QeG9E$wRXw9o!Bm4_rqHAmC#9lW!6}wpOWW4 zeLB7VWLNjcTC?O=(;63V+Q$51#;j#dB74fCoFti?G?=IJUp0NU;P~|3H@B|I8UH-0 zo_F_2S-b9^f4haFyed);9(t&EG^Xt80a?%HMNteq3)F%;HcgMp>2h(pv1Gx_lxTmo zKef?G+1vSqY*YuQ`1lBr=Zfsjvw|`x5}?PVU%S)owfKymv3ak46Q&D zW|wcf?rM4}l=L)YEczgQD1V(y@3pHIUpyn%UiACW(;=Yv$n1i^n=I+^DLU9)I<4ftJw8y2h9`#fg7-B#NJyhO7}fwVY>FtD~pvhIM9=|Gr+8uqe8~ zcfu==eSyS|6G~~Emh3H>CfnQ(e|lw7utH77WC7nMVXL*X4Dar0Gs$r|V<4U`^V8Bz zYT=)bBVrlXOe3yM;*hRh^x(!4HIGfd86?<_ZBTu*F!5v6eA#K+)EqV~JFLjLc0$(o zuFBE}PbF4bnTo=`xJdc*pt)3e;8ZsVBH*@rg znI17QHB_~}{;_sKM7YE4)oRZvwWyXJLI ztNyJ=in9V{NZe-JXtsZA??Hn-f%EySoC_+FxKph6TuYzP#?|GNY7wY(lNppJ_d0YK znzyR^B}8Ot^LS^rZnX}2u=Z>7g9C5eHfXD@S?Am4*ePr9`GRRexbK6s2j99}6#skv z=6pU&Swi|Y-{QsA4_9xis90+!t9Eo-^zEECeN7WD-Zi*$mDkK^EniSZe5cE%bWnz? zK6&ozv$h?%7Coo)S^_h5KRnx|_`p!a;&+4Zf|Y3sJo%5_Z=W8R)IIn0S~ zzflQ6bFO@tubLv2rghDxd1c|-1)Q@xueaRj{`kc}ezD6YdnMLbrJLf3&pB$^lKyrc zzxHHZf&7iSrVUd&;wqXaKXO{{sWK_PeNMX4#5c-&(=)v5Bv)LY@1k_m9OQ-Ft;X8Y zKke#!W(XY9bdjl{Net5zjl(BPdC`}1jC%8CT;8zq<1 z!a1EL7N0NNm=|+{-#GZjgX=tQ9czlNiCDG<*%u1k^}4J)(W9=bBQr*2(%z+8wuDqP zW$c#wd;faa()~M19%ry}>xPwb$;=R#X)Cx!hRws!Vx!`gwRs!9y=WP;h+V@s<*1ey-j#28OfYXfyK0LGEw{BqXJ#1)b5f-{NmM!tm4o>&@#%fujI`NOm!AJ5O=l0iJyvhFD$m3=??_7U-T``D5{?E1y!QzBK>;dF7s|*q{C|z#wbQ$0!)-s@yHM|ZbI!Yjn;{(vzdcp(wflaE>iuu8?DPNn z-AOUudDpA3(2%!XqO)jOYHF&Ik8Gc3>WR1KRF59@c716nQTtHVQhoWAyX8q`9IUo&pCM7yZ>SN9h29WgY^pLOWe|XF>$eh+~;$Z zMvp$OpLO%Qw5+$M=e={1xy#SQ)Z993ekN|)!-boFcJ2Ou=(=5j-u*uZBLD1K)U>{T zX5rx@_m1nx@^`u@P5kqW#l=v?V9t~CQ8Tuue4Nu;t~+z<+JwA=z6Q6}M!qjNP+57O z`-XgN&)%b-7YM(TDLf-tKUbzou7?mGPA{(IZ~uRleGi!+7X zIJ!;gmVjI0{Zx+yDg`n|d-NuHs7(5xaBS(}7om$52t>`X_T`Q;)Ox-@=dt6Q;+f>%LZ15_@3{z_ ztm_gu^ypEN_Q6w{&vz}CwO#k`l%{j}6Ir7iYlW-XLHpedguM4M-R3^)qSU$S>=TE% z6_u4{H9IXAfB734>Axqq>aqL5{@x|2r9z(jow#9BxKAvKR3D}!>#Spe(qxPxSB&(c*|yA^78FxW_GvNe#R7-FT;?y z`FP{oC~n)|H}bDa9?#qHt0C~&bmR3}R$e*6=QxXnI-guu1eMJHH?YJmKQ%*`e~o>@ zX}h`O?Os@un>r=`)Q4*-leL_Wnk{zk zpLWr@GsQkReGyNm%clB^x88o}JHKw(s|RVDHrYt;{rHtbV%j~f#cWrZJAM@`Q<`-B zozc3q-o?UP9!obYwURV@=h4Kso_B8jm8?s5CLX+9)%NRfg_lrgiae;kd9z$$!Hw0c zRSYj4Ugmp)?X0ZckBYYn8tc6qoZa)~>J$Fn$oIRHFBjv4v#Dq(H zkBg)ZW`2J^=U>#Xn-&Hfoqq` zC4Yg}XD4c?y$jdP|Gi-1Rf8l4<~`rf8od6SDZJgGW{UWMkcQt|=F06n^HOQz7k*If z_qS)l@!Vgg9er;b8Be~w_W8$;JcHeH91JGM?R2@s4|36$;1>3Cnry}vntnE7>pkmZ zlwQt1QTjs2(_Ss4r#8Q9llS~srJMUfO5ZH+_+!8@=daq;C`+a$iN`YDvC}=i1%vGQ zt;tf@zAQ_^q?s#GT=G$!W@D`d^VKC*#YsIYzwMS;*_yLog&h;D?!BB?EO5_S-A})wI_N~VJm14q zQ_14@^_fRb2h>MSjyQgfdGdp$GrU!VI$b`wKQ7xnHDJZt4V&Ld6#w12`Tysa`_Dh9 zIm>d+oPUY7S6_1cRJqeXpB>;~Y1O-MssQfq{X+)78&qol`;+09XK;J^%m! literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/sort_distance_from_origin.png b/docs/assets/selectors_operators/sort_distance_from_origin.png new file mode 100644 index 0000000000000000000000000000000000000000..3c285359fd543da970379882421537b4c1c4ba69 GIT binary patch literal 61130 zcmeAS@N?(olHy`uVBq!ia0y~yVEn?sz^KE)#=yW}y4&#t1H-$Co-U3d6?5Livd<84 zz4dR^s_IM6<}iE56^ZdA*lfPHe)sdaf`^$VH8(V!;Y$(|U}kz&vV8Zwxi4+}-;12l z@Q5=y{cKKoQhDfK|F35rG-)`dOq*LLUzlEARkdpWx^>(4@hos|@6&6ZGl!{Z;{WaE zeTCJ|?)$!UdEV3aHvj8YC##*E$rZ^e_(-;eVNIAe-;0FO7Z(;fxAV!iHy8JDaTRsE zH!r!nmcOUEx&L0&T;03a{&DrMkIdP}KZ^GE-LHH6qxCv-LGPKP=||F;ZE9q# zO28&u&6@gWz5edJk5kXv6drHCUtb{kyqdje-+uGwyMGnMO*#8x-@GaBfu@^7L2Uxep7y3YYwpRV?0?oK}0^lzU}Zw>F%KX&%d=Xdt0%fszTAG`jZXt}1X z@h}IEz@Zbr=NPv!Bp-8FmXP0nBtF+a=U;_$|9-pw_xE+bz5RaG!kCa zVo=;9TYqmZn=*Y~eC#HX1ry}91zuR_d|Z-w?uF797KbNHp6txU&HeI7XYqM1 z{?PgR9≥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 wFVdQ&MBb@02?(300000 literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/sort_sortby_length.png b/docs/assets/selectors_operators/sort_sortby_length.png new file mode 100644 index 0000000000000000000000000000000000000000..c703d50398b7082b43bca9c2474889609ba5b111 GIT binary patch literal 29935 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

    NhcS{h8J2c>3Tr+hW5l+Zlz=rfLNJeUK$nXv{iQ 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 literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/thumb_filter_nested.png b/docs/assets/selectors_operators/thumb_filter_nested.png new file mode 100644 index 0000000000000000000000000000000000000000..f4e6f324aa2461e233fe2500fe29c2df3047e2f4 GIT binary patch literal 7001 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 C^taIf literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/thumb_filter_shape_properties.png b/docs/assets/selectors_operators/thumb_filter_shape_properties.png new file mode 100644 index 0000000000000000000000000000000000000000..2d58d2e36fdb5687a27a5d20fb68c853f1b9f7ff GIT binary patch literal 49623 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 z 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 literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/thumb_group_axis.png b/docs/assets/selectors_operators/thumb_group_axis.png new file mode 100644 index 0000000000000000000000000000000000000000..fd9637d741a889b37e90be7ae000bc765bd8d11a GIT binary patch literal 58493 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 literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/thumb_group_hole_area.png b/docs/assets/selectors_operators/thumb_group_hole_area.png new file mode 100644 index 0000000000000000000000000000000000000000..30476d0a36274987a51f7e3e6a6b4c88e09c2b5b GIT binary patch literal 35586 zcmeAS@N?(olHy`uVBq!ia0y~yVE6^X9Bd2>3>|NxY#A83PI|gHhE&XXTgyI2ro8f- zacOye`TFnHp3Cob>zt+Z*K6v`|tmrKlAR*n|Gp-cRx4nxm;eBKfm(#XQq8W z9(C)}nwTS;$a83CWqN$g$EQ7~+js@e|Je<)_jye7`bg%VC*S+bSDimQ`r}dY_;W2A zcm-G)pY1Joh}>3lOeRt^Urb`(Bj&r}@p?>&vlSC%eVBgQ&Ueg+^S-=x;ewj@+*TQx zo|m)UFZuoGbSvM7S*A@J%4Yk$_ODAnHv6#S!?jJC`>bP>t}ZprSfs#G)BCPlUwlQ* zJs!^pe&!o(x%V^ntlDEz(Yubj{QC6MTbmcNdB1jWa9m(AJ@#DVCt&J~ZnWb1ZY|-H2V)5iyEp=&Emph-{;dAT6OTTrakl`SJI9)_NU%&iaTc1@ouPPSS6n0j2i<+RIJxRgK?1V3e2CwSJODAt?@GmR;`^JoCnb$-k6|fKXg>HR& zbB9Odu9c>HIp=oT*ChWsl@ah~o(3oPDW^>)Lf1_l1ymx%LL3>^_bKM;bulq5>YTjM zt7lo$jOfc}*QZM{xitO+h2Uq_2hrOcS{RBsqb~E;Z7j>oP5r^Wuwh5cv?G!wJ!uD~ zs00dfK3H_%Z(fwzfy?zFH;;TMkkIsX3-D6TJtgx*#qL7w$ESC=-QQLnsCc10wR>K# z%l;6lN#Pn@H*`)rcrhzGoK`v^{ro{0!#Ptcb}Q$o@C_TbNmp0RD#%zMraf!7;gp^a z<{!WT8?Y^}bx)b@7f@1p!oRE}GBaZD(p@n%-OHGF9rRho9iX!Az{7?)4Ze1k@!O_Y z{y&~ETO%RzucysDJO16fr7i?nGEMFTyC;V24#yMz|JjeX1SovCdTB$&(mV&hWs(vs z%T6@CxOOXVg7t%K+agaI8(n@pt83?0+Y3IN(YK#3TAC%WDdopY)A$<8@K3w-eeyL{ z3;f%=$fs`cI>i;M79Eku%yambQE-vD;2;0J($nSY>unSyZ(I*ZvIA*4` zY&fQz%zr;PDpGFMk383zpWcPc>SPQRnR(K}!__*}ZGD{m9me9mu=2H^%@=-tW4>fd zbp0L{fBBEvk83_Y_31ibx@Bp~$Jy1=URpD%iX8;*#R>-An}00bYAsow|=^dPE9mJ{R?T1kkh?e+a!K0UlsJz z%y;?TX_b0jW*c%h?_M#}?{(gR#SAZYx|RPaeQh^~y-~jB^U>*-HCP_%&Q=Wi{o>hq zlXkIKp$sWG-}-f%j6N7r!Iz6k+ksW}eg=b~LlCNr|HqNZe0A3XS{cT{JWdS%x|urc5>eCyZd_d_r?6#lz5nJ*xypR}z_GFwLMeu;q=* z<+WXA;SFawcYHM8{-<=`-NiFM|0(F-wykgT>DMuJdy4Hk^LPC&x_D|=>1!1xV}_ht zTRMwZi3+jvl;0_AzjWb(gEmV|@#AB?Yb1V@=f^GSO3MCKJ>RwD<(tgUj4$s#T=1nl zRghD;a9WqTZnh|UutBff9Tq+lpg=u>|g)2do{M7-eeKWaQWbhk1hd~DtCE{rr$s7Te973+u4fF z^*26j`CCyHek^|N=Q&MM7q{9T7e7Da71Iwr>+1K+cc*uAJz!>LzO;ScS6#jv_J41* ziB3wGc5>COu%wONQc8c%s%8bXYraxDqBgmcchd@aIp3*oF3emaE59m3T*Ywh>`w=S zE>^s_xBtc>ZttkeDU1FejjxGXyJn5aoc80B@6X(~PHD-St3GAXTU@%9lrH0Bde6UI z=k-UgaN}8buD$x=ziI2Hsa)qRu2s&u_1WMA!%V-Vb$@p5Jtr@*&+YruB*9C2zTYjM z?{>Pr>iGTjYx(;2tTwz=y;kFt=w|7uFBg?DO+6Smh2_#64>MopWhVs!SX3eaKG~;`K7_e|znFd)v#Fx$XO{a%)Q~ANU%a{ce6$L-p@r zw(sv#BLz59#5j*wq^|Be`OffmF?XDf@%$~@7hm1GpuM_!nZ+@-?XRW!emH!8$|SB< z^H@4R?ES9S53jJlzfrJON&5Zl=)y0$m!(fHJI|NH?80h#@Zc6DRoA(K;mr>+{PiXs z@NqTL*v{)}bR%L@i{u2RyDQar)V(fTT;B8MZD!q{8wEETy5J9b zRMa|r!c`onxdfft_N^>@i?5RWJGON#g-tne^>^=`JUEZJ>bZ^dpFh%{8sD8}J-2*Y zp6vT`CikmE--erg+(Mtn|?qWM5(8s=$=uxZsai>q*@PioAP~M)t1P0sq5CZFNbakb1~Xvu9)CD?Qws)$u8>^ zW{wBBV_bw-8Q-0qn10}0x;bZydC*zuJqu6llAKUtypFwPp^Hn_ z>(yrEa`_^>X^&<}{x;mcN?L7lf>Vo5r0G-3e>=7_91}Jsi5s}+<_q{5w&b_@;|KINQrg4&-F7Gut+t>GaF&jwiyxZkbncdlZ z^5T}JuZOoUz8g|>syVceP1gT%(f05s*Bl%!RX+Rk#6y$sTlnLheJ@vV@;}VwE>l{w zY~lr`2`{fW_@r|?(>?Jh57ny9}2hZ_`a`p z!S5o)6VG@9uID@bx*oqK_EwPe-zW#cX-ylWT*W4u&G6h&=Hf&$+Gc zX1v3z;@&KD!gBMf6orK=Ei7ZY-p=)X(cAjr-O}|7)MT84!Yf(qivKc+IhVyRd@KC> z;k&;#pT0SKs5ejk#lAWJKkqX?So0{`Sgg(I5dZ4aQ?AZBm>`j`WMZZGjU6x7#B83K zeE#aGnZhT_nD1}3<^MDDf54J^EXhhG!H2rtXK#F+BC0pPPJ}zFGws5S9t&_T33*U&GUNG$}Y8FGEAzE5?1^4hfdq@$~l&oh?`#oWQ4Bm=pB9z7A#`|-r? z&G|MB;)V~o8LyW8-kE>TGNkSJ?X*Odl@FX(mnq1295y&w7@Rhg(Qj_Pa@Y)TyIv&Xe~=Nlv^s(Z^6OWBZMOV#j&HzWPbaqBC{FXK}l3Ni;0B z%Afyy&z#rK*bn#wA1N)i{!#n4{#%ytX#J=>cEv)y8dX?|EGn_hI*a?afB# z>_CxRTKK)t{?pW51->qMJ;oooLmwXaRWT`0Wv*t|)8=5OJ1eag$M3B6^5i>U{NUVO zKP3^SODSi*@SNb9eY^Dl*L978D!1qvpJr#v&1Ie#NEjl=qX4q?*NBY`z?9I41Dig_p^2;|C8b{hEc> ze14rwiwG+ITOhPP?R%c{!YMaJ{uX@y_hyr}*o5+)t^VdIdlJtD+8I8z_K!WaeSh)G zy1bPVYPAYscTR24kC1pUPx{ll?{7ZWmc*aqIxznRL*`qx4`S!v*RIssr6BWjmXyFL zuaKW%Y<}BSJVVkCF{kdF?D4`rX1D((esQ%AjYl_T@z2|x*Gt!V224|7mSujr zx8`^Q!Oe(=ny0EMBc@n7%xt|e#hyj-o?@t%LhC3j~= z!IdJ$DuR;&bZ#8mx^u7Jv%F=3OAQWi|J>b_UHy@3%cHs-drkd!Kb!e)CiCaN*>Ne# zGc9g~w^h%NZ1kSJ`@_1YzkiB5tJ*)=oxCcoO0KGV_Q!oM-<_T*l=%IbYnQ^7W$*v% zEIM197JEA3ju5YAxxfK;;kJ2xvzv5;KX2^LI_YPcdL}!ZK`(k!*8YPmCEnKz;}%qR zg&6%l#=N7}_j_s4G+RcK>rK`6#wtGRWsec*P0K+DomE{)t^u#EK_Wst(c<26le8%Y2-Hhj=hS`j~*;} zKH+xTE8okOJ09OHvb>&Vz{{z-wRy+iQ?WNH7xC@CYdQb=v0z#KVyWYM({_b-Kex$L z<2aW3RwTa0($*}?4M z&v5qB#n_&e-?ZyLy6uxyVw)Z8TX5icfS%>P-L`&51<$>DWO#Y!%~*w}$GE@8Fl^U< zZnbg-Yum8Z`*z|orZCmLx1VSf>^mMa8)#ObK2IOY|W_K^H(9UQsEr`mde`SXTHs8j?w-T#pIJ!Cn_<|#(;PK zeQW0T5!d=cjs2Tm3bpj?kGmqSQTMm$cCGx~>6aHAeHj|DKeqbW{V2PL&}DZljF#VCvjE>E^SC;h(dv@Enl!JsTs&R2<2ir<-T5 z`{SWs|E|sFCFeaW*m3i=tnU1YAC;b*Ym?y#YTv!};jLEp1(Hf~cW*Zx`($Wxjpv|` zmcY_G4`Sx|2t5$a`F3>r$JEzsCw!-$pZIL=(z(X#?Eb!eSsy4B_HXGbAHA3IhBGt_ zVntkMKI;*c`TzRbgS`1S;|gku^v>06YC32-eOW2PyL;&?>qYM6Gv6tV{a*Bp@qy9Z zy?I-bb1lBlRF4zBQ!4ZGNl(U#6*1dN+1P{_@9g=a5OT96As~0p@$D9@4gN*j_4hrQ z{o*!zco*O4)AIZ8{h8SH>A>1d+3?n8r^=}0Ojj|HBY?k|g?v?C0xhdCYqUFw2vX1Ao zg8h!YIM-`EYpcVp)4UPdMRQpb`?j5BE(<#>&ScS<>{_Aw=p$EL(LtlQdDWX3&c~@Q zzNso)sPjn?mLvYM5o8)h!uYbDxX&AqSx-RUJKB+U2KE>&4`Yn|=KuggkP zFFq($GrkuuHucn`%!Gy>F#m-3 z{2u+-9~SeYi8UF%_rF<@oICvzRmck zzTdPqRzu;gbjVSzRpF+-mldX&DK!=>KV`&FUc9N2Vcz0{FCSSlZsTO*-nA{gF!+ei z_HdTx&Z1ox()nye8~pG2=y#b_Tj!Sq^86|M&cma|v?KFnVhfX%{<6aR*LMURx$>d$ z-RYK3FZP?=3lik5v0Tt`wo9o+Q`Pl6<0I2@e*QC@+dg)D(=3}NTEoB*{P}R~f5DjR zh4Pa>*WL8pS#_cNe5Zq*Xv1?^|4eg-0MkFOcD5S$GQQvOL?OiW{4y4`J$?_(KWjg( z(L8b4ZGC_J)`!R5-k-g9|3bAdp9?%@$p;+Wa8hTT*~~3FQc9;!e6~&Nj!y5n)psfm z-C*V4{vpK-+10U_}4*GAm{W(KAX9jlEH^c71yt| z57mu(z(e)*NxmqJ;ig@U#vYj`S^ar+-*wT*Qc#G^!)Up zQ*TTp-}OXF?TK)WZk!UCc5VCI9p_Hh`>Ul++kXFX`}547OlelfE*;x$pd-UtN z81y%sI=Jpd#k#eebDIVC)ZP?i2{~)*k^AYx*T#QVqUFC|1jn!HV)HtD+C=S6cy}fXZXH)$#XZA& z%a2tYuQKatc2HV2;gDv|ub*3YRC==O&99c(^ZTht!t3SN}X-Y?D=yWrE-~IO5g{GH=;y<`DzjZR?!Y5yAU;&ACU%^j|=ZApBDDvn<#tXlJz2;Q@SR2HSX*@Kleje%}$F}V_l&G=8+8b zzqCuYW>uyL8uzZB;yNYtDEm9x6<=j@fL^4k}kW&X$Xd(P*gxVKYJ z{(AT>TinKe^To{z7rgu@)hAtE|1rBj*lxkY-~IZ}Z`&2Um5XyR4*h8Q>-CZcN3T72 zQyxF#UO;5O>xCor8EdAjdnGSA;hIEns$;3fRN02hO)X5fZpohf_UrivA6DIrW#S*V zc4ypvvvcNN*Rx-oSh|Bh9aT5Ee4g*X-PJz98;a7*>wdjq>N&#P(RL|}_x}=AZ>N{1 zUAaDNH(xhph2Gyr{p(lEL)>O>-SThhvt18L4;u=r8DE~Hq2>3ub9&Iuhy`bJ-JVa~ zlGgBY&5m|epL;&%@5dkDpWh|cemulpwLyGGiP&*i7bJ}fQlYP{AbWpnvnL;u>l zsarSualQ5XKUZJe^g!m{jn%VeJ2`%|Kcx6{Q-H$?uk1800oPf9CmyH1^HiVm|J$== z+|4@~)GH?@++OnM15;X6ndSZssh=3;dvyCBLCU&#=m`ev;A?R_J}r zr~LD>YQ}eej?GQ}vCQUdp6ra|MZ33}{4G8vy8D}T3jeg;sEF>}?-ggqp0ca?#Hn;H z@8v7a*)J=P_tsB3+3@XMkbgw@BG`m#TW0_Cv6qatSy$*hNBtxfU$`r1;S#)6LQ}@#i_n%p9J|Syk;`h$3 z@b@pi4A)mTPR)6LE8qB3!8Gw_N);R8b)Sj%i=DsxLNfX8=Eo+CHqUr-D*LIwV%VB!?5e;jW@}b z9J0P|m$jU#OxSVnj4O-dX|Zl^J8$iJ1&iM@XX8%zd}rFTV5M%wHSXHg%O@CFH#3xX zGcwBVU0RWm&YidOi^44Jq;Jj`q=dae_4rSRNva+jN z;z;XClgm7pTXeb`3nPPM>u+DY@a}8UzHOJMK2uCQQ?SR<{6&s>Vc*vEvl-WS|2|u( zV6mA)_J-B(x$K>_JI|c;?T~h~Fy8qg>Am^YY#+yrJ(qh{1@@?fl<-eWs5;zm_0%hy zzg(Q38|x05&CQ9-xu{wHjH_kdzi(gm>-B17^EAhb^PUc}$uvrHnw0s)lkY^}o(D(S z^z%E;7%Y9pc7|)&sh9`Pz0FoHDz$wb)j)){f+J2CcBp^ zTybh97h4ZK7u`Lt`mp4OgX*etIu0HAt#`jaevb*e>C?h9E2K6?MeYs!aYpNNW8K1& z-rt=B-?e;u>#y+X%Koi?LPJ*;)heZ~(d74*kTZ@{N|oqxxmS^AUt#uO8tdBV)zP-;TObX>sHCrX{`WA{x{s%BvXuNp1O|$ylSM?x*sk z&d^WA^K$Gj_of+vrf-%m+u%5lbszs1ZkM=S%%@I$U#obo9cQ#tDiL5l(v2Dwl1^j_utK#VfgWUnd@wY z7=g5^eK%YfmNBTVc$llr_xRyl-H4qpBzi6i`N_|<)w!Pjy|Iq*!tDb8CwJ<@1M^>5z2Z2r(a?E%YEralN1>^->-UT|bFR!3-=KG4_sdyaO*;~fMkVIH zu6ysqP(FV;f7bO)uMbY%{LyAz#$ic@9luYB)MV?(I(s@CKA3De!}Hm0&pz?_&!&~X zdbvkB{#?STH~shLe5=>;zIyu-+w4fGX-u<@X*@coqBUWYyVTPSYj|6v+ZK~90lh~V}JYSyUq?s`Ca*{J$;Eo$=SeLUsg%oxE$E+UbgkYyYDuvwL4fg zP0so}=T-KX&jA{7TML<4n0{`{H~n8)n|gA2QsG`j5rNRa^pM$kL0WT)w_39BAJQzD zw)4Q74QqEfP7j}I=Gl}-taL)d-Q78Fl z^`^J=CokI__DP;+=ks0tg?s1x>@s^;!VF4mZe2@{bKPfKdWGqs$~}YcEdO4wJZe$2 zg-zGwlIL{AD7kpIng#ROb@X3fbNqE=ktvfFf87q16*X&B6kLlgC0>aQTajb>IJy6E zd-b-bnXjAp8#I4BT=##@E;0MoDK|sTln6bnF}=K;?ZY1CQqHqem3P#9m;XR*L{NA=LO=n&; zkIurVXS?rTDT-r=sd)3+IQuZ;=d)cpb*eH#+9tAU>|1$16y6M*cz&A~`!2`$6F%q7 zSLc4V&#x|9IAi9!pc|~y;1F?yCcBLf2n0%det5U7uP^G%qD?op z0Iq=)TzT1gm`KPPyi+X)Umwwu6@bT=eQw~ov?iiE``%F}b+F4*eHTdJLFL(Sl zt>kw-adF4IY~QOs=a0tNsqd=3KjrL~J;}!yD;6f-E%H*ZKg=*+=UJ@kT1#nO!KV{h zW@)<_PU2yh#CVM3R$c0yo4OS@nccR&ym2|^TgcSP%+i3r?{9H!t+QD6dZVFMq-aI` zj?2E!{3eQ?>fC+WYwi`P`(~c@cev}S!vnWnee>x`L|oiv`MPskcQkw!e=sfL+3uE4 zrv$G|SNjlBEi87+*Q@Zpugk4jlpI0^GucfUF&9k^NS1PP}A$jG5Pk2h; z10DTyPlWmM{Fm4SKYg}g{f)nO`d-ef6?igjU7A5+{PY)db;72-VLqZ*x*&V!ZK-1B z^qny|e)&6!&$#I5mwfvX+{~5nyh%d%oX`P(^%L>T2aJ#V@jjSoA}xRT)P^-H#m~#G zI-U@(sijo-qV37_1N*`ja{OvMWqE4P*SDGr?*8~|d)C`~@u~FG#`pls3-R_I@h5i*Ly#HP_3{Hyvir z6)I-EWpwM#+v%5&zKoFG;dkZkrAa?!)5V&D^$v6YEwohld05H&;}f;yl2z|4PIE6W zIkjnf%E9^B^LG1IZjYW&X_5M`c-EQEd)_Wzu=n`xW0raqGcTFi95`n^Z$DRuRwmC8 zXA47_qdmJArJ7F9Os`qsANZoW`rGQWjt}3RJM#B`fNA};FQ4p?2z%@q ztb9XrlgGbZ+OgB3A09jS((rIGhXU8n*RFrwoGEKxc2Y5~Wab0DP?7!nx}UbnvDM7} z%=ngjx9Q%`3r^}(*Zh7{`8a1rSEb#(uYQsb(l5B!%QDQ@InQuLC#?os(myM)N=JWPZC0u#_hb6Y&8tqgR%N5lXzw_CxaO5sPvQFXf`?p7p1wKXV7dC?&u4{7FY_9#?aGeXo|rSm``C=bs&N<2 zh@D#;^CQI1rdeUW(<+_axkmiWIV-g@^Q#ojuaY|S?;RJzKheRSq}{lE6g*K%bCp5Suy8_O3*z6zyBRhH}$er zn>bE>x;S^stnHuHKJZw=#NQ<|!TQ#HGsYr0iFfU88`Z@5PZ;yhoik<5>l*h@O<6N- z;>-4bZ<%vq{`Z>qr$ij%Ui|f2EtdXs_Og;F!3Ud|80Pbw_*r-}^xxHGsU}m83xt&L z^t35Sim0^}EiqS1mNVRBd;8josh;L*}QH zUhOVvp2~e>L)KACmP?Ojc5P$IS$*%+)-`G8-ij1&Uh8+%XZ!ajnJ=zKT{O$oeK-4M zy6G%C!vmX-8$_=bo;fG2V@BlN{+Xi89m`YYU*!F~YrfF#>)B=1ivqtoFY6R?-R2dl zxl)%~K;wW~hs%QZT~l`dDcHU<)}UyfFvID*^KXtHNvl#6u31&L6_Y*N3Lx`X&=Ld&Xb8b?zL;fxXi?JgjylKb7!e2^8+zo7d=f zzkAEOzS4=m68^@oKAe?uJ>r4B>#PPtD|X%@Wgffjld`%zW}lY0@VoGago6jigB|yH z9W5JAr@wLToaIvcQsGb+-_dWkSDw4`+TS{%tlwH|+0wmgHIBM@>p9jZY8<+0dRgDB zL44xojAho`Gap$zKbXw1g0Fv}l7wTF`nJi}0}t{f`v|Z!=0QEAAp6-6uNeT~BcCp|7HUHRTb-u*-O!H~J)uNYI?+y@TVBh1` zyZWfl4^JkW-E-Ej^uNhp{`UJG&yRoCy`Cf6;Q#f>XO;)c18$aSrCDXZezWPdgYcfz zQ1e!sqoskMWgkm)qqj-q?|ST;y4pMJf29Z4-@{KIo<6#|Dcn&sMDu9SAB%oLYt4;1 z3~ZcAOp8wW{yDrd`N!cCn?2g+A3yYReS(`S|0-`Du4js=T{or5U;C;*Z@;bm^I7G- z)Csotw!X2oPd^^wP-nLIWw7N(o~Ajz1&1`398&vq)c8W#`sa*yN|(I0*rXJC)1f-w zvTk#=-MY-o=X3$v{U%%VA@6j**IQboM%R_cBE}qb5{nn{oq*;=~ThZad z#}5yRDm-7k#oEnE; z#}C+dsh^!(|GVv#dCiBm2fVWm@QLEt@77>q?-=I~{?~i4cm95*0@tV}mE{v=P1))9KrJEoZ&gP} z)XGZNfIDaJncVHGKWWuCCG*0JbN`t{_I_`g=ipbrX2;6JS+{z=ism1F-~RgJnRoV! z%Act2sl6!J(rk6?5|>ETh8xSPHRsB#Gjrd=@LWIrtj~TAhB~#aKU9hy&G~yYvMhJ` z2i~8z&Y3^?aiedh-)q%I5rvl(n{v(MZtP_^J=^cmwWqrSBPTsj5!sups=?oD80e9m z85{7l+jn;Utu38*E3ePhb!7Sf?9_*;Pp7W9BCMn6$5P~8&ECSmG^uCGOtzd(|4#y0SN6&3<7g&7A-cuXM9_IhPIqzcSvmbZ!8s>lO+IE@o z!=A@+?{Ce1I`ip0k6qSQ?;7s!)cLEj;<%E+>kQk-=IK_m6*$?nye93~@{;A1cAJ1d z%YxZT``t1XGVKZr8h-@2|6FLUf8)3ERhg=weKQul2@xs2JlA~d8PVr;Ii&@rPfxZQ znzeo0y0deFMsj?X`nRLIH!A-$dKN0{;Ct3PgTrv%zVn$d;R5>t4=cYu zSvMzkx64eAI^F&(`=6!qE84&~pnvsZ??A=rN@*%Tnvd*c-(D8ZBD(!rTwDgN z<;oYXE)l-U(}Ff^UoE#kfA-n$_qV+Yy%Nr&G?6F4BJ9xb3o8?5`=#)>S)4esW0~FV zH_X;%7ghDe7H~&z%Q5Vs zNJcVBDlVCLE~EU@W6#^_KD?_Bc^j%5u{)$ zHp9=GUQ;)&WU|?PUDosbjBneL<@nSu)GZSG{{N#_$h4k^Yq@V-h_LJV<-wEb>=Gny zTzqxT3!A_3LNhEUbZEF&J-t!jlpDLhuDkHKYxJm(=$+iR)4%w}hwaR{>64gN zbw(!mb8zO8D&aE1jAbp4WUX)A?y| z_?!~)sXL^Eg7&aXOsq>4GCuYFLB?A{n{EFY;$G$+o*#0zC9P7*?d%TORj0EmnmJbl zp4wnnV_mmz`au!7qgy}kI(TW5?Y5-{*z0XWxA;mvaP>=SJy*$l{Go`}txs}%*H))- zXat&^JNfT*dU(;h zM!RH$xIa9Tc%JC8TDpq(*GppSzYM)FZoCGUrDL-{MD*Hq7PWN`xpGFc-~Xp z`}v6Y{8eJ<%U`tb?wi>qKX38Q*yENBy)8m7-sm5%x7|N!_T%@_JB2r|{x$KE>k*3s zYZt_Rv-y4Mo7K*0Mb*@j9+OV>_S5nv$vJvEsifp~bS2@pVPIKESbnNRR-HIjA zM}pt}@63Ky*8DQ)*~6m3tdE}!X7ycDvXPWtLqtTYHS9|W%|6dmP{Cnj==DQPZPuiaPI`Osg zY39>{=Ep5M)}GtM(RNh*V)QTngoDiju5)ihD|U7rUHvZOLr>>C?gIDZ;x)S&`fN^V z>|5%PK8vCGAH$^1Q~G%9pHv{l5LfVDGv;wjLyb+te8+8}&#aC~yUd;g?aBsp*z3N zc&U`IZr8cj{p^$AiAe_+n~M~lXDsP6E6;sCwP?u-3Aag##TKD%`zM#Z+J0+8VzU;< zk#BVqJ2*El(hItNVU5Z1wzCf#PMtDPv2WY)$7sum%Lxa=7jg)8T=C1A{V=9k{894x zhjp8`+U)J@c2N?)aMVL?^Tkg-b0_O1pIzf;GIiO9#j?jYs1$173#!v~i4#v(jeOye zw1d-&YaQ<%R{NW^JWU%!!_U6lbfzLbXpypOQ=ho~f%C2>wTgVddX`PIJRVp-Q)$+V z&eo5+_ZBD25SnH_@5q~3j#pgW5@#%tV3GK?MrXbJJnow6-LXQ_Q!eG?`zI&-eps+a z%WBtjCwJ*LJ$G5{SGF#CE3zs|EUGAV?+q6&|0O4GtoWqE=Doiw;;MN9+jk`eH^tLR zBGp-3g0^0hL_N#ZmRT(B(e?FzZMI_Pc9Ty5eW`pk&2oBH#9KVCxq`&?M3Skf8K4a*tJ)z$){D+a_81yPb`{h!6?cCTSrU-IEp{yo_@|NlGp z@%+oLPS;<=MC$!N5bm|k*gxj<8Iz<-s~=5#@xM{BPH=9hn@K^$gf+t@Sw%xtv=~q6^Hvx zJzMKLmhX?XJM3`PmhBL?^eJ~SNw*7ARGN=1jC}AU@Y9`=nX^AAy06}SInAu#=j0=j zx^MUniGDcD9b_-MsJ1A7yR_Jo34QJ5ri&jR(5;C65f*a#>7E_O6qhUsS=gsiclW!> zuhVtC*7>*kCM=B5{AP2uj*H>EuB~3Tjyjy={s)8p62=eebkrPr@ghWzh(T=D{UUsF1~v~ zgP+3v6y`tErC(*umTsEPC17_mM!Mp5#-WCF2L)2?_zo4!n!UUj8Zvo|pz#J_Wqf_9gK zbFjsRxe2ou@BGZJaBIQm9~UIl)!)@hM4bNiTIKAQMbCG9JH3fhdEtX&OVu~*f6e)4 zPya*zRrmUW7S36IPa|cqA#b2%&(TMrKOSmVUx@g`HSO%ncDd=5>*|7v%!1Q`*(xSZ z_Dg@MH9LxXrT7DtFTT=kxyyq8SuIV9{_T@vYanc{lX3ic-W{%G-4cE5J8h3KFSndp zaIHp4Z&_PFD+7e7heSx@xNE(j?Lpl0 zm3=yso2}i?t-f#3K6|c^Vs^v6nDpJ3pFGO>&UAmLS^T#C<=>yFTQ1a1U*XI+`DWa5 z`$cIQKOVgoUu;yVY8SLuu4l!f%6a{D5^74Dn%IBG9dvjc{&AoAo93idQ)7+~x?lId|2;i_U;5p& z%+JqCm)%aWk8cD8faA?Q8I%3?{do9(aZUDf-uG*{`tRl#Je_;6p{e4Ofs0^JZiUFz zi4yOn7T*l=v~6fvRbH68#mZ;CtYj$vdFF;ipf1-I1p{N}xzW~Kk@Lq^f_Iv(Zkick91SVzt6%1oK4WU824{@vu~N$1US zJX4m~{k;fV*1+t06k8@+qW zyC=Jy90eCAw<$)wO){ztoRz!pgSx)(h6UeL^fGPQBCI+(W*wU$_T>6f_Qs_gxdpo$ zUp`DM4&NVn>+Z!*>!QlV5B&T($034I{?5b7*(N(;ooBEz|#QhgAMFyUwVc zQb%0e z?H9H)VUL%oE4Zgst_$1#x9GQ=h~Zj!>6K<>{5srk>?1!p7=`}od|&r{e&0=#EZ17| zhc>zno5e+r*bdP>SVz$M-R(9 z*_#~ruf1z&%9mc(!mmBe5i$3V)_?d|(vaLWkMCWYNcn-@$2&Y!?!NWkU0cchCi21a z%y&r)<@*n^{C=^yv#af|y4Hsm#_tbSpSstowOg>Q>Xzr?@D)odw)|(6S@Xl}UU{kZ zDdsc5YSnTKe{$Gv+8mFNn*B5*r+t&=V{LKcyP97!CmXgobMAX=zFzOx;@|0ySIu;{ zlw7=OiJ=q2c6pYYCoGG1GOT0gV4Ti;cVB6>rTT@mXUumDW(ZEWyvF#Nihb=Tqb;)2 z<#n_T|NU7V|M%5KQ)#mkx6N`lRd$|pUSR#_wX}KOq49u|!J&$pygXeyxgW7k_FREx8*<}i=hc0*{Za7O zSHsnJoBGV%B35#e6@011buHP`wkRqX`*j3vVf$CZ{$t6OAK7a&k}LC{UfUyff~7k* z)Zk-#ZSltCtJ!>0l`~e#9N9C=?w#DFKZRAL8Vf#2`Ey-a^*keII=^3DU!aAa#0^{T#We2pFWK*_wWAyHSY`4131+L9>xe+=H1*BcV|bnaS`Y#o^sueZv=-lC$OF8YEZF{;=^C ze}aR&i$lQM44bo=;UDha`~BhC>-vVuUbcuJtr(^1YmRo2`)}Q}yZBp_VaMwkJX>rZ zsD5m^!(H&al|g*LM7Kqq_Hr2qPal`Q5M$P~>{H^I^>1BWJ!LkgG}v?OIGN9Wwus>! zlX3fc_6O%`Q=0R>?2DW*n`c?3L{;ai)pu9ktazGH@%rMzT{pVt8r%K7@c&OO`&|2p zJL~KiVjl?lGyb@9w|?8pSC+B$#jeG>qgM63+*lH@(c;#!Z^~Quxx9WXV9Y-EzP;G7 z#(h$6US>Wxux!q=JFo1Ptl+)hx9&MZ?V^xKM*BOFGp5X(w|ReunEr{=+tUq@$S=IY@ zt($(er|#dZnX&cNuQ!Qb-J&;Rmu9!fn~JrE81)VO*16}K&Cqx_>+i$A-3Hs2$-j@= zcKnsn<+WR6_OE1OC~v+Q?PF|rz`t4SyG~KvoQ6Kxw_A7Azux`f<1^{NRyDaPi>=Ky z__W(U%-#1s;n$q|kKcO#u9Qqm<2v$W|6b4BSwFsHcv$IlKOXScA~S8;95 zIXUOpWD&#gD<<=D^ADbni)*`j+4|!%R(64~wVk^|w!b@Kw?{O0XM$eL#k8xds?U_K z+qKqy@;c+ZoRI07hd$oBvYK;B?K}B-760F{*Oz=Re7@MnwR`^SCdq$0v$NUrV{Ee@ zyuW8x-#+Kc3bg<$T?O^Re-bXwUG67D8Z=%?V7mHHqO8>PVY_}@S9W@Ng5On!?|+NW zey(Y_Jv-+2`2{oM3U=>Z)jcEFm~G=T&m7rRN7+|DPYPJ9CegZo{gIRyp*<|K%jX@r zx_Q1!>{8BY+h%5}sZM5jzLRI0FY5z6UB5@V)}>7GPad^2d+sS&BDw$WW(Mx8-v!sV zo?o;mg-3PMv7NVGB*g8?n*UhZ9~d&|0z4;`UwpS^rkM z#N03axxB1|(fUP1;p1bxSBku@8Z2j-w0Z5t%0C%jt^edIdqDk`2$ zImceStYzn)imWg7uRiG5R95g^J7d{2``PxxO9H)eiqfk1GSp;!^*7i*pYe#{{7;!L z$&(uwGaGHo-7hzN`F|ec=C5PG_WtuCCvIxSJeCRF zV))(A>_^6)53A>v{m!Ija>yYfu?5}{g&0_9rQNSO<3e7CU_Wc)3NPAr|oCMNn5;r9Q$AP zHa>geRZf51vLM3;e%HkHnTnpVPTf1P*PW>`W`ghujlRv>S4;7~nb-ch30i6}LmaJ#(rm{7K&u*>EHr_Yvr+Wm9a-m?#0haHz(`+C>OrY;Qw z=T{OvkJ}!)6kPS4Z~L$5ujmAG&zZL_Gxcr0*KfCe&+E2L9J`;LdbW32n#QA$=DhW; zYt|`tFRSz`)z91g#Z~2!+P}{`y)91}tzEM%?fl8b)(^hTdKuTy|DEB4<+0KY-*;)$ z@h#Wz@SYKG-_>^Pu7%OH{)V%+&i;J1U}4m%qr4ZlR#e@$$#|I*xy`ew_)c(lOtR4d z-HIH+hTU6|)qI~?*{nXg^WhxU9qxy@OkOkuo?hQsd-v*&`s+$1Jkye|_W0e|m1KUZ zxlrYj5qrh6TavsnJA%%>WIun?t>K*8`JX$*POSYD8m0E&<+6f3`6hqEj8$|a{`}k9 zzy5DX_L-j<%efysXM2&o?bOwYSMJA~uI1gOIsfn#IZ;P}4Zdq;UhSLpLE&BPGa;FG ztGBE=Rm2ddQ1mvhdbZJlLN12$^PKrLgT(`bC6CW?&8;|DA;Uh&T|lTQEK|qDZq?7W zO{+gX+ILjKQ>Z*l?h{vy=HolZQyAjjNCh+QxGsMF;<3k!cP1NsezNhP{D-igFD@Q5 zy0iJKmd&PmzIS_mvDUmfB`z2iw8wWwS6mTO>Ye*~bN(-Tr5E?*QOKr3-MP9&4`2V0 z|G4J!r?68R$_m^b*>8>n#Qgqo;l_>GdVgOmY@fC!f9bqF<5eHeX`sM!JyINnjh&SEyoYsZw z@tgmz-Mo6&Tbn1@;?K*CMYnIdVS3M`++Hu+uIKl>xJGB&rvj>%Px*+RuJ*siKYx{e z+=(sUId)nv(_6SGNkTs6ZtuDSmv5L~YwQr&WWA0hPVRTxi>DP!YZb4*IwQSi?wjdm z6Xoq9<7+n6Rm{^rx9mx~b)6CKK^_mOUG7R1IsbKRYAdYLLiirmYL_k2v+Ali)ph;J zuLpbwxY;j6Era>b*bOo zHg*fWn6%*kUsGN7#2Jq?vx{HzXaBtEGCTXPam8c%^`_ghk1Q`L-6i*TcVeD&m|6LQ zed!!;Lf-my65hSC=KDJ(H%|TL)}-{Sb8NFKzwp<-Sodj?Lsh14O3U|G^SmV48z*)pghU>X zuxgm7V!GzSbZw=Tni{-ng1jn~E>pV_GdPsyn$K*Imvy{bV1DlQ@$i3-Uq0RO`PSTw zmG7G;F4+|M{m*8lXWvzdA5{i*gll9==^7%)${9ro6Z~iIpY|1|A zGe=fk@Ukf?v2=UfZc%=-<-NhYPP=o@Iv2m3Y<#i!dhywkbY1;P=N8{*y8htsNrv>w z%9V=+_kJ|Ew|9$Z@$21&(>Rh;RzCakdiUj2%W00ss!pUQoy{p{$h*PMxq8vrDK3s$ zyxu|oJH(6?{w~Q@`1*vm{_4-k)8ECeTw}BGuD~__nCW$n%(g-k!>_ph@|i5idgMwA zgWqLsuPG*eebXMkND%$?*pcUG^B;D9SN-Hn(W?(FPI(Jy@Gc3EmUKjb83Y+)L(0@1M<<436 zwIY|YTle0uG7RXG-@jvyzx~e_skb*y=#Y4P@XVhAyV@(;n9dZoDLvV+v*JwEa|`uU zx7#JnhMNLUFP?P8c*XG<4dT`8!T&cuTX*jL#gDVioujtaRm;6T?aEo=XmF@2#b@XI zF8>7+OnFoeSNuFuQo`eM(Ne;-wnV`9qTIX!u2oX24kcTdg)}EKhe~(}-af9e%IndJ z{=S5`T=S5NE%a>lUeB;{4r9Xd%NNn@*!1%1K(SA}-f*F5g zUwG8Ykf-}RyO8}s%1zd$%o5%y$?^WCef(1w?NRA0*S+5yIkj0rinsVws;5b@&!t8;tzc58l{OUWt8=NlJ&ssI4_nkXb z{5$QztX5e8$-k+cjhCw5%{0AyeD9o$Lmr+SZ9XNlWh+c~^7|e-pilo z^7>h6&^F(^;|ep?Xr(>kn74d zd_37vI*B!fS99C{&(ypAt=F>g@#$GSiC4E3uR3~uqMP{hkk-eOyO|4L#bm!=GUk~h zF-1_2{loIpacwGI9ob83<_O6qpKVdAl0Ei(@^W9J=Z&pfZ6j`7@C{b|cxK|viY>W< zR_=aDrI!Pzv6wugkS z%G-2IM!4O2rH0h0gsU4P_CA}nP$`$`bM~)|8@9>k)^4r%b;9IN#c{1YiPs!;axEIC zEE6$({IcDNpYPLm{amZI`TI5rm0rx;k@e4T#+L~vM2^q5eLHu(nC?O)`DBw0Z816b zez*AXEU(Pl3b-??tzjWV{#VRc9f4##15YU$Npe@ymtm zGH>59>~8R%ckxMB-klX1Q>Pvjlx<#ot6y^R{271m?Y+O;dy;(L*4t-PExxDyvSi$K zwfx-ATVhvTk{)mK)slI@*5)Q@(mU@#55KEOis+NOt3!6_-eeH($T@f_IAY2b#i3@Of2r;oUW6HaG7z zRhBldSl4sVM|@_j*}VI8r;O|rWZ#BMUJbbZN6D&hPY>JUS!Z5k#Ca&s*rEE1?@!I| z)jM9F-JQ_G`lI1w(sdi%TetVQsWs;_pUbs+{-xA9VY|P=>aL~?)rS&p?uRR0EESdT zVlmvC#F716?#Q26cJnkB&asenx7Tf7s_M)=b#k>kpJU5sgMz%;{**E5f9gh#K>MPg1-R;aQ zT9I*Hri5?m!)dP76-V~1NE7!xV#+$*-~QCi%(xdT4)!iBJYf{-67hcKZ^zGKam_vp z3h(B7FUtx#(sW5-+l&2&Ws*6iu1YOABVv9(b4hTs32*b?&4mj#a~H2_&rRZ5pKs?G zTzAN$>Z3xmV#DtBZV#5~E_4t&oUCZ`>yyxzV}~^ORX6N;$r5H#R>{Gd%tMU7CcNR&hkSm3b_hB0K2>5!VOdHcUDwb|$TrYIl+g~(GDY@eNC)dgZ_JzRb^mYxSv~ z^T}>=eI>i}HM@#;mu=&Y*K0YoL*}VFgZfL^D;KOY9Il@%SP7;m%fFfKnkukTex1^b^Ut%l62&K2*M{+@6_`N!9Jsb=?MK28dL z^ln+*H`mg;6??Wy9%uJrY?b@*E|VwSp}SxD@3}=S_FX=VOCMTXJ12QyLWM+O>}j6b z1?`!g5(k!^Dy{e!!Q$j_+U|}T!~2zCTT&V9I?ov$URcPbR&ndizgX^%mu0;x_y1rI z-{12(P5#N;)WaVgo_*e>eZ8nQ`}mhK*Gn^b>*6k^U0-qAS6w7!^R81m6SOxeOl46? zHCXn)B;!cMmMl3HgK6WXI8+uw4bk9*-HLdZ+J0LvWo4p#m)7~Gq=rR z3~_z%-=jGCzs8A_#@Hgp`ONd;WCcFgo1~vLt?JCK$o?j^veNr>I-`Hx{*@~^+Ar<+ zI_d9)2m$?4KWXtdB2Oee*$Oj*)z{76EnnRi?%=;#V5$!5*X%!4HY;WxdH9ZXUadjn zk{)kq_l@1Tu4feZDm0l5e#vD$wc`1H-ud;!sB?O=I~~M#^qyfePf}+r_-=eKI^z*r zMcT|Zr4v$4UQ+w(DmnkXylA?jzwgmG?f4^mX2s=g3f|JV#dfLL=FsfO;ybx@>AOxC z?R~hRraav`_3n=thTZ0OUg;V0-t}Qmag>s~Twl6L|LeDJ?lDfIfQ%$xq-#XJ% zoIW>yGvmCOd!I?&dN3>7@3n|W^0Jl!i{A41OMUY!M5me*UusNBP>-JwWRo9%qifsb zr9Yl>f1bEZaL4+U-1)E4s?7AKzJ72ieR0|8SFZ$B47-$93eO2XcXFk4NTmYD4B;F{ zor$UzI=}A4HB|R)%v-!eKW@!t9bul$me*Ij`uP2K`s4X^``fOs-2eX4+#NN?47Y^v ze0Vk`WmcBjre*(K=BDnvz3FZ$-^1ps9Z9B(19EpQD}2%YG%)n-EC0V**XIBF@yeRN zzWQytRhz~vKZf|-nX~H_HvL({Q2W@;ae?OwPTLR1!~3Te+0WTh(ZL+kvM54oTG6wZ z?$dqub90OT6r8r-eofZihPgt#V{_n-H!G6Of82e$Y|rKcB7%CJ4}H0E*13bQoq@J*ZJ0> zzI7YX$ZL7NOMb$L!L#EGWT-sMvMkO;y1Rp;M=ieYkg;@4-BGy{C3R z58cwcC-Qjhg2hFrBBG8yHSRlvJ{>8K&2Gmg zq&n@r@$Rt3Suqi&jKH)F*$oV5D_N-lYPb@gtCApHvdlvhKt+jIBuXjKFQ)$?% z_wbkH+lq$?yljsZ8(ytc|GIX^+{>Oavvvm*T;=uKWv;CIXp^Pwjm&?7h01d|Ph52F z?aEj+B}gZH-Lb}d4Dx&vXa0P|RvC9fVYj`1v-szuvGP;}CVW7ZZc!M9gt{hl@L*txA-MK@w%Ty^hdRGBT}n|EvJ>j3pdd0g(heg)gV zlJcuddYJqByYPv(RkJqVbE-O+QSzMg#TxsMb0w#|{h+3Jd)xN%lxjCFhC5#;MW!j~ANzS(``hD%b1z#4ze&B^ zue4Cp_4Omoqh)X3l-b-3YcG$P)u8k8u?UOr!|leA4WDy=rtJxiHrSlTaGZ^QQIqaT z%T^(|s9h}WzZUICNwbf*HB+`$tFEG~Kilwe^XEgVQnOVJ_f#zD{JbUhQVmmm^@|rxSzap%sD|0OUHg7i)KwgGi0nIc_Mh#K_0ls!1rK|E<|xrRx6OXb zIi4ve1$CycKYH-rf~Ws?&94gna#;5Bt+jh)eOGsg++fkSs9Ly~lmGqf%XUw2n<< zzV&u{dd>G9`S)pAr8A$lo+&XuFt_yi)S`Z()=)J1OFS)59A+w4vUYCEw>p1h}JYhzg z#f7$MyQCj{nLCrGnX~)p)7iJz9k}-{tLEJ=`=q~JbN9$Msx98Jem3u=RC$>&@0GG1 zn`Z|a9WdX_xWh-_oL<#M9VzwT2`q{t0u#JuR{yH%eLb!I%Yo3<{dccbDK0;GPU-^Z zgB)fTu1yzzU8~RC6DM|~Pm*`(ejQG)(9SKHt0rlz+N2m=XPzL5dS!7=?_(wCboO!PvcBNRX1#{H9P+}DA{#m$?d0? ztvCG6P`&;tM~k8So4Az$|AWV@r}hLEIkh$X-0EzxYWq#q)0Rjna8f`sP`T@y?J4qu7CRV zFz##~zucJ_ujkq9JbE$hZ!yC^Zfe~FSon=@xSTm4-eFGIOQYB9B{E6ODHBa#TM~{_#7se4G7I z?O(dOeu;mtFYTDjx^n~P7ZsE3_b%H!pZY(ma($GNeN6ny9KMxF+%sP~hK3o}?U?Yo z{d20<@{iZo%*+ejdedRs^q&(vL4`xG6_^~~hU z;-zMNzssMpZ7%ZP-sE{&%I`r!xMth2CduM$Kg3`Cc`kD1OVY9`#rwAe1i~8h-nytM z<+CeCLR7A($+QbI8P|>95(xw>KKLtihIUhJ$_8$H#TJh+B&YqGjoM)dN-jR5Z z@yt581(SmQT{!urUHrq&&s}kMm<8_WF8BL)`z5b>{GEoCFMXz~I?8xU*)|&{9}hTF z@qZEjmbI~^>9>P-o9hJmx+$NItB!`+Pz!+!iPSw627Ib2Sqk6SjQg~Z*yBKtNpywq%MQi&c_27+I$a9{OnVB z*ZJJ$BWwzp>47E%IU7XW*|c`>`|j`maEcepDX=c< zwUV08@P2}ufWNf-E++=@sh2jW%zNWM*CYGQxwprw=kG2KUeg~D_l$2#_Mv6hOir-W z&h3uzX?`EM$K#o>%C;PHx&LXWKYbEB9+9vJ!@qHnD_?xnA|0oci}|%w`+? z*k^1OduM8I4Z9F>-g|l_LzIKExXJV4Z~ieioThcm3^3fiQGRv$v=4l%mR(xdG`%<_ z&X->B)-TKgCS5;rKWc0+(8&CQ#@3Xtu zqhu@Q5a8=nenM`}nO)D<&e5=(SQ3==@j`-X-QHrs^_n{#pAx?qVA`;8<0Kx*#l`+J zAIv>1RiJmubZ2(_zH8^tPMoZ?yvr<5V9BZ?SIdjj-+8^RSW~U=Z?g2ecU3du%ZybL zYj>NzzA?RK!DRW(soXA!wyc)Xm%rDqEc|z7)`PQ5Ew@iC`gF?WRKl5rwpARCtN&hB zY7|go+L_$9`%l7YpY7M*$}7zL^T+(blG3}OxqqgozfYK#J7bC1`O;VF0!Fo}E?&n2 z;^!UP{5yL?(XGON%FE@e7p@LymoB_)d-Yn&_n3Y6jW<*e2F>SK zJXq&Fx8j-Ny);84ZL$7V`Lm4XN4vWp9%bC2skCI7;wnuUi@^Tlx6?isUJ03Ow|*DD z=|e-FK9|Z!?W4wX(j@ClyZUb1_3BV%awH+WYI`+fUp}xc$r5K<>};SCytyFGj1j?p?gnZEucF zrqWb1-cT`@NDNRll1*}P&Z<)Hvk2jp{!k^F+ zy&4tUH(uua5OayMSf^pBasT52e~I1x*B<(Q=37v&Ge=VFq1df3dC8;6?8_fN`yn{5 z`8@Z7%BIJ`wG0K5=P*225i>pPJj0xtJ3TYK`7hL%H*HA`2w5OCRiejxMwr`&OcZrF|Va2k7bq|)coH{4C zU0$thYc!u=OYS0Tsk?n^jDyoxCIs*t6HaqiO65@ve)HPfZp(Z2lB(Oz#Z1TN=bNwi zm~zPe)$5Ro*LQ{OX9x<|U7Gmk%W}brH?Ms^pFVu*`tqwR*OrwEH!n`}5}LVYmD176 zIr4Kf>Ne@4hUz*>5@;?oHknYX$}o0i$d6;5B?`}65>!-wiO zo@>NyW?+v}^G@TsU}3$kp>FSexdSiEKD^X6HCQAm;T!bu3giIb5IlecIc7GwmdM_kB~AJ$XN8 zhUwl+tACa&xK1-|+ESvExXjnUb7E_Q#;pVAO8P_%E*dL**Qx&V*+)uSxS@FF_nM>0 zn|9|`n%z{0-Y7eH;vGHSdrh;#F2q=Mh4+OlNZugS{d$*xx}EX)nSSaw&VG*i_EbJy&{{IUE_JxY&m^t{_I89RFeb* z!}|B_I5S^{@2sisrG@R0TS`RKtF=GweIBN`@MOjRQ{fwS{A4j7PWSuP|04dK+=cCHcdmY1c+Tu- z@3FV*UwixtaoP9Yct!oodo%0B^#s>*X&mxeRN%G5XO&h^Xx^;!#u$zNXKRbuca(jP zTzIF#Z|<&QpN$^7tYlEHt{MIg*;e6brg9^c0t2ors7T2$7G2e6H%XBBFXVw!F z`czVSdZs9xni;d^b;bR>O$_ICte350&NJVwWnRh3r|@Yhf8egytxr9qU5>i0*?Mn# z!kzMdFUO8ep^Ni*SyMV(+%Mh@Z@j<9fzd|z`k6Ne?%c9_H?5~&Td38!P0BhGo?o9I zy*)43?P}`d>)b;lyXU^W+f*xg{nh7HzYW(Gaco}wtJ0uvi`9R-IS*#4N4>k_z3j&^S^I*_ zKR#DypXT50a4y3_hP8akMZ@I(Cn8?8hu40(vHwG{xkJsNcfJop_w4iWd@`wFkJ3D& zvo4pG+$zzW%v>(0x9jz(y)TW}uS{EQclDf6wW9m#$6KBp@|S#a&t%5p-cre>dwzL8 zm|74b7VUB3k8a@Qh_LIO$G_40h59Q|_XgNRQ<-O=H*QTd8rKUWa!O@;< zaWA@2eqROWsV2`D^X~?;7AaTk+bp-~PL6o_?mxu_Cz^O>x-Oh3x%T9bv-57wd1Y{pu zjgHr^&bO)l5+T0-N!W=)QG6f%aIDauEMz&;h{sh(B~YmHGUvlKty?>;&IzA6ZT(8l z2h(l@ehb#D(B%5H`EmPhbMagLHK``7DN)7z+vGByN$p)))F6IRWEZoRS|`h-Ju^~r zwy>y%c*phJIrzF=dm6TyIkk6_wm&q8>g=Sq-p*|E;+Mx`VOnG?%fTl@sq1(1f|96+$oj>=N;*Tku|7tcmygQvOAm_XNz}uA>r?cfY zCOpk3*`BuT)v{v7+EWbAS3myo@ZR6$(hn?OuZuVGeH&78W%^OWDICSKl(}3)U)f*h z6;yOR-nGo{jdfu2)XjZ|RW@HQTC+T7+4G#|Pv>9jc<`@+!@eSsb-lyxx^szk3l`aU zv|9DdzIkQMCBu-e)SzNNoy)o*CYOz+j!7^7{-Gw>P#L+4`_;HVnSXC%R=*ZJaoSxQ*WO_9;{G2uMS`A4 zp8K-roRPWtY}txprB~;y^5ZsM{V~P*^rpaFZ?-v|?%Uz~HCV`>aeH>L+4Q$7WWU?> z|C~3)V0V##r)|T*3eG8o5vdw0L?@KQJ)hgnB!1%U_kw%ZR{u1Lx+ADZOV3IY4d zOv^rg*TTz9Wjfh!oFWwt1}AxH?cb`L`sG4kS7ym<&GxLz;oD>${`sbIWM$vUl4+th zroUw0-drFObJ}3fj%zRPih2rFvrmfm&3rmP`p3k-?i^42es8`k`||Wl!I|c>eIB&; zAOGZZX!j)>(OltQ4_TS>Tz$S8r!5n|^ni6+`h<*`AKyK9R8;Jh=2bJ?zl)oHyYAss zZoY#)nllCcf=w^$exFy9CG5PC;rgSyixc-0XKJT~3-&8IE9s`r40`)V`0x800hVE` zF*8pw#WTCw!*>_NA{{LUw z7B7z8CbRW&YJ%N?^F1f}PTI|rpEv#Uxi^oaV;0zp8r!Bn|MAs)fh=q`7F@5NZ{O??-abUi$%aZ2Otvjbk7Zxqy5j18pzT?U{?{~?S;%OX<1P-kAu4WUo zI&N{$?D{^R^E+It^{^!oy?4Lv>c&cMiT_W<9@jnJp2yFzSR+?LPo7X5x$cEPDleGe-p1S<+pd^BlS-k!{JidUxfMI7d-IK47Jpk<5xLgwNt zmH`f`8+OKbuy86@F)2SvG?}XQ<3;Lg$H}~VEZ1AwRV_TX$)>N=Z{?ZlGT-x*%&?O4Ol` z3xjO-Jx z{>G~X2CK?Z! zUzP$lZD*f(-M%|HRe1BBJ#O}QcKC4Aysc=)7&dT`Ct3g*113vKp0Q`GaNJhRI5 zE;G(8Ui|L)uFme0bI%OKRysi?}y)PWslx zdB3~#=o<5pRo=@JX62o#cy_|XW>Y@jy?qt-|30qmS6X^d+5%AoYRkrT>rkjyt1h$E|;bGQ{5Vke&v<76OVDWDWzDSj?pxp^*iO~ zLltFDS$%owuKQ(=m-o+2;1OE=**ok!x4iB8okyZiW$DHREL|;}`Q{MA`K&0vk7p!8 zyeuV^;w)};Y@6p5GDYQwgyN@z>c&N9wd%JX$Te^J^j)zbShiAQf}54@LMU!jd zeC6|^zj948D@j&K>}4za{Z&%_RT?Ubl*Ry+4?KmF^3kJ{2i?j!LBBRr<6xU%hH+uGjdzUBS#uSXhZzkg@D z@#}Bnrlt#yme%$c%KBW-ac`+KsS0d(KJ!(u>E-i58*-V9@A7_Fr>D0Mn5>+Us3#Fr3zLs`Y~iNksGMH&lE zOmJgjeAHw7R$=jR-V>Gn=|Wszr#8-9$k3ab;GuG6Z|&h{-0uB+wI8SX{{8*tydH-W z`}(}kPw#ZUDcGghf9T{p-?DAK*Tn6`>naqDZ8z`T@iOn>5iQ}Rsd6X9eE7~N+fL1R zz4p+;e?~3LnKcPdwKe*C9=X)BwmWAUq&9EsxRE>GWW&T&XWiVD_GGp^YYKXNa^GTJ z3!{KO<>sd|g75bG$9$G?dByL~Hc?Hxq3GScKU>6G&ZTeoeAOml2H%65eUcT?FU&$t zB`%TVjnpZa&Ld&eK9Nt()mNi)vSCu@Qw}|gwO2ILO?@SrI6Q?|HK!Rw1xr;|Wk|&D z|F-U1*seF%cqhzXkTUn{nGa8ExQ|&Tlv>FB=s)~0>_pxf)-C0?cYZlse9bn-qb6SO zfUNM0*}L1muI8B}Hl4@jz8$lDeI@6zsr-+Xr@wu`pf0!N;YFc)-#negPL|C7u`V;C z_2l2*fxeERB`wQO$5~x#Y5#uiX|T6l?b%`hmFCUInY2{6K5^>l+VLG&yGZ2q{BtfW zEDsJg_iA*;xBuD{^?UK=J?~@NdgO8?=3crS5o+GFP=)o4Oucos>ywh{GYxnyn}mc0 z341Eb`p;ZDE3NKFm%aTbEm{AR9(&1*>(}x=y}oqbec_RHtOdW4C++w9aYC_jL%oXS z(Mzo+-y%O9F1{AaP+oWbUeIM7Uhg!q8NqiF|2C{_vpwq0@!slE%U$*C%7WLu#r%)D zB;75i7QQcNVcy_!v7ll>T57iJkhs9xmo0y7LOf!mi%ro{_)_z-sEsAq#7T4O^rxv%iv%KeA?-;_>c&x5^ z>(0UOAkCoNbNGu5j4tL+()eRpnK|9W+{ z{`&7%58t2X*e3JRgS-4^O3(AX{d&8s&Kup;w49SWFSoVm;d0;V>I1WGn)Ow_b2%!b zwUp=jq`kM#8K*0qObH9-wdfTKD|urX*B)*q{eyq6%TQv8Jqmv{`lR-R0f zV*kC$aBq!3@6y9H%VunszgvC!$`7Y!KZ4t}0_0_nPWmOcX4bvVPYz6rHK+26Z#f|{ zSE6yZm7aI$9Nxav;KV0Z8EgW9K^8_bhfW_4d$?>;w4u4hT;{D4%$~n7GBC{Ia|~h= z6ex{LoW3-)><+`K%JgL_TuHt=Wh`zje(OK`M}DIxzwXZu_oiq5e|C04+Pd$5KX5yy z#QiyBvuua>nY>&(#nY!Fxi)=F3#JB~NMkmn87zC4WeIQR@4M6NXXifDQ3-Q9v+C^{uKtI)-QSgD ze3Yi~Bxwjf;b(l6ar()Ims7(RJ^Q@kses81HS4+34K1~`sW&cGO6sM`A6qr)X^jK3 zpts27XU@MQqRt-Quq9KSX;Gu$S)~gPY#;4e#ec>m!bn8KX`^A;f^>)d=4&^qPphl= zU$%>{aI5U98+q%#-we~&>793W<<023DzE!?{5p46|2Z3|eK%{tTk+d_M2()b9696^ zn8}=F(zxwh)t~Fd(?8w%8ZGwDIk!ZlDI+OC?%cbgVY)iL~}vBcDL-k{O)Y`m7^J^EnjbMJ^3%S*3#ZZZN7oCT;VCv+;pZVlUa7CZ<@DKwwx;{ zM>xExagv8nyWh13+x^!)3ki51ajQ%6sq+fH{=(jMuZ8++(yN!PeAGQph^@-qd&BbG z6Q6H?y=bw7FY7T@EAuXvwidl)3&}^i3p%$Ps;yNIeR}Q2IosW}ALeWdzW2&=!IVHH zwTqK|63d@U`E=JZn7fEC2wdCb*dWXP#3g-Zg6A9m_fC-+EQ+d)CZ=td)lDQ*Z?v>| zg}!~`EBjvF(2S2~$-MpV-kpoh`E12`gX!Qq(eFBipp)ht!psp9^EZxcw{Wnw@!rHOuvVd(o@KRb2h*_1)#?Y)+nzFLh25IikVu zUG#my#o|rzzilpmJoASCZT8tSccb?oHNU7|FtM}7-bHuHvhEiJN)4ZL)3wFz`tsuz zEINDBH_d9}LbQ;LBfO2b!s9va;o6_dxJvF>bcUSZb;@20j0uVd@KuWLKj^y7f4 z{s%#qlrH~c=F8cc3XiLnw9bCVyVP02tL?z=6I?zjC+}3J9h;HhdNp#+ZvKl0cMHl^ z^QUZP>XKm;*5Phs%Kyppxpn{V=9PSZ6#p5#i@9>}QRa+`LY|Tm7mu?gpWH3~{_UMj zC(kunUoQT8vqilBMD%yl#I&m%)6UrOP2)*>QFA`m_4bjv3cITto*rJ+)%Guf zlZ|(-J;`)-dmg~L-+q>7n$)!W^AejrZdh!^FJ;%(@zQ{Y`Qbu)=g2o^9BCp-n;HC4 zSDRexO0fyHU4BPYX`Y`=-`36Zle@SS#e~29oA^b&)cMcV$9v~CvlN{xcI?-P?~X4~ zy1(m9sLd@aY0-%)v$EO_XqdloyL)q8#_6z*lUs5Lvux8YYWX{| zOnd3Gc#idZzG611ip*&`W+A)#=A1KLutd-C=7r;dlXkH&Dc>vQ_3601VeYH@&IkJ2 z>sns@YByBAwf;M=XZ_reUim-k{sx@!z57JiFm8|1`V5Y0zIA>Zgrrjv^ zJFj(n)$=``KOQbwzCx`=XX%2qyT#alX;);viWYx&eA2JHb1kPhIV}&!CVX7C+9z*L zw*Tx66E@%U5|TO{oS|WT>~y$ix4+~QGk)o_nYZu8_McuZ>ln1SVZO7##HEhs&Pgs_ zu;RpfRg+JOA-#88U3Z3E-{D}YX}R^-WTAhREP}Tu-8K-qb8OwpTmReNHC|!PerNUX z?3}|j4e?);g71F2YRvyQe*4x3{kdl=Zh!g~WB)hi$&s5s(yUD92?R15?(12`{NwJu zn|nSyz3ct`fvxwq56dR*P`kajTK4jsr%TRO)b4or(L5Gh3>%)%| z?PpXknSVSi{O`m0)9P0IKF!Ma-SMB5z|5MH5n2sfi}@06Kdg+nE94q`RAW7(_&K-q znZG5bhi!M5%Uuwq-mu(M@bF58ZE`ajW7S_5o_@6V$AP8m71nv)aVg`9o%5^Az1gba zIm7nG^(UCL7MbY=FT8EXy6}CkPWQHbRy^v>EBbko6ygra2W(?Km|dwbK~vGdbZ5|o z_GybuehPXpHO{$oHTdthmDlI~@6Wu@vSotUyl(sD_IBTH*w?+4w*S?B{X=2R&WMJ2 zMk;o5n@!Ff-o5Pc-s#(wB`$1Iwmu*7GOIB+Of#eGrcpktM-yYDp@8>_A5T|vZ(O`t zaJ%09Ui-+6liBZTIL*_Xa*}0BPW&CdBEbVE`PDyLtl;8kUn6$cY3bMXt{M;Af@7+Z z1kbE}w{69YSYh|(E{!9TmE2bJ*?n_cnEB&#n&zv8-JXqFw@*A+c4@lj-sxZM#RQln zl9PSJQa&F2(OpsS=HS1JUtV0_|NZUz+Qh?cypN9c&R+5O#`SyapKmI)gYqrdfTc1}He z+;B?B+Xo9pPZY7=(9zAC{j%zse3+>8lXcte?>a1BG;5&?M}EYGu8OF}#20M}T#ME@ zdl;2vXz1nszj@DmO1InJ(CgFo3&cr8v@mcl^wC({u}e_MN#;%7fy)WPuYZNTh;Kaf z;@|`aC#mG*8w=kGR0-L-MX!2$Fv95D()YFBtIrFZFweb}lJ}`Nb$zzrFZqZB_RX5_ zvmc#EP>r)PWY3SRW8oFu=p*&qXZkv;(3~&A%NS-QT$U9+;NRo2asP5AYyT^s&uub4 zoBuo}>&fEJn`Oj84xjeRa=kn^jaTVJ_ml|L{nP%}{W_W@olx=Wgbq*7${mT{{FJ8! z32=G}-Az9q@N2uRX3d*r{xYv_?x~#k>x^->-7J$EYc&l+gSD?+ixJ+nY}uA2A?qf; z5)fU)abVHpNB70*GiFXu@e+~pP;7Nf6nN|W_80d_@n39)HI#?YhuQ8#-^6%2sGyi2DRtuP5a!>A-z1XpP z@3d@cGpzJx7xLuC?wQWMPDjtwyW9Gx+8rNt1&IW!jSD_}@^kcB=Bl`YY3W0q1C@ya z=XwHktHalb?7y}3O2zf2=K*qwL9_NKFk7=H|0-TD^X~tlxBpEl-n^`y<=o$MXP#27 z_jB8#@5&F|x45r+W&Atr^rD(p#>I)#OuVzgX20GMwtdg921eyo221r13PnZldRq|F zryeoOR@k-VyG-)A$Mb)kTb}g&Ug7$pMGspZ#@rT<-|_Mt$I%(?L5zEnPwLs!C+W34 za-1^VV&z=p@Li|=W^(hXp4Fp^BmIcVl8k>kcx_pP`R@$sd zG|}6)=;a~f*t;wB_kY~%Zgt|%y9ulxSM9bIKA_gP<=ue;4JDWN-xFzXxX=7Y-mE^Y z_-XS>_N%ooYfp;?CblI?Fj@xa8ErI7REc8s^!W25+P?1C=j{UTF1!zTx97dz{@rJ$ zKa#q8@zq5KuK0UZws~zYE;%&wKcm zWZ(NeZRzm*rr66D+B_(y^ zSg$ni@%ryarx!N*IZ6LY612IqkEi@@hG|hx_N3jP?@P8#e^j?4^k3%M;FDQKYZIP# zM%nq-Xb3tuo3y=tF6R>9`8m)f%+R~e)FLW=ER-GnLQ&^K3K)Rzycf-<+l!U9s?P z_CJArd+HkfV$%QrdvkTi*G-3K#F=JoHuY7y@QiKy;j7Pjo~vAP?rQj)vFod}ty#z^ zcLw`=X2PMWoHZF=`7}1QE!-$zKaC-i^~RjK9P3?v!i~NX4}}aJCM)%S&9Hy_%KzVe z>3^?YB=+q;JK@MzgL~gM?vIU>GI$qr!{EoqqrA>L)_j~=(m6-W{gPv#dB?SR{#tW3 zO?&RE-eYm4bg_=bvRwO(3O~BT#rN#lwD7NZ;^U*g?|-`47*-@)_pjK)PPkkDx#|Vk zo7aQepIfCrUY}RTd1k^IP3692&m78rKGpj?=lJ_MKPG1HVrQJnr|efeE9TROcdR$6 z7Oz;Zw`^J#A;D!_Qh&-tIY-ct-23gL8>TclN3j zqrfMr>zYCZkI%i!bf10xmZW~yFqgYLt2IBr@R(auP$4((M*P0y1f4$*fB$>yz59o# zne!nlzv?&HG4bc(7hL9_b%J~UmalAo4qMN63$=J?^pM--(p^@4%f-!W!o7-FMR+Ha z+U%_t+g5J2U}KJi?^5MCqFYy~oI4%1az(38*1eNYuPiF&64}J!vnp;XQ&-DF!^huu zW&Yc+-~Zp?S^IC5U#iPrbfDN;IAVL=+%2iyu5&g#y!>9jwzA@1ukO^t+qX^mzAo~P z$m;lzT8>Q%mTGw)b7}5O3JTuwanWp(04wc92WDtxhg9?hnI>-GzqVREiMQfu#7%Ag za-ARB8QkXmd;kB>r+a6mudR&ObM(X39s1%uZt4gA7F}13FiaL$-7&GH|CQ|iMY_$E zza{1gi%aGU-!0t2cwTO1+p7;6v$Wj|*6$KGohYGy%~N{O+2nbusRdkdC9gi1%n%DW z;$V~ch4<(d@k?z*$3yGu9_(-q`*Bis=Yd4k{JiW5ZJ3+#ieW|i@sZr^{uS=FCA6G2> z?O}AQwnX8FzWv{S)8~D%3#s||w29Gb=BDahQXk)3wEXdA_I&2cGN)ELt=y#JyFu7w zaYvQMMFR=`Po0bEZA_YlRoBID{%Lm?@i))*0Y&*8(&Pem_Cz_!>e>=PhZ|! z&ch=AtG<71JZJy6#^3z*F1KUCx6hpX<{z8_I%#s!?v5wVzSpM)W+p6Ix3A=jSE$MQ zRh<2LsScjGsVkzCKQ}e#bxO#2Ch6$fvZ<-;5)S3xQ?cRWcWo&?)%UyKzg9QTS8HIl zJ5jq+q0w)FTGXR_n^N0--x}K!)tIhLaPU{T8(F^S)s?)H*_WF&_Y^JRjE;+Ja{YRD z$FipyUd^0*by^({KL=Kr&+I;S^4g(nmi~CU zy4zrJ(uB=hLRufqshsK)KkLrSh5nmvyBVL}lQVT`^Qskm$9tx;oG9;Kx@GV5d-v|W zz95sREYDeP)f5x5L21jjZCt@ukA*Eh;r8tL+S;8O4Ssd6wmBCENG3+?e!$@)e!)0r z^)`LEkP?{}D-Y<$#h%fevVL|g$JB=w=GRxQX#MjchRJ2Qm~HU%b0w2Ec6I2;z4zUF zr!wiw;ryR9=g;v(K77es@vuL8`s2JiJ2ob4%e}nJ*Rplbz8^&kJ^VP=gln91`Fp=~ zVxWvv&I3)uOCQcXn0AK8;M8t!Hoh-Y9v|1&eXi1#A9wi7SBx49`^{Zx1Ud&$#%501`!ci_>3rRJX+-<*EU^+ILJ`8+M@ zLx+Eh7vDX*d*2VA((D)ft}FWar+s|6*rfBxx6|>DCYD^faz*_e&wK4-m)(}_QsL5> z>h?QANZwz4@%c5ojLU^O=68QPI^CG3WXFwDa~6p%_uHGT(ldYmo*CkY{=8heevzKh zp?0>Q4YQQq^KoWE%A^IXqdZSn1`glM=nTQ&ku{mq>cQwh;5@tl#}9`FCA%eB1}^lQkco#$=WF zElcnfsa;U2cm3A;sB2xUU++rzvIty$!n0F)eze>Fjn=12?B-rJN%fra$TKrM!uix{j#Cy4l47)3?dE=IFF6j5wiHQCPe+RXTv< z!4+v;_rsg6*e~H%zx<v3aIG@A206>wiVu_J2|Jqo&Nc9 zaq$0&uB^M>JTH7UoRr^m(Clu)nS`F!kU*Kfna;D;+0XRg-XHbhU#)$?nJ>N7+YIiD ze?L0?bKv6JOL$BKx0p<5aC7FGo5*n{)5g#=P$0zUntPI4xzfpfChxy}TYvFqF8^6h z8GcjAL$`G8q*vW~B$m=X;lCFJ)h`)``NxBp?c{=PkJ%fuGg%N^u) zPk#^`ZnLU?DeGn>rPUvobT&>rGF`4l=g)t$+?(^$r1?5-ONVP6`t{ao!&&wn`uk!u z9MtdMk*3ytF52TT5bbefg*i;n4ThR`cFJ&ZE` z)I1L@s`h`fUwq4(Ur#3Wm-RBmMmGF*1)1pB>Ekui;6m}l;5EO`0Q_uBmLzU>=w*Y1wF3JRqMho=4K&oK_! VwMe)!fPsO5!PC{xWt~$(69806;#2?t literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/thumb_group_properties_with_keys.png b/docs/assets/selectors_operators/thumb_group_properties_with_keys.png new file mode 100644 index 0000000000000000000000000000000000000000..9cdacfd9e12e6c016134d54d71a453b1b1f60fab GIT binary patch literal 46276 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 YMeJtblQmId3=9kmp00i_>zopr0KSsO;{X5v literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/thumb_sort_axis.png b/docs/assets/selectors_operators/thumb_sort_axis.png new file mode 100644 index 0000000000000000000000000000000000000000..63500f7b6a71b78e8d27a29c94bb4dc29a6240d8 GIT binary patch literal 36767 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 literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/thumb_sort_distance.png b/docs/assets/selectors_operators/thumb_sort_distance.png new file mode 100644 index 0000000000000000000000000000000000000000..40daf5e0a62ececeedfe774fc9bc4693c2934878 GIT binary patch literal 41709 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 MPgg&ebxsLQ0GSMKQ~&?~ literal 0 HcmV?d00001 diff --git a/docs/index.rst b/docs/index.rst index beec8ec..2ca15bc 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -42,9 +42,9 @@ somewhat restrictive Fluent API (method chaining) is replaced with stateful context managers - i.e. `with` blocks - thus enabling the full python toolbox: for loops, references to objects, object sorting and filtering, etc. -Note that this documentation is available in +Note that this documentation is available in `pdf `_ and -`epub `_ formats +`epub `_ formats for reference while offline. ######## @@ -113,6 +113,7 @@ Table Of Contents introductory_examples.rst tutorials.rst objects.rst + selectors_operators.rst operations.rst builders.rst joints.rst diff --git a/docs/selectors_operators.rst b/docs/selectors_operators.rst new file mode 100644 index 0000000..9199af6 --- /dev/null +++ b/docs/selectors_operators.rst @@ -0,0 +1,393 @@ +####################### +Selectors and Operators +####################### + +Selectors and operators are powerful methods to select and organize CAD objects for +subsequent operations. + +.. _selectors: + +********* +Selectors +********* + +Selectors provide methods to extract all or a subset of a feature type in the referenced +object. These methods select Edges, Faces, Solids, Vertices, or Wires in Builder objects +or from Shape objects themselves. All of these methods return a :class:`~topology.ShapeList`, +which is a subclass of ``list`` and may be sorted, grouped, or filtered by +:ref:`operators`. + +Overview +======== + ++--------------+----------------+-----------------------------------------------+-----------------------+ +| Selector | Criteria | Applicability | Description | ++==============+================+===============================================+=======================+ +| |vertices| | ALL, LAST | ``BuildLine``, ``BuildSketch``, ``BuildPart`` | ``Vertex`` extraction | ++--------------+----------------+-----------------------------------------------+-----------------------+ +| |edges| | ALL, LAST, NEW | ``BuildLine``, ``BuildSketch``, ``BuildPart`` | ``Edge`` extraction | ++--------------+----------------+-----------------------------------------------+-----------------------+ +| |wires| | ALL, LAST | ``BuildLine``, ``BuildSketch``, ``BuildPart`` | ``Wire`` extraction | ++--------------+----------------+-----------------------------------------------+-----------------------+ +| |faces| | ALL, LAST | ``BuildSketch``, ``BuildPart`` | ``Face`` extraction | ++--------------+----------------+-----------------------------------------------+-----------------------+ +| |solids| | ALL, LAST | ``BuildPart`` | ``Solid`` extraction | ++--------------+----------------+-----------------------------------------------+-----------------------+ + +Both shape objects and builder objects have access to selector methods to select all of +a feature as long as they can contain the feature being selected. + +.. code-block:: python + + # In context + with BuildSketch() as context: + Rectangle(1, 1) + context.edges() + + # Build context implicitly has access to the selector + edges() + + # Taking the sketch out of context + context.sketch.edges() + + # Create sketch out of context + Rectangle(1, 1).edges() + +Select In Build Objects +======================== + +Build objects track the last operation and their selector methods can take +:class:`~build_enums.Select` as criteria to specify a subset of +features to extract. By default, a selector will select ``ALL`` of a feature, while +``LAST`` selects features created or altered by the most recent operation. |edges| can +uniquely specify ``NEW`` to only select edges created in the last operation which neither +existed in the referenced object before the last operation, nor the modifying object. + +.. important:: + + :class:`~build_enums.Select` as selector criteria is only valid for builder objects! + + .. code-block:: python + + # In context + with BuildPart() as context: + Box(2, 2, 1) + Cylinder(1, 2) + context.edges(Select.LAST) + + # Does not work out of context! + context.part.edges(Select.LAST) + (Box(2, 2, 1) + Cylinder(1, 2)).edges(Select.LAST) + +Create a simple part to demonstrate selectors. Select using the default criteria +``Select.ALL``. Specifying ``Select.ALL`` for the selector is not required. + +.. code-block:: python + + with BuildPart() as part: + Box(5, 5, 1) + Cylinder(1, 5) + + part.vertices() + part.edges() + part.faces() + + # Is the same as + part.vertices(Select.ALL) + part.edges(Select.ALL) + part.faces(Select.ALL) + +.. figure:: assets/selectors_operators/selectors_select_all.png + :align: center + + The default ``Select.ALL`` features + +Select features changed in the last operation with criteria ``Select.LAST``. + +.. code-block:: python + + with BuildPart() as part: + Box(5, 5, 1) + Cylinder(1, 5) + + part.vertices(Select.LAST) + part.edges(Select.LAST) + part.faces(Select.LAST) + +.. figure:: assets/selectors_operators/selectors_select_last.png + :align: center + + ``Select.LAST`` features + +Select only new edges from the last operation with ``Select.NEW``. This option is only +available for a ``ShapeList`` of edges! + +.. code-block:: python + + with BuildPart() as part: + Box(5, 5, 1) + Cylinder(1, 5) + + part.edges(Select.NEW) + +.. figure:: assets/selectors_operators/selectors_select_new.png + :align: center + + ``Select.NEW`` edges where box and cylinder intersect + +This only returns new edges which are not reused from Box or Cylinder, in this case where +the objects `intersect`. But what happens if the objects don't intersect and all the +edges are reused? + +.. code-block:: python + + with BuildPart() as part: + Box(5, 5, 1, align=(Align.CENTER, Align.CENTER, Align.MAX)) + Cylinder(2, 2, align=(Align.CENTER, Align.CENTER, Align.MIN)) + + part.edges(Select.NEW) + +.. figure:: assets/selectors_operators/selectors_select_new_none.png + :align: center + + ``Select.NEW`` edges when box and cylinder don't intersect + +No edges are selected! Unlike the previous example, the Edge between the Box and Cylinder +objects is an edge reused from the Cylinder. Think of ``Select.NEW`` as a way to select +only completely new edges created by the operation. + +.. note:: + + Chamfer and fillet modify the current object, but do not have new edges. + + .. code-block:: python + + with BuildPart() as part: + Box(5, 5, 1) + Cylinder(1, 5) + edges = part.edges().filter_by(lambda a: a.length == 1) + fillet(edges, 1) + + part.edges(Select.NEW) + + .. figure:: assets/selectors_operators/selectors_select_new_fillet.png + :align: center + + Left, ``Select.NEW`` returns no edges after fillet. Right, ``Select.LAST`` + +.. _operators: + +********* +Operators +********* + +Operators provide methods refine a ``ShapeList`` of features isolated by a *selector* to +further specify feature(s). These methods can sort, group, or filter ``ShapeList`` +objects and return a modified ``ShapeList``, or in the case of |group_by|, ``GroupBy``, +a list of ``ShapeList`` objects accessible by index or key. + +Overview +======== + ++----------------------+------------------------------------------------------------------+-------------------------------------------------------+ +| Method | Criteria | Description | ++======================+==================================================================+=======================================================+ +| |sort_by| | ``Axis``, ``Edge``, ``Wire``, ``SortBy``, callable, property | Sort ``ShapeList`` by criteria | ++----------------------+------------------------------------------------------------------+-------------------------------------------------------+ +| |sort_by_distance| | ``Shape``, ``VectorLike`` | Sort ``ShapeList`` by distance from criteria | ++----------------------+------------------------------------------------------------------+-------------------------------------------------------+ +| |group_by| | ``Axis``, ``Edge``, ``Wire``, ``SortBy``, callable, property | Group ``ShapeList`` by criteria | ++----------------------+------------------------------------------------------------------+-------------------------------------------------------+ +| |filter_by| | ``Axis``, ``Plane``, ``GeomType``, ``ShapePredicate``, property | Filter ``ShapeList`` by criteria | ++----------------------+------------------------------------------------------------------+-------------------------------------------------------+ +| |filter_by_position| | ``Axis`` | Filter ``ShapeList`` by ``Axis`` & mix / max values | ++----------------------+------------------------------------------------------------------+-------------------------------------------------------+ + +Operator methods take criteria to refine ``ShapeList``. Broadly speaking, the criteria +fall into the following categories, though not all operators take all criteria: + +- Geometric objects: ``Axis``, ``Plane`` +- Topological objects: ``Edge``, ``Wire`` +- Enums: :class:`~build_enums.SortBy`, :class:`~build_enums.GeomType` +- Properties, eg: ``Face.area``, ``Edge.length`` +- ``ShapePredicate``, eg: ``lambda e: e.is_interior == 1``, ``lambda f: lf.edges() >= 3`` +- Callable eg: ``Vertex().distance`` + +Sort +======= + +A ``ShapeList`` can be sorted with the |sort_by| and |sort_by_distance| +methods based on a sorting criteria. Sorting is a critical step when isolating individual +features as a ``ShapeList`` from a selector is typically unordered. + +Here we want to capture some vertices from the object furthest along ``X``: All the +vertices are first captured with the |vertices| selector, then sort by ``Axis.X``. +Finally, the vertices can be captured with a list slice for the last 4 list items, as the +items are sorted from least to greatest ``X`` position. Remember, ``ShapeList`` is a +subclass of ``list``, so any list slice can be used. + +.. code-block:: python + + part.vertices().sort_by(Axis.X)[-4:] + +.. figure:: assets/selectors_operators/operators_sort_x.png + :align: center + +| + +Examples +-------- + +.. toctree:: + :maxdepth: 2 + :hidden: + + selectors_operators/sort_examples + +.. grid:: 3 + :gutter: 3 + + .. grid-item-card:: SortBy + :img-top: assets/selectors_operators/thumb_sort_sortby.png + :link: sort_sortby + :link-type: ref + + .. grid-item-card:: Along Wire + :img-top: assets/selectors_operators/thumb_sort_along_wire.png + :link: sort_along_wire + :link-type: ref + + .. grid-item-card:: Axis + :img-top: assets/selectors_operators/thumb_sort_axis.png + :link: sort_axis + :link-type: ref + + .. grid-item-card:: Distance From + :img-top: assets/selectors_operators/thumb_sort_distance.png + :link: sort_distance_from + :link-type: ref + +Group +======== + +A ShapeList can be grouped and sorted with the |group_by| method based on a grouping +criteria. Grouping can be a great way to organize features without knowing the values of +specific feature properties. Rather than returning a ``Shapelist``, |group_by| returns +a ``GroupBy`` which can be indexed to retrieve a ``Shapelist`` for further operations. +``GroupBy`` groups can also be accessed using a key with the ``group`` method. If the +keys are unknown they can be discovered with ``key_to_group_index``. + +If we want only the edges from the smallest faces by area we can get the faces, then +group by ``SortBy.AREA``. The ``ShapeList`` of smallest faces is available from the first +list index. Finally, a ``ShapeList`` has access to selectors, so calling |edges| will +return a new list of all edges in the previous list. + +.. code-block:: python + + part.faces().group_by(SortBy.AREA)[0].edges()) + +.. figure:: assets/selectors_operators/operators_group_area.png + :align: center + +| + +Examples +-------- + +.. toctree:: + :maxdepth: 2 + :hidden: + + selectors_operators/group_examples + +.. grid:: 3 + :gutter: 3 + + .. grid-item-card:: Axis and Length + :img-top: assets/selectors_operators/thumb_group_axis.png + :link: group_axis + :link-type: ref + + .. grid-item-card:: Hole Area + :img-top: assets/selectors_operators/thumb_group_hole_area.png + :link: group_hole_area + :link-type: ref + + .. grid-item-card:: Properties with Keys + :img-top: assets/selectors_operators/thumb_group_properties_with_keys.png + :link: group_properties_with_keys + :link-type: ref + +Filter +========= + +A ``ShapeList`` can be filtered with the |filter_by| and |filter_by_position| methods based +on a filtering criteria. Filters are flexible way to isolate (or exclude) features based +on known criteria. + +Lets say we need all the faces with a normal in the ``+Z`` direction. One way to do this +might be with a list comprehension, however |filter_by| has the capability to take a +lambda function as a filter condition on the entire list. In this case, the normal of +each face can be checked against a vector direction and filtered accordingly. + +.. code-block:: python + + part.faces().filter_by(lambda f: f.normal_at() == Vector(0, 0, 1)) + +.. figure:: assets/selectors_operators/operators_filter_z_normal.png + :align: center + +| + +Examples +-------- + +.. toctree:: + :maxdepth: 2 + :hidden: + + selectors_operators/filter_examples + +.. grid:: 3 + :gutter: 3 + + .. grid-item-card:: GeomType + :img-top: assets/selectors_operators/thumb_filter_geomtype.png + :link: filter_geomtype + :link-type: ref + + .. grid-item-card:: All Edges Circle + :img-top: assets/selectors_operators/thumb_filter_all_edges_circle.png + :link: filter_all_edges_circle + :link-type: ref + + .. grid-item-card:: Axis and Plane + :img-top: assets/selectors_operators/thumb_filter_axisplane.png + :link: filter_axis_plane + :link-type: ref + + .. grid-item-card:: Inner Wire Count + :img-top: assets/selectors_operators/thumb_filter_inner_wire_count.png + :link: filter_inner_wire_count + :link-type: ref + + .. grid-item-card:: Nested Filters + :img-top: assets/selectors_operators/thumb_filter_nested.png + :link: filter_nested + :link-type: ref + + .. grid-item-card:: Shape Properties + :img-top: assets/selectors_operators/thumb_filter_shape_properties.png + :link: filter_shape_properties + :link-type: ref + +.. |vertices| replace:: :meth:`~topology.Shape.vertices` +.. |edges| replace:: :meth:`~topology.Shape.edges` +.. |wires| replace:: :meth:`~topology.Shape.wires` +.. |faces| replace:: :meth:`~topology.Shape.faces` +.. |solids| replace:: :meth:`~topology.Shape.solids` +.. |sort_by| replace:: :meth:`~topology.ShapeList.sort_by` +.. |sort_by_distance| replace:: :meth:`~topology.ShapeList.sort_by_distance` +.. |group_by| replace:: :meth:`~topology.ShapeList.group_by` +.. |filter_by| replace:: :meth:`~topology.ShapeList.filter_by` +.. |filter_by_position| replace:: :meth:`~topology.ShapeList.filter_by_position` diff --git a/docs/selectors_operators/examples/filter_all_edges_circle.py b/docs/selectors_operators/examples/filter_all_edges_circle.py new file mode 100644 index 0000000..4099962 --- /dev/null +++ b/docs/selectors_operators/examples/filter_all_edges_circle.py @@ -0,0 +1,50 @@ +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as part: + with BuildSketch() as s: + Rectangle(115, 50) + with Locations((5 / 2, 0)): + SlotOverall(90, 12, mode=Mode.SUBTRACT) + extrude(amount=15) + + with BuildSketch(Plane.XZ.offset(50 / 2)) as s3: + with Locations((-115 / 2 + 26, 15)): + SlotOverall(42 + 2 * 26 + 12, 2 * 26, rotation=90) + zz = extrude(amount=-12) + split(bisect_by=Plane.XY) + edgs = part.part.edges().filter_by(Axis.Y).group_by(Axis.X)[-2] + fillet(edgs, 9) + + with Locations(zz.faces().sort_by(Axis.Y)[0]): + with Locations((42 / 2 + 6, 0)): + CounterBoreHole(24 / 2, 34 / 2, 4) + mirror(about=Plane.XZ) + + with BuildSketch() as s4: + RectangleRounded(115, 50, 6) + extrude(amount=80, mode=Mode.INTERSECT) + # fillet does not work right, mode intersect is safer + + with BuildSketch(Plane.YZ) as s4: + with BuildLine() as bl: + l1 = Line((0, 0), (18 / 2, 0)) + l2 = PolarLine(l1 @ 1, 8, 60, length_mode=LengthMode.VERTICAL) + l3 = Line(l2 @ 1, (0, 8)) + mirror(about=Plane.YZ) + make_face() + extrude(amount=115 / 2, both=True, mode=Mode.SUBTRACT) + + faces = part.faces().filter_by( + lambda f: all(e.geom_type == GeomType.CIRCLE for e in f.edges()) + ) + for i, f in enumerate(faces): + RigidJoint(f"bearing_bore_{i}", joint_location=f.center_location) + +show(part, [f.translate(f.normal_at() * 0.01) for f in faces], render_joints=True) +save_screenshot(os.path.join(filedir, "filter_all_edges_circle.png")) diff --git a/docs/selectors_operators/examples/filter_axisplane.py b/docs/selectors_operators/examples/filter_axisplane.py new file mode 100644 index 0000000..2477360 --- /dev/null +++ b/docs/selectors_operators/examples/filter_axisplane.py @@ -0,0 +1,47 @@ +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +axis = Axis.Z +plane = Plane.XY +with BuildPart() as part: + with BuildSketch(Plane.XY.shift_origin((1, 1))) as plane_rep: + Rectangle(2, 2) + with Locations((-.9, -.9)): + Text("Plane.XY", .2, align=(Align.MIN, Align.MIN), mode=Mode.SUBTRACT) + plane_rep = plane_rep.sketch + plane_rep.color = Color(0, .55, .55, .1) + + with Locations((-1, -1, 0)): + b = Box(1, 1, 1) + f = b.faces() + res = f.filter_by(axis) + axis_rep = [Axis(f.center(), f.normal_at()) for f in res] + show_object([b, res, axis_rep]) + + with Locations((1, 1, 0)): + b = Box(1, 1, 1) + f = b.faces() + res = f.filter_by(plane) + show_object([b, res, plane_rep]) + + save_screenshot(os.path.join(filedir, "filter_axisplane.png")) + reset_show() + + with Locations((-1, -1, 0)): + b = Box(1, 1, 1) + f = b.faces() + res = f.filter_by(lambda f: abs(f.normal_at().dot(axis.direction)) < 1e-6) + show_object([b, res, axis_rep]) + + with Locations((1, 1, 0)): + b = Box(1, 1, 1) + f = b.faces() + res = f.filter_by(lambda f: abs(f.normal_at().dot(plane.z_dir)) < 1e-6) + show_object([b, res, plane_rep]) + + save_screenshot(os.path.join(filedir, "filter_dot_axisplane.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/filter_geomtype.py b/docs/selectors_operators/examples/filter_geomtype.py new file mode 100644 index 0000000..245ec2d --- /dev/null +++ b/docs/selectors_operators/examples/filter_geomtype.py @@ -0,0 +1,23 @@ +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as part: + Box(5, 5, 1) + Cylinder(2, 5) + edges = part.edges().filter_by(lambda a: a.length == 1) + fillet(edges, 1) + +part.edges().filter_by(GeomType.LINE) + +part.faces().filter_by(GeomType.CYLINDER) + +show(part, part.edges().filter_by(GeomType.LINE)) +save_screenshot(os.path.join(filedir, "filter_geomtype_line.png")) + +show(part, part.faces().filter_by(GeomType.CYLINDER)) +save_screenshot(os.path.join(filedir, "filter_geomtype_cylinder.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/filter_inner_wire_count.py b/docs/selectors_operators/examples/filter_inner_wire_count.py new file mode 100644 index 0000000..c938b18 --- /dev/null +++ b/docs/selectors_operators/examples/filter_inner_wire_count.py @@ -0,0 +1,38 @@ +from copy import copy +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +bracket = import_step(os.path.join(working_path, "nema-17-bracket.step")) +faces = bracket.faces() + +motor_mounts = faces.filter_by(GeomType.CYLINDER).filter_by(lambda f: f.radius == 3.3/2) +for i, f in enumerate(motor_mounts): + location = f.axis_of_rotation.location + RigidJoint(f"motor_m3_{i}", bracket, joint_location=location) + +motor_face = faces.filter_by(lambda f: len(f.inner_wires()) == 5).sort_by(Axis.X)[-1] +motor_bore = motor_face.inner_wires().edges().filter_by(lambda e: e.radius == 16).edge() +location = Location(motor_bore.arc_center, motor_bore.normal() * 90, Intrinsic.YXZ) +RigidJoint(f"motor", bracket, joint_location=location) + +before_linear = copy(bracket) + +mount_face = faces.filter_by(lambda f: len(f.inner_wires()) == 6).sort_by(Axis.Z)[-1] +mount_slots = mount_face.inner_wires().edges().filter_by(GeomType.CIRCLE) +joint_edges = [ + Line(mount_slots[i].arc_center, mount_slots[i + 1].arc_center) + for i in range(0, len(mount_slots), 2) +] +for i, e in enumerate(joint_edges): + LinearJoint(f"mount_m4_{i}", bracket, axis=Axis(e), linear_range=(0, e.length / 2)) + +show(before_linear, render_joints=True) +save_screenshot(os.path.join(filedir, "filter_inner_wire_count.png")) + +show(bracket, render_joints=True) +save_screenshot(os.path.join(filedir, "filter_inner_wire_count_linear.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/filter_nested.py b/docs/selectors_operators/examples/filter_nested.py new file mode 100644 index 0000000..95ebfe3 --- /dev/null +++ b/docs/selectors_operators/examples/filter_nested.py @@ -0,0 +1,39 @@ +from copy import copy +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as part: + Cylinder(15, 2, align=(Align.CENTER, Align.CENTER, Align.MIN)) + with BuildSketch(): + RectangleRounded(10, 10, 2.5) + extrude(amount=15) + + with BuildSketch(): + Circle(2.5) + Rectangle(4, 5, mode=Mode.INTERSECT) + extrude(amount=15, mode=Mode.SUBTRACT) + + with GridLocations(20, 0, 2, 1): + Hole(3.5 / 2) + + before = copy(part) + + faces = part.faces().filter_by( + lambda f: len(f.inner_wires().edges().filter_by(GeomType.LINE)) == 2 + ) + wires = faces.wires().filter_by( + lambda w: any(e.geom_type == GeomType.LINE for e in w.edges()) + ) + chamfer(wires.edges(), 0.5) + +location = Location((-25, -25)) +b = before.part.moved(location) +f = [f.moved(location) for f in faces] + +show(b, f, part) +save_screenshot(os.path.join(filedir, "filter_nested.png")) diff --git a/docs/selectors_operators/examples/filter_shape_properties.py b/docs/selectors_operators/examples/filter_shape_properties.py new file mode 100644 index 0000000..e87a757 --- /dev/null +++ b/docs/selectors_operators/examples/filter_shape_properties.py @@ -0,0 +1,25 @@ +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as open_box_builder: + Box(20, 20, 5) + offset(amount=-2, openings=open_box_builder.faces().sort_by(Axis.Z)[-1]) + inside_edges = open_box_builder.edges().filter_by(Edge.is_interior) + fillet(inside_edges, 1.5) + outside_edges = open_box_builder.edges().filter_by(Edge.is_interior, reverse=True) + fillet(outside_edges, 0.5) + +open_box = open_box_builder.part +open_box.color = Color(0xEDAE49) +outside_fillets = Compound(open_box.faces().filter_by(Face.is_circular_convex)) +outside_fillets.color = Color(0xD1495B) +inside_fillets = Compound(open_box.faces().filter_by(Face.is_circular_concave)) +inside_fillets.color = Color(0x00798C) + +show(open_box, inside_fillets, outside_fillets) +save_screenshot(os.path.join(filedir, "filter_shape_properties.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/group_axis.py b/docs/selectors_operators/examples/group_axis.py new file mode 100644 index 0000000..24c200d --- /dev/null +++ b/docs/selectors_operators/examples/group_axis.py @@ -0,0 +1,28 @@ +import os +from copy import copy + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as fins: + with GridLocations(4, 6, 4, 4): + Box(2, 3, 10, align=(Align.CENTER, Align.CENTER, Align.MIN)) + +with BuildPart() as part: + Box(34, 48, 5, align=(Align.CENTER, Align.CENTER, Align.MAX)) + with GridLocations(20, 27, 2, 2): + add(fins) + + without = copy(part) + + target = part.edges().group_by(Axis.Z)[-1].group_by(Edge.length)[-1] + fillet(target, .75) + +show(without) +save_screenshot(os.path.join(filedir, "group_axis_without.png")) + +show(part) +save_screenshot(os.path.join(filedir, "group_axis_with.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/group_hole_area.py b/docs/selectors_operators/examples/group_hole_area.py new file mode 100644 index 0000000..f404db7 --- /dev/null +++ b/docs/selectors_operators/examples/group_hole_area.py @@ -0,0 +1,31 @@ +from copy import copy +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as part: + Cylinder(10, 30, rotation=(90, 0, 0)) + Cylinder(8, 40, rotation=(90, 0, 0), align=(Align.CENTER, Align.CENTER, Align.MAX)) + Cylinder(8, 23, rotation=(90, 0, 0), align=(Align.CENTER, Align.CENTER, Align.MIN)) + Cylinder(5, 40, rotation=(90, 0, 0), align=(Align.CENTER, Align.CENTER, Align.MIN)) + with BuildSketch(Plane.XY.offset(8)) as s: + SlotCenterPoint((0, 38), (0, 48), 5) + extrude(amount=2.5, both=True, mode=Mode.SUBTRACT) + + before = copy(part) + + faces = part.faces().group_by( + lambda f: Face(f.inner_wires()[0]).area if f.inner_wires() else 0 + ) + chamfer([f.outer_wire().edges() for f in faces[-1]], 0.5) + +show( + before, + [f.translate(f.normal_at() * 0.01) for f in faces], + part.part.translate((40, 40)), +) +save_screenshot(os.path.join(filedir, "group_hole_area.png")) diff --git a/docs/selectors_operators/examples/group_properties_with_keys.py b/docs/selectors_operators/examples/group_properties_with_keys.py new file mode 100644 index 0000000..85824f7 --- /dev/null +++ b/docs/selectors_operators/examples/group_properties_with_keys.py @@ -0,0 +1,61 @@ +import os +from copy import copy + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as part: + with BuildSketch(Plane.XZ) as sketch: + with BuildLine(): + CenterArc((-6, 12), 10, 0, 360) + Line((-16, 0), (16, 0)) + make_hull() + Rectangle(50, 5, align=(Align.CENTER, Align.MAX)) + + extrude(amount=12) + + Box(38, 6, 22, align=(Align.CENTER, Align.MAX, Align.MIN), mode=Mode.SUBTRACT) + + circle = part.edges().filter_by(GeomType.CIRCLE).sort_by(Axis.Y)[0] + with Locations(Plane(circle.arc_center, z_dir=circle.normal())): + CounterBoreHole(13 / 2, 16 / 2, 4) + + mirror(about=Plane.XZ) + + before_fillet = copy(part) + + length_groups = part.edges().group_by(Edge.length) + fillet(length_groups.group(6) + length_groups.group(5), 4) + + after_fillet = copy(part) + + with BuildSketch() as pins: + with Locations((-21, 0)): + Circle(3 / 2) + with Locations((21, 0)): + SlotCenterToCenter(1, 3) + extrude(amount=-12, mode=Mode.SUBTRACT) + + with GridLocations(42, 16, 2, 2): + CounterBoreHole(3.5 / 2, 3.5, 0) + + after_holes = copy(part) + + radius_groups = part.edges().filter_by(GeomType.CIRCLE).group_by(Edge.radius) + bearing_edges = radius_groups.group(8).group_by(SortBy.DISTANCE)[-1] + pin_edges = radius_groups.group(1.5).filter_by_position(Axis.Z, -5, -5) + chamfer([pin_edges, bearing_edges], .5) + +location = Location((-20, -20)) +items = [before_fillet.part] + length_groups.group(6) + length_groups.group(5) +before = Compound(items).move(location) +show(before, after_fillet.part.move(Location((20, 20)))) +save_screenshot(os.path.join(filedir, "group_length_key.png")) + +location = Location((-20, -20), (180, 0, 0)) +after = Compound([after_holes.part] + pin_edges + bearing_edges).move(location) +show(after, part.part.move(Location((20, 20), (180, 0, 0)))) +save_screenshot(os.path.join(filedir, "group_radius_key.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/selectors_operators.py b/docs/selectors_operators/examples/selectors_operators.py new file mode 100644 index 0000000..8cda0b5 --- /dev/null +++ b/docs/selectors_operators/examples/selectors_operators.py @@ -0,0 +1,93 @@ +from copy import copy +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +selectors = [solids, vertices, edges, faces] +line = Line((-9, -9), (9, 9)) +for i, selector in enumerate(selectors): + u = i / (len(selectors) - 1) + with BuildPart() as part: + with Locations(line @ u): + Box(5, 5, 1) + Cylinder(2, 5) + show_object([part, selector()]) + +save_screenshot(os.path.join(filedir, "selectors_select_all.png")) +reset_show() + +for i, selector in enumerate(selectors[1:4]): + u = i / (len(selectors) - 1) + with BuildPart() as part: + with Locations(line @ u): + Box(5, 5, 1) + Cylinder(2, 5) + show_object([part, selector(Select.LAST)]) + +save_screenshot(os.path.join(filedir, "selectors_select_last.png")) +reset_show() + +with BuildPart() as part: + with Locations(line @ 1/3): + Box(5, 5, 1) + Cylinder(2, 5) + edges = part.edges(Select.NEW) + part_copy = copy(part) + + with Locations(line @ 2/3): + b = Box(5, 5, 1) + c = Cylinder(2, 5) + c.color = Color("DarkTurquoise") + + show(part_copy, edges, b, c, alphas=[.5, 1, .5, 1]) + +save_screenshot(os.path.join(filedir, "selectors_select_new.png")) +reset_show() + +with BuildPart() as part: + with Locations(line @ 1/3): + Box(5, 5, 1, align=(Align.CENTER, Align.CENTER, Align.MAX)) + Cylinder(2, 2, align=(Align.CENTER, Align.CENTER, Align.MIN)) + edges = part.edges(Select.NEW) + part_copy = copy(part) + + with Locations(line @ 2/3): + b = Box(5, 5, 1, align=(Align.CENTER, Align.CENTER, Align.MAX), mode=Mode.PRIVATE) + c = Cylinder(2, 2, align=(Align.CENTER, Align.CENTER, Align.MIN), mode=Mode.PRIVATE) + c.color = Color("DarkTurquoise") + show(part_copy, edges, b, c, alphas=[.5, 1, .5, 1]) + +save_screenshot(os.path.join(filedir, "selectors_select_new_none.png")) +reset_show() + +with BuildPart() as part: + with Locations(line @ 1/3): + Box(5, 5, 1) + Cylinder(2, 5) + edges = part.edges().filter_by(lambda a: a.length == 1) + fillet(edges, 1) + show_object([part, part.edges(Select.NEW)]) + +with BuildPart() as part: + with Locations(line @ 2/3): + Box(5, 5, 1) + Cylinder(2, 5) + edges = part.edges().filter_by(lambda a: a.length == 1) + fillet(edges, 1) + show_object([part, part.edges(Select.LAST)]) + +save_screenshot(os.path.join(filedir, "selectors_select_new_fillet.png")) + +show(part, part.vertices().sort_by(Axis.X)[-4:]) +save_screenshot(os.path.join(filedir, "operators_sort_x.png")) + +show(part, part.faces().group_by(SortBy.AREA)[0].edges()) +save_screenshot(os.path.join(filedir, "operators_group_area.png")) + +faces = part.faces().filter_by(lambda f: f.normal_at() == Vector(0, 0, 1)) +show(part, [f.translate(f.normal_at() * 0.01) for f in faces]) +save_screenshot(os.path.join(filedir, "operators_filter_z_normal.png")) diff --git a/docs/selectors_operators/examples/sort_along_wire.py b/docs/selectors_operators/examples/sort_along_wire.py new file mode 100644 index 0000000..654e096 --- /dev/null +++ b/docs/selectors_operators/examples/sort_along_wire.py @@ -0,0 +1,31 @@ +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildSketch() as along_wire: + Rectangle(48, 16, align=Align.MIN) + Rectangle(16, 48, align=Align.MIN) + Rectangle(32, 32, align=Align.MIN) + + for i, v in enumerate(along_wire.vertices()): + fillet(v, i + 1) + +show(along_wire) +save_screenshot(os.path.join(filedir, "sort_not_along_wire.png")) + + +with BuildSketch() as along_wire: + Rectangle(48, 16, align=Align.MIN) + Rectangle(16, 48, align=Align.MIN) + Rectangle(32, 32, align=Align.MIN) + + sorted_verts = along_wire.vertices().sort_by(along_wire.wire()) + for i, v in enumerate(sorted_verts): + fillet(v, i + 1) + +show(along_wire) +save_screenshot(os.path.join(filedir, "sort_along_wire.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/sort_axis.py b/docs/selectors_operators/examples/sort_axis.py new file mode 100644 index 0000000..198a597 --- /dev/null +++ b/docs/selectors_operators/examples/sort_axis.py @@ -0,0 +1,28 @@ +from copy import copy +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as part: + with BuildSketch(Plane.YZ) as profile: + with BuildLine(): + l1 = FilletPolyline((16, 0), (32, 0), (32, 25), radius=12) + l2 = FilletPolyline((16, 4), (28, 4), (28, 15), radius=8) + Line(l1 @ 0, l2 @ 0) + Polyline(l1 @ 1, l1 @ 1 - Vector(2, 0), l2 @ 1 + Vector(2, 0), l2 @ 1) + make_face() + extrude(amount=34) + + before = copy(part).part + + face = part.faces().sort_by(Axis.X)[-1] + edge = face.edges().sort_by(Axis.Y)[0] + revolve(face, -Axis(edge), 90) + +f = face.translate(face.normal_at() * 0.01) +show(before, f, edge, part.part.translate((25, 33))) +save_screenshot(os.path.join(filedir, "sort_axis.png")) diff --git a/docs/selectors_operators/examples/sort_distance_from.py b/docs/selectors_operators/examples/sort_distance_from.py new file mode 100644 index 0000000..25e853d --- /dev/null +++ b/docs/selectors_operators/examples/sort_distance_from.py @@ -0,0 +1,21 @@ +import os +from itertools import product + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +boxes = ShapeList( + Box(1, 1, 1).scale(0.75 if (i, j) == (1, 2) else 0.25).translate((i, j, 0)) + for i, j in product(range(-3, 4), repeat=2) +) + +boxes = boxes.sort_by_distance(Vertex()) +show(*boxes, colors=ColorMap.listed(len(boxes))) +save_screenshot(os.path.join(filedir, "sort_distance_from_origin.png")) + +boxes = boxes.sort_by_distance(boxes.sort_by(Solid.volume).last) +show(*boxes, colors=ColorMap.listed(len(boxes))) +save_screenshot(os.path.join(filedir, "sort_distance_from_largest.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/sort_sortby.py b/docs/selectors_operators/examples/sort_sortby.py new file mode 100644 index 0000000..28cbf48 --- /dev/null +++ b/docs/selectors_operators/examples/sort_sortby.py @@ -0,0 +1,45 @@ +import os + +from build123d import * +from ocp_vscode import * + +working_path = os.path.dirname(os.path.abspath(__file__)) +filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") + +with BuildPart() as part: + Box(5, 5, 1) + Cylinder(2, 5) + edges = part.edges().filter_by(lambda a: a.length == 1) + fillet(edges, 1) + +box = Box(5, 5, 5).move(Location((-6, -6))) +sphere = Sphere(5 / 2).move(Location((6, 6))) +solids = ShapeList([part.part, box, sphere]) + +part.wires().sort_by(SortBy.LENGTH)[:4] + +part.wires().sort_by(Wire.length)[:4] +part.wires().group_by(SortBy.LENGTH)[0] + +part.vertices().sort_by(SortBy.DISTANCE)[-2:] + +part.vertices().sort_by_distance(Vertex())[-2:] +part.vertices().group_by(Vertex().distance)[-1] + + +show(part, part.wires().sort_by(SortBy.LENGTH)[:4]) +save_screenshot(os.path.join(filedir, "sort_sortby_length.png")) + +# show(part, part.faces().sort_by(SortBy.AREA)[-2:]) +# save_screenshot(os.path.join(filedir, "sort_sortby_area.png")) + +# solid = solids.sort_by(SortBy.VOLUME)[-1] +# solid.color = "violet" +# show([part, box, sphere], solid) +# save_screenshot(os.path.join(filedir, "sort_sortby_volume.png")) + +# show(part, part.edges().filter_by(GeomType.CIRCLE).sort_by(SortBy.RADIUS)[-4:]) +# save_screenshot(os.path.join(filedir, "sort_sortby_radius.png")) + +show(part, part.vertices().sort_by(SortBy.DISTANCE)[-2:]) +save_screenshot(os.path.join(filedir, "sort_sortby_distance.png")) \ No newline at end of file diff --git a/docs/selectors_operators/filter_examples.rst b/docs/selectors_operators/filter_examples.rst new file mode 100644 index 0000000..85bdb9d --- /dev/null +++ b/docs/selectors_operators/filter_examples.rst @@ -0,0 +1,195 @@ +################## +Filter Examples +################## + +.. _filter_geomtype: + +GeomType +============= + +:class:`~build_enums.GeomType` enums are shape type shorthands for ``Edge`` and ``Face`` +objects. They are most helpful for filtering objects of that specific type for further +operations, and are sometimes necessary e.g. before sorting or filtering by radius. +``Edge`` and ``Face`` each support a subset of ``GeomType``: + +* ``Edge`` can be type ``LINE``, ``CIRCLE``, ``ELLIPSE``, ``HYPERBOLA``, ``PARABOLA``, ``BEZIER``, ``BSPLINE``, ``OFFSET``, ``OTHER`` +* ``Face`` can be type ``PLANE``, ``CYLINDER``, ``CONE``, ``SPHERE``, ``TORUS``, ``BEZIER``, ``BSPLINE``, ``REVOLUTION``, ``EXTRUSION``, ``OFFSET``, ``OTHER`` + +.. dropdown:: Setup + + .. literalinclude:: examples/filter_geomtype.py + :language: python + :lines: 3, 8-13 + +.. literalinclude:: examples/filter_geomtype.py + :language: python + :lines: 15 + +.. figure:: ../assets/selectors_operators/filter_geomtype_line.png + :align: center + +| + +.. literalinclude:: examples/filter_geomtype.py + :language: python + :lines: 17 + +.. figure:: ../assets/selectors_operators/filter_geomtype_cylinder.png + :align: center + +| + +.. _filter_all_edges_circle: + +All Edges Circle +======================== + +In this complete bearing block, we want to add joints for the bearings. These should be +located in the counterbore recess. One way to locate the joints is by finding faces with +centers located where the joints need to be located. Filtering for faces with only +circular edges selects the counterbore faces that meet the joint criteria. + +.. dropdown:: Setup + + .. literalinclude:: examples/filter_all_edges_circle.py + :language: python + :lines: 3, 8-41 + +.. literalinclude:: examples/filter_all_edges_circle.py + :language: python + :lines: 43-47 + +.. figure:: ../assets/selectors_operators/filter_all_edges_circle.png + :align: center + +| + +.. _filter_axis_plane: + +Axis and Plane +================= + +Filtering by an Axis will select faces perpendicular to the axis. Likewise filtering by +Plane will select faces parallel to the plane. + +.. dropdown:: Setup + + .. code-block:: python + + from build123d import * + + with BuildPart() as part: + Box(1, 1, 1) + +.. code-block:: python + + part.faces().filter_by(Axis.Z) + part.faces().filter_by(Plane.XY) + +.. figure:: ../assets/selectors_operators/filter_axisplane.png + :align: center + +| + +It might be useful to filter by an Axis or Plane in other ways. A lambda can be used to +accomplish this with feature properties or methods. Here, we are looking for faces where +the dot product of face normal and either the axis direction or the plane normal is about +to 0. The result is faces parallel to the axis or perpendicular to the plane. + +.. code-block:: python + + part.faces().filter_by(lambda f: abs(f.normal_at().dot(Axis.Z.direction) < 1e-6) + part.faces().filter_by(lambda f: abs(f.normal_at().dot(Plane.XY.z_dir)) < 1e-6) + +.. figure:: ../assets/selectors_operators/filter_dot_axisplane.png + :align: center + +| + +.. _filter_inner_wire_count: + +Inner Wire Count +======================== + +This motor bracket imported from a step file needs joints for adding to an assembly. +Joints for the M3 clearance holes were already found by using the cylindrical face's +axis of rotation, but the motor bore and slots need specific placement. The motor bore +can be found by filtering for faces with 5 inner wires, sorting for the desired face, +and then filtering for the specific inner wire by radius. + +- bracket STEP model: :download:`nema-17-bracket.step ` + +.. dropdown:: Setup + + .. literalinclude:: examples/filter_inner_wire_count.py + :language: python + :lines: 4, 9-16 + +.. literalinclude:: examples/filter_inner_wire_count.py + :language: python + :lines: 18-21 + +.. figure:: ../assets/selectors_operators/filter_inner_wire_count.png + :align: center + +| + +Linear joints for the slots are appropriate for mating flexibility, but require more +than a single location. The slot arc centers can be used for creating a linear joint +axis and range. To do that we can filter for faces with 6 inner wires, sort for and +select the top face, and then filter for the circular edges of the inner wires. + +.. literalinclude:: examples/filter_inner_wire_count.py + :language: python + :lines: 25-32 + +.. figure:: ../assets/selectors_operators/filter_inner_wire_count_linear.png + :align: center + +| + +.. _filter_nested: + +Nested Filters +======================== + +Filters can be nested to specify features by characteristics other than their own, like +child properties. Here we want to chamfer the mating edges of the D bore and square +shaft. A way to do this is first looking for faces with only 2 line edges among the +inner wires. The nested filter captures the straight edges, while the parent filter +selects faces based on the count. Then, from those faces, we filter for the wires with +any line edges. + +.. dropdown:: Setup + + .. literalinclude:: examples/filter_nested.py + :language: python + :lines: 4, 9-22 + +.. literalinclude:: examples/filter_nested.py + :language: python + :lines: 26-32 + +.. figure:: ../assets/selectors_operators/filter_nested.png + :align: center + +| + +.. _filter_shape_properties: + +Shape Properties +======================== + +Selected features can be quickly filtered by feature properties. First, we filter by +interior and exterior edges using the ``Edge`` ``is interior`` property to apply +different fillets accordingly. Then the ``Face`` ``is_circular_*`` properties are used +to highlight the resulting fillets. + +.. literalinclude:: examples/filter_shape_properties.py + :language: python + :lines: 3-4, 8-22 + +.. figure:: ../assets/selectors_operators/filter_shape_properties.png + :align: center + +| \ No newline at end of file diff --git a/docs/selectors_operators/group_examples.rst b/docs/selectors_operators/group_examples.rst new file mode 100644 index 0000000..3653ce7 --- /dev/null +++ b/docs/selectors_operators/group_examples.rst @@ -0,0 +1,116 @@ +################# +Group Examples +################# + +.. _group_axis: + +Axis and Length +================== + +This heatsink component could use fillets on the ends of the fins on the long ends. One +way to accomplish this is to filter by length, sort by axis, and slice the +result knowing how many edges to expect. + +.. dropdown:: Setup + + .. literalinclude:: examples/group_axis.py + :language: python + :lines: 4, 9-17 + +.. figure:: ../assets/selectors_operators/group_axis_without.png + :align: center + +| + +However, ``group_by`` can be used to first group all the edges by z-axis position and then +group again by length. In both cases, you can select the desired edges from the last group. + +.. literalinclude:: examples/group_axis.py + :language: python + :lines: 21-22 + +.. figure:: ../assets/selectors_operators/group_axis_with.png + :align: center + +| + +.. _group_hole_area: + +Hole Area +================== + +Callables are available to ``group_by``, like ``sort_by``. Here, the first inner wire +is converted to a face and then that area is the grouping criteria to find the faces +with the largest hole. + +.. dropdown:: Setup + + .. literalinclude:: examples/group_hole_area.py + :language: python + :lines: 4, 9-17 + +.. literalinclude:: examples/group_hole_area.py + :language: python + :lines: 21-24 + +.. figure:: ../assets/selectors_operators/group_hole_area.png + :align: center + +| + +.. _group_properties_with_keys: + +Properties with Keys +==================== + +Groups are usually selected by list slice, often smallest ``[0]`` or largest ``[-1]``, +but they can also be selected by key with the ``group`` method if the keys are known. +Starting with an incomplete bearing block we are looking to add fillets to the ribs +and corners. We know the edge lengths so the edges can be grouped by ``Edge.Length`` and +then the desired groups are selected with the ``group`` method using the lengths as keys. + +.. dropdown:: Setup + + .. literalinclude:: examples/group_properties_with_keys.py + :language: python + :lines: 4, 9-26 + +.. literalinclude:: examples/group_properties_with_keys.py + :language: python + :lines: 30, 31 + +.. figure:: ../assets/selectors_operators/group_length_key.png + :align: center + +| + +Next, we add alignment pin and counterbore holes after the fillets to make sure +screw heads sit flush where they overlap the fillet. Once that is done, it's time to +finalize the tight-tolerance bearing and pin holes with chamfers to make installation +easier. We can filter by ``GeomType.CIRCLE`` and group by ``Edge.radius`` to group the +circular edges. Again, the radii are known, so we can retrieve those groups directly +and then further specify only the edges the bearings and pins are installed from. + +.. dropdown:: Adding holes + + .. literalinclude:: examples/group_properties_with_keys.py + :language: python + :lines: 35-43 + +.. literalinclude:: examples/group_properties_with_keys.py + :language: python + :lines: 47-50 + +.. figure:: ../assets/selectors_operators/group_radius_key.png + :align: center + +| + +Note that ``group_by`` is not the only way to capture edges with a known property +value! ``filter_by`` with a lambda expression can be used as well: + +.. code-block:: python + + radius_groups = part.edges().filter_by(GeomType.CIRCLE) + bearing_edges = radius_groups.filter_by(lambda e: e.radius == 8) + pin_edges = radius_groups.filter_by(lambda e: e.radius == 1.5) diff --git a/docs/selectors_operators/sort_examples.rst b/docs/selectors_operators/sort_examples.rst new file mode 100644 index 0000000..91284a9 --- /dev/null +++ b/docs/selectors_operators/sort_examples.rst @@ -0,0 +1,144 @@ +################ +Sort Examples +################ + +.. _sort_sortby: + +SortBy +============= + +:class:`~build_enums.SortBy` enums are shape property shorthands which work across +``Shape`` multiple object types. ``SortBy`` is a criteria for both ``sort_by`` and +``group_by``. + +* ``SortBy.LENGTH`` works with ``Edge``, ``Wire`` +* ``SortBy.AREA`` works with ``Face``, ``Solid`` +* ``SortBy.VOLUME`` works with ``Solid`` +* ``SortBy.RADIUS`` works with ``Edge``, ``Face`` with :class:`~build_enums.GeomType` ``CIRCLE``, ``CYLINDER``, ``SPHERE`` +* ``SortBy.DISTANCE`` works ``Vertex``, ``Edge``, ``Wire``, ``Face``, ``Solid`` + +``SortBy`` is often interchangeable with specific shape properties and can alternatively +be used with``group_by``. + +.. dropdown:: Setup + + .. literalinclude:: examples/sort_sortby.py + :language: python + :lines: 3, 8-13 + +.. literalinclude:: examples/sort_sortby.py + :language: python + :lines: 19-22 + +.. figure:: ../assets/selectors_operators/sort_sortby_length.png + :align: center + +| + +.. literalinclude:: examples/sort_sortby.py + :language: python + :lines: 24-27 + +.. figure:: ../assets/selectors_operators/sort_sortby_distance.png + :align: center + +| + +.. _sort_along_wire: + +Along Wire +============= + +Vertices selected from an edge or wire might have a useful ordering when created from +a single object, but when created from multiple objects, the ordering not useful. For +example, when applying incrementing fillet radii to a list of vertices from the face, +the order is random. + +.. dropdown:: Setup + + .. literalinclude:: examples/sort_along_wire.py + :language: python + :lines: 3, 8-12 + +.. literalinclude:: examples/sort_along_wire.py + :language: python + :lines: 14-15 + +.. figure:: ../assets/selectors_operators/sort_not_along_wire.png + :align: center + +| + +Vertices may be sorted along the wire they fall on to create order. Notice the fillet +radii now increase in order. + +.. literalinclude:: examples/sort_along_wire.py + :language: python + :lines: 26-28 + +.. figure:: ../assets/selectors_operators/sort_along_wire.png + :align: center + +| + +.. _sort_axis: + +Axis +========================= + +Sorting by axis is often the most straightforward way to optimize selections. In this +part we want to revolve the face at the end around an inside edge of the completed +extrusion. First, the face to extrude can be found by sorting along x-axis and the revolution +edge can be found sorting along y-axis. + +.. dropdown:: Setup + + .. literalinclude:: examples/sort_axis.py + :language: python + :lines: 4, 9-18 + +.. literalinclude:: examples/sort_axis.py + :language: python + :lines: 22-24 + +.. figure:: ../assets/selectors_operators/sort_axis.png + :align: center + +| + +.. _sort_distance_from: + +Distance From +========================= + +A ``sort_by_distance`` can be used to sort objects by their distance from another object. +Here we are sorting the boxes by distance from the origin, using an empty ``Vertex`` +(at the origin) as the reference shape to find distance to. + +.. dropdown:: Setup + + .. literalinclude:: examples/sort_distance_from.py + :language: python + :lines: 2-5, 9-13 + +.. literalinclude:: examples/sort_distance_from.py + :language: python + :lines: 15-16 + +.. figure:: ../assets/selectors_operators/sort_distance_from_origin.png + :align: center + +| + +The example can be extended by first sorting the boxes by volume using the ``Solid`` +property ``volume``, and getting the last (largest) box. Then, the boxes sorted by +their distance from the largest box. + +.. literalinclude:: examples/sort_distance_from.py + :language: python + :lines: 19-20 + +.. figure:: ../assets/selectors_operators/sort_distance_from_largest.png + :align: center + +| \ No newline at end of file From 9b78e0767ff6147568aea40edcb0a21e6b78902f Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 7 Apr 2025 11:37:59 -0400 Subject: [PATCH 259/518] FontStyle and and Text: add BOLDITALIC font aspect to resolve #778 --- docs/cheat_sheet.rst | 2 +- src/build123d/build_enums.py | 1 + src/build123d/objects_sketch.py | 2 +- src/build123d/topology/composite.py | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index a4d0d4b..d99769d 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -228,7 +228,7 @@ Cheat Sheet +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.Extrinsic` | XYZ, XZY, YZX, YXZ, ZXY, ZYX, XYX, XZX, YZY, YXY, ZXZ, ZYZ | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ - | :class:`~build_enums.FontStyle` | REGULAR, BOLD, ITALIC | + | :class:`~build_enums.FontStyle` | REGULAR, BOLD, BOLDITALIC, ITALIC | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.FrameMethod` | CORRECTED, FRENET | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index 8f8059a..fb425d3 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -220,6 +220,7 @@ class FontStyle(Enum): REGULAR = auto() BOLD = auto() ITALIC = auto() + BOLDITALIC = auto() def __repr__(self): return f"<{self.__class__.__name__}.{self.name}>" diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 6da3725..47f01d6 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -546,7 +546,7 @@ class Text(BaseSketchObject): font_size (float): size of the font in model units font (str, optional): font name. Defaults to "Arial" font_path (str, optional): system path to font file. Defaults to None - font_style (Font_Style, optional): font style, REGULAR, BOLD, or ITALIC. + font_style (Font_Style, optional): font style, REGULAR, BOLD, BOLDITALIC, or ITALIC. Defaults to Font_Style.REGULAR align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. Defaults to (Align.CENTER, Align.CENTER) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 767f6f9..6674163 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -67,6 +67,7 @@ import OCP.TopAbs as ta from OCP.BRepAlgoAPI import BRepAlgoAPI_Fuse from OCP.Font import ( Font_FA_Bold, + Font_FA_BoldItalic, Font_FA_Italic, Font_FA_Regular, Font_FontMgr, @@ -306,6 +307,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): FontStyle.REGULAR: Font_FA_Regular, FontStyle.BOLD: Font_FA_Bold, FontStyle.ITALIC: Font_FA_Italic, + FontStyle.BOLDITALIC: Font_FA_BoldItalic, }[font_style] mgr = Font_FontMgr.GetInstance_s() From f245ac5a486837348e70c9a17457446b518f8408 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 9 Apr 2025 12:52:55 -0400 Subject: [PATCH 260/518] Text and make_text: add TextAlign enum to control OCCT text alignment with Graphic3d enums to resolve #458 and #459. - Create TextAlign enum - Add text_align tuple arg to Text and make_text which resolves to (horiz_align, vert_align) and maps to Graphic3d_HTA_* and Graphic3d_HTA_* enums for Font_FontMgr.Perform() - Use (CENTER, CENTER) as default - Set align default to None to align by text alignment by default. align still aligns the bounding box - Minimal test coverage for addition of text_align --- src/build123d/__init__.py | 1 + src/build123d/build_enums.py | 14 +++++++ src/build123d/objects_sketch.py | 13 +++++-- src/build123d/topology/composite.py | 59 +++++++++++++++++++++++++---- tests/test_build_sketch.py | 3 +- 5 files changed, 79 insertions(+), 11 deletions(-) diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index 197fb43..5e39329 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -63,6 +63,7 @@ __all__ = [ "Select", "Side", "SortBy", + "TextAlign", "Transition", "Unit", "Until", diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index fb425d3..62babad 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -345,6 +345,20 @@ class SortBy(Enum): return f"<{self.__class__.__name__}.{self.name}>" +class TextAlign(Enum): + """Text Alignment""" + + BOTTOM = auto() + CENTER = auto() + LEFT = auto() + RIGHT = auto() + TOP = auto() + TOPFIRSTLINE = auto() + + def __repr__(self): + return f"<{self.__class__.__name__}.{self.name}>" + + class Transition(Enum): """Sweep discontinuity handling option""" diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 47f01d6..cd5452a 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -36,7 +36,7 @@ from typing import cast from collections.abc import Iterable from build123d.build_common import LocationList, flatten_sequence, validate_inputs -from build123d.build_enums import Align, FontStyle, Mode +from build123d.build_enums import Align, FontStyle, Mode, TextAlign from build123d.build_sketch import BuildSketch from build123d.geometry import ( Axis, @@ -540,6 +540,7 @@ class Text(BaseSketchObject): Create text defined by text string and font size. May have difficulty finding non-system fonts depending on platform and render default. font_path defines an exact path to a font file and overrides font. + text_align aligns texts inside bounding box while align the aligns bounding box Args: txt (str): text to render @@ -548,8 +549,11 @@ class Text(BaseSketchObject): font_path (str, optional): system path to font file. Defaults to None font_style (Font_Style, optional): font style, REGULAR, BOLD, BOLDITALIC, or ITALIC. Defaults to Font_Style.REGULAR + text_align (tuple[TextAlign, TextAlign], optional): horizontal text align + LEFT, CENTER, or RIGHT. Vertical text align BOTTOM, CENTER, TOP, or + TOPFIRSTLINE. Defaults to (TextAlign.CENTER, TextAlign.CENTER) align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. - Defaults to (Align.CENTER, Align.CENTER) + Defaults to None path (Edge | Wire, optional): path for text to follow. Defaults to None position_on_path (float, optional): the relative location on path to position the text, values must be between 0.0 and 1.0. Defaults to 0.0 @@ -567,7 +571,8 @@ class Text(BaseSketchObject): font: str = "Arial", font_path: str | None = None, font_style: FontStyle = FontStyle.REGULAR, - align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), + text_align: tuple[TextAlign, TextAlign] = (TextAlign.CENTER, TextAlign.CENTER), + align: Align | tuple[Align, Align] | None = None, path: Edge | Wire | None = None, position_on_path: float = 0.0, rotation: float = 0.0, @@ -581,6 +586,7 @@ class Text(BaseSketchObject): self.font = font self.font_path = font_path self.font_style = font_style + self.text_align = text_align self.align = align self.text_path = path self.position_on_path = position_on_path @@ -593,6 +599,7 @@ class Text(BaseSketchObject): font=font, font_path=font_path, font_style=font_style, + text_align=text_align, align=align, position_on_path=position_on_path, text_path=path, diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 6674163..cc33a10 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -73,6 +73,16 @@ from OCP.Font import ( Font_FontMgr, Font_SystemFont, ) +from OCP.gp import gp_Ax3 +from OCP.Graphic3d import ( + Graphic3d_HTA_LEFT, + Graphic3d_HTA_CENTER, + Graphic3d_HTA_RIGHT, + Graphic3d_VTA_BOTTOM, + Graphic3d_VTA_CENTER, + Graphic3d_VTA_TOP, + Graphic3d_VTA_TOPFIRSTLINE, +) from OCP.GProp import GProp_GProps from OCP.NCollection import NCollection_Utf8String from OCP.StdPrs import StdPrs_BRepTextBuilder as Font_BRepTextBuilder, StdPrs_BRepFont @@ -86,7 +96,7 @@ from OCP.TopoDS import ( TopoDS_Shape, ) from anytree import PreOrderIter -from build123d.build_enums import Align, CenterOf, FontStyle +from build123d.build_enums import Align, CenterOf, FontStyle, TextAlign from build123d.geometry import ( TOLERANCE, Axis, @@ -239,7 +249,8 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): font: str = "Arial", font_path: str | None = None, font_style: FontStyle = FontStyle.REGULAR, - align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), + text_align: tuple[TextAlign, TextAlign] = (TextAlign.CENTER, TextAlign.CENTER), + align: Align | tuple[Align, Align] | None = None, position_on_path: float = 0.0, text_path: Edge | Wire | None = None, ) -> Compound: @@ -255,12 +266,15 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): font_size: size of the font in model units font: font name font_path: path to font file - font_style: text style. Defaults to FontStyle.REGULAR. + font_style: text style. Defaults to FontStyle.REGULAR + text_align (tuple[TextAlign, TextAlign], optional): horizontal text align + LEFT, CENTER, or RIGHT. Vertical text align BOTTOM, CENTER, TOP, or + TOPFIRSTLINE. Defaults to (TextAlign.CENTER, TextAlign.CENTER) align (Union[Align, tuple[Align, Align]], optional): align min, center, or max - of object. Defaults to (Align.CENTER, Align.CENTER). + of object. Defaults to None position_on_path: the relative location on path to position the text, - between 0.0 and 1.0. Defaults to 0.0. - text_path: a path for the text to follows. Defaults to None - linear text. + between 0.0 and 1.0. Defaults to 0.0 + text_path: a path for the text to follows. Defaults to None (linear text) Returns: a Compound object containing multiple Faces representing the text @@ -310,6 +324,32 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): FontStyle.BOLDITALIC: Font_FA_BoldItalic, }[font_style] + if text_align[0] not in [TextAlign.LEFT, TextAlign.CENTER, TextAlign.RIGHT]: + raise ValueError("Horizontal TextAlign must be LEFT, CENTER, or RIGHT") + + if text_align[1] not in [ + TextAlign.BOTTOM, + TextAlign.CENTER, + TextAlign.TOP, + TextAlign.TOPFIRSTLINE, + ]: + raise ValueError( + "Vertical TextAlign must be BOTTOM, CENTER, TOP, or TOPFIRSTLINE" + ) + + horiz_align = { + TextAlign.LEFT: Graphic3d_HTA_LEFT, + TextAlign.CENTER: Graphic3d_HTA_CENTER, + TextAlign.RIGHT: Graphic3d_HTA_RIGHT, + }[text_align[0]] + + vert_align = { + TextAlign.BOTTOM: Graphic3d_VTA_BOTTOM, + TextAlign.CENTER: Graphic3d_VTA_CENTER, + TextAlign.TOP: Graphic3d_VTA_TOP, + TextAlign.TOPFIRSTLINE: Graphic3d_VTA_TOPFIRSTLINE, + }[text_align[1]] + mgr = Font_FontMgr.GetInstance_s() if font_path and mgr.CheckFont(TCollection_AsciiString(font_path).ToCString()): @@ -332,7 +372,12 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): font_kind, float(font_size), ) - text_flat = Compound(builder.Perform(font_i, NCollection_Utf8String(txt))) + + text_flat = Compound( + builder.Perform( + font_i, NCollection_Utf8String(txt), gp_Ax3(), horiz_align, vert_align + ) + ) # Align the text from the bounding box align_text = tuplify(align, 2) diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 205bebf..a29e723 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -361,7 +361,8 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(t.font, "Arial") self.assertIsNone(t.font_path) self.assertEqual(t.font_style, FontStyle.REGULAR) - self.assertEqual(t.align, (Align.CENTER, Align.CENTER)) + self.assertEqual(t.text_align, (TextAlign.CENTER, TextAlign.CENTER)) + self.assertIsNone(t.align) self.assertIsNone(t.text_path) self.assertEqual(t.position_on_path, 0) self.assertEqual(t.rotation, 0) From 50b1d5b5d57d34817b3cc97a9aa018b0edd2e9d7 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 10 Apr 2025 22:12:05 -0400 Subject: [PATCH 261/518] Rename to Topology Selection and Exploration, add section on `new_edges`, elaborate on `GroupBy` --- .../filter_all_edges_circle.png | Bin .../filter_axisplane.png | Bin .../filter_dot_axisplane.png | Bin .../filter_geomtype_cylinder.png | Bin .../filter_geomtype_line.png | Bin .../filter_inner_wire_count.png | Bin .../filter_inner_wire_count_linear.png | Bin .../filter_nested.png | Bin .../filter_shape_properties.png | Bin .../group_axis_with.png | Bin .../group_axis_without.png | Bin .../group_hole_area.png | Bin .../group_length_key.png | Bin .../group_radius_key.png | Bin .../operators_filter_z_normal.png | Bin .../operators_group_area.png | Bin .../operators_sort_x.png | Bin .../selectors_new_edges.png | Bin 0 -> 16100 bytes .../selectors_select_all.png | Bin .../selectors_select_last.png | Bin .../selectors_select_new.png | Bin .../selectors_select_new_fillet.png | Bin .../selectors_select_new_none.png | Bin .../sort_along_wire.png | Bin .../sort_axis.png | Bin .../sort_distance_from_largest.png | Bin .../sort_distance_from_origin.png | Bin .../sort_not_along_wire.png | Bin .../sort_sortby_distance.png | Bin .../sort_sortby_length.png | Bin .../thumb_filter_all_edges_circle.png | Bin .../thumb_filter_axisplane.png | Bin .../thumb_filter_geomtype.png | Bin .../thumb_filter_inner_wire_count.png | Bin .../thumb_filter_nested.png | Bin .../thumb_filter_shape_properties.png | Bin .../thumb_group_axis.png | Bin .../thumb_group_hole_area.png | Bin .../thumb_group_properties_with_keys.png | Bin .../thumb_sort_along_wire.png | Bin .../thumb_sort_axis.png | Bin .../thumb_sort_distance.png | Bin .../thumb_sort_sortby.png | Bin docs/index.rst | 2 +- ...s_operators.rst => topology_selection.rst} | 111 ++++++++++++------ .../examples/filter_all_edges_circle.py | 2 +- .../examples/filter_axisplane.py | 2 +- .../examples/filter_geomtype.py | 2 +- .../examples/filter_inner_wire_count.py | 2 +- .../examples/filter_nested.py | 2 +- .../examples/filter_shape_properties.py | 2 +- .../examples/group_axis.py | 2 +- .../examples/group_hole_area.py | 2 +- .../examples/group_properties_with_keys.py | 2 +- .../examples/selectors_operators.py | 9 +- .../examples/sort_along_wire.py | 2 +- .../examples/sort_axis.py | 2 +- .../examples/sort_distance_from.py | 2 +- .../examples/sort_sortby.py | 2 +- .../filter_examples.rst | 18 +-- .../group_examples.rst | 10 +- .../sort_examples.rst | 14 +-- 62 files changed, 118 insertions(+), 72 deletions(-) rename docs/assets/{selectors_operators => topology_selection}/filter_all_edges_circle.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_axisplane.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_dot_axisplane.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_geomtype_cylinder.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_geomtype_line.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_inner_wire_count.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_inner_wire_count_linear.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_nested.png (100%) rename docs/assets/{selectors_operators => topology_selection}/filter_shape_properties.png (100%) rename docs/assets/{selectors_operators => topology_selection}/group_axis_with.png (100%) rename docs/assets/{selectors_operators => topology_selection}/group_axis_without.png (100%) rename docs/assets/{selectors_operators => topology_selection}/group_hole_area.png (100%) rename docs/assets/{selectors_operators => topology_selection}/group_length_key.png (100%) rename docs/assets/{selectors_operators => topology_selection}/group_radius_key.png (100%) rename docs/assets/{selectors_operators => topology_selection}/operators_filter_z_normal.png (100%) rename docs/assets/{selectors_operators => topology_selection}/operators_group_area.png (100%) rename docs/assets/{selectors_operators => topology_selection}/operators_sort_x.png (100%) create mode 100644 docs/assets/topology_selection/selectors_new_edges.png rename docs/assets/{selectors_operators => topology_selection}/selectors_select_all.png (100%) rename docs/assets/{selectors_operators => topology_selection}/selectors_select_last.png (100%) rename docs/assets/{selectors_operators => topology_selection}/selectors_select_new.png (100%) rename docs/assets/{selectors_operators => topology_selection}/selectors_select_new_fillet.png (100%) rename docs/assets/{selectors_operators => topology_selection}/selectors_select_new_none.png (100%) rename docs/assets/{selectors_operators => topology_selection}/sort_along_wire.png (100%) rename docs/assets/{selectors_operators => topology_selection}/sort_axis.png (100%) rename docs/assets/{selectors_operators => topology_selection}/sort_distance_from_largest.png (100%) rename docs/assets/{selectors_operators => topology_selection}/sort_distance_from_origin.png (100%) rename docs/assets/{selectors_operators => topology_selection}/sort_not_along_wire.png (100%) rename docs/assets/{selectors_operators => topology_selection}/sort_sortby_distance.png (100%) rename docs/assets/{selectors_operators => topology_selection}/sort_sortby_length.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_filter_all_edges_circle.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_filter_axisplane.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_filter_geomtype.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_filter_inner_wire_count.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_filter_nested.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_filter_shape_properties.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_group_axis.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_group_hole_area.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_group_properties_with_keys.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_sort_along_wire.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_sort_axis.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_sort_distance.png (100%) rename docs/assets/{selectors_operators => topology_selection}/thumb_sort_sortby.png (100%) rename docs/{selectors_operators.rst => topology_selection.rst} (77%) rename docs/{selectors_operators => topology_selection}/examples/filter_all_edges_circle.py (95%) rename docs/{selectors_operators => topology_selection}/examples/filter_axisplane.py (94%) rename docs/{selectors_operators => topology_selection}/examples/filter_geomtype.py (87%) rename docs/{selectors_operators => topology_selection}/examples/filter_inner_wire_count.py (94%) rename docs/{selectors_operators => topology_selection}/examples/filter_nested.py (92%) rename docs/{selectors_operators => topology_selection}/examples/filter_shape_properties.py (91%) rename docs/{selectors_operators => topology_selection}/examples/group_axis.py (89%) rename docs/{selectors_operators => topology_selection}/examples/group_hole_area.py (92%) rename docs/{selectors_operators => topology_selection}/examples/group_properties_with_keys.py (96%) rename docs/{selectors_operators => topology_selection}/examples/selectors_operators.py (91%) rename docs/{selectors_operators => topology_selection}/examples/sort_along_wire.py (90%) rename docs/{selectors_operators => topology_selection}/examples/sort_axis.py (91%) rename docs/{selectors_operators => topology_selection}/examples/sort_distance_from.py (88%) rename docs/{selectors_operators => topology_selection}/examples/sort_sortby.py (94%) rename docs/{selectors_operators => topology_selection}/filter_examples.rst (89%) rename docs/{selectors_operators => topology_selection}/group_examples.rst (90%) rename docs/{selectors_operators => topology_selection}/sort_examples.rst (87%) diff --git a/docs/assets/selectors_operators/filter_all_edges_circle.png b/docs/assets/topology_selection/filter_all_edges_circle.png similarity index 100% rename from docs/assets/selectors_operators/filter_all_edges_circle.png rename to docs/assets/topology_selection/filter_all_edges_circle.png diff --git a/docs/assets/selectors_operators/filter_axisplane.png b/docs/assets/topology_selection/filter_axisplane.png similarity index 100% rename from docs/assets/selectors_operators/filter_axisplane.png rename to docs/assets/topology_selection/filter_axisplane.png diff --git a/docs/assets/selectors_operators/filter_dot_axisplane.png b/docs/assets/topology_selection/filter_dot_axisplane.png similarity index 100% rename from docs/assets/selectors_operators/filter_dot_axisplane.png rename to docs/assets/topology_selection/filter_dot_axisplane.png diff --git a/docs/assets/selectors_operators/filter_geomtype_cylinder.png b/docs/assets/topology_selection/filter_geomtype_cylinder.png similarity index 100% rename from docs/assets/selectors_operators/filter_geomtype_cylinder.png rename to docs/assets/topology_selection/filter_geomtype_cylinder.png diff --git a/docs/assets/selectors_operators/filter_geomtype_line.png b/docs/assets/topology_selection/filter_geomtype_line.png similarity index 100% rename from docs/assets/selectors_operators/filter_geomtype_line.png rename to docs/assets/topology_selection/filter_geomtype_line.png diff --git a/docs/assets/selectors_operators/filter_inner_wire_count.png b/docs/assets/topology_selection/filter_inner_wire_count.png similarity index 100% rename from docs/assets/selectors_operators/filter_inner_wire_count.png rename to docs/assets/topology_selection/filter_inner_wire_count.png diff --git a/docs/assets/selectors_operators/filter_inner_wire_count_linear.png b/docs/assets/topology_selection/filter_inner_wire_count_linear.png similarity index 100% rename from docs/assets/selectors_operators/filter_inner_wire_count_linear.png rename to docs/assets/topology_selection/filter_inner_wire_count_linear.png diff --git a/docs/assets/selectors_operators/filter_nested.png b/docs/assets/topology_selection/filter_nested.png similarity index 100% rename from docs/assets/selectors_operators/filter_nested.png rename to docs/assets/topology_selection/filter_nested.png diff --git a/docs/assets/selectors_operators/filter_shape_properties.png b/docs/assets/topology_selection/filter_shape_properties.png similarity index 100% rename from docs/assets/selectors_operators/filter_shape_properties.png rename to docs/assets/topology_selection/filter_shape_properties.png diff --git a/docs/assets/selectors_operators/group_axis_with.png b/docs/assets/topology_selection/group_axis_with.png similarity index 100% rename from docs/assets/selectors_operators/group_axis_with.png rename to docs/assets/topology_selection/group_axis_with.png diff --git a/docs/assets/selectors_operators/group_axis_without.png b/docs/assets/topology_selection/group_axis_without.png similarity index 100% rename from docs/assets/selectors_operators/group_axis_without.png rename to docs/assets/topology_selection/group_axis_without.png diff --git a/docs/assets/selectors_operators/group_hole_area.png b/docs/assets/topology_selection/group_hole_area.png similarity index 100% rename from docs/assets/selectors_operators/group_hole_area.png rename to docs/assets/topology_selection/group_hole_area.png diff --git a/docs/assets/selectors_operators/group_length_key.png b/docs/assets/topology_selection/group_length_key.png similarity index 100% rename from docs/assets/selectors_operators/group_length_key.png rename to docs/assets/topology_selection/group_length_key.png diff --git a/docs/assets/selectors_operators/group_radius_key.png b/docs/assets/topology_selection/group_radius_key.png similarity index 100% rename from docs/assets/selectors_operators/group_radius_key.png rename to docs/assets/topology_selection/group_radius_key.png diff --git a/docs/assets/selectors_operators/operators_filter_z_normal.png b/docs/assets/topology_selection/operators_filter_z_normal.png similarity index 100% rename from docs/assets/selectors_operators/operators_filter_z_normal.png rename to docs/assets/topology_selection/operators_filter_z_normal.png diff --git a/docs/assets/selectors_operators/operators_group_area.png b/docs/assets/topology_selection/operators_group_area.png similarity index 100% rename from docs/assets/selectors_operators/operators_group_area.png rename to docs/assets/topology_selection/operators_group_area.png diff --git a/docs/assets/selectors_operators/operators_sort_x.png b/docs/assets/topology_selection/operators_sort_x.png similarity index 100% rename from docs/assets/selectors_operators/operators_sort_x.png rename to docs/assets/topology_selection/operators_sort_x.png diff --git a/docs/assets/topology_selection/selectors_new_edges.png b/docs/assets/topology_selection/selectors_new_edges.png new file mode 100644 index 0000000000000000000000000000000000000000..b7c5fb0f9f8cf5766844f9ffa9c0230eb3c10de7 GIT binary patch literal 16100 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 literal 0 HcmV?d00001 diff --git a/docs/assets/selectors_operators/selectors_select_all.png b/docs/assets/topology_selection/selectors_select_all.png similarity index 100% rename from docs/assets/selectors_operators/selectors_select_all.png rename to docs/assets/topology_selection/selectors_select_all.png diff --git a/docs/assets/selectors_operators/selectors_select_last.png b/docs/assets/topology_selection/selectors_select_last.png similarity index 100% rename from docs/assets/selectors_operators/selectors_select_last.png rename to docs/assets/topology_selection/selectors_select_last.png diff --git a/docs/assets/selectors_operators/selectors_select_new.png b/docs/assets/topology_selection/selectors_select_new.png similarity index 100% rename from docs/assets/selectors_operators/selectors_select_new.png rename to docs/assets/topology_selection/selectors_select_new.png diff --git a/docs/assets/selectors_operators/selectors_select_new_fillet.png b/docs/assets/topology_selection/selectors_select_new_fillet.png similarity index 100% rename from docs/assets/selectors_operators/selectors_select_new_fillet.png rename to docs/assets/topology_selection/selectors_select_new_fillet.png diff --git a/docs/assets/selectors_operators/selectors_select_new_none.png b/docs/assets/topology_selection/selectors_select_new_none.png similarity index 100% rename from docs/assets/selectors_operators/selectors_select_new_none.png rename to docs/assets/topology_selection/selectors_select_new_none.png diff --git a/docs/assets/selectors_operators/sort_along_wire.png b/docs/assets/topology_selection/sort_along_wire.png similarity index 100% rename from docs/assets/selectors_operators/sort_along_wire.png rename to docs/assets/topology_selection/sort_along_wire.png diff --git a/docs/assets/selectors_operators/sort_axis.png b/docs/assets/topology_selection/sort_axis.png similarity index 100% rename from docs/assets/selectors_operators/sort_axis.png rename to docs/assets/topology_selection/sort_axis.png diff --git a/docs/assets/selectors_operators/sort_distance_from_largest.png b/docs/assets/topology_selection/sort_distance_from_largest.png similarity index 100% rename from docs/assets/selectors_operators/sort_distance_from_largest.png rename to docs/assets/topology_selection/sort_distance_from_largest.png diff --git a/docs/assets/selectors_operators/sort_distance_from_origin.png b/docs/assets/topology_selection/sort_distance_from_origin.png similarity index 100% rename from docs/assets/selectors_operators/sort_distance_from_origin.png rename to docs/assets/topology_selection/sort_distance_from_origin.png diff --git a/docs/assets/selectors_operators/sort_not_along_wire.png b/docs/assets/topology_selection/sort_not_along_wire.png similarity index 100% rename from docs/assets/selectors_operators/sort_not_along_wire.png rename to docs/assets/topology_selection/sort_not_along_wire.png diff --git a/docs/assets/selectors_operators/sort_sortby_distance.png b/docs/assets/topology_selection/sort_sortby_distance.png similarity index 100% rename from docs/assets/selectors_operators/sort_sortby_distance.png rename to docs/assets/topology_selection/sort_sortby_distance.png diff --git a/docs/assets/selectors_operators/sort_sortby_length.png b/docs/assets/topology_selection/sort_sortby_length.png similarity index 100% rename from docs/assets/selectors_operators/sort_sortby_length.png rename to docs/assets/topology_selection/sort_sortby_length.png diff --git a/docs/assets/selectors_operators/thumb_filter_all_edges_circle.png b/docs/assets/topology_selection/thumb_filter_all_edges_circle.png similarity index 100% rename from docs/assets/selectors_operators/thumb_filter_all_edges_circle.png rename to docs/assets/topology_selection/thumb_filter_all_edges_circle.png diff --git a/docs/assets/selectors_operators/thumb_filter_axisplane.png b/docs/assets/topology_selection/thumb_filter_axisplane.png similarity index 100% rename from docs/assets/selectors_operators/thumb_filter_axisplane.png rename to docs/assets/topology_selection/thumb_filter_axisplane.png diff --git a/docs/assets/selectors_operators/thumb_filter_geomtype.png b/docs/assets/topology_selection/thumb_filter_geomtype.png similarity index 100% rename from docs/assets/selectors_operators/thumb_filter_geomtype.png rename to docs/assets/topology_selection/thumb_filter_geomtype.png diff --git a/docs/assets/selectors_operators/thumb_filter_inner_wire_count.png b/docs/assets/topology_selection/thumb_filter_inner_wire_count.png similarity index 100% rename from docs/assets/selectors_operators/thumb_filter_inner_wire_count.png rename to docs/assets/topology_selection/thumb_filter_inner_wire_count.png diff --git a/docs/assets/selectors_operators/thumb_filter_nested.png b/docs/assets/topology_selection/thumb_filter_nested.png similarity index 100% rename from docs/assets/selectors_operators/thumb_filter_nested.png rename to docs/assets/topology_selection/thumb_filter_nested.png diff --git a/docs/assets/selectors_operators/thumb_filter_shape_properties.png b/docs/assets/topology_selection/thumb_filter_shape_properties.png similarity index 100% rename from docs/assets/selectors_operators/thumb_filter_shape_properties.png rename to docs/assets/topology_selection/thumb_filter_shape_properties.png diff --git a/docs/assets/selectors_operators/thumb_group_axis.png b/docs/assets/topology_selection/thumb_group_axis.png similarity index 100% rename from docs/assets/selectors_operators/thumb_group_axis.png rename to docs/assets/topology_selection/thumb_group_axis.png diff --git a/docs/assets/selectors_operators/thumb_group_hole_area.png b/docs/assets/topology_selection/thumb_group_hole_area.png similarity index 100% rename from docs/assets/selectors_operators/thumb_group_hole_area.png rename to docs/assets/topology_selection/thumb_group_hole_area.png diff --git a/docs/assets/selectors_operators/thumb_group_properties_with_keys.png b/docs/assets/topology_selection/thumb_group_properties_with_keys.png similarity index 100% rename from docs/assets/selectors_operators/thumb_group_properties_with_keys.png rename to docs/assets/topology_selection/thumb_group_properties_with_keys.png diff --git a/docs/assets/selectors_operators/thumb_sort_along_wire.png b/docs/assets/topology_selection/thumb_sort_along_wire.png similarity index 100% rename from docs/assets/selectors_operators/thumb_sort_along_wire.png rename to docs/assets/topology_selection/thumb_sort_along_wire.png diff --git a/docs/assets/selectors_operators/thumb_sort_axis.png b/docs/assets/topology_selection/thumb_sort_axis.png similarity index 100% rename from docs/assets/selectors_operators/thumb_sort_axis.png rename to docs/assets/topology_selection/thumb_sort_axis.png diff --git a/docs/assets/selectors_operators/thumb_sort_distance.png b/docs/assets/topology_selection/thumb_sort_distance.png similarity index 100% rename from docs/assets/selectors_operators/thumb_sort_distance.png rename to docs/assets/topology_selection/thumb_sort_distance.png diff --git a/docs/assets/selectors_operators/thumb_sort_sortby.png b/docs/assets/topology_selection/thumb_sort_sortby.png similarity index 100% rename from docs/assets/selectors_operators/thumb_sort_sortby.png rename to docs/assets/topology_selection/thumb_sort_sortby.png diff --git a/docs/index.rst b/docs/index.rst index 2ca15bc..0af6014 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -113,8 +113,8 @@ Table Of Contents introductory_examples.rst tutorials.rst objects.rst - selectors_operators.rst operations.rst + topology_selection.rst builders.rst joints.rst assemblies.rst diff --git a/docs/selectors_operators.rst b/docs/topology_selection.rst similarity index 77% rename from docs/selectors_operators.rst rename to docs/topology_selection.rst index 9199af6..f1ef50e 100644 --- a/docs/selectors_operators.rst +++ b/docs/topology_selection.rst @@ -1,8 +1,11 @@ -####################### -Selectors and Operators -####################### +##################################### +Topology Selection and Exploration +##################################### -Selectors and operators are powerful methods to select and organize CAD objects for +:ref:`topology` is the structure of build123d geometric features and traversing the +topology of a part is often required to specify objects for an operation or to locate a +CAD feature. :ref:`selectors` allow selection of topology objects into a |ShapeList|. +:ref:`operators` are powerful methods further explore and refine a |ShapeList| for subsequent operations. .. _selectors: @@ -13,7 +16,7 @@ Selectors Selectors provide methods to extract all or a subset of a feature type in the referenced object. These methods select Edges, Faces, Solids, Vertices, or Wires in Builder objects -or from Shape objects themselves. All of these methods return a :class:`~topology.ShapeList`, +or from Shape objects themselves. All of these methods return a |ShapeList|, which is a subclass of ``list`` and may be sorted, grouped, or filtered by :ref:`operators`. @@ -53,10 +56,10 @@ a feature as long as they can contain the feature being selected. # Create sketch out of context Rectangle(1, 1).edges() -Select In Build Objects +Select In Build Context ======================== -Build objects track the last operation and their selector methods can take +Build contexts track the last operation and their selector methods can take :class:`~build_enums.Select` as criteria to specify a subset of features to extract. By default, a selector will select ``ALL`` of a feature, while ``LAST`` selects features created or altered by the most recent operation. |edges| can @@ -97,7 +100,7 @@ Create a simple part to demonstrate selectors. Select using the default criteria part.edges(Select.ALL) part.faces(Select.ALL) -.. figure:: assets/selectors_operators/selectors_select_all.png +.. figure:: assets/topology_selection/selectors_select_all.png :align: center The default ``Select.ALL`` features @@ -114,7 +117,7 @@ Select features changed in the last operation with criteria ``Select.LAST``. part.edges(Select.LAST) part.faces(Select.LAST) -.. figure:: assets/selectors_operators/selectors_select_last.png +.. figure:: assets/topology_selection/selectors_select_last.png :align: center ``Select.LAST`` features @@ -130,7 +133,7 @@ available for a ``ShapeList`` of edges! part.edges(Select.NEW) -.. figure:: assets/selectors_operators/selectors_select_new.png +.. figure:: assets/topology_selection/selectors_select_new.png :align: center ``Select.NEW`` edges where box and cylinder intersect @@ -147,7 +150,7 @@ edges are reused? part.edges(Select.NEW) -.. figure:: assets/selectors_operators/selectors_select_new_none.png +.. figure:: assets/topology_selection/selectors_select_new_none.png :align: center ``Select.NEW`` edges when box and cylinder don't intersect @@ -158,7 +161,8 @@ only completely new edges created by the operation. .. note:: - Chamfer and fillet modify the current object, but do not have new edges. + Chamfer and fillet modify the current object, but do not have new edges via + ``Select.NEW``. .. code-block:: python @@ -170,11 +174,44 @@ only completely new edges created by the operation. part.edges(Select.NEW) - .. figure:: assets/selectors_operators/selectors_select_new_fillet.png + .. figure:: assets/topology_selection/selectors_select_new_fillet.png :align: center Left, ``Select.NEW`` returns no edges after fillet. Right, ``Select.LAST`` +Select New Edges In Algebra Mode +================================ + +The utility method ``new_edges`` compares one or more shape objects to a +another "combined" shape object and returns the edges new to the combined shape. +``new_edges`` is available both Algebra mode or Builder mode, but is necessary in +Algebra Mode where ``Select.NEW`` is unavailable + +.. code-block:: python + + box = Box(5, 5, 1) + circle = Cylinder(2, 5) + part = box + circle + edges = new_edges(box, circle, combined=part) + +.. figure:: assets/topology_selection/selectors_new_edges.png + :align: center + +``new_edges`` can also find edges created during a chamfer or fillet operation by +comparing the object before the operation to the "combined" object. + +.. code-block:: python + + box = Box(5, 5, 1) + circle = Cylinder(2, 5) + part_before = box + circle + edges = part_before.edges().filter_by(lambda a: a.length == 1) + part = fillet(edges, 1) + edges = new_edges(part_before, combined=part) + +.. figure:: assets/topology_selection/operators_group_area.png + :align: center + .. _operators: ********* @@ -230,7 +267,7 @@ subclass of ``list``, so any list slice can be used. part.vertices().sort_by(Axis.X)[-4:] -.. figure:: assets/selectors_operators/operators_sort_x.png +.. figure:: assets/topology_selection/operators_sort_x.png :align: center | @@ -242,28 +279,28 @@ Examples :maxdepth: 2 :hidden: - selectors_operators/sort_examples + topology_selection/sort_examples .. grid:: 3 :gutter: 3 .. grid-item-card:: SortBy - :img-top: assets/selectors_operators/thumb_sort_sortby.png + :img-top: assets/topology_selection/thumb_sort_sortby.png :link: sort_sortby :link-type: ref .. grid-item-card:: Along Wire - :img-top: assets/selectors_operators/thumb_sort_along_wire.png + :img-top: assets/topology_selection/thumb_sort_along_wire.png :link: sort_along_wire :link-type: ref .. grid-item-card:: Axis - :img-top: assets/selectors_operators/thumb_sort_axis.png + :img-top: assets/topology_selection/thumb_sort_axis.png :link: sort_axis :link-type: ref .. grid-item-card:: Distance From - :img-top: assets/selectors_operators/thumb_sort_distance.png + :img-top: assets/topology_selection/thumb_sort_distance.png :link: sort_distance_from :link-type: ref @@ -272,10 +309,11 @@ Group A ShapeList can be grouped and sorted with the |group_by| method based on a grouping criteria. Grouping can be a great way to organize features without knowing the values of -specific feature properties. Rather than returning a ``Shapelist``, |group_by| returns -a ``GroupBy`` which can be indexed to retrieve a ``Shapelist`` for further operations. -``GroupBy`` groups can also be accessed using a key with the ``group`` method. If the -keys are unknown they can be discovered with ``key_to_group_index``. +specific feature properties. Rather than returning a ``ShapeList``, |group_by| returns +a ``GroupBy``, a list of ``ShapeList`` objects sorted by the grouping criteria. +``GroupBy`` can be printed to view the members of each group, indexed like a list to +retrieve a ``ShapeList``, and be accessed using a key with the ``group`` method. If the +group keys are unknown they can be discovered with ``key_to_group_index``. If we want only the edges from the smallest faces by area we can get the faces, then group by ``SortBy.AREA``. The ``ShapeList`` of smallest faces is available from the first @@ -286,7 +324,7 @@ return a new list of all edges in the previous list. part.faces().group_by(SortBy.AREA)[0].edges()) -.. figure:: assets/selectors_operators/operators_group_area.png +.. figure:: assets/topology_selection/operators_group_area.png :align: center | @@ -298,23 +336,23 @@ Examples :maxdepth: 2 :hidden: - selectors_operators/group_examples + topology_selection/group_examples .. grid:: 3 :gutter: 3 .. grid-item-card:: Axis and Length - :img-top: assets/selectors_operators/thumb_group_axis.png + :img-top: assets/topology_selection/thumb_group_axis.png :link: group_axis :link-type: ref .. grid-item-card:: Hole Area - :img-top: assets/selectors_operators/thumb_group_hole_area.png + :img-top: assets/topology_selection/thumb_group_hole_area.png :link: group_hole_area :link-type: ref .. grid-item-card:: Properties with Keys - :img-top: assets/selectors_operators/thumb_group_properties_with_keys.png + :img-top: assets/topology_selection/thumb_group_properties_with_keys.png :link: group_properties_with_keys :link-type: ref @@ -334,7 +372,7 @@ each face can be checked against a vector direction and filtered accordingly. part.faces().filter_by(lambda f: f.normal_at() == Vector(0, 0, 1)) -.. figure:: assets/selectors_operators/operators_filter_z_normal.png +.. figure:: assets/topology_selection/operators_filter_z_normal.png :align: center | @@ -346,38 +384,38 @@ Examples :maxdepth: 2 :hidden: - selectors_operators/filter_examples + topology_selection/filter_examples .. grid:: 3 :gutter: 3 .. grid-item-card:: GeomType - :img-top: assets/selectors_operators/thumb_filter_geomtype.png + :img-top: assets/topology_selection/thumb_filter_geomtype.png :link: filter_geomtype :link-type: ref .. grid-item-card:: All Edges Circle - :img-top: assets/selectors_operators/thumb_filter_all_edges_circle.png + :img-top: assets/topology_selection/thumb_filter_all_edges_circle.png :link: filter_all_edges_circle :link-type: ref .. grid-item-card:: Axis and Plane - :img-top: assets/selectors_operators/thumb_filter_axisplane.png + :img-top: assets/topology_selection/thumb_filter_axisplane.png :link: filter_axis_plane :link-type: ref .. grid-item-card:: Inner Wire Count - :img-top: assets/selectors_operators/thumb_filter_inner_wire_count.png + :img-top: assets/topology_selection/thumb_filter_inner_wire_count.png :link: filter_inner_wire_count :link-type: ref .. grid-item-card:: Nested Filters - :img-top: assets/selectors_operators/thumb_filter_nested.png + :img-top: assets/topology_selection/thumb_filter_nested.png :link: filter_nested :link-type: ref .. grid-item-card:: Shape Properties - :img-top: assets/selectors_operators/thumb_filter_shape_properties.png + :img-top: assets/topology_selection/thumb_filter_shape_properties.png :link: filter_shape_properties :link-type: ref @@ -391,3 +429,4 @@ Examples .. |group_by| replace:: :meth:`~topology.ShapeList.group_by` .. |filter_by| replace:: :meth:`~topology.ShapeList.filter_by` .. |filter_by_position| replace:: :meth:`~topology.ShapeList.filter_by_position` +.. |ShapeList| replace:: :class:`~topology.ShapeList` diff --git a/docs/selectors_operators/examples/filter_all_edges_circle.py b/docs/topology_selection/examples/filter_all_edges_circle.py similarity index 95% rename from docs/selectors_operators/examples/filter_all_edges_circle.py rename to docs/topology_selection/examples/filter_all_edges_circle.py index 4099962..2531158 100644 --- a/docs/selectors_operators/examples/filter_all_edges_circle.py +++ b/docs/topology_selection/examples/filter_all_edges_circle.py @@ -4,7 +4,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as part: with BuildSketch() as s: diff --git a/docs/selectors_operators/examples/filter_axisplane.py b/docs/topology_selection/examples/filter_axisplane.py similarity index 94% rename from docs/selectors_operators/examples/filter_axisplane.py rename to docs/topology_selection/examples/filter_axisplane.py index 2477360..3bb08ff 100644 --- a/docs/selectors_operators/examples/filter_axisplane.py +++ b/docs/topology_selection/examples/filter_axisplane.py @@ -4,7 +4,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") axis = Axis.Z plane = Plane.XY diff --git a/docs/selectors_operators/examples/filter_geomtype.py b/docs/topology_selection/examples/filter_geomtype.py similarity index 87% rename from docs/selectors_operators/examples/filter_geomtype.py rename to docs/topology_selection/examples/filter_geomtype.py index 245ec2d..cb791cd 100644 --- a/docs/selectors_operators/examples/filter_geomtype.py +++ b/docs/topology_selection/examples/filter_geomtype.py @@ -4,7 +4,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as part: Box(5, 5, 1) diff --git a/docs/selectors_operators/examples/filter_inner_wire_count.py b/docs/topology_selection/examples/filter_inner_wire_count.py similarity index 94% rename from docs/selectors_operators/examples/filter_inner_wire_count.py rename to docs/topology_selection/examples/filter_inner_wire_count.py index c938b18..7f8ef68 100644 --- a/docs/selectors_operators/examples/filter_inner_wire_count.py +++ b/docs/topology_selection/examples/filter_inner_wire_count.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") bracket = import_step(os.path.join(working_path, "nema-17-bracket.step")) faces = bracket.faces() diff --git a/docs/selectors_operators/examples/filter_nested.py b/docs/topology_selection/examples/filter_nested.py similarity index 92% rename from docs/selectors_operators/examples/filter_nested.py rename to docs/topology_selection/examples/filter_nested.py index 95ebfe3..dba8293 100644 --- a/docs/selectors_operators/examples/filter_nested.py +++ b/docs/topology_selection/examples/filter_nested.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as part: Cylinder(15, 2, align=(Align.CENTER, Align.CENTER, Align.MIN)) diff --git a/docs/selectors_operators/examples/filter_shape_properties.py b/docs/topology_selection/examples/filter_shape_properties.py similarity index 91% rename from docs/selectors_operators/examples/filter_shape_properties.py rename to docs/topology_selection/examples/filter_shape_properties.py index e87a757..7a1f39c 100644 --- a/docs/selectors_operators/examples/filter_shape_properties.py +++ b/docs/topology_selection/examples/filter_shape_properties.py @@ -4,7 +4,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as open_box_builder: Box(20, 20, 5) diff --git a/docs/selectors_operators/examples/group_axis.py b/docs/topology_selection/examples/group_axis.py similarity index 89% rename from docs/selectors_operators/examples/group_axis.py rename to docs/topology_selection/examples/group_axis.py index 24c200d..4e95757 100644 --- a/docs/selectors_operators/examples/group_axis.py +++ b/docs/topology_selection/examples/group_axis.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as fins: with GridLocations(4, 6, 4, 4): diff --git a/docs/selectors_operators/examples/group_hole_area.py b/docs/topology_selection/examples/group_hole_area.py similarity index 92% rename from docs/selectors_operators/examples/group_hole_area.py rename to docs/topology_selection/examples/group_hole_area.py index f404db7..43cd53c 100644 --- a/docs/selectors_operators/examples/group_hole_area.py +++ b/docs/topology_selection/examples/group_hole_area.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as part: Cylinder(10, 30, rotation=(90, 0, 0)) diff --git a/docs/selectors_operators/examples/group_properties_with_keys.py b/docs/topology_selection/examples/group_properties_with_keys.py similarity index 96% rename from docs/selectors_operators/examples/group_properties_with_keys.py rename to docs/topology_selection/examples/group_properties_with_keys.py index 85824f7..85c4eaf 100644 --- a/docs/selectors_operators/examples/group_properties_with_keys.py +++ b/docs/topology_selection/examples/group_properties_with_keys.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as part: with BuildSketch(Plane.XZ) as sketch: diff --git a/docs/selectors_operators/examples/selectors_operators.py b/docs/topology_selection/examples/selectors_operators.py similarity index 91% rename from docs/selectors_operators/examples/selectors_operators.py rename to docs/topology_selection/examples/selectors_operators.py index 8cda0b5..e19e613 100644 --- a/docs/selectors_operators/examples/selectors_operators.py +++ b/docs/topology_selection/examples/selectors_operators.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") selectors = [solids, vertices, edges, faces] line = Line((-9, -9), (9, 9)) @@ -91,3 +91,10 @@ save_screenshot(os.path.join(filedir, "operators_group_area.png")) faces = part.faces().filter_by(lambda f: f.normal_at() == Vector(0, 0, 1)) show(part, [f.translate(f.normal_at() * 0.01) for f in faces]) save_screenshot(os.path.join(filedir, "operators_filter_z_normal.png")) + +box = Box(5, 5, 1) +circle = Cylinder(2, 5) +part = box + circle +edges = new_edges(box, circle, combined=part) +show(part, edges) +save_screenshot(os.path.join(filedir, "selectors_new_edges.png")) \ No newline at end of file diff --git a/docs/selectors_operators/examples/sort_along_wire.py b/docs/topology_selection/examples/sort_along_wire.py similarity index 90% rename from docs/selectors_operators/examples/sort_along_wire.py rename to docs/topology_selection/examples/sort_along_wire.py index 654e096..0870d51 100644 --- a/docs/selectors_operators/examples/sort_along_wire.py +++ b/docs/topology_selection/examples/sort_along_wire.py @@ -4,7 +4,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildSketch() as along_wire: Rectangle(48, 16, align=Align.MIN) diff --git a/docs/selectors_operators/examples/sort_axis.py b/docs/topology_selection/examples/sort_axis.py similarity index 91% rename from docs/selectors_operators/examples/sort_axis.py rename to docs/topology_selection/examples/sort_axis.py index 198a597..62074a6 100644 --- a/docs/selectors_operators/examples/sort_axis.py +++ b/docs/topology_selection/examples/sort_axis.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as part: with BuildSketch(Plane.YZ) as profile: diff --git a/docs/selectors_operators/examples/sort_distance_from.py b/docs/topology_selection/examples/sort_distance_from.py similarity index 88% rename from docs/selectors_operators/examples/sort_distance_from.py rename to docs/topology_selection/examples/sort_distance_from.py index 25e853d..8f82b6f 100644 --- a/docs/selectors_operators/examples/sort_distance_from.py +++ b/docs/topology_selection/examples/sort_distance_from.py @@ -5,7 +5,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") boxes = ShapeList( Box(1, 1, 1).scale(0.75 if (i, j) == (1, 2) else 0.25).translate((i, j, 0)) diff --git a/docs/selectors_operators/examples/sort_sortby.py b/docs/topology_selection/examples/sort_sortby.py similarity index 94% rename from docs/selectors_operators/examples/sort_sortby.py rename to docs/topology_selection/examples/sort_sortby.py index 28cbf48..9500e0b 100644 --- a/docs/selectors_operators/examples/sort_sortby.py +++ b/docs/topology_selection/examples/sort_sortby.py @@ -4,7 +4,7 @@ from build123d import * from ocp_vscode import * working_path = os.path.dirname(os.path.abspath(__file__)) -filedir = os.path.join(working_path, "..", "..", "assets", "selectors_operators") +filedir = os.path.join(working_path, "..", "..", "assets", "topology_selection") with BuildPart() as part: Box(5, 5, 1) diff --git a/docs/selectors_operators/filter_examples.rst b/docs/topology_selection/filter_examples.rst similarity index 89% rename from docs/selectors_operators/filter_examples.rst rename to docs/topology_selection/filter_examples.rst index 85bdb9d..f7233b8 100644 --- a/docs/selectors_operators/filter_examples.rst +++ b/docs/topology_selection/filter_examples.rst @@ -25,7 +25,7 @@ operations, and are sometimes necessary e.g. before sorting or filtering by radi :language: python :lines: 15 -.. figure:: ../assets/selectors_operators/filter_geomtype_line.png +.. figure:: ../assets/topology_selection/filter_geomtype_line.png :align: center | @@ -34,7 +34,7 @@ operations, and are sometimes necessary e.g. before sorting or filtering by radi :language: python :lines: 17 -.. figure:: ../assets/selectors_operators/filter_geomtype_cylinder.png +.. figure:: ../assets/topology_selection/filter_geomtype_cylinder.png :align: center | @@ -59,7 +59,7 @@ circular edges selects the counterbore faces that meet the joint criteria. :language: python :lines: 43-47 -.. figure:: ../assets/selectors_operators/filter_all_edges_circle.png +.. figure:: ../assets/topology_selection/filter_all_edges_circle.png :align: center | @@ -86,7 +86,7 @@ Plane will select faces parallel to the plane. part.faces().filter_by(Axis.Z) part.faces().filter_by(Plane.XY) -.. figure:: ../assets/selectors_operators/filter_axisplane.png +.. figure:: ../assets/topology_selection/filter_axisplane.png :align: center | @@ -101,7 +101,7 @@ to 0. The result is faces parallel to the axis or perpendicular to the plane. part.faces().filter_by(lambda f: abs(f.normal_at().dot(Axis.Z.direction) < 1e-6) part.faces().filter_by(lambda f: abs(f.normal_at().dot(Plane.XY.z_dir)) < 1e-6) -.. figure:: ../assets/selectors_operators/filter_dot_axisplane.png +.. figure:: ../assets/topology_selection/filter_dot_axisplane.png :align: center | @@ -129,7 +129,7 @@ and then filtering for the specific inner wire by radius. :language: python :lines: 18-21 -.. figure:: ../assets/selectors_operators/filter_inner_wire_count.png +.. figure:: ../assets/topology_selection/filter_inner_wire_count.png :align: center | @@ -143,7 +143,7 @@ select the top face, and then filter for the circular edges of the inner wires. :language: python :lines: 25-32 -.. figure:: ../assets/selectors_operators/filter_inner_wire_count_linear.png +.. figure:: ../assets/topology_selection/filter_inner_wire_count_linear.png :align: center | @@ -170,7 +170,7 @@ any line edges. :language: python :lines: 26-32 -.. figure:: ../assets/selectors_operators/filter_nested.png +.. figure:: ../assets/topology_selection/filter_nested.png :align: center | @@ -189,7 +189,7 @@ to highlight the resulting fillets. :language: python :lines: 3-4, 8-22 -.. figure:: ../assets/selectors_operators/filter_shape_properties.png +.. figure:: ../assets/topology_selection/filter_shape_properties.png :align: center | \ No newline at end of file diff --git a/docs/selectors_operators/group_examples.rst b/docs/topology_selection/group_examples.rst similarity index 90% rename from docs/selectors_operators/group_examples.rst rename to docs/topology_selection/group_examples.rst index 3653ce7..3f0057b 100644 --- a/docs/selectors_operators/group_examples.rst +++ b/docs/topology_selection/group_examples.rst @@ -17,7 +17,7 @@ result knowing how many edges to expect. :language: python :lines: 4, 9-17 -.. figure:: ../assets/selectors_operators/group_axis_without.png +.. figure:: ../assets/topology_selection/group_axis_without.png :align: center | @@ -29,7 +29,7 @@ group again by length. In both cases, you can select the desired edges from the :language: python :lines: 21-22 -.. figure:: ../assets/selectors_operators/group_axis_with.png +.. figure:: ../assets/topology_selection/group_axis_with.png :align: center | @@ -53,7 +53,7 @@ with the largest hole. :language: python :lines: 21-24 -.. figure:: ../assets/selectors_operators/group_hole_area.png +.. figure:: ../assets/topology_selection/group_hole_area.png :align: center | @@ -79,7 +79,7 @@ then the desired groups are selected with the ``group`` method using the lengths :language: python :lines: 30, 31 -.. figure:: ../assets/selectors_operators/group_length_key.png +.. figure:: ../assets/topology_selection/group_length_key.png :align: center | @@ -101,7 +101,7 @@ and then further specify only the edges the bearings and pins are installed from :language: python :lines: 47-50 -.. figure:: ../assets/selectors_operators/group_radius_key.png +.. figure:: ../assets/topology_selection/group_radius_key.png :align: center | diff --git a/docs/selectors_operators/sort_examples.rst b/docs/topology_selection/sort_examples.rst similarity index 87% rename from docs/selectors_operators/sort_examples.rst rename to docs/topology_selection/sort_examples.rst index 91284a9..a4779fc 100644 --- a/docs/selectors_operators/sort_examples.rst +++ b/docs/topology_selection/sort_examples.rst @@ -30,7 +30,7 @@ be used with``group_by``. :language: python :lines: 19-22 -.. figure:: ../assets/selectors_operators/sort_sortby_length.png +.. figure:: ../assets/topology_selection/sort_sortby_length.png :align: center | @@ -39,7 +39,7 @@ be used with``group_by``. :language: python :lines: 24-27 -.. figure:: ../assets/selectors_operators/sort_sortby_distance.png +.. figure:: ../assets/topology_selection/sort_sortby_distance.png :align: center | @@ -64,7 +64,7 @@ the order is random. :language: python :lines: 14-15 -.. figure:: ../assets/selectors_operators/sort_not_along_wire.png +.. figure:: ../assets/topology_selection/sort_not_along_wire.png :align: center | @@ -76,7 +76,7 @@ radii now increase in order. :language: python :lines: 26-28 -.. figure:: ../assets/selectors_operators/sort_along_wire.png +.. figure:: ../assets/topology_selection/sort_along_wire.png :align: center | @@ -101,7 +101,7 @@ edge can be found sorting along y-axis. :language: python :lines: 22-24 -.. figure:: ../assets/selectors_operators/sort_axis.png +.. figure:: ../assets/topology_selection/sort_axis.png :align: center | @@ -125,7 +125,7 @@ Here we are sorting the boxes by distance from the origin, using an empty ``Vert :language: python :lines: 15-16 -.. figure:: ../assets/selectors_operators/sort_distance_from_origin.png +.. figure:: ../assets/topology_selection/sort_distance_from_origin.png :align: center | @@ -138,7 +138,7 @@ their distance from the largest box. :language: python :lines: 19-20 -.. figure:: ../assets/selectors_operators/sort_distance_from_largest.png +.. figure:: ../assets/topology_selection/sort_distance_from_largest.png :align: center | \ No newline at end of file From 194fc374a960fd79f19722bc4cdedd18126bfafd Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 10 Apr 2025 22:59:28 -0400 Subject: [PATCH 262/518] make_text: Fuse glyphs with multiple overlapping faces --- src/build123d/topology/composite.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index cc33a10..8b24f57 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -379,6 +379,9 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): ) ) + # Fuse glyphs with multiple overlapping faces + text_flat = Compound(Face.fuse(*text_flat.faces())) + # Align the text from the bounding box align_text = tuplify(align, 2) text_flat = text_flat.translate( From bc13d05c9173d561e261feb447d36708da9c853d Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 11 Apr 2025 00:37:45 -0400 Subject: [PATCH 263/518] Revert "make_text: Fuse glyphs with multiple overlapping faces" This reverts commit 194fc374a960fd79f19722bc4cdedd18126bfafd. --- src/build123d/topology/composite.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 8b24f57..cc33a10 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -379,9 +379,6 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): ) ) - # Fuse glyphs with multiple overlapping faces - text_flat = Compound(Face.fuse(*text_flat.faces())) - # Align the text from the bounding box align_text = tuplify(align, 2) text_flat = text_flat.translate( From d2d979cde07eb05c708e560dfa6f0ab8bd17cac5 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 11 Apr 2025 12:11:47 -0400 Subject: [PATCH 264/518] make_text: add enum and ValueError tests --- src/build123d/topology/composite.py | 8 ++++++-- tests/test_build_enums.py | 1 + tests/test_build_sketch.py | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index cc33a10..63bdb14 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -325,7 +325,10 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): }[font_style] if text_align[0] not in [TextAlign.LEFT, TextAlign.CENTER, TextAlign.RIGHT]: - raise ValueError("Horizontal TextAlign must be LEFT, CENTER, or RIGHT") + raise ValueError( + "Horizontal TextAlign must be LEFT, CENTER, or RIGHT. " + f"Got {text_align[0]}" + ) if text_align[1] not in [ TextAlign.BOTTOM, @@ -334,7 +337,8 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): TextAlign.TOPFIRSTLINE, ]: raise ValueError( - "Vertical TextAlign must be BOTTOM, CENTER, TOP, or TOPFIRSTLINE" + "Vertical TextAlign must be BOTTOM, CENTER, TOP, or TOPFIRSTLINE. " + f"Got {text_align[1]}" ) horiz_align = { diff --git a/tests/test_build_enums.py b/tests/test_build_enums.py index 7d06964..df7ba9b 100644 --- a/tests/test_build_enums.py +++ b/tests/test_build_enums.py @@ -55,6 +55,7 @@ class TestEnumRepr(unittest.TestCase): Side, SortBy, Transition, + TextAlign, Unit, Until, ] diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index a29e723..0e2e062 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -370,6 +370,12 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(len(test.sketch.faces()), 4) self.assertEqual(t.faces()[0].normal_at(), Vector(0, 0, 1)) + with self.assertRaises(ValueError): + Text("test", 2, text_align=(TextAlign.BOTTOM, TextAlign.BOTTOM)) + + with self.assertRaises(ValueError): + Text("test", 2, text_align=(TextAlign.LEFT, TextAlign.LEFT)) + def test_trapezoid(self): with BuildSketch() as test: t = Trapezoid(6, 2, 63.434948823) From c4dadd690a74fde2e632cdc3e0356abf6fa72f0f Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 11 Apr 2025 12:15:12 -0400 Subject: [PATCH 265/518] Add TextAlign --- docs/cheat_sheet.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index d99769d..ecdd42d 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -262,6 +262,8 @@ Cheat Sheet +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.SortBy` | LENGTH, RADIUS, AREA, VOLUME, DISTANCE | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ + | :class:`~build_enums.TextAlign` | BOTTOM, CENTER, LEFT, RIGHT, TOP, TOPFIRSTLINE | + +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.Transition` | RIGHT, ROUND, TRANSFORMED | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.Unit` | MC, MM, CM, M, IN, FT | From 2431a054469386a924e22046b002926451257bcd Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 12 Apr 2025 11:39:56 -0400 Subject: [PATCH 266/518] Adding deglob tool to help remove glob imports --- tools/deglob.py | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100755 tools/deglob.py diff --git a/tools/deglob.py b/tools/deglob.py new file mode 100755 index 0000000..5761568 --- /dev/null +++ b/tools/deglob.py @@ -0,0 +1,167 @@ +#!/usr/bin/env python +""" +name: deglob.py +by: Gumyr +date: April 12th 2025 + +desc: + + A command-line script (deglob.py) that scans a Python file for references to + symbols from the build123d library and outputs a 'from build123d import ...' + line listing only the symbols that are actually used by that file. + + This is useful to replace wildcard imports like 'from build123d import *' + with a more explicit import statement. By relying on Python's AST, this + script can detect which build123d names are referenced, then generate + an import statement listing only those names. This practice can help + prevent polluting the global namespace and improve clarity. + + Example: + deglob.py my_build123d_script.py + + After parsing my_build123d_script.py, the script prints a line such as: + from build123d import Workplane, Solid + + Which you can then paste back into the file to replace the glob import. + + Module Contents: + - parse_args(): Parse the command-line argument for the input file path. + - find_used_symbols(): Parse Python source code to find referenced names. + - main(): Orchestrates reading the file, analyzing symbols, and printing + the replacement import line. + + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import argparse +import ast +import sys +from pathlib import Path + +import build123d + + +def parse_args(): + """ + Parse command-line arguments for the deglob tool. + + Returns: + argparse.Namespace: An object containing the parsed command-line arguments: + - build123d_file (Path): Path to the input build123dO file. + """ + parser = argparse.ArgumentParser( + description="Find all the build123d symbols in module." + ) + + # Required positional argument + parser.add_argument("build123d_file", type=Path, help="Path to the build123d file") + + args = parser.parse_args() + + return args + + +def find_used_symbols(source_code: str) -> set[str]: + """find_used_symbols + + Extract all of the symbols from the source code into a set of strings. + + Args: + source_code (str): contents of build123d program + + Returns: + set[str]: extracted symbols + """ + tree = ast.parse(source_code) + + # Is the glob import from build123d used? + from_glob_import = any( + isinstance(node, ast.ImportFrom) + and node.module == "build123d" + and any(alias.name == "*" for alias in node.names) + for node in ast.walk(tree) + ) + if not from_glob_import: + print("Glob import from build123d not found") + sys.exit(0) + + symbols = set() + + # Create a custom version of visit_Name that records the symbol + class SymbolFinder(ast.NodeVisitor): + def visit_Name(self, node): + # node.id is the variable name or symbol + symbols.add(node.id) + self.generic_visit(node) + + SymbolFinder().visit(tree) + return symbols + + +def main(): + """ + Main entry point for the deglob script. + + Steps: + 1. Parse and validate command-line arguments for the target Python file. + 2. Read the file's source code. + 3. Use an AST-based check to confirm whether there is at least one + 'from build123d import *' statement in the code. + 4. Collect all referenced symbol names from the file's abstract syntax tree. + 5. Intersect these names with those found in build123d.__all__ to identify + which build123d symbols are actually used. + 6. Print an import statement that explicitly imports only the used symbols. + + Behavior: + - If no 'from build123d import *' import is found, the script prints + a message and exits. + - If multiple glob imports appear, only a single explicit import line + is generated regardless of the number of glob imports in the file. + - Pre-existing non-glob imports are left unchanged in the user's code; + they may result in redundant imports if the user chooses to keep them. + + Raises: + SystemExit: If the file does not exist or if a glob import statement + isn't found. + """ + # Get the command line arguments + args = parse_args() + + # Check that the build123d file is valid + if not args.build123d_file.exists(): + print(f"Error: file not found - {args.build123d_file}", file=sys.stderr) + sys.exit(1) + + # Read the code + with open(args.build123d_file, "r", encoding="utf-8") as f: + code = f.read() + + # Check for the glob import and extract the symbols + used_symbols = find_used_symbols(code) + + # Find the imported build123d symbols + actual_imports = sorted(used_symbols.intersection(set(build123d.__all__))) + + # Create the import statement to replace the glob import + import_line = f"from build123d import {', '.join(actual_imports)}" + print(import_line) + + +if __name__ == "__main__": + main() From 294095b978c80fbd18c02e09669c999896699b33 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sat, 12 Apr 2025 22:25:38 -0400 Subject: [PATCH 267/518] Text: extend docstring --- src/build123d/objects_sketch.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index cd5452a..f603147 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -538,25 +538,37 @@ class Text(BaseSketchObject): """Sketch Object: Text Create text defined by text string and font size. - May have difficulty finding non-system fonts depending on platform and render default. - font_path defines an exact path to a font file and overrides font. - text_align aligns texts inside bounding box while align the aligns bounding box + Fonts installed to the system can be specified by name and FontStyle. Fonts with + subfamilies not in FontStyle should be specified with the subfamily name, e.g. + "Arial Black". Alternatively, a specific font file can be specified with font_path. + + Note: Windows 10+ users must "Install for all users" for fonts to be found by name. + + Not all fonts have every FontStyle available, however ITALIC and BOLDITALIC will + still italicize the font if the respective font file is not available. + + text_align specifies alignment of text inside the bounding box, while align the + aligns the bounding box itself. + + Optionally, the Text can be positioned on a non-linear edge or wire with a path and + position_on_path. + Args: txt (str): text to render font_size (float): size of the font in model units font (str, optional): font name. Defaults to "Arial" font_path (str, optional): system path to font file. Defaults to None - font_style (Font_Style, optional): font style, REGULAR, BOLD, BOLDITALIC, or ITALIC. - Defaults to Font_Style.REGULAR + font_style (Font_Style, optional): font style, REGULAR, BOLD, BOLDITALIC, or + ITALIC. Defaults to Font_Style.REGULAR text_align (tuple[TextAlign, TextAlign], optional): horizontal text align LEFT, CENTER, or RIGHT. Vertical text align BOTTOM, CENTER, TOP, or TOPFIRSTLINE. Defaults to (TextAlign.CENTER, TextAlign.CENTER) - align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. - Defaults to None + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of + object. Defaults to None path (Edge | Wire, optional): path for text to follow. Defaults to None - position_on_path (float, optional): the relative location on path to position the - text, values must be between 0.0 and 1.0. Defaults to 0.0 + position_on_path (float, optional): the relative location on path to position + the text, values must be between 0.0 and 1.0. Defaults to 0.0 rotation (float, optional): angle to rotate object. Defaults to 0 mode (Mode, optional): combination mode. Defaults to Mode.ADD """ From 1c129b38ab8a7d05f9e05793078a2405e5fff5b3 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 17 Apr 2025 13:44:11 -0400 Subject: [PATCH 268/518] revolve: Fix modulo of revolution_arc to keep expected sign for angle --- src/build123d/operations_part.py | 5 +++-- tests/test_build_part.py | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index a8209bc..c1cd10b 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -464,8 +464,9 @@ def revolve( # Make sure we account for users specifying angles larger than 360 degrees, and # for OCCT not assuming that a 0 degree revolve means a 360 degree revolve - angle = revolution_arc % 360.0 - angle = 360.0 if angle == 0 else angle + sign = 1 if revolution_arc >= 0 else -1 + angle = revolution_arc % (sign * 360.0) + angle = sign * 360.0 if angle == 0 else angle if all([s is None for s in profile_list]): if context is None or (context is not None and not context.pending_faces): diff --git a/tests/test_build_part.py b/tests/test_build_part.py index ec4fe0d..e4cb7fa 100644 --- a/tests/test_build_part.py +++ b/tests/test_build_part.py @@ -412,6 +412,25 @@ class TestRevolve(unittest.TestCase): self.assertLess(test.part.volume, 244 * pi * 20, 5) self.assertGreater(test.part.volume, 100 * pi * 20, 5) + def test_revolve_size(self): + """Verify revolution result matches revolution_arc size and direction""" + ax = Axis.X + sizes = [30, 90, 150, 180, 200, 360, 500, 720, 750] + sizes = [x * -1 for x in sizes[::-1]] + [0] + sizes + for size in sizes: + profile = RegularPolygon(10, 4, align=(Align.CENTER, Align.MIN)) + solid = revolve(profile, axis=ax, revolution_arc=size) + + # Find any rotation edge and and the start tangent normal to the profile + edge = solid.edges().filter_by(GeomType.CIRCLE).sort_by(Edge.length)[-1] + sign = (edge % 0).Z + + expected = size % (sign * 360) + expected = sign * 360 if expected == 0 else expected + result = edge.length / edge.radius / pi * 180 * sign + + self.assertAlmostEqual(expected, result) + # Invalid test # def test_invalid_axis_origin(self): # with BuildPart(): From 2a730b5fef72a53f081d6c5f26d395d68be5d27f Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 18 Apr 2025 14:04:21 -0400 Subject: [PATCH 269/518] Added Location.center to enable sort_by, etc. --- src/build123d/geometry.py | 4 ++++ tests/test_direct_api/test_location.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index af254dd..bf67ad5 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1709,6 +1709,10 @@ class Location: """intersect axis with other &""" return self.intersect(other) + def center(self) -> Vector: + """Return center of the location - useful for sorting""" + return self.position + def to_axis(self) -> Axis: """Convert the location into an Axis""" return Axis.Z.located(self) diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index baf640e..44f9dc0 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -414,6 +414,9 @@ class TestLocation(unittest.TestCase): self.assertEqual(Pos(Vector(1, 2, 3)).position, Vector(1, 2, 3)) self.assertEqual(Pos(1, Y=2, Z=3).position, Vector(1, 2, 3)) + def test_center(self): + self.assertEqual(Location((2, 4, 8), (1, 2, 3)).center(), Vector(2, 4, 8)) + if __name__ == "__main__": unittest.main() From d4cb27414eba0cee76e4c9def7a935fbe521e529 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 18 Apr 2025 20:34:07 -0400 Subject: [PATCH 270/518] Added Location.mirror --- src/build123d/geometry.py | 40 ++++++++++++++++++++++++++ tests/test_direct_api/test_location.py | 22 ++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index bf67ad5..431fed0 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1713,6 +1713,46 @@ class Location: """Return center of the location - useful for sorting""" return self.position + def mirror(self, mirror_plane: Plane) -> Location: + """ + Return a new Location mirrored across the given plane. + + This method reflects both the position and orientation of the current Location + across the specified mirror_plane using affine vector mathematics. + + Due to the mathematical properties of reflection: + - The true mirror of a right-handed coordinate system is a *left-handed* one. + + However, `build123d` requires all coordinate systems to be right-handed. + Therefore, this implementation: + - Reflects the X and Z directions across the mirror plane + - Recomputes the Y direction as: `Y = X × Z` + + This ensures the resulting Location maintains a valid right-handed frame, + while remaining as close as possible to the geometric mirror. + + Args: + mirror_plane (Plane): The plane to mirror across. + + Returns: + Location: A new mirrored Location that preserves right-handedness. + """ + + def mirror_dir(v: Vector, pln: Plane) -> Vector: + return v - 2 * (v.dot(pln.z_dir)) * pln.z_dir + + # Mirror the location position + to_plane = self.position - mirror_plane.origin + distance = to_plane.dot(mirror_plane.z_dir) + pos = self.position - 2 * distance * mirror_plane.z_dir + + # Mirror the orientation + loc_plane = Plane(self) + mx_dir = mirror_dir(loc_plane.x_dir, mirror_plane) + mz_dir = mirror_dir(loc_plane.z_dir, mirror_plane) + + return Location(Plane(origin=pos, x_dir=mx_dir, z_dir=mz_dir)) + def to_axis(self) -> Axis: """Convert the location into an Axis""" return Axis.Z.located(self) diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index 44f9dc0..4d4298e 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -417,6 +417,28 @@ class TestLocation(unittest.TestCase): def test_center(self): self.assertEqual(Location((2, 4, 8), (1, 2, 3)).center(), Vector(2, 4, 8)) + def test_mirror_location(self): + # Original location: positioned at (10, 0, 5) with a rotated orientation + loc = Location((10, 0, 5), (30, 45, 60)) + + # Mirror across the YZ plane (X-flip) + mirror_plane = Plane.YZ + mirrored = loc.mirror(mirror_plane) + + # Check mirrored position + expected_position = Vector(-10, 0, 5) + self.assertEqual( + mirrored.position, + expected_position, + msg=f"Expected position {expected_position}, got {mirrored.position}", + ) + + # Check that the mirrored orientation is still right-handed + plane = Plane(mirrored) + cross = plane.x_dir.cross(plane.y_dir) + dot = cross.dot(plane.z_dir) + self.assertGreater(dot, 0.999, "Orientation is not right-handed") + if __name__ == "__main__": unittest.main() From 0854cac191d17fcc32316eee8a640aa283d026da Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 22 Apr 2025 14:10:29 -0400 Subject: [PATCH 271/518] Fixed normal_at(u,v) Issue #973 --- src/build123d/topology/two_d.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 1f372d2..0c50802 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1351,8 +1351,8 @@ class Face(Mixin2D, Shape[TopoDS_Face]): if surface_point is None: u_val0, u_val1, v_val0, v_val1 = self._uv_bounds() - u_val = u * (u_val0 + u_val1) - v_val = v * (v_val0 + v_val1) + u_val = u_val0 + u * (u_val1 - u_val0) + v_val = v_val0 + v * (v_val1 - v_val0) else: # project point on surface projector = GeomAPI_ProjectPointOnSurf( From 739368c41720b3a2f45438fd8b87f4c105872780 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 22 Apr 2025 15:40:25 -0400 Subject: [PATCH 272/518] Updating location_at use normal_at(u,v) --- src/build123d/topology/two_d.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 0c50802..3c918bb 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1232,9 +1232,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): """Location at the u/v position of face""" origin = self.position_at(u, v) if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(origin)) + pln = Plane(origin, z_dir=self.normal_at(u, v)) else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(origin)) + pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(u, v)) return Location(pln) def make_holes(self, interior_wires: list[Wire]) -> Face: From 6590df1e65d98cf4d95a0803836a4fb95bd6a099 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 23 Apr 2025 20:17:02 -0400 Subject: [PATCH 273/518] Fixed Issue #843 added is_forward to Edge parameter methods --- src/build123d/topology/one_d.py | 75 +++++++++++++++++++++++------- tests/test_build_part.py | 26 ++++++++--- tests/test_direct_api/test_edge.py | 65 +++++++++++++++++++++++++- tests/test_direct_api/test_wire.py | 2 - 4 files changed, 141 insertions(+), 27 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index aae9cb9..0b6a559 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -506,7 +506,7 @@ class Mixin1D(Shape): Note that circles may have identical start and end points. """ curve = self.geom_adaptor() - umax = curve.LastParameter() + umax = curve.LastParameter() if self.is_forward else curve.FirstParameter() return Vector(curve.Value(umax)) @@ -546,6 +546,12 @@ class Mixin1D(Shape): """ curve = self.geom_adaptor() + if not self.is_forward: + if position_mode == PositionMode.PARAMETER: + distance = 1 - distance + else: + distance = self.length - distance + if position_mode == PositionMode.PARAMETER: param = self.param_at(distance) else: @@ -595,7 +601,9 @@ class Mixin1D(Shape): ) loc = Location(TopLoc_Location(transformation)) - return loc + if self.is_forward: + return loc + return -loc def locations( self, @@ -822,8 +830,12 @@ class Mixin1D(Shape): curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: + if not self.is_forward: + distance = 1 - distance param = self.param_at(distance) else: + if not self.is_forward: + distance = self.length - distance param = self.param_at(distance / self.length) return Vector(curve.Value(param)) @@ -1120,7 +1132,7 @@ class Mixin1D(Shape): Note that circles may have identical start and end points. """ curve = self.geom_adaptor() - umin = curve.FirstParameter() + umin = curve.FirstParameter() if self.is_forward else curve.LastParameter() return Vector(curve.Value(umin)) @@ -1169,6 +1181,12 @@ class Mixin1D(Shape): Returns: Vector: tangent value """ + if not self.is_forward: + if position_mode == PositionMode.PARAMETER: + position = 1 - position + else: + position = self.length - position + if isinstance(position, (float, int)): curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: @@ -1198,7 +1216,9 @@ class Mixin1D(Shape): res = gp_Vec() curve.D1(parameter, tmp, res) - return Vector(gp_Dir(res)) + if self.is_forward: + return Vector(gp_Dir(res)) + return Vector(gp_Dir(res)) * -1 def vertex(self) -> Vertex | None: """Return the Vertex""" @@ -2089,16 +2109,29 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): projected_edges = [w.edges()[0] for w in projected_wires] return projected_edges - def reversed(self) -> Edge: - """Return a copy of self with the opposite orientation""" + def reversed(self, reconstruct: bool = False) -> Edge: + """reversed + + Return a copy of self with the opposite orientation. + + Args: + reconstruct (bool, optional): rebuild edge instead of setting OCCT flag. + Defaults to False. + + Returns: + Edge: reversed + """ reversed_edge = copy.deepcopy(self) - first: float = self.param_at(0) - last: float = self.param_at(1) - curve = BRep_Tool.Curve_s(self.wrapped, first, last) - first = curve.ReversedParameter(first) - last = curve.ReversedParameter(last) - topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() - reversed_edge.wrapped = topods_edge + if reconstruct: + first: float = self.param_at(0) + last: float = self.param_at(1) + curve = BRep_Tool.Curve_s(self.wrapped, first, last) + first = curve.ReversedParameter(first) + last = curve.ReversedParameter(last) + topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() + reversed_edge.wrapped = topods_edge + else: + reversed_edge.wrapped = downcast(self.wrapped.Reversed()) return reversed_edge def to_axis(self) -> Axis: @@ -2805,10 +2838,18 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): def order_edges(self) -> ShapeList[Edge]: """Return the edges in self ordered by wire direction and orientation""" - ordered_edges = [ - e if e.is_forward else e.reversed() for e in self.edges().sort_by(self) - ] - return ShapeList(ordered_edges) + + sorted_edges = self.edges().sort_by(self) + ordered_edges = ShapeList([sorted_edges[0]]) + + for edge in sorted_edges[1:]: + last_edge = ordered_edges[-1] + if abs(last_edge @ 1 - edge @ 0) < TOLERANCE: + ordered_edges.append(edge) + else: + ordered_edges.append(edge.reversed()) + + return ordered_edges def param_at_point(self, point: VectorLike) -> float: """Parameter at point on Wire""" diff --git a/tests/test_build_part.py b/tests/test_build_part.py index e4cb7fa..f573847 100644 --- a/tests/test_build_part.py +++ b/tests/test_build_part.py @@ -415,20 +415,32 @@ class TestRevolve(unittest.TestCase): def test_revolve_size(self): """Verify revolution result matches revolution_arc size and direction""" ax = Axis.X + profile = RegularPolygon(10, 4, align=(Align.CENTER, Align.MIN)) + full_volume = revolve(profile, ax, 360).volume sizes = [30, 90, 150, 180, 200, 360, 500, 720, 750] sizes = [x * -1 for x in sizes[::-1]] + [0] + sizes for size in sizes: - profile = RegularPolygon(10, 4, align=(Align.CENTER, Align.MIN)) solid = revolve(profile, axis=ax, revolution_arc=size) - # Find any rotation edge and and the start tangent normal to the profile - edge = solid.edges().filter_by(GeomType.CIRCLE).sort_by(Edge.length)[-1] + # Create a rotation edge and and the start tangent normal to the profile + edge = Edge.make_circle( + 1, + Plane.YZ, + 0, + size % 360, + ( + AngularDirection.COUNTER_CLOCKWISE + if size > 0 + else AngularDirection.CLOCKWISE + ), + ) sign = (edge % 0).Z expected = size % (sign * 360) expected = sign * 360 if expected == 0 else expected result = edge.length / edge.radius / pi * 180 * sign + self.assertAlmostEqual(solid.volume, full_volume * abs(expected) / 360) self.assertAlmostEqual(expected, result) # Invalid test @@ -506,10 +518,10 @@ class TestThicken(unittest.TestCase): outer_sphere = thicken(non_planar, amount=0.1) self.assertAlmostEqual(outer_sphere.volume, (4 / 3) * pi * (1.1**3 - 1**3), 5) - wire = JernArc((0, 0), (-1, 0), 1, 180).edge().reversed() + JernArc( - (0, 0), (1, 0), 2, -90 - ) - part = thicken(sweep((wire ^ 0) * RadiusArc((0, 0), (0, -1), 1), wire), 0.4) + wire = JernArc((0, -2), (-1, 0), 1, -180) + JernArc((0, 0), (1, 0), 2, -90) + + surface = sweep((wire ^ 0) * RadiusArc((0, 0), (0, -1), 1), wire) + part = thicken(surface, 0.4) self.assertAlmostEqual(part.volume, 2.241583787221904, 5) part = thicken( diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 3eb2da5..97acf57 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -29,7 +29,7 @@ license: import math import unittest -from build123d.build_enums import AngularDirection, GeomType, Transition +from build123d.build_enums import AngularDirection, GeomType, PositionMode, Transition from build123d.geometry import Axis, Plane, Vector from build123d.objects_curve import CenterArc, EllipticalCenterArc from build123d.objects_sketch import Circle, Rectangle, RegularPolygon @@ -282,6 +282,9 @@ class TestEdge(unittest.TestCase): e2r = e2.reversed() self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) + e2r = e2.reversed(reconstruct=True) + self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) + def test_init(self): with self.assertRaises(TypeError): Edge(direction=(1, 0, 0)) @@ -294,6 +297,66 @@ class TestEdge(unittest.TestCase): self.assertEqual(len(inside_edges), 5) self.assertTrue(all(e.geom_type == GeomType.ELLIPSE for e in inside_edges)) + def test_position_at(self): + line = Edge.make_line((1, 1), (2, 2)) + self.assertEqual(line @ 0, Vector(1, 1, 0)) + self.assertEqual(line @ 1, Vector(2, 2, 0)) + self.assertEqual(line.reversed() @ 0, Vector(2, 2, 0)) + self.assertEqual(line.reversed() @ 1, Vector(1, 1, 0)) + + self.assertEqual( + line.position_at(1, position_mode=PositionMode.LENGTH), + Vector(1, 1) + Vector(math.sqrt(2) / 2, math.sqrt(2) / 2), + ) + self.assertEqual( + line.reversed().position_at(1, position_mode=PositionMode.LENGTH), + Vector(2, 2) - Vector(math.sqrt(2) / 2, math.sqrt(2) / 2), + ) + + def test_tangent_at(self): + arc = Edge.make_circle(1, start_angle=0, end_angle=180) + self.assertEqual(arc % 0, Vector(0, 1, 0)) + self.assertEqual(arc % 1, Vector(0, -1, 0)) + self.assertEqual(arc.reversed() % 0, Vector(0, 1, 0)) + self.assertEqual(arc.reversed() % 1, Vector(0, -1, 0)) + self.assertEqual(arc.reversed() @ 0, Vector(-1, 0, 0)) + self.assertEqual(arc.reversed() @ 1, Vector(1, 0, 0)) + + self.assertEqual( + arc.tangent_at(math.pi, position_mode=PositionMode.LENGTH), Vector(0, -1, 0) + ) + self.assertEqual( + arc.reversed().tangent_at(math.pi / 2, position_mode=PositionMode.LENGTH), + Vector(1, 0, 0), + ) + + def test_location_at(self): + arc = Edge.make_circle(1, start_angle=0, end_angle=180) + self.assertEqual(arc.location_at(0).position, Vector(1, 0, 0)) + self.assertEqual(arc.location_at(1).position, Vector(-1, 0, 0)) + self.assertEqual(arc.location_at(0).z_axis.direction, Vector(0, 1, 0)) + self.assertEqual(arc.location_at(1).z_axis.direction, Vector(0, -1, 0)) + + self.assertEqual(arc.reversed().location_at(0).position, Vector(-1, 0, 0)) + self.assertEqual(arc.reversed().location_at(1).position, Vector(1, 0, 0)) + self.assertEqual( + arc.reversed().location_at(0).z_axis.direction, Vector(0, 1, 0) + ) + self.assertEqual( + arc.reversed().location_at(1).z_axis.direction, Vector(0, -1, 0) + ) + + self.assertEqual( + arc.location_at(math.pi, position_mode=PositionMode.LENGTH).position, + Vector(-1, 0, 0), + ) + self.assertEqual( + arc.reversed() + .location_at(math.pi, position_mode=PositionMode.LENGTH) + .position, + Vector(1, 0, 0), + ) + if __name__ == "__main__": unittest.main() diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py index c3295e3..3391b88 100644 --- a/tests/test_direct_api/test_wire.py +++ b/tests/test_direct_api/test_wire.py @@ -182,8 +182,6 @@ class TestWire(unittest.TestCase): ] ) ordered_edges = w1.order_edges() - self.assertFalse(all(e.is_forward for e in w1.edges())) - self.assertTrue(all(e.is_forward for e in ordered_edges)) self.assertAlmostEqual(ordered_edges[0] @ 0, (0, 0, 0), 5) self.assertAlmostEqual(ordered_edges[1] @ 0, (1, 0, 0), 5) self.assertAlmostEqual(ordered_edges[2] @ 0, (1, 1, 0), 5) From 3920086bd9242b71638a296292c8629033416f4c Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 23 Apr 2025 21:43:34 -0400 Subject: [PATCH 274/518] Fixing typing problems --- src/build123d/topology/one_d.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 0b6a559..4fbe3e1 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1181,13 +1181,14 @@ class Mixin1D(Shape): Returns: Vector: tangent value """ - if not self.is_forward: - if position_mode == PositionMode.PARAMETER: - position = 1 - position - else: - position = self.length - position if isinstance(position, (float, int)): + if not self.is_forward: + if position_mode == PositionMode.PARAMETER: + position = 1 - position + else: + position = self.length - position + curve = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: parameter = self.param_at(position) @@ -2121,6 +2122,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Returns: Edge: reversed """ + if self.wrapped is None: + raise ValueError("An empty edge can't be reversed") + + assert isinstance(self.wrapped, TopoDS_Edge) + reversed_edge = copy.deepcopy(self) if reconstruct: first: float = self.param_at(0) From ed5e0307e3a9db741c0bad007abb99822a49911a Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 24 Apr 2025 11:54:15 -0400 Subject: [PATCH 275/518] Fixed full_round Issue #972 --- src/build123d/operations_sketch.py | 101 +++++++++++++---------------- tests/test_build_sketch.py | 18 +++++ 2 files changed, 63 insertions(+), 56 deletions(-) diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index 4883be5..8dfc9d8 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -31,6 +31,7 @@ from __future__ import annotations from collections.abc import Iterable from scipy.spatial import Voronoi +from typing import cast from build123d.build_enums import Mode, SortBy from build123d.topology import ( Compound, @@ -43,7 +44,7 @@ from build123d.topology import ( topo_explore_connected_edges, topo_explore_common_vertex, ) -from build123d.geometry import Vector, TOLERANCE +from build123d.geometry import Plane, Vector, TOLERANCE from build123d.build_common import flatten_sequence, validate_inputs from build123d.build_sketch import BuildSketch @@ -82,6 +83,9 @@ def full_round( raise ValueError("A single Edge must be provided") validate_inputs(context, "full_round", edge) + if edge.topo_parent is None: + raise ValueError("edge must be extracted from shape") + # # Generate a set of evenly spaced points along the given edge and the # edges connected to it and use them to generate the Voronoi vertices @@ -112,24 +116,19 @@ def full_round( (float("inf"), int()), (float("inf"), int()), ] - for i, v in enumerate(voronoi_vertices): - distances = [edge_group[i].distance_to(v) for i in range(3)] + distances = [edge.distance_to(v) for edge in edge_group] avg_distance = sum(distances) / 3 - differences = max(abs(dist - avg_distance) for dist in distances) + difference = max(abs(d - avg_distance) for d in distances) - # Check if this delta is among the three smallest and update best_three if so - # Compare with the largest delta in the best three - if differences < best_three[-1][0]: - # Replace the last element with the new one - best_three[-1] = (differences, i) - # Sort the list to keep the smallest deltas first + # Prefer vertices with minimal difference + if difference < best_three[-1][0]: + best_three[-1] = (difference, i) best_three.sort(key=lambda x: x[0]) - # Extract the indices of the best three and average them - best_indices = [x[1] for x in best_three] - voronoi_circle_center: Vector = ( - sum((voronoi_vertices[i] for i in best_indices), Vector(0, 0, 0)) / 3.0 + # Refine by averaging the best three + voronoi_circle_center = ( + sum((voronoi_vertices[i] for _, i in best_three), Vector(0, 0, 0)) / 3 ) # Determine where the connected edges intersect with the largest empty circle @@ -137,67 +136,57 @@ def full_round( e.distance_to_with_closest_points(voronoi_circle_center)[1] for e in connected_edges ] + + # Determine where the target edge intersects with the largest empty circle middle_edge_arc_point = edge.distance_to_with_closest_points(voronoi_circle_center)[ 1 ] + + # Trim the connected edges to allow room for the circular feature + origin = sum(connected_edges_end_points, Vector(0, 0, 0)) / 2 + x_dir = (connected_edges_end_points[1] - connected_edges_end_points[0]).normalized() + to_arc_vec = origin - middle_edge_arc_point + # Project `to_arc_vec` onto the plane perpendicular to `x_dir` + z_dir = (to_arc_vec - x_dir * to_arc_vec.dot(x_dir)).normalized() + + split_pln = Plane(origin=origin, x_dir=x_dir, z_dir=z_dir) + trimmed_connected_edges = [e.split(split_pln) for e in connected_edges] + typed_trimmed_connected_edges = [] + for trimmed_edge in trimmed_connected_edges: + if trimmed_edge is None: + raise ValueError("Invalid geometry to create the end arc") + assert isinstance(trimmed_edge, Edge) + typed_trimmed_connected_edges.append(trimmed_edge) # Make mypy happy + + # Flip the middle point if the user wants the concave solution if invert: middle_edge_arc_point = voronoi_circle_center * 2 - middle_edge_arc_point - connected_edges_end_params = [ - e.param_at_point(connected_edges_end_points[i]) - for i, e in enumerate(connected_edges) - ] - for param in connected_edges_end_params: - if not 0.0 < param < 1.0: - raise ValueError("Invalid geometry to create the end arc") - - common_vertex_points = [ - Vector(topo_explore_common_vertex(edge, e)) for e in connected_edges - ] - common_vertex_params = [ - e.param_at_point(common_vertex_points[i]) for i, e in enumerate(connected_edges) - ] - - # Trim the connected edges to end at the closest points to the circle center - trimmed_connected_edges = [ - e.trim(*sorted([1.0 - common_vertex_params[i], connected_edges_end_params[i]])) - for i, e in enumerate(connected_edges) - ] - # Record the position of the newly trimmed connected edges to build the arc - # accurately - trimmed_end_points = [] - for i in range(2): - if ( - trimmed_connected_edges[i].position_at(0) - - connected_edges[i].position_at(0) - ).length < TOLERANCE: - trimmed_end_points.append(trimmed_connected_edges[i].position_at(1)) - else: - trimmed_end_points.append(trimmed_connected_edges[i].position_at(0)) # Generate the new circular edge new_arc = Edge.make_three_point_arc( - trimmed_end_points[0], + connected_edges_end_points[0], middle_edge_arc_point, - trimmed_end_points[1], + connected_edges_end_points[1], ) # Recover other edges - if edge.topo_parent is None: - other_edges: ShapeList[Edge] = ShapeList() - else: - other_edges = ( - edge.topo_parent.edges() - - topo_explore_connected_edges(edge) - - ShapeList([edge]) - ) + other_edges = ( + edge.topo_parent.edges() + - topo_explore_connected_edges(edge) + - ShapeList([edge]) + ) # Rebuild the face # Note that the longest wire must be the perimeter and others holes face_wires = Wire.combine( - trimmed_connected_edges + [new_arc] + other_edges + typed_trimmed_connected_edges + [new_arc] + other_edges ).sort_by(SortBy.LENGTH, reverse=True) pending_face = Face(face_wires[0], face_wires[1:]) + # Flip the face to match the original parent + if edge.topo_parent.faces()[0].normal_at() != pending_face.normal_at(): + pending_face = -pending_face + if context is not None: context._add_to_context(pending_face, mode=mode) context.pending_edges = ShapeList() diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 205bebf..874a3ba 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -494,6 +494,9 @@ class TestBuildSketchObjects(unittest.TestCase): with self.assertRaises(ValueError): full_round(trap.edges().sort_by(Axis.X)[-1]) + with self.assertRaises(ValueError): + full_round(Edge.make_line((0, 0), (1, 0))) + l1 = Edge.make_spline([(-1, 0), (1, 0)], tangents=((0, -8), (0, 8)), scale=True) l2 = Edge.make_line(l1 @ 0, l1 @ 1) face = Face(Wire([l1, l2])) @@ -508,6 +511,21 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertAlmostEqual(r1, r2, 2) self.assertTupleAlmostEquals(tuple(c1), tuple(c2), 2) + rect = Rectangle(34, 10) + convex_rect = full_round((rect.edges() << Axis.X)[0])[0] + concave_rect = full_round((rect.edges() << Axis.X)[0], invert=True)[0] + self.assertLess(convex_rect.area, rect.area) + self.assertLess(concave_rect.area, convex_rect.area) + + tri = Triangle(a=10, b=10, c=10) + tri_round = full_round(tri.edges().sort_by(Axis.X)[0])[0] + self.assertLess(tri_round.area, tri.area) + + # Test flipping the face + flipped = -Rectangle(34, 10).face() + rounded = full_round((flipped.edges() << Axis.X)[0])[0].face() + self.assertEqual(flipped.normal_at(), rounded.normal_at()) + @pytest.mark.parametrize( "slot,args", From 890f1a540b9e78b4b2dcfc802136b1b38ecceb0d Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 25 Apr 2025 11:57:01 -0400 Subject: [PATCH 276/518] Fixed normal_at bug when passed a Vector --- src/build123d/geometry.py | 4 ++++ src/build123d/topology/two_d.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 431fed0..041ec61 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -144,6 +144,10 @@ class Vector: """ + # Note: Vector can't be made into a Sequence as NumPy attempts to be "helpful" by + # auto-converting array-like objects (objects with __len__() and indexing) into NumPy + # arrays during certain arithmetic operations. + # pylint: disable=too-many-public-methods _wrapped: gp_Vec _dim = 0 diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 3c918bb..d6ea1e2 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1325,7 +1325,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): surface_point, u, v = None, -1.0, -1.0 if args: - if isinstance(args[0], Sequence): + if isinstance(args[0], (Vector, Sequence)): surface_point = args[0] elif isinstance(args[0], (int, float)): u = args[0] From 846878f879be6810f668e97a1325993f8196872a Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Sat, 26 Apr 2025 00:21:20 -0700 Subject: [PATCH 277/518] Resolve deprecation warnings of regex library Signed-off-by: Emmanuel Ferdman --- tests/test_direct_api/test_assembly.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_direct_api/test_assembly.py b/tests/test_direct_api/test_assembly.py index 7ac43be..71e862b 100644 --- a/tests/test_direct_api/test_assembly.py +++ b/tests/test_direct_api/test_assembly.py @@ -49,7 +49,7 @@ class TestAssembly(unittest.TestCase): actual_topo_lines = actual_topo.splitlines() self.assertEqual(len(actual_topo_lines), len(expected_topo_lines)) for actual_line, expected_line in zip(actual_topo_lines, expected_topo_lines): - start, end = re.split(r"at 0x[0-9a-f]+,", expected_line, 2, re.I) + start, end = re.split(r"at 0x[0-9a-f]+,", expected_line, maxsplit=2, flags=re.I) self.assertTrue(actual_line.startswith(start)) self.assertTrue(actual_line.endswith(end)) From 8f344871a61870cfdb67d5ff8b1457e9989f6809 Mon Sep 17 00:00:00 2001 From: Nicholas Devenish Date: Sun, 27 Apr 2025 16:22:38 +0100 Subject: [PATCH 278/518] Add explicit scipy dependency This is used in several places e.g. topology/one_d.py but was previously being pulled in implicitly via svgpathtools. --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index d888355..78a1104 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,7 @@ dependencies = [ "ocpsvg >= 0.5, < 0.6", "trianglesolver", "sympy", + "scipy", ] [project.urls] From 3ef537d640f2bd9badf13bfc2b1ae39aef395c60 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 29 Apr 2025 13:55:24 -0500 Subject: [PATCH 279/518] pyproject.toml -> update ipython version pin to include v9.x.x --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d888355..552b442 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ "svgpathtools >= 1.5.1, < 2", "anytree >= 2.8.0, < 3", "ezdxf >= 1.1.0, < 2", - "ipython >= 8.0.0, < 9", + "ipython >= 8.0.0, < 10", "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", "trianglesolver", From 2374c26898a5728e6f3ce410bde14193fdc6c260 Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Tue, 29 Apr 2025 12:19:26 -0700 Subject: [PATCH 280/518] Resolve deprecation warnings of regex library Signed-off-by: Emmanuel Ferdman --- tests/test_direct_api/test_shape_list.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py index c1c967f..643221d 100644 --- a/tests/test_direct_api/test_shape_list.py +++ b/tests/test_direct_api/test_shape_list.py @@ -64,14 +64,14 @@ class TestShapeList(unittest.TestCase): actual_lines = actual.splitlines() self.assertEqual(len(actual_lines), len(expected_lines)) for actual_line, expected_line in zip(actual_lines, expected_lines): - start, end = re.split(r"at 0x[0-9a-f]+", expected_line, 2, re.I) + start, end = re.split(r"at 0x[0-9a-f]+", expected_line, maxsplit=2, flags=re.I) self.assertTrue(actual_line.startswith(start)) self.assertTrue(actual_line.endswith(end)) def assertDunderReprEqual(self, actual: str, expected: str): splitter = r"at 0x[0-9a-f]+" - actual_split_list = re.split(splitter, actual, 0, re.I) - expected_split_list = re.split(splitter, expected, 0, re.I) + actual_split_list = re.split(splitter, actual, maxsplit=0, flags=re.I) + expected_split_list = re.split(splitter, expected, maxsplit=0, flags=re.I) for actual_split, expected_split in zip(actual_split_list, expected_split_list): self.assertEqual(actual_split, expected_split) From 60cd260e74a69c56ad7b4159e8f0bc2433659055 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 1 May 2025 10:03:33 -0400 Subject: [PATCH 281/518] Adding wrap feature --- src/build123d/topology/one_d.py | 42 +++ src/build123d/topology/two_d.py | 427 ++++++++++++++++++++++++++++- tests/test_direct_api/test_edge.py | 17 +- tests/test_direct_api/test_face.py | 60 +++- 4 files changed, 538 insertions(+), 8 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 4fbe3e1..51fae46 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -116,6 +116,7 @@ from OCP.GeomFill import ( GeomFill_Frenet, GeomFill_TrihedronLaw, ) +from OCP.GeomProjLib import GeomProjLib from OCP.HLRAlgo import HLRAlgo_Projector from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds @@ -1810,6 +1811,47 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return locations + def _extend_spline( + self, + at_start: bool, + geom_surface: Geom_Surface, + extension_factor: float = 0.1, + ): + """Helper method to slightly extend an edge that is bound to a surface""" + if self.geom_type != GeomType.BSPLINE: + raise TypeError("_extend_spline only works with splines") + + u_start: float = self.param_at(0) + u_end: float = self.param_at(1) + + curve_original = BRep_Tool.Curve_s(self.wrapped, u_start, u_end) + n_poles = curve_original.NbPoles() + poles = [curve_original.Pole(i + 1) for i in range(n_poles)] + # Find position and tangent past end of spline to extend it + ends = (-extension_factor, 1) if at_start else (0, 1 + extension_factor) + if at_start: + new_pole = self.position_at(-extension_factor).to_pnt() + poles = [new_pole] + poles + else: + new_pole = self.position_at(1 + extension_factor).to_pnt() + poles = poles + [new_pole] + tangents: list[VectorLike] = [self.tangent_at(p) for p in ends] + + pnts: list[VectorLike] = [Vector(p) for p in poles] + extended_edge = Edge.make_spline(pnts, tangents=tangents) + + geom_curve = BRep_Tool.Curve_s( + extended_edge.wrapped, extended_edge.param_at(0), extended_edge.param_at(1) + ) + snapped_geom_curve = GeomProjLib.Project_s(geom_curve, geom_surface) + if snapped_geom_curve is None: + raise RuntimeError("Failed to snap extended edge to surface") + + # Build a new projected edge + snapped_edge = Edge(BRepBuilderAPI_MakeEdge(snapped_geom_curve).Edge()) + + return snapped_edge, snapped_geom_curve + def find_intersection_points( self, other: Axis | Edge | None = None, tolerance: float = TOLERANCE ) -> ShapeList[Vector]: diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index d6ea1e2..6a46c58 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -56,8 +56,9 @@ license: from __future__ import annotations import copy +import sys import warnings -from typing import Any, overload, TYPE_CHECKING +from typing import Any, overload, TypeVar, TYPE_CHECKING from collections.abc import Iterable, Sequence @@ -66,7 +67,11 @@ from OCP.BRep import BRep_Tool, BRep_Builder from OCP.BRepAdaptor import BRepAdaptor_Surface from OCP.BRepAlgo import BRepAlgo from OCP.BRepAlgoAPI import BRepAlgoAPI_Common -from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakeShell +from OCP.BRepBuilderAPI import ( + BRepBuilderAPI_MakeFace, + BRepBuilderAPI_MakeEdge, + BRepBuilderAPI_MakeWire, +) from OCP.BRepClass3d import BRepClass3d_SolidClassifier from OCP.BRepFill import BRepFill from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d @@ -76,10 +81,15 @@ from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeFilling, BRepOffsetAPI_MakePipeS from OCP.BRepTools import BRepTools, BRepTools_ReShape from OCP.GProp import GProp_GProps from OCP.Geom import Geom_BezierSurface, Geom_Surface, Geom_RectangularTrimmedSurface -from OCP.GeomAPI import GeomAPI_PointsToBSplineSurface, GeomAPI_ProjectPointOnSurf +from OCP.GeomAPI import ( + GeomAPI_ExtremaCurveCurve, + GeomAPI_PointsToBSplineSurface, + GeomAPI_ProjectPointOnSurf, +) from OCP.GeomAbs import GeomAbs_C0 +from OCP.GeomProjLib import GeomProjLib from OCP.Precision import Precision -from OCP.ShapeFix import ShapeFix_Solid +from OCP.ShapeFix import ShapeFix_Solid, ShapeFix_Wire from OCP.Standard import ( Standard_Failure, Standard_NoSuchObject, @@ -89,7 +99,7 @@ from OCP.StdFail import StdFail_NotDone from OCP.TColStd import TColStd_HArray2OfReal from OCP.TColgp import TColgp_HArray2OfPnt from OCP.TopExp import TopExp -from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape +from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid from OCP.gce import gce_MakeLin from OCP.gp import gp_Pnt, gp_Vec @@ -131,7 +141,9 @@ from .zero_d import Vertex if TYPE_CHECKING: # pragma: no cover from .three_d import Solid # pylint: disable=R0801 - from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 + from .composite import Compound, Curve # pylint: disable=R0801 + +T = TypeVar("T", Edge, Wire, "Face") class Mixin2D(Shape): @@ -256,6 +268,132 @@ class Mixin2D(Shape): """shells - all the shells in this Shape""" return Shape.get_shape_list(self, "Shell") + def _wrap_edge( + self, + planar_edge: Edge, + surface_loc: Location, + snap_to_face: bool = True, + tolerance: float = 0.001, + ) -> Edge: + """_wrap_edge + + Helper method of wrap that handles wrapping edges on surfaces (Face or Shell). + + Args: + planar_edge (Edge): edge to wrap around surface + surface_loc (Location): location on surface to wrap + snap_to_face (bool,optional): ensure wrapped edge is tight against surface. + Defaults to True. + tolerance (float, optional): maximum allowed length error during initial wrapping + operation. Defaults to 0.001 + + Raises: + RuntimeError: wrapping over surface boundary, try difference surface_loc + Returns: + Edge: wraped edge + """ + + def _intersect_surface_normal( + point: Vector, direction: Vector + ) -> tuple[Vector, Vector]: + """Return the intersection point and normal of the closest surface face + along direction""" + axis = Axis(point, direction) + face = self.faces_intersected_by_axis(axis).sort_by( + lambda f: f.distance_to(point) + )[0] + intersections = face.find_intersection_points(axis) + if not intersections: + raise RuntimeError( + "wrapping over surface boundary, try difference surface_loc" + ) + return min(intersections, key=lambda pair: abs(pair[0] - point)) + + def _find_point_on_surface( + current_point: Vector, normal: Vector, relative_position: Vector + ) -> tuple[Vector, Vector]: + """Project a 2D offset from a local surface frame onto the 3D surface""" + local_plane = Plane( + origin=current_point, + x_dir=surface_x_direction, + z_dir=normal, + ) + world_point = local_plane.from_local_coords(relative_position) + return _intersect_surface_normal( + world_point, world_point - target_object_center + ) + + # Initial setup + target_object_center = self.center(CenterOf.BOUNDING_BOX) + + surface_x_direction = surface_loc.x_axis.direction + + planar_edge_length = planar_edge.length + + # Start adaptive refinement + subdivisions = 3 + max_loops = 10 + loop_count = 0 + length_error = sys.float_info.max + + while length_error > tolerance and loop_count < max_loops: + # Get starting point and normal + surface_origin = surface_loc.position + surface_normal = surface_loc.z_axis.direction + + # Seed the wrapped path + wrapped_edge_points: list[Vector] = [] + planar_position = planar_edge.position_at(0) + current_point, current_normal = _find_point_on_surface( + surface_origin, surface_normal, planar_position + ) + wrapped_edge_points.append(current_point) + + # Subdivide and propagate + for div in range(1, subdivisions + int(not planar_edge.is_closed)): + prev = planar_edge.position_at((div - 1) / subdivisions) + curr = planar_edge.position_at(div / subdivisions) + offset = curr - prev + current_point, current_normal = _find_point_on_surface( + current_point, current_normal, offset + ) + wrapped_edge_points.append(current_point) + + # Build and evaluate + wrapped_edge = Edge.make_spline( + wrapped_edge_points, periodic=planar_edge.is_closed + ) + length_error = abs(planar_edge_length - wrapped_edge.length) + + subdivisions *= 2 + loop_count += 1 + + if length_error > tolerance: + raise RuntimeError( + f"Length error of {length_error:.6f} exceeds tolerance {tolerance}" + ) + if not wrapped_edge.is_valid(): + raise RuntimeError("Wraped edge is invalid") + + if not snap_to_face: + return wrapped_edge + + # Project the curve onto the surface + surface_handle = BRep_Tool.Surface_s(self.wrapped) + first_param: float = wrapped_edge.param_at(0) + last_param: float = wrapped_edge.param_at(1) + curve_handle = BRep_Tool.Curve_s(wrapped_edge.wrapped, first_param, last_param) + proj_curve_handle = GeomProjLib.Project_s(curve_handle, surface_handle) + if proj_curve_handle is None: + raise RuntimeError( + "Projection failed, try setting `snap_to_face` to False." + ) + + # Build a new projected edge + projected_edge = Edge(BRepBuilderAPI_MakeEdge(proj_curve_handle).Edge()) + + return projected_edge + class Face(Mixin2D, Shape[TopoDS_Face]): """A Face in build123d represents a 3D bounded surface within the topological data @@ -1501,10 +1639,287 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) return self.outer_wire() + @overload + def wrap( + self, + planar_shape: Edge, + surface_loc: Location, + tolerance: float = 0.001, + extension_factor: float = 0.1, + ) -> Edge: ... + @overload + def wrap( + self, + planar_shape: Wire, + surface_loc: Location, + tolerance: float = 0.001, + extension_factor: float = 0.1, + ) -> Wire: ... + @overload + def wrap( + self, + planar_shape: Face, + surface_loc: Location, + tolerance: float = 0.001, + extension_factor: float = 0.1, + ) -> Face: ... + + def wrap( + self, + planar_shape: T, + surface_loc: Location, + tolerance: float = 0.001, + extension_factor: float = 0.1, + ) -> T: + """wrap + + Wrap a planar 2D shape onto a 3D surface. + + This method conforms a 2D shape defined on the XY plane (Edge, + Wire, or Face) to the curvature of a non-planar 3D Face (the + target surface), starting at a specified surface location. The + operation attempts to preserve the original edge lengths and + shape as closely as possible while minimizing the geometric + distortion that naturally arises when mapping flat geometry onto + curved surfaces. + + The wrapping process follows the local orientation of the surface + and progressively fits each edge along the curvature. To help + ensure continuity, the first and last edges are extended and trimmed + to close small gaps introduced by distortion. The final shape is tightly + aligned to the surface geometry. + + This method is useful for applying flat features—such as + decorative patterns, cutouts, or boundary outlines—onto curved or + freeform surfaces while retaining their original proportions. + + Args: + planar_shape (Edge | Wire | Face): flat shape to wrap around surface + surface_loc (Location): location on surface to wrap + tolerance (float, optional): maximum allowed error. Defaults to 0.001 + extension_factor (float, optional): amount to extend the wrapped first + and last edges to allow them to cross. Defaults to 0.1 + + Raises: + ValueError: Invalid planar shape + + Returns: + Edge | Wire | Face: wrapped shape + + """ + + if isinstance(planar_shape, Edge): + return self._wrap_edge(planar_shape, surface_loc, tolerance) + elif isinstance(planar_shape, Wire): + return self._wrap_wire( + planar_shape, surface_loc, tolerance, extension_factor + ) + elif isinstance(planar_shape, Face): + return self._wrap_face( + planar_shape, surface_loc, tolerance, extension_factor + ) + else: + raise TypeError( + f"planar_shape must be of type Edge, Wire, Face not " + f"{type(planar_shape)}" + ) + def _uv_bounds(self) -> tuple[float, float, float, float]: """Return the u min, u max, v min, v max values""" return BRepTools.UVBounds_s(self.wrapped) + def _wrap_face( + self: Face, + planar_face: Face, + surface_loc: Location, + tolerance: float = 0.001, + extension_factor: float = 0.1, + ) -> Face: + """_wrap_face + + Helper method of wrap that handles wrapping faces on surfaces. + + Args: + planar_face (Face): flat face to wrap around surface + surface_loc (Location): location on surface to wrap + tolerance (float, optional): maximum allowed error. Defaults to 0.001 + extension_factor (float, optional): amount to extend wrapped first + and last edges to allow them to cross. Defaults to 0.1 + + Returns: + Face: wrapped face + """ + wrapped_perimeter = self._wrap_wire( + planar_face.outer_wire(), surface_loc, tolerance, extension_factor + ) + wrapped_holes = [ + self._wrap_wire(w, surface_loc, tolerance, extension_factor) + for w in planar_face.inner_wires() + ] + wrapped_face = Face.make_surface( + wrapped_perimeter, interior_wires=wrapped_holes + ) + + # Potentially flip the wrapped face to match the surface + surface_normal = surface_loc.z_axis.direction + wrapped_normal = wrapped_face.normal_at(surface_loc.position) + if surface_normal.dot(wrapped_normal) < 0: # are they opposite? + wrapped_face = -wrapped_face + return wrapped_face + + def _wrap_wire( + self: Face, + planar_wire: Wire, + surface_loc: Location, + tolerance: float = 0.001, + extension_factor: float = 0.1, + ) -> Wire: + """_wrap_wire + + Helper method of wrap that handles wrapping wires on surfaces. + + Args: + planar_wire (Wire): wire to wrap around surface + surface_loc (Location): location on surface to wrap + tolerance (float, optional): maximum allowed error. Defaults to 0.001 + extension_factor (float, optional): amount to extend wrapped first + and last edges to allow them to cross. Defaults to 0.1 + + Raises: + RuntimeError: wrapped wire is not valid + + Returns: + Wire: wrapped wire + """ + # + # Part 1: Preparation + # + surface_point = surface_loc.position + surface_x_direction = surface_loc.x_axis.direction + surface_geometry = BRep_Tool.Surface_s(self.wrapped) + + if len(planar_wire.edges()) == 1: + return Wire([self._wrap_edge(planar_wire.edge(), surface_loc, tolerance)]) + + planar_edges = planar_wire.order_edges() + wrapped_edges: list[Edge] = [] + + # Need to keep track of the separation between adjacent edges + first_start_point = None + + # + # Part 2: Wrap the planar wires on the surface by creating a spline + # through points cast from the planar onto the surface. + # + # If the wire doesn't start at the origin, create an wrapped construction line + # to get to the beginning of the first edge + if planar_edges[0].position_at(0) == Vector(0, 0, 0): + edge_surface_point = surface_point + planar_edge_end_point = Vector(0, 0, 0) + else: + construction_line = Edge.make_line( + Vector(0, 0, 0), planar_edges[0].position_at(0) + ) + wrapped_construction_line: Edge = self._wrap_edge( + construction_line, surface_loc, tolerance + ) + edge_surface_point = wrapped_construction_line.position_at(1) + planar_edge_end_point = planar_edges[0].position_at(0) + edge_surface_location = Location( + Plane( + edge_surface_point, + x_dir=surface_x_direction, + z_dir=self.normal_at(edge_surface_point), + ) + ) + + # Wrap each edge and add them to the wire builder + for planar_edge in planar_edges: + local_planar_edge = planar_edge.translate(-planar_edge_end_point) + wrapped_edge: Edge = self._wrap_edge( + local_planar_edge, edge_surface_location, tolerance + ) + edge_surface_point = wrapped_edge.position_at(1) + edge_surface_location = Location( + Plane( + edge_surface_point, + x_dir=surface_x_direction, + z_dir=self.normal_at(edge_surface_point), + ) + ) + planar_edge_end_point = planar_edge.position_at(1) + if first_start_point is None: + first_start_point = wrapped_edge.position_at(0) + wrapped_edges.append(wrapped_edge) + + # For open wires we're finished + if not planar_wire.is_closed: + return Wire(wrapped_edges) + + # + # Part 3: The first and last edges likey don't meet at this point due to + # distortion caused by following the surface, so we'll need to join + # them. + # + + # Extend the first and last edge so that they cross + first_edge, first_curve = wrapped_edges[0]._extend_spline( + True, surface_geometry, extension_factor + ) + last_edge, last_curve = wrapped_edges[-1]._extend_spline( + False, surface_geometry, extension_factor + ) + + # Trim the extended edges at their intersection point + extrema = GeomAPI_ExtremaCurveCurve(first_curve, last_curve) + if extrema.NbExtrema() < 1: + raise RuntimeError( + "Extended first/last edges do not intersect; increase extension." + ) + param_first, param_last = extrema.Parameters(1) + + u_start_first: float = first_edge.param_at(0) + u_end_first: float = first_edge.param_at(1) + new_start = (param_first - u_start_first) / (u_end_first - u_start_first) + trimmed_first = first_edge.trim(new_start, 1.0) + + u_start_last: float = last_edge.param_at(0) + u_end_last: float = last_edge.param_at(1) + new_end = (param_last - u_start_last) / (u_end_last - u_start_last) + trimmed_last = last_edge.trim(0.0, new_end) + + # Replace the first and last edges with their modified versions + wrapped_edges[0] = trimmed_first + wrapped_edges[-1] = trimmed_last + + # + # Part 4: Build a wire from the edges and fix it to close gaps + # + closing_error = ( + trimmed_first.position_at(0) - trimmed_last.position_at(1) + ).length + wire_builder = BRepBuilderAPI_MakeWire() + combined_edges = TopTools_ListOfShape() + for edge in wrapped_edges: + combined_edges.Append(edge.wrapped) + wire_builder.Add(combined_edges) + wire_builder.Build() + raw_wrapped_wire = wire_builder.Wire() + wire_fixer = ShapeFix_Wire() + wire_fixer.SetPrecision(2 * closing_error) # enable fixing start/end gaps + wire_fixer.Load(raw_wrapped_wire) + wire_fixer.FixReorder() + wire_fixer.FixConnected() + wrapped_wire = Wire(wire_fixer.Wire()) + + # + # Part 5: Validate + # + if not wrapped_wire.is_valid(): + raise RuntimeError("wrapped wire is not valid") + + return wrapped_wire + class Shell(Mixin2D, Shape[TopoDS_Shell]): """A Shell is a fundamental component in build123d's topological data structure diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 97acf57..292b94e 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -29,12 +29,15 @@ license: import math import unittest +from unittest.mock import patch, PropertyMock + from build123d.build_enums import AngularDirection, GeomType, PositionMode, Transition from build123d.geometry import Axis, Plane, Vector from build123d.objects_curve import CenterArc, EllipticalCenterArc from build123d.objects_sketch import Circle, Rectangle, RegularPolygon from build123d.operations_generic import sweep -from build123d.topology import Edge +from build123d.topology import Edge, Face +from OCP.GeomProjLib import GeomProjLib class TestEdge(unittest.TestCase): @@ -357,6 +360,18 @@ class TestEdge(unittest.TestCase): Vector(1, 0, 0), ) + def test_extend_spline(self): + geom_surface = Face.make_rect(4, 4).geom_adaptor() + with self.assertRaises(TypeError): + Edge.make_line((0, 0), (1, 0))._extend_spline(True, geom_surface) + + @patch.object(GeomProjLib, "Project_s", return_value=None) + def test_extend_spline_failed_snap(self, mock_is_valid): + geom_surface = Face.make_rect(4, 4).geom_adaptor() + spline = Edge.make_spline([(0, 0), (1, 0), (2, 0)]) + with self.assertRaises(RuntimeError): + spline._extend_spline(True, geom_surface) + if __name__ == "__main__": unittest.main() diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 4b0557c..5e099df 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -43,10 +43,11 @@ from build123d.exporters3d import export_stl from build123d.geometry import Axis, Location, Plane, Pos, Vector from build123d.importers import import_stl from build123d.objects_curve import Line, Polyline, Spline, ThreePointArc -from build123d.objects_part import Box, Cylinder, Sphere, Torus +from build123d.objects_part import Box, Cone, Cylinder, Sphere, Torus from build123d.objects_sketch import ( Circle, Ellipse, + Polygon, Rectangle, RegularPolygon, Triangle, @@ -55,6 +56,7 @@ from build123d.operations_generic import fillet, offset from build123d.operations_part import extrude from build123d.operations_sketch import make_face from build123d.topology import Edge, Face, Solid, Wire +from OCP.GeomAPI import GeomAPI_ExtremaCurveCurve class TestFace(unittest.TestCase): @@ -830,6 +832,62 @@ class TestFace(unittest.TestCase): s = Sphere(1).face() self.assertIsNone(s.radii) + def test_wrap(self): + surfaces = [ + part.faces().filter_by(GeomType.PLANE, reverse=True)[0] + for part in (Cylinder(5, 10), Sphere(5), Cone(5, 2, 10)) + ] + inner = PolarLocations(1, 5, -18).local_locations + outer = PolarLocations(3, 5, -18 + 36).local_locations + points = [p.position for pair in zip(inner, outer) for p in pair] + star = (Polygon(*points, align=Align.NONE) - Circle(0.5)).face() + planar_edge = Edge.make_line((0, 0), (3, 3)) + planar_wire = Wire([planar_edge, Edge.make_line(planar_edge @ 1, (3, 0))]) + for surface in surfaces: + with self.subTest(surface=surface): + target = surface.location_at(0.5, 0.5, x_dir=(1, 0, 0)) + + wrapped_face: Face = surface.wrap(star, target) + self.assertTrue(isinstance(wrapped_face, Face)) + self.assertFalse(wrapped_face.is_planar_face) + self.assertTrue(wrapped_face.inner_wires()) + + wrapped_edge = surface.wrap(planar_edge, target) + self.assertTrue(wrapped_edge.geom_type == GeomType.BSPLINE) + self.assertAlmostEqual(planar_edge.length, wrapped_edge.length, 2) + self.assertAlmostEqual(wrapped_edge @ 0, target.position, 5) + + wrapped_wire = surface.wrap(planar_wire, target) + self.assertAlmostEqual(planar_wire.length, wrapped_wire.length, 2) + self.assertAlmostEqual(wrapped_wire @ 0, target.position, 5) + + with self.assertRaises(TypeError): + surface.wrap(Solid.make_box(1, 1, 1), target) + + @patch.object(GeomAPI_ExtremaCurveCurve, "NbExtrema", return_value=0) + def test_wrap_intersect_error(self, mock_is_valid): + surface = Cone(5, 2, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] + target = surface.location_at(0.5, 0.5, x_dir=(1, 0, 0)) + inner = PolarLocations(1, 5, -18).local_locations + outer = PolarLocations(3, 5, -18 + 36).local_locations + points = [p.position for pair in zip(inner, outer) for p in pair] + star = (Polygon(*points, align=Align.NONE) - Circle(0.5)).face() + + with self.assertRaises(RuntimeError): + surface.wrap(star.outer_wire(), target) + + @patch.object(Wire, "is_valid", return_value=False) + def test_wrap_invalid_wire(self, mock_is_valid): + surface = Cone(5, 2, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] + target = surface.location_at(0.5, 0.5, x_dir=(1, 0, 0)) + inner = PolarLocations(1, 5, -18).local_locations + outer = PolarLocations(3, 5, -18 + 36).local_locations + points = [p.position for pair in zip(inner, outer) for p in pair] + star = (Polygon(*points, align=Align.NONE) - Circle(0.5)).face() + + with self.assertRaises(RuntimeError): + surface.wrap(star, target) + class TestAxesOfSymmetrySplitNone(unittest.TestCase): def test_split_returns_none(self): From 8a603f17eeb585696bbb29518fcaab1a180c520d Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 1 May 2025 10:17:00 -0400 Subject: [PATCH 282/518] Fixing typing errors --- src/build123d/topology/two_d.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 6a46c58..522c172 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -301,7 +301,9 @@ class Mixin2D(Shape): axis = Axis(point, direction) face = self.faces_intersected_by_axis(axis).sort_by( lambda f: f.distance_to(point) - )[0] + )[ + 0 + ] # type: ignore[type-var] intersections = face.find_intersection_points(axis) if not intersections: raise RuntimeError( @@ -342,7 +344,7 @@ class Mixin2D(Shape): surface_normal = surface_loc.z_axis.direction # Seed the wrapped path - wrapped_edge_points: list[Vector] = [] + wrapped_edge_points: list[VectorLike] = [] planar_position = planar_edge.position_at(0) current_point, current_normal = _find_point_on_surface( surface_origin, surface_normal, planar_position From a7e80494ff1bdf5628813d9d0374b8478b3135a6 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 1 May 2025 10:28:03 -0400 Subject: [PATCH 283/518] Fixing typing errors --- src/build123d/topology/shape_core.py | 7 ++++++- src/build123d/topology/two_d.py | 6 ++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 905a5b3..a4b48e1 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2215,9 +2215,14 @@ class Comparable(ABC): def __lt__(self, other: Any) -> bool: ... +class SupportsLessThan(Protocol): + def __lt__(self, other: Any) -> bool: ... + + # This TypeVar allows IDEs to see the type of objects within the ShapeList T = TypeVar("T", bound=Union[Shape, Vector]) -K = TypeVar("K", bound=Comparable) +# K = TypeVar("K", bound=Comparable) +K = TypeVar("K", bound=SupportsLessThan) class ShapePredicate(Protocol): diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 522c172..8764d16 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -301,9 +301,7 @@ class Mixin2D(Shape): axis = Axis(point, direction) face = self.faces_intersected_by_axis(axis).sort_by( lambda f: f.distance_to(point) - )[ - 0 - ] # type: ignore[type-var] + )[0] intersections = face.find_intersection_points(axis) if not intersections: raise RuntimeError( @@ -1711,7 +1709,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): """ if isinstance(planar_shape, Edge): - return self._wrap_edge(planar_shape, surface_loc, tolerance) + return self._wrap_edge(planar_shape, surface_loc, True, tolerance) elif isinstance(planar_shape, Wire): return self._wrap_wire( planar_shape, surface_loc, tolerance, extension_factor From 6a1b3a2f9b09f5fea678b3699b7548dd32264c58 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 1 May 2025 10:30:57 -0400 Subject: [PATCH 284/518] Fixing typing errors --- src/build123d/topology/two_d.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 8764d16..a7aa570 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1799,7 +1799,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): surface_geometry = BRep_Tool.Surface_s(self.wrapped) if len(planar_wire.edges()) == 1: - return Wire([self._wrap_edge(planar_wire.edge(), surface_loc, tolerance)]) + return Wire( + [self._wrap_edge(planar_wire.edge(), surface_loc, True, tolerance)] + ) planar_edges = planar_wire.order_edges() wrapped_edges: list[Edge] = [] @@ -1821,7 +1823,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): Vector(0, 0, 0), planar_edges[0].position_at(0) ) wrapped_construction_line: Edge = self._wrap_edge( - construction_line, surface_loc, tolerance + construction_line, surface_loc, True, tolerance ) edge_surface_point = wrapped_construction_line.position_at(1) planar_edge_end_point = planar_edges[0].position_at(0) @@ -1837,7 +1839,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): for planar_edge in planar_edges: local_planar_edge = planar_edge.translate(-planar_edge_end_point) wrapped_edge: Edge = self._wrap_edge( - local_planar_edge, edge_surface_location, tolerance + local_planar_edge, edge_surface_location, True, tolerance ) edge_surface_point = wrapped_edge.position_at(1) edge_surface_location = Location( From 86806dfc250c7e108cec344273a16f3dc541386e Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 1 May 2025 10:34:18 -0400 Subject: [PATCH 285/518] Fixing typing errors --- src/build123d/topology/two_d.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index a7aa570..9c721a1 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1799,9 +1799,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): surface_geometry = BRep_Tool.Surface_s(self.wrapped) if len(planar_wire.edges()) == 1: - return Wire( - [self._wrap_edge(planar_wire.edge(), surface_loc, True, tolerance)] - ) + planar_edge = planar_wire.edge() + assert planar_edge is not None + return Wire([self._wrap_edge(planar_edge, surface_loc, True, tolerance)]) planar_edges = planar_wire.order_edges() wrapped_edges: list[Edge] = [] From cd122b82e3b38fb9a7a474134e5322ac06784f98 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 May 2025 10:08:48 -0500 Subject: [PATCH 286/518] benchmark.yml -> print csv results to stdout for easier comparison among runs --- .github/workflows/benchmark.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index a0568a4..16169f2 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -3,7 +3,7 @@ name: benchmarks on: [push, pull_request, workflow_dispatch] jobs: - tests: + benchmarks: strategy: fail-fast: false matrix: @@ -22,4 +22,5 @@ jobs: python-version: ${{ matrix.python-version }} - name: benchmark run: | - python -m pytest --benchmark-only + python -m pytest --benchmark-only --csv="results.csv" + echo results.csv From 05df0a1bbdf25e94fd5a628095241cd2579278e3 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 May 2025 11:43:21 -0500 Subject: [PATCH 287/518] benchmark.yml -> generate JSON results, generate CSV report, echo to console --- .github/workflows/benchmark.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 16169f2..5415be7 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -22,5 +22,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: benchmark run: | - python -m pytest --benchmark-only --csv="results.csv" + python -m pytest --benchmark-only --benchmark-save + pytest-benchmark compare --csv="results.csv" echo results.csv From 8f15604ec0bbf11996afee784dedc05e08aad08a Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 May 2025 11:45:27 -0500 Subject: [PATCH 288/518] benchmark.yml -> trying --benchmark-autosave instead --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 5415be7..8f9c757 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -22,6 +22,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: benchmark run: | - python -m pytest --benchmark-only --benchmark-save + python -m pytest --benchmark-only --benchmark-autosave pytest-benchmark compare --csv="results.csv" echo results.csv From 3b59821c54f505803d495809a5e6d7f000421219 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 May 2025 11:47:46 -0500 Subject: [PATCH 289/518] benchmark.yml -> cat instead of echo --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 8f9c757..49fcc89 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -24,4 +24,4 @@ jobs: run: | python -m pytest --benchmark-only --benchmark-autosave pytest-benchmark compare --csv="results.csv" - echo results.csv + cat results.csv From c11ed030b3afa90fc295f6500e6bbd6fdeeb8f17 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 May 2025 11:55:54 -0500 Subject: [PATCH 290/518] benchmark.yml -> also upload results.csv to an artifact --- .github/workflows/benchmark.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 49fcc89..8ef2a53 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -25,3 +25,7 @@ jobs: python -m pytest --benchmark-only --benchmark-autosave pytest-benchmark compare --csv="results.csv" cat results.csv + - uses: actions/upload-artifact@v4 + with: + name: benchmark-results + path: results.csv From 7c52e506a3004e74fa41f7350ec407b22722b0e0 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 1 May 2025 11:59:44 -0500 Subject: [PATCH 291/518] benchmark.yml -> tag artifact with os matrix name --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 8ef2a53..56976c4 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -27,5 +27,5 @@ jobs: cat results.csv - uses: actions/upload-artifact@v4 with: - name: benchmark-results + name: benchmark-results-${{ matrix.os }} path: results.csv From 46f062c1750f78273b42e16ab29df08f7aad7c45 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 1 May 2025 14:42:01 -0400 Subject: [PATCH 292/518] Removed meta-data from full_round Issue #979 --- src/build123d/operations_sketch.py | 5 ++--- tests/test_build_sketch.py | 18 +++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index 8dfc9d8..0d4c43b 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -73,8 +73,7 @@ def full_round( ValueError: Invalid geometry Returns: - (Sketch, Vector, float): A tuple where the first value is the modified shape, the second the - geometric center of the arc, and the third the radius of the arc + Sketch: the modified shape """ context: BuildSketch | None = BuildSketch._get_context("full_round") @@ -192,7 +191,7 @@ def full_round( context.pending_edges = ShapeList() # return Sketch(Compound([pending_face]).wrapped) - return Sketch([pending_face]), new_arc.arc_center, new_arc.radius + return Sketch([pending_face]) def make_face( diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index da4618b..d57fbf7 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -510,27 +510,23 @@ class TestBuildSketchObjects(unittest.TestCase): with self.assertRaises(ValueError): full_round(face.edges()[0]) - positive, c1, r1 = full_round(trap.edges().sort_by(SortBy.LENGTH)[0]) - negative, c2, r2 = full_round( - trap.edges().sort_by(SortBy.LENGTH)[0], invert=True - ) - self.assertLess(negative.area, positive.area) - self.assertAlmostEqual(r1, r2, 2) - self.assertTupleAlmostEquals(tuple(c1), tuple(c2), 2) + positive = full_round(trap.edges().sort_by(SortBy.LENGTH)[0]) + negative = full_round(trap.edges().sort_by(SortBy.LENGTH)[0], invert=True) + self.assertLess(negative.face().area, positive.face().area) rect = Rectangle(34, 10) - convex_rect = full_round((rect.edges() << Axis.X)[0])[0] - concave_rect = full_round((rect.edges() << Axis.X)[0], invert=True)[0] + convex_rect = full_round((rect.edges() << Axis.X)[0]) + concave_rect = full_round((rect.edges() << Axis.X)[0], invert=True) self.assertLess(convex_rect.area, rect.area) self.assertLess(concave_rect.area, convex_rect.area) tri = Triangle(a=10, b=10, c=10) - tri_round = full_round(tri.edges().sort_by(Axis.X)[0])[0] + tri_round = full_round(tri.edges().sort_by(Axis.X)[0]) self.assertLess(tri_round.area, tri.area) # Test flipping the face flipped = -Rectangle(34, 10).face() - rounded = full_round((flipped.edges() << Axis.X)[0])[0].face() + rounded = full_round((flipped.edges() << Axis.X)[0]).face() self.assertEqual(flipped.normal_at(), rounded.normal_at()) From 9259725cf75b22f77693d2e047ac9cdf817af31c Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 1 May 2025 15:16:11 -0400 Subject: [PATCH 293/518] Updating to new full_round --- docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py b/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py index 60c0fce..586e689 100644 --- a/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py +++ b/docs/assets/ttt/ttt-24-SPO-06-Buffer_Stand.py @@ -11,7 +11,10 @@ with BuildPart() as p: with BuildSketch(Plane.YZ) as yz: Trapezoid(2.5, 4, 90 - 6, align=(Align.CENTER, Align.MIN)) - _, arc_center, arc_radius = full_round(yz.edges().sort_by(SortBy.LENGTH)[0]) + full_round(yz.edges().sort_by(SortBy.LENGTH)[0]) + circle_edge = yz.edges().filter_by(GeomType.CIRCLE)[0] + arc_center = circle_edge.arc_center + arc_radius = circle_edge.radius extrude(amount=10, mode=Mode.INTERSECT) # To avoid OCCT problems, don't attempt to extend the top arc, remove instead @@ -47,11 +50,11 @@ with BuildPart() as p: part = scale(p.part, IN) -got_mass = part.volume*7800e-6/LB +got_mass = part.volume * 7800e-6 / LB want_mass = 3.923 tolerance = 0.02 delta = abs(got_mass - want_mass) print(f"Mass: {got_mass:0.1f} lbs") -assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' +assert delta < tolerance, f"{got_mass=}, {want_mass=}, {delta=}, {tolerance=}" show(p) From 2e7df8ccd47f72302408cc88174a6b989d8bf486 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 7 May 2025 21:27:03 -0400 Subject: [PATCH 294/518] Adding Face/Shell.revolve for Edge/Wire --- src/build123d/topology/two_d.py | 56 ++++++++++++++++++++++++++++++ tests/test_direct_api/test_face.py | 16 +++++++-- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 9c721a1..a45ff70 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -78,6 +78,7 @@ from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeFilling, BRepOffsetAPI_MakePipeShell +from OCP.BRepPrimAPI import BRepPrimAPI_MakeRevol from OCP.BRepTools import BRepTools, BRepTools_ReShape from OCP.GProp import GProp_GProps from OCP.Geom import Geom_BezierSurface, Geom_Surface, Geom_RectangularTrimmedSurface @@ -106,6 +107,7 @@ from OCP.gp import gp_Pnt, gp_Vec from build123d.build_enums import CenterOf, GeomType, Keep, SortBy, Transition from build123d.geometry import ( + DEG2RAD, TOLERANCE, Axis, Color, @@ -1130,6 +1132,34 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) return return_value + @classmethod + def revolve( + cls, + profile: Edge, + angle: float, + axis: Axis, + ) -> Face: + """sweep + + Revolve an Edge around an axis. + + Args: + profile (Edge): the object to sweep + angle (float): the angle to revolve through + axis (Axis): rotation Axis + + Returns: + Face: resulting face + """ + revol_builder = BRepPrimAPI_MakeRevol( + profile.wrapped, + axis.wrapped, + angle * DEG2RAD, + True, + ) + + return cls(revol_builder.Shape()) + @classmethod def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: """sew faces @@ -2025,6 +2055,32 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): """ return cls(_make_loft(objs, False, ruled)) + @classmethod + def revolve( + cls, + profile: Curve | Wire, + angle: float, + axis: Axis, + ) -> Face: + """sweep + + Revolve a 1D profile around an axis. + + Args: + profile (Curve | Wire): the object to revolve + angle (float): the angle to revolve through + axis (Axis): rotation Axis + + Returns: + Shell: resulting shell + """ + profile = Wire(profile.edges()) + revol_builder = BRepPrimAPI_MakeRevol( + profile.wrapped, axis.wrapped, angle * DEG2RAD, True + ) + + return cls(revol_builder.Shape()) + @classmethod def sweep( cls, diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 5e099df..0bde6c6 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -42,7 +42,7 @@ from build123d.build_sketch import BuildSketch from build123d.exporters3d import export_stl from build123d.geometry import Axis, Location, Plane, Pos, Vector from build123d.importers import import_stl -from build123d.objects_curve import Line, Polyline, Spline, ThreePointArc +from build123d.objects_curve import JernArc, Line, Polyline, Spline, ThreePointArc from build123d.objects_part import Box, Cone, Cylinder, Sphere, Torus from build123d.objects_sketch import ( Circle, @@ -55,7 +55,7 @@ from build123d.objects_sketch import ( from build123d.operations_generic import fillet, offset from build123d.operations_part import extrude from build123d.operations_sketch import make_face -from build123d.topology import Edge, Face, Solid, Wire +from build123d.topology import Edge, Face, Shell, Solid, Wire from OCP.GeomAPI import GeomAPI_ExtremaCurveCurve @@ -888,6 +888,18 @@ class TestFace(unittest.TestCase): with self.assertRaises(RuntimeError): surface.wrap(star, target) + def test_revolve(self): + l1 = Edge.make_line((3, 0), (3, 2)) + revolved = Face.revolve(l1, 360, Axis.Y) + self.assertTrue(isinstance(revolved, Face)) + self.assertAlmostEqual(revolved.area, 2 * math.pi * 3 * 2, 5) + + l2 = JernArc(l1 @ 1, l1 % 1, 1, 90) + w1 = Wire([l1, l2]) + revolved = Shell.revolve(w1, 180, Axis.Y) + self.assertTrue(isinstance(revolved, Shell)) + self.assertAlmostEqual(revolved.edges().sort_by(Axis.Y)[-1].radius, 2, 5) + class TestAxesOfSymmetrySplitNone(unittest.TestCase): def test_split_returns_none(self): From 9ab0405ab0d564e6924ce53449e5a2138a1ebc14 Mon Sep 17 00:00:00 2001 From: Luz Paz Date: Sun, 11 May 2025 20:41:24 -0400 Subject: [PATCH 295/518] Fix various typos Found via `codespell -q 3 -L parm,parms,re-use` --- examples/lego.py | 2 +- examples/lego_algebra.py | 2 +- src/build123d/topology/two_d.py | 6 +++--- src/build123d/topology/zero_d.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/lego.py b/examples/lego.py index 88cb1a4..0cba2b3 100644 --- a/examples/lego.py +++ b/examples/lego.py @@ -75,7 +75,7 @@ with BuildPart() as lego: exporter = ExportSVG(scale=6) exporter.add_shape(plan.sketch) exporter.write("assets/lego_step6.svg") - # Substract a rectangle leaving ribs on the block walls + # Subtract a rectangle leaving ribs on the block walls Rectangle( block_length - 2 * (wall_thickness + ridge_depth), block_width - 2 * (wall_thickness + ridge_depth), diff --git a/examples/lego_algebra.py b/examples/lego_algebra.py index 9df8132..54abec2 100644 --- a/examples/lego_algebra.py +++ b/examples/lego_algebra.py @@ -34,7 +34,7 @@ plan += locs * Rectangle(width=block_length, height=ridge_width) locs = GridLocations(lego_unit_size, 0, pip_count, 1) plan += locs * Rectangle(width=ridge_width, height=block_width) -# Substract a rectangle leaving ribs on the block walls +# Subtract a rectangle leaving ribs on the block walls plan -= Rectangle( block_length - 2 * (wall_thickness + ridge_depth), block_width - 2 * (wall_thickness + ridge_depth), diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index a45ff70..e3876a1 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -292,7 +292,7 @@ class Mixin2D(Shape): Raises: RuntimeError: wrapping over surface boundary, try difference surface_loc Returns: - Edge: wraped edge + Edge: wrapped edge """ def _intersect_surface_normal( @@ -375,7 +375,7 @@ class Mixin2D(Shape): f"Length error of {length_error:.6f} exceeds tolerance {tolerance}" ) if not wrapped_edge.is_valid(): - raise RuntimeError("Wraped edge is invalid") + raise RuntimeError("Wrapped edge is invalid") if not snap_to_face: return wrapped_edge @@ -1889,7 +1889,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return Wire(wrapped_edges) # - # Part 3: The first and last edges likey don't meet at this point due to + # Part 3: The first and last edges likely don't meet at this point due to # distortion caused by following the surface, so we'll need to join # them. # diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index 59518c7..f0bd1a0 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -239,7 +239,7 @@ class Vertex(Shape[TopoDS_Vertex]): def __sub__(self, other: Vertex | Vector | tuple) -> Vertex: # type: ignore """Subtract - Substract a Vertex with a Vertex, Vector or Tuple from self + Subtract a Vertex with a Vertex, Vector or Tuple from self Args: other: Value to add From 9b5106467102a345045cd1b1380b023f0f99861a Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 13 May 2025 10:03:52 -0500 Subject: [PATCH 296/518] deglob.py -> add ability to write deglobbed change back to target file --- tools/deglob.py | 79 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 63 insertions(+), 16 deletions(-) diff --git a/tools/deglob.py b/tools/deglob.py index 5761568..dd44aa4 100755 --- a/tools/deglob.py +++ b/tools/deglob.py @@ -16,8 +16,9 @@ desc: an import statement listing only those names. This practice can help prevent polluting the global namespace and improve clarity. - Example: - deglob.py my_build123d_script.py + Examples: + python deglob.py my_build123d_script.py + python deglob.py -h After parsing my_build123d_script.py, the script prints a line such as: from build123d import Workplane, Solid @@ -26,6 +27,7 @@ desc: Module Contents: - parse_args(): Parse the command-line argument for the input file path. + - count_glob_imports(): Count the number of occurences of a glob import. - find_used_symbols(): Parse Python source code to find referenced names. - main(): Orchestrates reading the file, analyzing symbols, and printing the replacement import line. @@ -53,6 +55,7 @@ import argparse import ast import sys from pathlib import Path +import re import build123d @@ -63,7 +66,7 @@ def parse_args(): Returns: argparse.Namespace: An object containing the parsed command-line arguments: - - build123d_file (Path): Path to the input build123dO file. + - build123d_file (Path): Path to the input build123d file. """ parser = argparse.ArgumentParser( description="Find all the build123d symbols in module." @@ -71,12 +74,41 @@ def parse_args(): # Required positional argument parser.add_argument("build123d_file", type=Path, help="Path to the build123d file") + parser.add_argument( + "--write", + help="Overwrite glob import in input file, defaults to read-only and printed to stdout", + action="store_true", + ) args = parser.parse_args() return args +def count_glob_imports(source_code: str) -> int: + """count_glob_imports + + Count the number of occurences of a glob import e.g. (from build123d import *) + + Args: + source_code (str): contents of build123d program + + Returns: + int: build123d glob import occurence count + """ + tree = ast.parse(source_code) + + # count instances of glob usage + glob_count = list( + isinstance(node, ast.ImportFrom) + and node.module == "build123d" + and any(alias.name == "*" for alias in node.names) + for node in ast.walk(tree) + ).count(True) + + return glob_count + + def find_used_symbols(source_code: str) -> set[str]: """find_used_symbols @@ -90,17 +122,6 @@ def find_used_symbols(source_code: str) -> set[str]: """ tree = ast.parse(source_code) - # Is the glob import from build123d used? - from_glob_import = any( - isinstance(node, ast.ImportFrom) - and node.module == "build123d" - and any(alias.name == "*" for alias in node.names) - for node in ast.walk(tree) - ) - if not from_glob_import: - print("Glob import from build123d not found") - sys.exit(0) - symbols = set() # Create a custom version of visit_Name that records the symbol @@ -152,7 +173,15 @@ def main(): with open(args.build123d_file, "r", encoding="utf-8") as f: code = f.read() - # Check for the glob import and extract the symbols + # Get the glob import count + glob_count = count_glob_imports(code) + + # Exit if no glob import was found + if not glob_count: + print("Glob import from build123d not found") + sys.exit(0) + + # Extract the symbols used_symbols = find_used_symbols(code) # Find the imported build123d symbols @@ -160,7 +189,25 @@ def main(): # Create the import statement to replace the glob import import_line = f"from build123d import {', '.join(actual_imports)}" - print(import_line) + + if args.write: + # Replace only the first instance, warn if more are found + updated_code = re.sub(r"from build123d import\s*\*", import_line, code, count=1) + + # Write code back to target file + with open(args.build123d_file, "w", encoding="utf-8") as f: + f.write(updated_code) + + if glob_count: + print(f"Replaced build123d glob import with '{import_line}'") + + if glob_count > 1: + print( + "Warning: more than one instance of glob import was detected " + f"(count: {glob_count}), only the first instance was replaced" + ) + else: + print(import_line) if __name__ == "__main__": From 67115111e2139540fff5560fceaf7ade9a1c3ac8 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 17 May 2025 13:20:17 -0400 Subject: [PATCH 297/518] Rework Location constructor, improve pylint --- src/build123d/geometry.py | 294 ++++++++++++------------- tests/test_direct_api/test_location.py | 31 ++- 2 files changed, 175 insertions(+), 150 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 041ec61..bc18517 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -38,15 +38,12 @@ import copy as copy_module import itertools import json import logging -import numpy as np import warnings +from collections.abc import Callable, Iterable, Sequence +from math import degrees, isclose, log10, pi, radians +from typing import TYPE_CHECKING, Any, TypeAlias, overload -from collections.abc import Iterable, Sequence -from math import degrees, log10, pi, radians, isclose -from typing import Any, overload, TypeAlias, TYPE_CHECKING - -import OCP.TopAbs as TopAbs_ShapeEnum - +import numpy as np from OCP.Bnd import Bnd_Box, Bnd_OBB from OCP.BRep import BRep_Tool from OCP.BRepBndLib import BRepBndLib @@ -54,7 +51,7 @@ from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeFace, BRepBuilderAPI_Transform from OCP.BRepGProp import BRepGProp, BRepGProp_Face # used for mass calculation from OCP.BRepTools import BRepTools from OCP.Geom import Geom_BoundedSurface, Geom_Line, Geom_Plane -from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf, GeomAPI_IntCS, GeomAPI_IntSS +from OCP.GeomAPI import GeomAPI_IntCS, GeomAPI_IntSS, GeomAPI_ProjectPointOnSurf from OCP.gp import ( gp_Ax1, gp_Ax2, @@ -74,10 +71,11 @@ from OCP.gp import ( # properties used to store mass calculation result from OCP.GProp import GProp_GProps from OCP.Quantity import Quantity_Color, Quantity_ColorRGBA +from OCP.TopAbs import TopAbs_ShapeEnum from OCP.TopLoc import TopLoc_Location from OCP.TopoDS import TopoDS, TopoDS_Edge, TopoDS_Face, TopoDS_Shape, TopoDS_Vertex -from build123d.build_enums import Align, Align2DType, Align3DType, Intrinsic, Extrinsic +from build123d.build_enums import Align, Align2DType, Align3DType, Extrinsic, Intrinsic if TYPE_CHECKING: # pragma: no cover from .topology import Edge, Face, Shape, Vertex @@ -497,8 +495,8 @@ class Vector: return_value = Vector(gp_Vec(pnt_t.XYZ())) else: # to gp_Dir for transformation of "direction vectors" (no translation or scaling) - dir = self.to_dir() - dir_t = dir.Transformed(affine_transform.wrapped.Trsf()) + gp_dir = self.to_dir() + dir_t = gp_dir.Transformed(affine_transform.wrapped.Trsf()) return_value = Vector(gp_Vec(dir_t.XYZ())) return return_value @@ -533,6 +531,7 @@ class Vector: """Find intersection of plane and vector""" def intersect(self, *args, **kwargs): + """Find intersection of geometric objects and vector""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) if axis is not None: @@ -550,6 +549,8 @@ class Vector: if shape is not None: return shape.intersect(self) + return None + VectorLike: TypeAlias = ( Vector | tuple[float, float] | tuple[float, float, float] | Sequence[float] @@ -647,7 +648,7 @@ class Axis(metaclass=AxisMeta): # Extract the start point and tangent topods_edge: TopoDS_Edge = edge.wrapped # type: ignore[annotation-unchecked] curve = BRep_Tool.Curve_s(topods_edge, float(), float()) - param_min, param_max = BRep_Tool.Range_s(topods_edge) + param_min, _ = BRep_Tool.Range_s(topods_edge) origin_pnt = gp_Pnt() tangent_vec = gp_Vec() curve.D1(param_min, origin_pnt, tangent_vec) @@ -674,18 +675,22 @@ class Axis(metaclass=AxisMeta): @property def position(self): + """The position or origin of the Axis""" return Vector(self.wrapped.Location()) @position.setter def position(self, position: VectorLike): + """Set the position or origin of the Axis""" self.wrapped.SetLocation(Vector(position).to_pnt()) @property def direction(self): + """The normalized direction of the Axis""" return Vector(self.wrapped.Direction()) @direction.setter def direction(self, direction: VectorLike): + """Set the direction of the Axis""" self.wrapped.SetDirection(Vector(direction).to_dir()) @property @@ -891,6 +896,7 @@ class Axis(metaclass=AxisMeta): """Find intersection of plane and axis""" def intersect(self, *args, **kwargs): + """Find intersection of geometric object and axis""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) if axis is not None: @@ -909,7 +915,7 @@ class Axis(metaclass=AxisMeta): # Solve the system of equations to find the intersection system_of_equations = np.array([d1, -d2, np.cross(d1, d2)]).T origin_diff = p2 - p1 - t1, t2, _ = np.linalg.lstsq(system_of_equations, origin_diff, rcond=None)[0] + t1, _, _ = np.linalg.lstsq(system_of_equations, origin_diff, rcond=None)[0] # Calculate the intersection point intersection_point = p1 + t1 * d1 @@ -944,6 +950,8 @@ class Axis(metaclass=AxisMeta): if shape is not None: return shape.intersect(self) + return None + class BoundBox: """A BoundingBox for a Shape""" @@ -951,7 +959,7 @@ class BoundBox: def __init__(self, bounding_box: Bnd_Box) -> None: if bounding_box.IsVoid(): - x_min, y_min, z_min, x_max, y_max, z_max = (0,) * 6 + x_min, y_min, z_min, x_max, y_max, z_max = (0.0,) * 6 else: x_min, y_min, z_min, x_max, y_max, z_max = bounding_box.Get() self.wrapped = None if bounding_box.IsVoid() else bounding_box @@ -1059,7 +1067,6 @@ class BoundBox: shape: TopoDS_Shape, tolerance: float | None = None, optimal: bool = True, - oriented: bool = False, ) -> BoundBox: """Constructs a bounding box from a TopoDS_Shape @@ -1075,22 +1082,13 @@ class BoundBox: tolerance = TOL if tolerance is None else tolerance # tol = TOL (by default) bbox = Bnd_Box() - bbox_obb = Bnd_OBB() if optimal: - # this is 'exact' but expensive - if oriented: - BRepBndLib.AddOBB_s(shape, bbox_obb, False, True, False) - else: - BRepBndLib.AddOptimal_s(shape, bbox) + BRepBndLib.AddOptimal_s(shape, bbox) else: - # this is adds +margin but is faster - if oriented: - BRepBndLib.AddOBB_s(shape, bbox_obb) - else: - BRepBndLib.Add_s(shape, bbox, True) + BRepBndLib.Add_s(shape, bbox, True) - return cls(bbox_obb) if oriented else cls(bbox) + return cls(bbox) def is_inside(self, second_box: BoundBox) -> bool: """Is the provided bounding box inside this one? @@ -1195,7 +1193,7 @@ class Color: if len(args) == 2: alpha = args[1] elif len(args) >= 3: - red, green, blue = args[0:3] + red, green, blue = args[0:3] # pylint: disable=unbalanced-tuple-unpacking if len(args) == 4: alpha = args[3] @@ -1246,9 +1244,8 @@ class Color: if self.iter_index > 3: raise StopIteration - else: - value = rgb_tuple[self.iter_index] - self.iter_index += 1 + value = rgb_tuple[self.iter_index] + self.iter_index += 1 return value # @deprecated @@ -1312,21 +1309,20 @@ class GeomEncoder(json.JSONEncoder): """ - def default(self, obj): + def default(self, o): """Return a JSON-serializable representation of a known geometry object.""" - if isinstance(obj, Axis): - return {"Axis": (tuple(obj.position), tuple(obj.direction))} - elif isinstance(obj, Color): - return {"Color": obj.to_tuple()} - if isinstance(obj, Location): - return {"Location": obj.to_tuple()} - elif isinstance(obj, Plane): - return {"Plane": (tuple(obj.origin), tuple(obj.x_dir), tuple(obj.z_dir))} - elif isinstance(obj, Vector): - return {"Vector": tuple(obj)} - else: - # Let the base class default method raise the TypeError - return super().default(obj) + if isinstance(o, Axis): + return {"Axis": (tuple(o.position), tuple(o.direction))} + if isinstance(o, Color): + return {"Color": o.to_tuple()} + if isinstance(o, Location): + return {"Location": o.to_tuple()} + if isinstance(o, Plane): + return {"Plane": (tuple(o.origin), tuple(o.x_dir), tuple(o.z_dir))} + if isinstance(o, Vector): + return {"Vector": tuple(o)} + # Let the base class default method raise the TypeError + return super().default(o) @staticmethod def geometry_hook(json_dict): @@ -1377,22 +1373,20 @@ class Location: } @overload - def __init__(self): # pragma: no cover + def __init__(self): """Empty location with not rotation or translation with respect to the original location.""" @overload - def __init__(self, location: Location): # pragma: no cover + def __init__(self, location: Location): """Location with another given location.""" @overload - def __init__(self, translation: VectorLike, angle: float = 0): # pragma: no cover + def __init__(self, translation: VectorLike, angle: float = 0): """Location with translation with respect to the original location. If angle != 0 then the location includes a rotation around z-axis by angle""" @overload - def __init__( - self, translation: VectorLike, rotation: RotationLike | None = None - ): # pragma: no cover + def __init__(self, translation: VectorLike, rotation: RotationLike | None = None): """Location with translation with respect to the original location. If rotation is not None then the location includes the rotation (see also Rotation class) """ @@ -1403,122 +1397,118 @@ class Location: translation: VectorLike, rotation: RotationLike, ordering: Extrinsic | Intrinsic, - ): # pragma: no cover + ): """Location with translation with respect to the original location. If rotation is not None then the location includes the rotation (see also Rotation class) ordering defaults to Intrinsic.XYZ, but can also be set to Extrinsic """ @overload - def __init__(self, plane: Plane): # pragma: no cover + def __init__(self, plane: Plane): """Location corresponding to the location of the Plane.""" @overload - def __init__(self, plane: Plane, plane_offset: VectorLike): # pragma: no cover + def __init__(self, plane: Plane, plane_offset: VectorLike): """Location corresponding to the angular location of the Plane with translation plane_offset.""" @overload - def __init__(self, top_loc: TopLoc_Location): # pragma: no cover + def __init__(self, top_loc: TopLoc_Location): """Location wrapping the low-level TopLoc_Location object t""" @overload - def __init__(self, gp_trsf: gp_Trsf): # pragma: no cover + def __init__(self, gp_trsf: gp_Trsf): """Location wrapping the low-level gp_Trsf object t""" @overload - def __init__( - self, translation: VectorLike, direction: VectorLike, angle: float - ): # pragma: no cover + def __init__(self, translation: VectorLike, direction: VectorLike, angle: float): """Location with translation t and rotation around direction by angle with respect to the original location.""" - def __init__(self, *args): - # pylint: disable=too-many-branches - transform = gp_Trsf() + def __init__(self, *args, **kwargs): + position = kwargs.pop("position", None) + orientation = kwargs.pop("orientation", None) + ordering = kwargs.pop("ordering", None) + angle = kwargs.pop("angle", None) + plane = kwargs.pop("plane", None) + location = kwargs.pop("location", None) + top_loc = kwargs.pop("top_loc", None) + gp_trsf = kwargs.pop("gp_trsf", None) - if len(args) == 0: - pass + # If any unexpected kwargs remain + if kwargs: + raise TypeError(f"Unexpected keyword arguments: {', '.join(kwargs)}") - elif len(args) == 1: - translation = args[0] - - if isinstance(translation, (Vector, Iterable)): - transform.SetTranslationPart(Vector(translation).wrapped) - elif isinstance(translation, Plane): - coordinate_system = gp_Ax3( - translation._origin.to_pnt(), - translation.z_dir.to_dir(), - translation.x_dir.to_dir(), - ) - transform.SetTransformation(coordinate_system) - transform.Invert() - elif isinstance(args[0], Location): - self.wrapped = translation.wrapped - return - elif isinstance(translation, TopLoc_Location): - self.wrapped = translation - return - elif isinstance(translation, gp_Trsf): - transform = translation + # Fill from positional args if not given via kwargs + if args: + if plane is None and isinstance(args[0], Plane): + plane = args[0] + elif location is None and isinstance(args[0], (Location, Rotation)): + location = args[0] + elif top_loc is None and isinstance(args[0], TopLoc_Location): + top_loc = args[0] + elif gp_trsf is None and isinstance(args[0], gp_Trsf): + gp_trsf = args[0] + elif isinstance(args[0], (Vector, Iterable)): + position = Vector(args[0]) + if len(args) > 1: + if isinstance(args[1], (Vector, Iterable)): + orientation = Vector(args[1]) + elif isinstance(args[1], (int, float)): + angle = args[1] + if len(args) > 2: + if isinstance(args[2], (int, float)) and orientation is not None: + angle = args[2] + elif isinstance(args[2], (Intrinsic, Extrinsic)): + ordering = args[2] + else: + raise TypeError( + f"Third parameter must be a float or order not {args[2]}" + ) else: - raise TypeError("Unexpected parameters") + raise TypeError(f"Invalid positional arguments: {args}") - elif len(args) == 2: - ordering = Intrinsic.XYZ - if isinstance(args[0], (Vector, Iterable)): - if isinstance(args[1], (Vector, Iterable)): - rotation = [radians(a) for a in args[1]] - quaternion = gp_Quaternion() - quaternion.SetEulerAngles(self._rot_order_dict[ordering], *rotation) - transform.SetRotation(quaternion) - elif isinstance(args[0], (Vector, tuple)) and isinstance( - args[1], (int, float) - ): - angle = radians(args[1]) - quaternion = gp_Quaternion() - quaternion.SetEulerAngles( - self._rot_order_dict[ordering], 0, 0, angle - ) - transform.SetRotation(quaternion) + # Construct transformation + trsf = gp_Trsf() - # set translation part after setting rotation (if exists) - transform.SetTranslationPart(Vector(args[0]).wrapped) - else: - translation, origin = args - coordinate_system = gp_Ax3( - Vector(origin).to_pnt(), - translation.z_dir.to_dir(), - translation.x_dir.to_dir(), - ) - transform.SetTransformation(coordinate_system) - transform.Invert() - elif len(args) == 3: - if ( - isinstance(args[0], (Vector, Iterable)) - and isinstance(args[1], (Vector, Iterable)) - and isinstance(args[2], (int, float)) - ): - translation, axis, angle = args - transform.SetRotation( - gp_Ax1(Vector().to_pnt(), Vector(axis).to_dir()), angle * pi / 180.0 - ) - elif ( - isinstance(args[0], (Vector, Iterable)) - and isinstance(args[1], (Vector, Iterable)) - and isinstance(args[2], (Extrinsic, Intrinsic)) - ): - translation = args[0] - rotation = [radians(a) for a in args[1]] - ordering = args[2] - quaternion = gp_Quaternion() - quaternion.SetEulerAngles(self._rot_order_dict[ordering], *rotation) - transform.SetRotation(quaternion) - else: - raise TypeError("Unsupported argument types for Location") + if plane: + cs = gp_Ax3( + plane.origin.to_pnt(), + plane.z_dir.to_dir(), + plane.x_dir.to_dir(), + ) + trsf.SetTransformation(cs) + trsf.Invert() - transform.SetTranslationPart(Vector(translation).wrapped) - self.wrapped = TopLoc_Location(transform) + elif gp_trsf: + trsf = gp_trsf + + elif angle is not None: + axis = gp_Ax1( + gp_Pnt(0, 0, 0), + Vector(orientation).to_dir() if orientation else gp_Dir(0, 0, 1), + ) + trsf.SetRotation(axis, radians(angle)) + + elif orientation is not None: + angles = [radians(a) for a in orientation] + rot_order = self._rot_order_dict.get( + ordering, gp_EulerSequence.gp_Intrinsic_XYZ + ) + quat = gp_Quaternion() + quat.SetEulerAngles(rot_order, *angles) + trsf.SetRotation(quat) + + if position: + trsf.SetTranslationPart(Vector(position).wrapped) + + # Final assignment based on input + if location is not None: + self.wrapped = location.wrapped + elif top_loc is not None: + self.wrapped = top_loc + else: + self.wrapped = TopLoc_Location(trsf) @property def position(self) -> Vector: @@ -1626,7 +1616,9 @@ class Location: # other is a Shape if hasattr(other, "wrapped") and isinstance(other.wrapped, TopoDS_Shape): # result = other.moved(self) - downcast_LUT = { + downcast_lut: dict[ + TopAbs_ShapeEnum, Callable[[TopoDS_Shape], TopoDS_Shape] + ] = { TopAbs_ShapeEnum.TopAbs_VERTEX: TopoDS.Vertex_s, TopAbs_ShapeEnum.TopAbs_EDGE: TopoDS.Edge_s, TopAbs_ShapeEnum.TopAbs_WIRE: TopoDS.Wire_s, @@ -1637,7 +1629,7 @@ class Location: } assert other.wrapped is not None try: - f_downcast = downcast_LUT[other.wrapped.ShapeType()] + f_downcast = downcast_lut[other.wrapped.ShapeType()] except KeyError as exc: raise ValueError(f"Unknown object type {other}") from exc @@ -1816,6 +1808,7 @@ class Location: """Find intersection of plane and location""" def intersect(self, *args, **kwargs): + """Find intersection of geometric object and location""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) if axis is not None: @@ -1833,6 +1826,8 @@ class Location: if shape is not None: return shape.intersect(self) + return None + class LocationEncoder(json.JSONEncoder): """Custom JSON Encoder for Location values @@ -1902,10 +1897,12 @@ class OrientedBoundBox: """ if isinstance(shape, Bnd_OBB): obb = shape - else: + elif hasattr(shape, "wrapped") and isinstance(shape.wrapped, TopoDS_Shape): obb = Bnd_OBB() # Compute the oriented bounding box for the shape. BRepBndLib.AddOBB_s(shape.wrapped, obb, True) + else: + raise TypeError(f"Expected Bnd_OBB or Shape, got {type(shape).__name__}") self.wrapped = obb @property @@ -1933,9 +1930,7 @@ class OrientedBoundBox: (False, True, False): [(1, 1, 1), (1, 1, -1), (-1, 1, -1), (-1, 1, 1)], (False, False, True): [(1, 1, 1), (1, -1, 1), (-1, -1, 1), (-1, 1, 1)], # 3D object case - (False, False, False): [ - (x, y, z) for x, y, z in itertools.product((-1, 1), (-1, 1), (-1, 1)) - ], + (False, False, False): list(itertools.product((-1, 1), (-1, 1), (-1, 1))), } hs = self.size * 0.5 order = orders[(hs.X < TOLERANCE, hs.Y < TOLERANCE, hs.Z < TOLERANCE)] @@ -2896,7 +2891,9 @@ class Plane(metaclass=PlaneMeta): raise ValueError("Cant's reposition empty object") if hasattr(obj, "wrapped") and isinstance(obj.wrapped, TopoDS_Shape): # Shapes # return_value = obj.transform_shape(transform_matrix) - downcast_LUT = { + downcast_lut: dict[ + TopAbs_ShapeEnum, Callable[[TopoDS_Shape], TopoDS_Shape] + ] = { TopAbs_ShapeEnum.TopAbs_VERTEX: TopoDS.Vertex_s, TopAbs_ShapeEnum.TopAbs_EDGE: TopoDS.Edge_s, TopAbs_ShapeEnum.TopAbs_WIRE: TopoDS.Wire_s, @@ -2907,7 +2904,7 @@ class Plane(metaclass=PlaneMeta): } assert obj.wrapped is not None try: - f_downcast = downcast_LUT[obj.wrapped.ShapeType()] + f_downcast = downcast_lut[obj.wrapped.ShapeType()] except KeyError as exc: raise ValueError(f"Unknown object type {obj}") from exc @@ -3001,6 +2998,7 @@ class Plane(metaclass=PlaneMeta): """Find intersection of plane and shape""" def intersect(self, *args, **kwargs): + """Find intersection of geometric object and shape""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) @@ -3046,6 +3044,8 @@ class Plane(metaclass=PlaneMeta): if shape is not None: return shape.intersect(self) + return None + CLASS_REGISTRY = { "Axis": Axis, diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index 4d4298e..46369a7 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -107,9 +107,9 @@ class TestLocation(unittest.TestCase): np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) # Test creation from Plane and Vector - loc4 = Location(Plane.XY, (0, 0, 1)) - np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 1), 1e-7) - np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) + # loc4 = Location(Plane.XY, (0, 0, 1)) + # np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 1), 1e-7) + # np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) # Test composition loc4 = Location((0, 0, 0), Vector(0, 0, 1), 15) @@ -181,6 +181,31 @@ class TestLocation(unittest.TestCase): np.testing.assert_allclose(loc3.to_tuple()[0], (1, 2, 3), 1e-6) np.testing.assert_allclose(loc3.to_tuple()[1], rot_angles, 1e-6) + def test_location_kwarg_parameters(self): + loc = Location(position=(10, 20, 30)) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + + loc = Location(position=(10, 20, 30), orientation=(10, 20, 30)) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) + + loc = Location( + position=(10, 20, 30), orientation=(90, 0, 90), ordering=Extrinsic.XYZ + ) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (0, 90, 90), 5) + + loc = Location((10, 20, 30), orientation=(10, 20, 30)) + self.assertAlmostEqual(loc.position, (10, 20, 30), 5) + self.assertAlmostEqual(loc.orientation, (10, 20, 30), 5) + + loc = Location(plane=Plane.isometric) + self.assertAlmostEqual(loc.position, (0, 0, 0), 5) + self.assertAlmostEqual(loc.orientation, (45.00, 35.26, 30.00), 2) + + loc = Location(location=Location()) + self.assertAlmostEqual(loc.position, (0, 0, 0), 5) + def test_location_parameters(self): loc = Location((10, 20, 30)) self.assertAlmostEqual(loc.position, (10, 20, 30), 5) From 2efd21ff5817025d21cae97644a54a9baac2f7c5 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 18 May 2025 10:18:08 -0400 Subject: [PATCH 298/518] Deprecated to_axis Issue #155 --- docs/tutorial_joints.py | 2 +- examples/joints.py | 9 ++- examples/joints_algebra.py | 8 +- src/build123d/geometry.py | 98 ++++++++++++++---------- src/build123d/topology/one_d.py | 8 +- tests/test_direct_api/test_axis.py | 15 +++- tests/test_direct_api/test_location.py | 9 ++- tests/test_direct_api/test_projection.py | 4 - 8 files changed, 94 insertions(+), 59 deletions(-) diff --git a/docs/tutorial_joints.py b/docs/tutorial_joints.py index e6d2fd3..ba1b149 100644 --- a/docs/tutorial_joints.py +++ b/docs/tutorial_joints.py @@ -159,7 +159,7 @@ class Hinge(Compound): for hole, hole_location in enumerate(hole_locations): CylindricalJoint( label="hole" + str(hole), - axis=hole_location.to_axis(), + axis=Axis(hole_location), linear_range=(-2 * CM, 2 * CM), angular_range=(0, 360), ) diff --git a/examples/joints.py b/examples/joints.py index f143af5..c51fb50 100644 --- a/examples/joints.py +++ b/examples/joints.py @@ -1,6 +1,7 @@ """ Experimental Joint development file """ + from build123d import * from ocp_vscode import * @@ -72,9 +73,9 @@ swing_arm_hinge_edge: Edge = ( .sort_by(Axis.X)[-2:] .sort_by(Axis.Y)[0] ) -swing_arm_hinge_axis = swing_arm_hinge_edge.to_axis() +swing_arm_hinge_axis = Axis(swing_arm_hinge_edge) base_corner_edge = base.edges().sort_by(Axis((0, 0, 0), (1, 1, 0)))[-1] -base_hinge_axis = base_corner_edge.to_axis() +base_hinge_axis = Axis(base_corner_edge) j3 = RevoluteJoint("hinge", base, axis=base_hinge_axis, angular_range=(0, 180)) j4 = RigidJoint("corner", hinge_arm, swing_arm_hinge_axis.location) base.joints["hinge"].connect_to(hinge_arm.joints["corner"], angle=90) @@ -86,7 +87,7 @@ slider_arm = JointBox(4, 1, 2, 0.2) s1 = LinearJoint( "slide", base, - axis=Edge.make_mid_way(*base_top_edges, 0.67).to_axis(), + axis=Axis(Edge.make_mid_way(*base_top_edges, 0.67)), linear_range=(0, base_top_edges[0].length), ) s2 = RigidJoint("slide", slider_arm, Location(Vector(0, 0, 0))) @@ -111,7 +112,7 @@ j5.connect_to(j6, position=-1, angle=90) j7 = LinearJoint( "slot", base, - axis=Edge.make_mid_way(*base_top_edges, 0.33).to_axis(), + axis=Axis(Edge.make_mid_way(*base_top_edges, 0.33)), linear_range=(0, base_top_edges[0].length), ) pin_arm = JointBox(2, 1, 2) diff --git a/examples/joints_algebra.py b/examples/joints_algebra.py index c0da394..1484329 100644 --- a/examples/joints_algebra.py +++ b/examples/joints_algebra.py @@ -62,9 +62,9 @@ swing_arm_hinge_edge = ( .sort_by(Axis.X)[-2:] .sort_by(Axis.Y)[0] ) -swing_arm_hinge_axis = swing_arm_hinge_edge.to_axis() +swing_arm_hinge_axis = Axis(swing_arm_hinge_edge) base_corner_edge = base.edges().sort_by(Axis((0, 0, 0), (1, 1, 0)))[-1] -base_hinge_axis = base_corner_edge.to_axis() +base_hinge_axis = Axis(base_corner_edge) j3 = RevoluteJoint("hinge", base, axis=base_hinge_axis, angular_range=(0, 180)) j4 = RigidJoint("corner", hinge_arm, swing_arm_hinge_axis.location) base.joints["hinge"].connect_to(hinge_arm.joints["corner"], angle=90) @@ -77,7 +77,7 @@ slider_arm = JointBox(4, 1, 2, 0.2) s1 = LinearJoint( "slide", base, - axis=Edge.make_mid_way(*base_top_edges, 0.67).to_axis(), + axis=Axis(Edge.make_mid_way(*base_top_edges, 0.67)), linear_range=(0, base_top_edges[0].length), ) s2 = RigidJoint("slide", slider_arm, Location(Vector(0, 0, 0))) @@ -102,7 +102,7 @@ j5.connect_to(j6, position=-1, angle=90) j7 = LinearJoint( "slot", base, - axis=Edge.make_mid_way(*base_top_edges, 0.33).to_axis(), + axis=Axis(Edge.make_mid_way(*base_top_edges, 0.33)), linear_range=(0, base_top_edges[0].length), ) pin_arm = JointBox(2, 1, 2) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index bc18517..414c1aa 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -593,6 +593,7 @@ class Axis(metaclass=AxisMeta): origin (VectorLike): start point direction (VectorLike): direction edge (Edge): origin & direction defined by start of edge + location (Location): location to convert to axis Attributes: position (Vector): the global position of the axis origin @@ -603,75 +604,84 @@ class Axis(metaclass=AxisMeta): _dim = 1 @overload - def __init__(self, gp_ax1: gp_Ax1): # pragma: no cover + def __init__(self, gp_ax1: gp_Ax1): """Axis: point and direction""" @overload - def __init__(self, origin: VectorLike, direction: VectorLike): # pragma: no cover + def __init__(self, location: Location): + """Axis from location""" + + @overload + def __init__(self, origin: VectorLike, direction: VectorLike): """Axis: point and direction""" @overload - def __init__(self, edge: Edge): # pragma: no cover + def __init__(self, edge: Edge): """Axis: start of Edge""" - def __init__(self, *args, **kwargs): + def __init__( + self, *args, **kwargs + ): # pylint: disable=too-many-branches, too-many-locals gp_ax1 = kwargs.pop("gp_ax1", None) origin = kwargs.pop("origin", None) direction = kwargs.pop("direction", None) edge = kwargs.pop("edge", None) + location = kwargs.pop("location", None) # Handle unexpected kwargs if kwargs: raise ValueError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + # Handle positional arguments if len(args) == 1: - if isinstance(args[0], gp_Ax1): - gp_ax1 = args[0] - elif ( - hasattr(args[0], "wrapped") - and args[0].wrapped is not None - and isinstance(args[0].wrapped, TopoDS_Edge) - ): - edge = args[0] + arg = args[0] + if isinstance(arg, gp_Ax1): + gp_ax1 = arg + elif isinstance(arg, Location): + location = arg + elif hasattr(arg, "wrapped") and isinstance(arg.wrapped, TopoDS_Edge): + edge = arg + elif isinstance(arg, (Vector, tuple)): + origin = arg else: - origin = args[0] + raise ValueError(f"Unrecognized single argument: {arg}") elif len(args) == 2: origin, direction = args + # Handle edge-based construction if edge is not None: - if ( - hasattr(edge, "wrapped") - and edge.wrapped is not None - and isinstance(edge.wrapped, TopoDS_Edge) - ): - # Extract the start point and tangent - topods_edge: TopoDS_Edge = edge.wrapped # type: ignore[annotation-unchecked] - curve = BRep_Tool.Curve_s(topods_edge, float(), float()) - param_min, _ = BRep_Tool.Range_s(topods_edge) - origin_pnt = gp_Pnt() - tangent_vec = gp_Vec() - curve.D1(param_min, origin_pnt, tangent_vec) - origin = Vector(origin_pnt) - direction = Vector(gp_Dir(tangent_vec)) - else: - raise ValueError(f"Invalid argument {edge}") + if not (hasattr(edge, "wrapped") and isinstance(edge.wrapped, TopoDS_Edge)): + raise ValueError(f"Invalid edge argument: {edge}") - if gp_ax1 is not None: - if not isinstance(gp_ax1, gp_Ax1): - raise ValueError(f"Invalid Axis parameter {gp_ax1}") - self.wrapped: gp_Ax1 = gp_ax1 # type: ignore[annotation-unchecked] - else: + topods_edge: TopoDS_Edge = edge.wrapped # type: ignore[annotation-unchecked] + curve = BRep_Tool.Curve_s(topods_edge, float(), float()) + param_min, _ = BRep_Tool.Range_s(topods_edge) + origin_pnt = gp_Pnt() + tangent_vec = gp_Vec() + curve.D1(param_min, origin_pnt, tangent_vec) + origin = Vector(origin_pnt) + direction = Vector(gp_Dir(tangent_vec)) + + # Convert location to axis + if location is not None: + gp_ax1 = Axis.Z.located(location).wrapped + + # Construct self.wrapped from gp_ax1 or origin/direction + if gp_ax1 is None: try: origin_vector = Vector(origin) direction_vector = Vector(direction) - except TypeError as exc: + gp_ax1 = gp_Ax1( + origin_vector.to_pnt(), + gp_Dir(*tuple(direction_vector.normalized())), + ) + except Exception as exc: raise ValueError("Invalid Axis parameters") from exc + elif not isinstance(gp_ax1, gp_Ax1): + raise ValueError(f"Invalid Axis parameter: {gp_ax1}") - self.wrapped = gp_Ax1( - origin_vector.to_pnt(), - gp_Dir(*tuple(direction_vector.normalized())), - ) + self.wrapped: gp_Ax1 = gp_ax1 # type: ignore[annotation-unchecked] @property def position(self): @@ -1425,7 +1435,9 @@ class Location: """Location with translation t and rotation around direction by angle with respect to the original location.""" - def __init__(self, *args, **kwargs): + def __init__( + self, *args, **kwargs + ): # pylint: disable=too-many-branches, too-many-locals, too-many-statements position = kwargs.pop("position", None) orientation = kwargs.pop("orientation", None) ordering = kwargs.pop("ordering", None) @@ -1751,6 +1763,12 @@ class Location: def to_axis(self) -> Axis: """Convert the location into an Axis""" + warnings.warn( + "to_axis is deprecated and will be removed in a future version. " + "Use 'Axis(Location)' instead.", + DeprecationWarning, + stacklevel=2, + ) return Axis.Z.located(self) def to_tuple(self) -> tuple[tuple[float, float, float], tuple[float, float, float]]: diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 51fae46..1c6faae 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1563,7 +1563,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Returns: Edge: linear Edge between two Edges """ - flip = first.to_axis().is_opposite(second.to_axis()) + flip = Axis(first).is_opposite(Axis(second)) pnts = [ Edge.make_line( first.position_at(i), second.position_at(1 - i if flip else i) @@ -2184,6 +2184,12 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def to_axis(self) -> Axis: """Translate a linear Edge to an Axis""" + warnings.warn( + "to_axis is deprecated and will be removed in a future version. " + "Use 'Axis(Edge)' instead.", + DeprecationWarning, + stacklevel=2, + ) if self.geom_type != GeomType.LINE: raise ValueError( f"to_axis is only valid for linear Edges not {self.geom_type}" diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py index bdc921e..2f76612 100644 --- a/tests/test_direct_api/test_axis.py +++ b/tests/test_direct_api/test_axis.py @@ -33,7 +33,7 @@ import unittest import numpy as np from OCP.gp import gp_Ax1, gp_Dir, gp_Pnt from build123d.geometry import Axis, Location, Plane, Vector -from build123d.topology import Edge +from build123d.topology import Edge, Vertex class AlwaysEqual: @@ -65,10 +65,18 @@ class TestAxis(unittest.TestCase): self.assertAlmostEqual(test_axis.position, (1, 2, 3), 5) self.assertAlmostEqual(test_axis.direction, (0, 0, 1), 5) + with self.assertRaises(ValueError): + Axis("one") with self.assertRaises(ValueError): Axis("one", "up") with self.assertRaises(ValueError): Axis(one="up") + with self.assertRaises(ValueError): + bad_edge = Edge() + bad_edge.wrapped = Vertex(0, 1, 2).wrapped + Axis(edge=bad_edge) + with self.assertRaises(ValueError): + Axis(gp_ax1=Edge.make_line((0, 0), (1, 0))) def test_axis_from_occt(self): occt_axis = gp_Ax1(gp_Pnt(1, 1, 1), gp_Dir(0, 1, 0)) @@ -100,6 +108,11 @@ class TestAxis(unittest.TestCase): self.assertAlmostEqual(y_axis.position, (0, 0, 1), 5) self.assertAlmostEqual(y_axis.direction, (0, 1, 0), 5) + def test_from_location(self): + axis = Axis(Location((1, 2, 3), (-90, 0, 0))) + self.assertAlmostEqual(axis.position, (1, 2, 3), 6) + self.assertAlmostEqual(axis.direction, (0, 1, 0), 6) + def test_axis_to_plane(self): x_plane = Axis.X.to_plane() self.assertTrue(isinstance(x_plane, Plane)) diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index 46369a7..1c6e666 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -270,10 +270,11 @@ class TestLocation(unittest.TestCase): self.assertAlmostEqual(loc1.position, loc3.position.to_tuple(), 6) self.assertAlmostEqual(loc1.orientation, loc3.orientation.to_tuple(), 6) - def test_to_axis(self): - axis = Location((1, 2, 3), (-90, 0, 0)).to_axis() - self.assertAlmostEqual(axis.position, (1, 2, 3), 6) - self.assertAlmostEqual(axis.direction, (0, 1, 0), 6) + # deprecated + # def test_to_axis(self): + # axis = Location((1, 2, 3), (-90, 0, 0)).to_axis() + # self.assertAlmostEqual(axis.position, (1, 2, 3), 6) + # self.assertAlmostEqual(axis.direction, (0, 1, 0), 6) def test_equal(self): loc = Location((1, 2, 3), (4, 5, 6)) diff --git a/tests/test_direct_api/test_projection.py b/tests/test_direct_api/test_projection.py index 5fbb7bd..8b0da03 100644 --- a/tests/test_direct_api/test_projection.py +++ b/tests/test_direct_api/test_projection.py @@ -94,10 +94,6 @@ class TestProjection(unittest.TestCase): self.assertAlmostEqual(projection[0].position_at(0), (0, 1, 0), 5) self.assertAlmostEqual(projection[0].arc_center, (0, 0, 0), 5) - def test_to_axis(self): - with self.assertRaises(ValueError): - Edge.make_circle(1, end_angle=30).to_axis() - if __name__ == "__main__": unittest.main() From ccdfda88e934b864bfe3a2b634ea31e57079f36e Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 19 May 2025 12:55:47 -0400 Subject: [PATCH 299/518] Adding method Face.wrap_faces --- src/build123d/topology/two_d.py | 65 ++++++++++++++++++++++++++++++ tests/test_direct_api/test_face.py | 17 ++++++++ 2 files changed, 82 insertions(+) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index e3876a1..1df34f7 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1754,6 +1754,71 @@ class Face(Mixin2D, Shape[TopoDS_Face]): f"{type(planar_shape)}" ) + def wrap_faces( + self, + faces: Iterable[Face], + path: Wire | Edge, + start: float = 0.0, + ) -> ShapeList[Face]: + """wrap_faces + + Wrap a sequence of 2D faces onto a 3D surface, aligned along a guiding path. + + This method places multiple planar `Face` objects (defined in the XY plane) onto a + curved 3D surface (`self`), following a given path (Wire or Edge) that lies on or + closely follows the surface. Each face is spaced along the path according to its + original horizontal (X-axis) position, preserving the relative layout of the input + faces. + + The wrapping process attempts to maintain the shape and size of each face while + minimizing distortion. Each face is repositioned to the origin, then individually + wrapped onto the surface starting at a specific point along the path. The face's + new orientation is defined using the path's tangent direction and the surface normal + at that point. + + This is particularly useful for placing a series of features—such as embossed logos, + engraved labels, or patterned tiles—onto a freeform or cylindrical surface, aligned + along a reference edge or curve. + + Args: + faces (Iterable[Face]): An iterable of 2D planar faces to be wrapped. + path (Wire | Edge): A curve on the target surface that defines the alignment + direction. The X-position of each face is mapped to a relative position + along this path. + start (float, optional): The relative starting point on the path (between 0.0 + and 1.0) where the first face should be placed. Defaults to 0.0. + + Returns: + ShapeList[Face]: A list of wrapped face objects, aligned and conformed to the + surface. + """ + path_length = path.length + + face_list = list(faces) + first_face_min_x = face_list[0].bounding_box().min.X + + # Position each face at the origin and wrap onto surface + wrapped_faces: ShapeList[Face] = ShapeList() + for face in face_list: + bbox = face.bounding_box() + face_center_x = (bbox.min.X + bbox.max.X) / 2 + delta_x = face_center_x - first_face_min_x + relative_position_on_wire = start + delta_x / path_length + path_position = path.position_at(relative_position_on_wire) + surface_location = Location( + Plane( + path_position, + x_dir=path.tangent_at(relative_position_on_wire), + z_dir=self.normal_at(path_position), + ) + ) + assert isinstance(face.position, Vector) + face.position -= (delta_x, 0, 0) # Shift back to origin + wrapped_face = Face.wrap(self, face, surface_location) + wrapped_faces.append(wrapped_face) + + return wrapped_faces + def _uv_bounds(self) -> tuple[float, float, float, float]: """Return the u min, u max, v min, v max values""" return BRepTools.UVBounds_s(self.wrapped) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 0bde6c6..5106228 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -50,6 +50,7 @@ from build123d.objects_sketch import ( Polygon, Rectangle, RegularPolygon, + Text, Triangle, ) from build123d.operations_generic import fillet, offset @@ -888,6 +889,22 @@ class TestFace(unittest.TestCase): with self.assertRaises(RuntimeError): surface.wrap(star, target) + def test_wrap_faces(self): + sphere = Solid.make_sphere(50, angle1=-90).face() + surface = sphere.face() + path: Edge = ( + sphere.cut( + Solid.make_cylinder(80, 100, Plane.YZ).locate(Location((-50, 0, -70))) + ) + .edges() + .sort_by(Axis.Z)[0] + .reversed() + ) + text = Text(txt="ei", font_size=15, align=(Align.MIN, Align.CENTER)) + wrapped_faces = surface.wrap_faces(text.faces(), path, 0.2) + self.assertEqual(len(wrapped_faces), 3) + self.assertTrue(all(not f.is_planar_face for f in wrapped_faces)) + def test_revolve(self): l1 = Edge.make_line((3, 0), (3, 2)) revolved = Face.revolve(l1, 360, Axis.Y) From aecc71dac2ff53d31f2ad938328814cc3ff6f613 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 19 May 2025 14:18:42 -0400 Subject: [PATCH 300/518] Adding topo_parent to Triangle vertices --- src/build123d/objects_sketch.py | 19 +++++++++++-------- tests/test_build_sketch.py | 3 +++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index f603147..1b1a6cc 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -544,16 +544,16 @@ class Text(BaseSketchObject): "Arial Black". Alternatively, a specific font file can be specified with font_path. Note: Windows 10+ users must "Install for all users" for fonts to be found by name. - - Not all fonts have every FontStyle available, however ITALIC and BOLDITALIC will - still italicize the font if the respective font file is not available. - text_align specifies alignment of text inside the bounding box, while align the + Not all fonts have every FontStyle available, however ITALIC and BOLDITALIC will + still italicize the font if the respective font file is not available. + + text_align specifies alignment of text inside the bounding box, while align the aligns the bounding box itself. - Optionally, the Text can be positioned on a non-linear edge or wire with a path and + Optionally, the Text can be positioned on a non-linear edge or wire with a path and position_on_path. - + Args: txt (str): text to render font_size (float): size of the font in model units @@ -564,10 +564,10 @@ class Text(BaseSketchObject): text_align (tuple[TextAlign, TextAlign], optional): horizontal text align LEFT, CENTER, or RIGHT. Vertical text align BOTTOM, CENTER, TOP, or TOPFIRSTLINE. Defaults to (TextAlign.CENTER, TextAlign.CENTER) - align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of + align (Align | tuple[Align, Align], optional): align MIN, CENTER, or MAX of object. Defaults to None path (Edge | Wire, optional): path for text to follow. Defaults to None - position_on_path (float, optional): the relative location on path to position + position_on_path (float, optional): the relative location on path to position the text, values must be between 0.0 and 1.0. Defaults to 0.0 rotation (float, optional): angle to rotate object. Defaults to 0 mode (Mode, optional): combination mode. Defaults to Mode.ADD @@ -782,9 +782,12 @@ class Triangle(BaseSketchObject): self.vertex_A = topo_explore_common_vertex( self.edge_b, self.edge_c ) #: vertex 'A' + self.vertex_A.topo_parent = self self.vertex_B = topo_explore_common_vertex( self.edge_a, self.edge_c ) #: vertex 'B' + self.vertex_B.topo_parent = self self.vertex_C = topo_explore_common_vertex( self.edge_a, self.edge_b ) #: vertex 'C' + self.vertex_C.topo_parent = self diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index d57fbf7..52a6194 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -419,6 +419,9 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertTupleAlmostEquals(tri.vertex_A, (3, 4, 0), 5) self.assertTupleAlmostEquals(tri.vertex_B, (0, 0, 0), 5) self.assertTupleAlmostEquals(tri.vertex_C, (3, 0, 0), 5) + self.assertEqual(tri.vertex_A.topo_parent, tri) + self.assertEqual(tri.vertex_B.topo_parent, tri) + self.assertEqual(tri.vertex_C.topo_parent, tri) tri = Triangle(c=5, C=90, a=3) self.assertAlmostEqual(tri.area, (3 * 4) / 2, 5) From 1b69032211c0514d245ee7a27159092d6e6d8aca Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 19 May 2025 14:28:37 -0400 Subject: [PATCH 301/518] Fixing typing --- src/build123d/objects_sketch.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 1b1a6cc..7e15e48 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -53,6 +53,7 @@ from build123d.topology import ( Face, ShapeList, Sketch, + Vertex, Wire, tuplify, topo_explore_common_vertex, @@ -782,12 +783,15 @@ class Triangle(BaseSketchObject): self.vertex_A = topo_explore_common_vertex( self.edge_b, self.edge_c ) #: vertex 'A' + assert isinstance(self.vertex_A, Vertex) self.vertex_A.topo_parent = self self.vertex_B = topo_explore_common_vertex( self.edge_a, self.edge_c ) #: vertex 'B' + assert isinstance(self.vertex_B, Vertex) self.vertex_B.topo_parent = self self.vertex_C = topo_explore_common_vertex( self.edge_a, self.edge_b ) #: vertex 'C' + assert isinstance(self.vertex_C, Vertex) self.vertex_C.topo_parent = self From cec429c5ccf75c290bd6f3ba8c3550826b866720 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 19 May 2025 19:56:27 -0400 Subject: [PATCH 302/518] Enabling ShapeList + Shape --- src/build123d/topology/shape_core.py | 25 ++++++++-- tests/test_direct_api/test_shape_list.py | 58 +++++++++++++++++++++++- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index a4b48e1..43ae9c6 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2326,10 +2326,27 @@ class ShapeList(list[T]): # ---- Instance Methods ---- - def __add__(self, other: ShapeList) -> ShapeList[T]: # type: ignore - """Combine two ShapeLists together operator +""" - # return ShapeList(itertools.chain(self, other)) # breaks MacOS-13 - return ShapeList(list(self) + list(other)) + def __add__(self, other: Shape | Iterable[Shape]) -> ShapeList[T]: # type: ignore + """Return a new ShapeList that includes other""" + if isinstance(other, (Vector, Shape)): + return ShapeList(tcast(list[T], list(self) + [other])) + if isinstance(other, Iterable) and all( + isinstance(o, (Shape, Vector)) for o in other + ): + return ShapeList(list(self) + list(other)) + raise TypeError(f"Cannot add object of type {type(other)} to ShapeList") + + def __iadd__(self, other: Shape | Iterable[Shape]) -> Self: # type: ignore + """In-place addition to this ShapeList""" + if isinstance(other, (Vector, Shape)): + self.append(tcast(T, other)) + elif isinstance(other, Iterable) and all( + isinstance(o, (Shape, Vector)) for o in other + ): + self.extend(other) + else: + raise TypeError(f"Cannot add object of type {type(other)} to ShapeList") + return self def __and__(self, other: ShapeList) -> ShapeList[T]: """Intersect two ShapeLists operator &""" diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py index 643221d..7ccf4a5 100644 --- a/tests/test_direct_api/test_shape_list.py +++ b/tests/test_direct_api/test_shape_list.py @@ -64,7 +64,9 @@ class TestShapeList(unittest.TestCase): actual_lines = actual.splitlines() self.assertEqual(len(actual_lines), len(expected_lines)) for actual_line, expected_line in zip(actual_lines, expected_lines): - start, end = re.split(r"at 0x[0-9a-f]+", expected_line, maxsplit=2, flags=re.I) + start, end = re.split( + r"at 0x[0-9a-f]+", expected_line, maxsplit=2, flags=re.I + ) self.assertTrue(actual_line.startswith(start)) self.assertTrue(actual_line.endswith(end)) @@ -403,5 +405,59 @@ class TestShapeList(unittest.TestCase): ) +class TestShapeListAddition(unittest.TestCase): + def setUp(self): + # Create distinct faces to test with + self.face1 = Box(1, 1, 1).faces().sort_by(Axis.Z)[0] # bottom face + self.face2 = Box(1, 1, 1).faces().sort_by(Axis.Z)[-1] # top face + self.face3 = Box(1, 1, 1).faces().sort_by(Axis.X)[0] # side face + + def test_add_single_shape(self): + sl = ShapeList([self.face1]) + result = sl + self.face2 + self.assertIsInstance(result, ShapeList) + self.assertEqual(len(result), 2) + self.assertIn(self.face1, result) + self.assertIn(self.face2, result) + + def test_add_shape_list(self): + sl1 = ShapeList([self.face1]) + sl2 = ShapeList([self.face2, self.face3]) + result = sl1 + sl2 + self.assertIsInstance(result, ShapeList) + self.assertEqual(len(result), 3) + self.assertListEqual(result, [self.face1, self.face2, self.face3]) + + def test_iadd_single_shape(self): + sl = ShapeList([self.face1]) + sl_id_before = id(sl) + sl += self.face2 + self.assertEqual(id(sl), sl_id_before) # in-place mutation + self.assertEqual(len(sl), 2) + self.assertListEqual(sl, [self.face1, self.face2]) + + def test_iadd_shape_list(self): + sl = ShapeList([self.face1]) + sl += ShapeList([self.face2, self.face3]) + self.assertEqual(len(sl), 3) + self.assertListEqual(sl, [self.face1, self.face2, self.face3]) + + def test_add_vector(self): + vector = Vector(1, 2, 3) + sl = ShapeList([vector]) + sl += Vector(4, 5, 6) + self.assertEqual(len(sl), 2) + self.assertIsInstance(sl[0], Vector) + self.assertIsInstance(sl[1], Vector) + + def test_add_invalid_type(self): + sl = ShapeList([self.face1]) + with self.assertRaises(TypeError): + _ = sl + 123 # type: ignore + + with self.assertRaises(TypeError): + sl += "not a shape" # type: ignore + + if __name__ == "__main__": unittest.main() From e6c33137b3a091fa0ee28f8270809e88db37bc80 Mon Sep 17 00:00:00 2001 From: Jan Graichen Date: Tue, 6 May 2025 22:35:59 +0200 Subject: [PATCH 303/518] feat: Add timestamp argument to STEP export Allow passing a timestamp value when export STEP files, to generate STEP files with a specific timestamp value in the file header. For example, a null timestamp (`0000-00-00T00:00:00`), or a static timestamp can be used when generated files should be equal if there are no visual changes, such as for file versioning. This commit extends the `#export_step` function, to accept a `timestamp` keyword argument, that can be a string or a `datetime` object. A `datetime` is easier to use from Python. --- src/build123d/exporters3d.py | 17 ++++++++++++++--- tests/test_exporters3d.py | 29 +++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index 7f2b53b..749e331 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -29,10 +29,10 @@ license: # pylint has trouble with the OCP imports # pylint: disable=no-name-in-module, import-error -from io import BytesIO +from datetime import datetime import warnings +from io import BytesIO from os import PathLike, fsdecode, fspath -from typing import Union import OCP.TopAbs as ta from anytree import PreOrderIter @@ -47,7 +47,11 @@ from OCP.RWGltf import RWGltf_CafWriter from OCP.STEPCAFControl import STEPCAFControl_Controller, STEPCAFControl_Writer from OCP.STEPControl import STEPControl_Controller, STEPControl_StepModelType from OCP.StlAPI import StlAPI_Writer -from OCP.TCollection import TCollection_AsciiString, TCollection_ExtendedString, TCollection_HAsciiString +from OCP.TCollection import ( + TCollection_AsciiString, + TCollection_ExtendedString, + TCollection_HAsciiString, +) from OCP.TColStd import TColStd_IndexedDataMapOfStringString from OCP.TDataStd import TDataStd_Name from OCP.TDF import TDF_Label @@ -262,6 +266,8 @@ def export_step( unit: Unit = Unit.MM, write_pcurves: bool = True, precision_mode: PrecisionMode = PrecisionMode.AVERAGE, + *, # Too many positional arguments + timestamp: str | datetime | None = None, ) -> bool: """export_step @@ -302,6 +308,11 @@ def export_step( header = APIHeaderSection_MakeHeader(writer.Writer().Model()) if to_export.label: header.SetName(TCollection_HAsciiString(to_export.label)) + if timestamp is not None: + if isinstance(timestamp, datetime): + header.SetTimeStamp(TCollection_HAsciiString(timestamp.isoformat())) + else: + header.SetTimeStamp(TCollection_HAsciiString(timestamp)) # consider using e.g. the non *Value versions instead # header.SetAuthorValue(1, TCollection_HAsciiString("Volker")); # header.SetOrganizationValue(1, TCollection_HAsciiString("myCompanyName")); diff --git a/tests/test_exporters3d.py b/tests/test_exporters3d.py index 9ca11b7..644ac3e 100644 --- a/tests/test_exporters3d.py +++ b/tests/test_exporters3d.py @@ -30,8 +30,10 @@ import json import os import re import unittest -from typing import Optional +from datetime import datetime from pathlib import Path +from typing import Optional +from zoneinfo import ZoneInfo import pytest @@ -39,7 +41,7 @@ from build123d.build_common import GridLocations from build123d.build_enums import Unit from build123d.build_line import BuildLine from build123d.build_sketch import BuildSketch -from build123d.exporters3d import export_gltf, export_step, export_brep, export_stl +from build123d.exporters3d import export_brep, export_gltf, export_step, export_stl from build123d.geometry import Color, Pos, Vector, VectorLike from build123d.objects_curve import Line from build123d.objects_part import Box, Sphere @@ -144,6 +146,29 @@ class TestExportStep(DirectApiTestCase): os.chmod("box_read_only.step", 0o777) # Make the file read/write os.remove("box_read_only.step") + def test_export_step_timestamp_datetime(self): + b = Box(1, 1, 1) + t = datetime(2025, 5, 6, 21, 30, 25) + self.assertTrue(export_step(b, "box.step", timestamp=t)) + with open("box.step", "r") as file: + step_data = file.read() + os.remove("box.step") + self.assertEqual( + re.findall("FILE_NAME\\('[^']*','([^']*)'", step_data), + ["2025-05-06T21:30:25"], + ) + + def test_export_step_timestamp_str(self): + b = Box(1, 1, 1) + self.assertTrue(export_step(b, "box.step", timestamp="0000-00-00T00:00:00")) + with open("box.step", "r") as file: + step_data = file.read() + os.remove("box.step") + self.assertEqual( + re.findall("FILE_NAME\\('[^']*','([^']*)'", step_data), + ["0000-00-00T00:00:00"], + ) + class TestExportGltf(DirectApiTestCase): def test_export_gltf(self): From 0e7ab984301074f3bea3bad96938138d30c42420 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 20 May 2025 19:10:57 -0400 Subject: [PATCH 304/518] Adding bicycle tire example --- docs/assets/examples/bicycle_tire.png | Bin 0 -> 255945 bytes docs/examples_1.rst | 23 ++++++ examples/bicycle_tire.py | 109 ++++++++++++++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 docs/assets/examples/bicycle_tire.png create mode 100644 examples/bicycle_tire.py diff --git a/docs/assets/examples/bicycle_tire.png b/docs/assets/examples/bicycle_tire.png new file mode 100644 index 0000000000000000000000000000000000000000..bba9acbdfd0242f37833c612bb9c56e60dc7d161 GIT binary patch literal 255945 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

    v)@AJfKE2o_tcaKbub5L)ZwJG_bg}Mvkcz1 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    a-x1!>&-cJmCR}`N#(MP` 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 z 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

    $=)RxK>y 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%0ACk=?9>Phk=J)^yHFocQzJ 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

    ps3n zQn9tiQ$^^dtj4MUwY70YuEtCopEa$tNzD`O(Rgsa-B0sqP15V0ia+t{?x($9o#vK* z8JWMUc$)pj%BsZ3x37)FrwJ`}-MVGPH1SXo#UioayU*k@yHy6tcFcaXbmyw7MGLAE zE^_+wTWokS#ll$g-RacF6I=`8R%dXWkFZj^8uEL$zp_sFL}rJ~z^4t|O}?4|)1)=) zDw4ll_<82V2d8h3surm4NL#n)iB{LL%-`SN%gf6@-`?NXH^~~5(OcS7E`3dKVOV6G zq@m2@v0Chh?#-Wl0qVL-qgag@A2gT88$Y|g_Rnj72Ak@4bqq7y-&bueuU%Tc_vgmm zsomj1J&ARifvZ+6T@@7sPnu;rzr<75t@e4-SatMPEn3Iwcc*g0Y2oIwr<;<4 ze|~CpI>Erey4uslF{Jt8!rtUPYt(}iG7TT<>3g2JzDrhP*U29d29sB`cRqZ=(e*b= zdKwEy7q9D#8?lbBn|{1`VFnt#6Vh1Vv#T&mF7FyIgXU3|4_96avOV#Adfq{MTI-c|Id0l$-iI7S9Hs1@D-98l?_O1SnO~c3MW|?=VH8@$kY!=Z6IW{QZiPWUL zDNPU4B!#(`eY$ccOkB8jNvOKVQ5FS*kN#@z`G0rb(4OA*<=^V0j`^ouY-QCXs;spR z?-frvb1p0BE%-EU8?T;; zNwt_Oz<%KCy;Sqg4;NZ_7|i2%x&$Xf>dX@3q(zAmZHXK{CZ}E>J1xbKaCg2>-?C8d z2AOiU1>a*=ZvVs_v}*4kbN4e%E0tC=-dM7p!G6Y!eUI1iiZ$$M?$_79kvrdf&1!}n zC0Cyv;+0+YyWu9kmaXj6_c6CLzF**5x@(!xjp?g3s_us}Y?c3e#FR<)g!8^dT-%rz zeASVD%4a$I!gBk6zmyr&;R4bPjwX z{%r1!;@Go7DPRAsj(Y#;$QRknt6nRgHLtjx-_EO>zsliF?Do4x-}cG-_}u@vaN&fI z6XNOZV#0UD*K6c`xE20fG2{LA?el-`S8qT5uKw-qZJpXe8nd6j3u!f9b=Z{%)&Q>|0|K~lH!_EH7Mf6MdjvNqqkcKz!;?Z>Ha7cR^> z9Q@?Lo<>=Xp2H_EOCPzcKktqb^P**$&WC>q%xnS;wJ4dW2x@W#l_Um!Sd^r~?O zKSE*q7Nwl_TX5}Uk`LN!2#dXSo%-g7u~MR-{<*AA zr**hdG(J72mTTpBdx!^K#kTUmxOp1;>ge3pH?Z}$N^@hsL4 zoy-c{V5OjP^(^DWUF+CqUUKe=+aT=EdsyLt@|{0n5aNRlmx-^EuAjl5h8GaPV{JLgECZ{oI#2~N~vMolKGqd**lhS WwC2QHcrq|BFnGH9xvX Date: Wed, 21 May 2025 13:25:08 -0400 Subject: [PATCH 305/518] Updating description of is_frenet parameter --- src/build123d/topology/three_d.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index ee92394..c74c0aa 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -1229,6 +1229,21 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): Sweep the given cross section into a prismatic solid along the provided path + The is_frenet parameter controls how the profile orientation changes as it + follows along the sweep path. If is_frenet is False, the orientation of the + profile is kept consistent from point to point. The resulting shape has the + minimum possible twisting. Unintuitively, when a profile is swept along a + helix, this results in the orientation of the profile slowly creeping + (rotating) as it follows the helix. Setting is_frenet to True prevents this. + + If is_frenet is True the orientation of the profile is based on the local + curvature and tangency vectors of the path. This keeps the orientation of the + profile consistent when sweeping along a helix (because the curvature vector of + a straight helix always points to its axis). However, when path is not a helix, + the resulting shape can have strange looking twists sometimes. For more + information, see Frenet Serret formulas + http://en.wikipedia.org/wiki/Frenet%E2%80%93Serret_formulas. + Args: section (Union[Face, Wire]): cross section to sweep path (Union[Wire, Edge]): sweep path @@ -1294,6 +1309,21 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): Sweep through a sequence of profiles following a path. + The is_frenet parameter controls how the profile orientation changes as it + follows along the sweep path. If is_frenet is False, the orientation of the + profile is kept consistent from point to point. The resulting shape has the + minimum possible twisting. Unintuitively, when a profile is swept along a + helix, this results in the orientation of the profile slowly creeping + (rotating) as it follows the helix. Setting is_frenet to True prevents this. + + If is_frenet is True the orientation of the profile is based on the local + curvature and tangency vectors of the path. This keeps the orientation of the + profile consistent when sweeping along a helix (because the curvature vector of + a straight helix always points to its axis). However, when path is not a helix, + the resulting shape can have strange looking twists sometimes. For more + information, see Frenet Serret formulas + http://en.wikipedia.org/wiki/Frenet%E2%80%93Serret_formulas. + Args: profiles (Iterable[Union[Wire, Face]]): list of profiles path (Union[Wire, Edge]): The wire to sweep the face resulting from the wires over From 14ef7d1a0d53d30c227d3b63a8bfb47ca8614a32 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 22 May 2025 16:07:08 -0400 Subject: [PATCH 306/518] Improved Edge.param_at_point and Wire.trim - Issue #795 --- src/build123d/topology/one_d.py | 172 ++++++++++++++--------------- tests/test_direct_api/test_edge.py | 22 ++++ 2 files changed, 107 insertions(+), 87 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 1c6faae..9b5ef43 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -60,7 +60,7 @@ from math import radians, inf, pi, cos, copysign, ceil, floor from typing import Literal, overload, TYPE_CHECKING from typing_extensions import Self from numpy import ndarray -from scipy.optimize import minimize +from scipy.optimize import minimize, minimize_scalar from scipy.spatial import ConvexHull import OCP.TopAbs as ta @@ -176,6 +176,7 @@ from build123d.build_enums import ( from build123d.geometry import ( DEG2RAD, TOLERANCE, + TOL_DIGITS, Axis, Color, Location, @@ -2078,14 +2079,25 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return None def param_at_point(self, point: VectorLike) -> float: - """Normalized parameter at point along Edge""" + """param_at_point + + Args: + point (VectorLike): point on Edge + + Raises: + ValueError: point not on edge + RuntimeError: failed to find parameter + + Returns: + float: parameter value at point on edge + """ # Note that this search algorithm would ideally be replaced with # an OCP based solution, something like that which is shown below. # However, there are known issues with the OCP methods for some # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.5ms while - # the OCP methods take about 0.4ms. + # end points. Also note that this search takes about 1.3ms on a + # complex curve while the OCP methods take about 0.4ms. # # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) # param_min, param_max = BRep_Tool.Range_s(self.wrapped) @@ -2095,26 +2107,47 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): point = Vector(point) - if not isclose_b(self.distance_to(point), 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is not on edge") + separation = self.distance_to(point) + if not isclose_b(separation, 0, abs_tol=TOLERANCE): + raise ValueError(f"point ({point}) is {separation} from edge") - # Function to be minimized - def func(param: ndarray) -> float: - return (self.position_at(param[0]) - point).length + # This algorithm finds the normalized [0, 1] parameter of a point on an edge + # by minimizing the 3D distance between the edge and the given point. + # + # Because some edges (e.g., BSplines) can have multiple local minima in the + # distance function, we subdivide the [0, 1] domain into 2^n intervals + # (logarithmic refinement) and perform a bounded minimization in each subinterval. + # + # The first solution found with an error smaller than the geometric resolution + # is returned. If no such minimum is found after all subdivisions, a runtime error + # is raised. - # Find the u value that results in a point within tolerance of the target - initial_guess = max( - 0.0, min(1.0, (point - self.position_at(0)).length / self.length) - ) - result = minimize( - func, - x0=initial_guess, - method="Nelder-Mead", - bounds=[(0.0, 1.0)], - tol=TOLERANCE, - ) - u_value = float(result.x[0]) - return u_value + max_divisions = 10 # Logarithmic refinement depth + + for division in range(max_divisions): + intervals = 2**division + step = 1.0 / intervals + + for i in range(intervals): + lo, hi = i * step, (i + 1) * step + + result = minimize_scalar( + lambda u: (self.position_at(u) - point).length, + bounds=(lo, hi), + method="bounded", + options={"xatol": TOLERANCE / 2}, + ) + + # Early exit if we're below resolution limit + if ( + result.fun + < ( + self @ (result.x + TOLERANCE) - self @ (result.x - TOLERANCE) + ).length + ): + return round(float(result.x), TOL_DIGITS) + + raise RuntimeError("Unable to find parameter, Edge is too complex") def project_to_shape( self, @@ -3076,88 +3109,53 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return self def trim(self: Wire, start: float, end: float) -> Wire: - """trim - - Create a new wire by keeping only the section between start and end. + """Trim a wire between [start, end] normalized over total length. Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 - - Raises: - ValueError: start >= end + start (float): normalized start position (0.0 to <1.0) + end (float): normalized end position (>0.0 to 1.0) Returns: - Wire: trimmed wire + Wire: trimmed Wire """ - - # pylint: disable=too-many-branches if start >= end: raise ValueError("start must be less than end") - edges = self.edges() + # Extract the edges in order + ordered_edges = self.edges().sort_by(self) # If this is really just an edge, skip the complexity of a Wire - if len(edges) == 1: - return Wire([edges[0].trim(start, end)]) + if len(ordered_edges) == 1: + return Wire([ordered_edges[0].trim(start, end)]) - # For each Edge determine the beginning and end wire parameters - # Note that u, v values are parameters along the Wire - edges_uv_values: list[tuple[float, float, Edge]] = [] - found_end_of_wire = False # for finding ends of closed wires - - for edge in edges: - u = self.param_at_point(edge.position_at(0)) - v = self.param_at_point(edge.position_at(1)) - if self.is_closed: # Avoid two beginnings or ends - u = ( - 1 - u - if found_end_of_wire and (isclose_b(u, 0) or isclose_b(u, 1)) - else u - ) - v = ( - 1 - v - if found_end_of_wire and (isclose_b(v, 0) or isclose_b(v, 1)) - else v - ) - found_end_of_wire = ( - isclose_b(u, 0) - or isclose_b(u, 1) - or isclose_b(v, 0) - or isclose_b(v, 1) - or found_end_of_wire - ) - - # Edge might be reversed and require flipping parms - u, v = (v, u) if u > v else (u, v) - - edges_uv_values.append((u, v, edge)) + total_length = self.length + start_len = start * total_length + end_len = end * total_length trimmed_edges = [] - for u, v, edge in edges_uv_values: - if v < start or u > end: # Edge not needed - continue + cur_length = 0.0 - if start <= u and v <= end: # keep whole Edge - trimmed_edges.append(edge) + for edge in ordered_edges: + edge_len = edge.length + edge_start = cur_length + edge_end = cur_length + edge_len + cur_length = edge_end - elif start >= u and end <= v: # Wire trimmed to single Edge - u_edge = edge.param_at_point(self.position_at(start)) - v_edge = edge.param_at_point(self.position_at(end)) - u_edge, v_edge = ( - (v_edge, u_edge) if u_edge > v_edge else (u_edge, v_edge) - ) - trimmed_edges.append(edge.trim(u_edge, v_edge)) + if edge_end <= start_len or edge_start >= end_len: + continue # skip - elif start <= u: # keep start of Edge - u_edge = edge.param_at_point(self.position_at(end)) - if u_edge != 0: - trimmed_edges.append(edge.trim(0, u_edge)) + if edge_start >= start_len and edge_end <= end_len: + trimmed_edges.append(edge) # keep whole Edge + else: + # Normalize trim points relative to this edge + trim_start_len = max(start_len, edge_start) + trim_end_len = min(end_len, edge_end) - else: # v <= end keep end of Edge - v_edge = edge.param_at_point(self.position_at(start)) - if v_edge != 1: - trimmed_edges.append(edge.trim(v_edge, 1)) + u0 = (trim_start_len - edge_start) / edge_len + u1 = (trim_end_len - edge_start) / edge_len + + if abs(u1 - u0) > TOLERANCE: + trimmed_edges.append(edge.trim(u0, u1)) return Wire(trimmed_edges) diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 292b94e..6507cbd 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -27,6 +27,7 @@ license: """ import math +import numpy as np import unittest from unittest.mock import patch, PropertyMock @@ -272,6 +273,27 @@ class TestEdge(unittest.TestCase): with self.assertRaises(ValueError): edge.param_at_point((-1, 1)) + def test_param_at_point_bspline(self): + # Define a complex spline with inflections and non-monotonic behavior + curve = Edge.make_spline( + [ + (-2, 0, 0), + (-10, 1, 0), + (0, 0, 0), + (1, -2, 0), + (2, 0, 0), + (1, 1, 0), + ] + ) + + # Sample N points along the curve using position_at and check that + # param_at_point returns approximately the same param (inverted) + N = 20 + for u in np.linspace(0.0, 1.0, N): + p = curve.position_at(u) + u_back = curve.param_at_point(p) + self.assertAlmostEqual(u, u_back, delta=1e-6, msg=f"u={u}, u_back={u_back}") + def test_conical_helix(self): helix = Edge.make_helix(1, 4, 1, normal=(-1, 0, 0), angle=10, lefthand=True) self.assertAlmostEqual(helix.bounding_box().min.X, -4, 5) From 30d26904ff86bfb0ddd24fbd259f6d692d35b723 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 23 May 2025 13:47:28 -0400 Subject: [PATCH 307/518] Adding Technical Drawing Tutorial --- docs/assets/stepper_drawing.svg | 771 ++++++++++++++++++++++++++++++++ docs/tech_drawing_tutorial.rst | 73 +++ docs/technical_drawing.py | 188 ++++++++ docs/tutorials.rst | 1 + 4 files changed, 1033 insertions(+) create mode 100644 docs/assets/stepper_drawing.svg create mode 100644 docs/tech_drawing_tutorial.rst create mode 100644 docs/technical_drawing.py diff --git a/docs/assets/stepper_drawing.svg b/docs/assets/stepper_drawing.svg new file mode 100644 index 0000000..6504639 --- /dev/null +++ b/docs/assets/stepper_drawing.svg @@ -0,0 +1,771 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/tech_drawing_tutorial.rst b/docs/tech_drawing_tutorial.rst new file mode 100644 index 0000000..227caab --- /dev/null +++ b/docs/tech_drawing_tutorial.rst @@ -0,0 +1,73 @@ +.. _tech_drawing_tutorial: + +########################## +Technical Drawing Tutorial +########################## + +This example demonstrates how to generate a standard technical drawing of a 3D part +using `build123d`. It creates orthographic and isometric views of a Nema 23 stepper +motor and exports the result as an SVG file suitable for printing or inspection. + +Overview +-------- + +A technical drawing represents a 3D object in 2D using a series of standardized views. +These include: + +- **Plan (Top View)** – as seen from directly above (Z-axis down) +- **Front Elevation** – looking at the object head-on (Y-axis forward) +- **Side Elevation (Right Side)** – viewed from the right (X-axis) +- **Isometric Projection** – a 3D perspective view to help visualize depth + +Each view is aligned to a position on the page and optionally scaled or annotated. + +How It Works +------------ + +The script uses the `project_to_viewport` method to project the 3D part geometry into 2D. +A helper function, `project_to_2d`, sets up the viewport (camera origin and up direction) +and places the result onto a virtual drawing sheet. + +The steps involved are: + +1. Load or construct a 3D part (in this case, a stepper motor). +2. Define a `TechnicalDrawing` border and title block using A4 page size. +3. Generate each of the standard views and apply transformations to place them. +4. Add dimensions using `ExtensionLine` and labels using `Text`. +5. Export the drawing using `ExportSVG`, separating visible and hidden edges by layer + and style. + +Result +------ + +.. image:: /assets/stepper_drawing.svg + :alt: Stepper motor technical drawing + :class: align-center + :width: 80% + +Try It Yourself +--------------- + +You can modify the script to: + +- Replace the part with your own `Part` model +- Adjust camera angles and scale +- Add other views (bottom, rear) +- Enhance with more labels and dimensions + +Code +---- + +.. literalinclude:: technical_drawing.py + :language: python + :start-after: [code] + :end-before: [end] + +Dependencies +------------ + +This example depends on the following packages: + +- `build123d` +- `bd_warehouse` (for the `StepperMotor` part) +- `ocp_vscode` (for local preview) diff --git a/docs/technical_drawing.py b/docs/technical_drawing.py new file mode 100644 index 0000000..55a6efc --- /dev/null +++ b/docs/technical_drawing.py @@ -0,0 +1,188 @@ +""" + +name: technical_drawing.py +by: gumyr +date: May 23, 2025 + +desc: + + Generate a multi-view technical drawing of a part, including isometric and + orthographic projections. + + This module demonstrates how to create a standard technical drawing using + `build123d`. It includes: + - Projection of a 3D part to 2D views (plan, front, side, isometric) + - Drawing borders and dimensioning using extension lines + - SVG export of visible and hidden geometry + - Example part: Nema 23 stepper motor from `bd_warehouse.open_builds` + + The following standard views are generated: + - Plan View (Top) + - Front Elevation + - Side Elevation (Right Side) + - Isometric Projection + + The resulting drawing is exported as an SVG and can be previewed using + the `ocp_vscode` viewer. + +license: + + Copyright 2025 gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +""" + +# [code] +from datetime import date + +from bd_warehouse.open_builds import StepperMotor +from build123d import * +from ocp_vscode import show + + +def project_to_2d( + part: Part, + viewport_origin: VectorLike, + viewport_up: VectorLike, + page_origin: VectorLike, + scale_factor: float = 1.0, +) -> tuple[ShapeList[Edge], ShapeList[Edge]]: + """project_to_2d + + Helper function to generate 2d views translated on the 2d page. + + Args: + part (Part): 3d object + viewport_origin (VectorLike): location of viewport + viewport_up (VectorLike): direction of the viewport Y axis + page_origin (VectorLike): center of 2d object on page + scale_factor (float, optional): part scalar. Defaults to 1.0. + + Returns: + tuple[ShapeList[Edge], ShapeList[Edge]]: visible & hidden edges + """ + scaled_part = part if scale_factor == 1.0 else scale(part, scale_factor) + visible, hidden = scaled_part.project_to_viewport( + viewport_origin, viewport_up, look_at=(0, 0, 0) + ) + visible = [Pos(*page_origin) * e for e in visible] + hidden = [Pos(*page_origin) * e for e in hidden] + + return ShapeList(visible), ShapeList(hidden) + + +# The object that appearing in the drawing +stepper: Part = StepperMotor("Nema23") + +# Create a standard technical drawing border on A4 paper +border = TechnicalDrawing( + designed_by="build123d", + design_date=date.fromisoformat("2025-05-23"), + page_size=PageSize.A4, + title="Nema 23 Stepper", + sub_title="Units: mm", + drawing_number="BD-1", + sheet_number=1, + drawing_scale=1, +) +page_size = border.bounding_box().size + +# Specify the drafting options for extension lines +drafting_options = Draft(font_size=3.5, decimal_precision=1, display_units=False) + +# Lists used to store the 2d visible and hidden lines +visible_lines, hidden_lines = [], [] + +# Isometric Projection - A 3D view where the part is rotated to reveal three +# dimensions equally. +iso_v, iso_h = project_to_2d( + stepper, + (100, 100, 100), + (0, 0, 1), + page_size * 0.3, + 0.75, +) +visible_lines.extend(iso_v) +hidden_lines.extend(iso_h) + +# Plan View (Top) - The view from directly above the part (looking down along +# the Z-axis). +vis, _ = project_to_2d( + stepper, + (0, 0, 100), + (0, 1, 0), + (page_size.X * -0.3, page_size.Y * 0.25), +) +visible_lines.extend(vis) + +# Dimension the top of the stepper +top_bbox = Curve(vis).bounding_box() +perimeter = Pos(*top_bbox.center()) * Rectangle(top_bbox.size.X, top_bbox.size.Y) +d1 = ExtensionLine( + border=perimeter.edges().sort_by(Axis.X)[-1], offset=1 * CM, draft=drafting_options +) +d2 = ExtensionLine( + border=perimeter.edges().sort_by(Axis.Y)[0], offset=1 * CM, draft=drafting_options +) +# Add a label +l1 = Text("Plan View", 6) +l1.position = vis.sort_by(Axis.Y)[-1].center() + (0, 5 * MM) + +# Front Elevation - The primary view, typically looking along the Y-axis, +# showing the height. +vis, _ = project_to_2d( + stepper, + (0, -100, 0), + (0, 0, 1), + (page_size.X * -0.3, page_size.Y * -0.125), +) +visible_lines.extend(vis) +d3 = ExtensionLine( + border=vis.sort_by(Axis.Y)[-1], offset=-5 * MM, draft=drafting_options +) +l2 = Text("Front Elevation", 6) +l2.position = vis.group_by(Axis.Y)[0].sort_by(Edge.length)[-1].center() + (0, -5 * MM) + +# Side Elevation - Often refers to the Right Side View, looking along the X-axis. +vis, _ = project_to_2d( + stepper, + (100, 0, 0), + (0, 0, 1), + (0, page_size.Y * 0.15), +) +visible_lines.extend(vis) +side_bbox = Curve(vis).bounding_box() +perimeter = Pos(*side_bbox.center()) * Rectangle(side_bbox.size.X, side_bbox.size.Y) +d4 = ExtensionLine( + border=perimeter.edges().sort_by(Axis.X)[-1], offset=1 * CM, draft=drafting_options +) +l3 = Text("Side Elevation", 6) +l3.position = vis.group_by(Axis.Y)[0].sort_by(Edge.length)[-1].center() + (0, -5 * MM) + + +# Initialize the SVG exporter +exporter = ExportSVG(unit=Unit.MM) +# Define visible and hidden line layers +exporter.add_layer("Visible") +exporter.add_layer("Hidden", line_color=(99, 99, 99), line_type=LineType.ISO_DOT) +# Add the objects to the appropriate layer +exporter.add_shape(visible_lines, layer="Visible") +exporter.add_shape(hidden_lines, layer="Hidden") +exporter.add_shape(border, layer="Visible") +exporter.add_shape([d1, d2, d3, d4], layer="Visible") +exporter.add_shape([l1, l2, l3], layer="Visible") +# Write the file +exporter.write(f"assets/stepper_drawing.svg") + +show(border, visible_lines, d1, d2, d3, d4, l1, l2, l3) +# [end] diff --git a/docs/tutorials.rst b/docs/tutorials.rst index 7ea3407..5ae7c96 100644 --- a/docs/tutorials.rst +++ b/docs/tutorials.rst @@ -16,3 +16,4 @@ as later tutorials build on the concepts introduced in earlier ones. examples_1.rst tttt.rst tutorial_surface_modeling.rst + tech_drawing_tutorial.rst From 44c3bac548eed9d6f906a54222c3b8c7bc114612 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 16:11:35 -0400 Subject: [PATCH 308/518] Added draft operation Issue #807 --- src/build123d/operations_part.py | 56 +++++++++++++++++- src/build123d/topology/three_d.py | 69 +++++++++++++++++++++- tests/test_build_part.py | 66 ++++++++++++++++++++- tests/test_direct_api/test_solid.py | 89 +++++++++++++++++++++++++---- 4 files changed, 264 insertions(+), 16 deletions(-) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index c1cd10b..31a47db 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -30,12 +30,13 @@ from __future__ import annotations from typing import cast from collections.abc import Iterable -from build123d.build_enums import Mode, Until, Kind, Side +from build123d.build_enums import GeomType, Mode, Until, Kind, Side from build123d.build_part import BuildPart from build123d.geometry import Axis, Plane, Vector, VectorLike from build123d.topology import ( Compound, Curve, + DraftAngleError, Edge, Face, Shell, @@ -55,6 +56,59 @@ from build123d.build_common import ( ) +def draft( + faces: Face | Iterable[Face], + neutral_plane: Plane, + angle: float, +) -> Part: + """Part Operation: draft + + Apply a draft angle to the given faces of the part + + Args: + faces: Faces to which the draft should be applied. + neutral_plane: Plane defining the neutral direction and position. + angle: Draft angle in degrees. + """ + context: BuildPart | None = BuildPart._get_context("draft") + + face_list: ShapeList[Face] = flatten_sequence(faces) + assert all(isinstance(f, Face) for f in face_list), "all faces must be of type Face" + validate_inputs(context, "draft", face_list) + + valid_geom_types = {GeomType.PLANE, GeomType.CYLINDER, GeomType.CONE} + unsupported = [f for f in face_list if f.geom_type not in valid_geom_types] + if unsupported: + raise ValueError( + f"Draft not supported on face(s) with geometry: " + f"{', '.join(set(f.geom_type.name for f in unsupported))}" + ) + + # Check that all the faces are associated with the same Solid + topo_parents = set(f.topo_parent for f in face_list) + if len(topo_parents) != 1: + raise ValueError("All faces must share the same topological parent (a Solid)") + parent_solids = next(iter(topo_parents)).solids() + if len(parent_solids) != 1: + raise ValueError("Topological parent must be a single Solid") + + # Create the drafted solid + try: + new_solid = parent_solids[0].draft(face_list, neutral_plane, angle) + except DraftAngleError as err: + raise DraftAngleError( + f"Draft operation failed. " + f"Use `err.face` and `err.problematic_shape` for more information.", + face=err.face, + problematic_shape=err.problematic_shape, + ) from err + + if context is not None: + context._add_to_context(new_solid, clean=False, mode=Mode.REPLACE) + + return Part(Compound([new_solid]).wrapped) + + def extrude( to_extrude: Face | Sketch | None = None, amount: float | None = None, diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index c74c0aa..32f1561 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -68,7 +68,11 @@ from OCP.BRepClass3d import BRepClass3d_SolidClassifier from OCP.BRepFeat import BRepFeat_MakeDPrism from OCP.BRepFilletAPI import BRepFilletAPI_MakeChamfer, BRepFilletAPI_MakeFillet from OCP.BRepOffset import BRepOffset_MakeOffset, BRepOffset_Skin -from OCP.BRepOffsetAPI import BRepOffsetAPI_MakePipeShell, BRepOffsetAPI_MakeThickSolid +from OCP.BRepOffsetAPI import ( + BRepOffsetAPI_DraftAngle, + BRepOffsetAPI_MakePipeShell, + BRepOffsetAPI_MakeThickSolid, +) from OCP.BRepPrimAPI import ( BRepPrimAPI_MakeBox, BRepPrimAPI_MakeCone, @@ -88,7 +92,7 @@ from OCP.TopExp import TopExp from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Solid, TopoDS_Wire from OCP.gp import gp_Ax2, gp_Pnt -from build123d.build_enums import CenterOf, Kind, Transition, Until +from build123d.build_enums import CenterOf, GeomType, Kind, Transition, Until from build123d.geometry import ( DEG2RAD, Axis, @@ -431,7 +435,7 @@ class Mixin3D(Shape): """ solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) + solid_classifier.Perform(gp_Pnt(*Vector(point)), tolerance) return solid_classifier.State() == ta.TopAbs_IN or solid_classifier.IsOnAFace() @@ -1421,3 +1425,62 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): raise RuntimeError("Error applying thicken to given surface") from err return result + + def draft(self, faces: Iterable[Face], neutral_plane: Plane, angle: float) -> Solid: + """Apply a draft angle to the given faces of the solid. + + Args: + faces: Faces to which the draft should be applied. + neutral_plane: Plane defining the neutral direction and position. + angle: Draft angle in degrees. + + Returns: + Solid with the specified draft angles applied. + + Raises: + RuntimeError: If draft application fails on any face or during build. + """ + valid_geom_types = {GeomType.PLANE, GeomType.CYLINDER, GeomType.CONE} + for face in faces: + if face.geom_type not in valid_geom_types: + raise ValueError( + f"Face {face} has unsupported geometry type {face.geom_type.name}. " + "Only PLANAR, CYLINDRICAL, and CONICAL faces are supported." + ) + + draft_angle_builder = BRepOffsetAPI_DraftAngle(self.wrapped) + + for face in faces: + draft_angle_builder.Add( + face.wrapped, + neutral_plane.z_dir.to_dir(), + radians(angle), + neutral_plane.wrapped, + Flag=True, + ) + if not draft_angle_builder.AddDone(): + raise DraftAngleError( + "Draft could not be added to a face.", + face=face, + problematic_shape=draft_angle_builder.ProblematicShape(), + ) + + try: + draft_angle_builder.Build() + result = Solid(draft_angle_builder.Shape()) + except StdFail_NotDone as err: + raise DraftAngleError( + "Draft build failed on the given solid.", + face=None, + problematic_shape=draft_angle_builder.ProblematicShape(), + ) from err + return result + + +class DraftAngleError(RuntimeError): + """Solid.draft custom exception""" + + def __init__(self, message, face=None, problematic_shape=None): + super().__init__(message) + self.face = face + self.problematic_shape = problematic_shape diff --git a/tests/test_build_part.py b/tests/test_build_part.py index f573847..d6fb66a 100644 --- a/tests/test_build_part.py +++ b/tests/test_build_part.py @@ -28,6 +28,8 @@ license: import unittest from math import pi, sin +from unittest.mock import MagicMock, patch + from build123d import * from build123d import LocationList, WorkplaneList @@ -56,7 +58,6 @@ class TestAlign(unittest.TestCase): class TestMakeBrakeFormed(unittest.TestCase): def test_make_brake_formed(self): - # TODO: Fix so this test doesn't raise a DeprecationWarning from NumPy with BuildPart() as bp: with BuildLine() as bl: Polyline((0, 0), (5, 6), (10, 1)) @@ -71,6 +72,67 @@ class TestMakeBrakeFormed(unittest.TestCase): self.assertAlmostEqual(sheet_metal.bounding_box().max.Z, 1, 2) +class TestPartOperationDraft(unittest.TestCase): + + def setUp(self): + self.box = Box(10, 10, 10).solid() + self.sides = self.box.faces().filter_by(Axis.Z, reverse=True) + self.bottom_face = self.box.faces().sort_by(Axis.Z)[0] + self.neutral_plane = Plane(self.bottom_face) + + def test_successful_draft(self): + """Test that a draft operation completes successfully""" + result = draft(self.sides, self.neutral_plane, 5) + self.assertIsInstance(result, Part) + self.assertLess(self.box.volume, result.volume) + + with BuildPart() as draft_box: + Box(10, 10, 10) + draft( + draft_box.faces().filter_by(Axis.Z, reverse=True), + Plane.XY.offset(-5), + 5, + ) + self.assertLess(draft_box.part.volume, 1000) + + def test_invalid_face_type(self): + """Test that a ValueError is raised for unsupported face types""" + torus = Torus(5, 1).solid() + with self.assertRaises(ValueError) as cm: + draft([torus.faces()[0]], self.neutral_plane, 5) + + def test_faces_from_multiple_solids(self): + """Test that using faces from different solids raises an error""" + box2 = Box(5, 5, 5).solid() + mixed = [self.sides[0], box2.faces()[0]] + with self.assertRaises(ValueError) as cm: + draft(mixed, self.neutral_plane, 5) + self.assertIn("same topological parent", str(cm.exception)) + + def test_faces_from_multiple_parts(self): + """Test that using faces from different solids raises an error""" + box2 = Box(5, 5, 5).solid() + part: Part = Part() + [self.box, Pos(X=10) * box2] + mixed = [part.faces().sort_by(Axis.X)[0], part.faces().sort_by(Axis.X)[-1]] + with self.assertRaises(ValueError) as cm: + draft(mixed, self.neutral_plane, 5) + + def test_bad_draft_faces(self): + with self.assertRaises(DraftAngleError): + draft(self.bottom_face, self.neutral_plane, 10) + + @patch("build123d.topology.three_d.BRepOffsetAPI_DraftAngle") + def test_draftangleerror_from_solid_draft(self, mock_draft_angle): + """Simulate a failure in AddDone and catch DraftAngleError""" + mock_builder = MagicMock() + mock_builder.AddDone.return_value = False + mock_builder.ProblematicShape.return_value = "ShapeX" + mock_draft_angle.return_value = mock_builder + + with self.assertRaises(DraftAngleError) as cm: + draft(self.sides, self.neutral_plane, 5) + + class TestBuildPart(unittest.TestCase): """Test the BuildPart Builder derived class""" @@ -171,7 +233,7 @@ class TestBuildPart(unittest.TestCase): def test_named_plane(self): with BuildPart(Plane.YZ) as test: self.assertTupleAlmostEquals( - WorkplaneList._get_context().workplanes[0].z_dir.to_tuple(), + WorkplaneList._get_context().workplanes[0].z_dir, (1, 0, 0), 5, ) diff --git a/tests/test_direct_api/test_solid.py b/tests/test_direct_api/test_solid.py index df44353..640bf31 100644 --- a/tests/test_direct_api/test_solid.py +++ b/tests/test_direct_api/test_solid.py @@ -29,19 +29,27 @@ license: import math import unittest +# Mocks for testing failure cases +from unittest.mock import MagicMock, patch + from build123d.build_enums import GeomType, Kind, Until -from build123d.geometry import ( - Axis, - BoundBox, - Location, - OrientedBoundBox, - Plane, - Pos, - Vector, -) +from build123d.geometry import Axis, Location, Plane, Pos, Vector from build123d.objects_curve import Spline +from build123d.objects_part import Box, Torus from build123d.objects_sketch import Circle, Rectangle -from build123d.topology import Compound, Edge, Face, Shell, Solid, Vertex, Wire +from build123d.topology import ( + Compound, + DraftAngleError, + Edge, + Face, + Shell, + Solid, + Vertex, + Wire, +) +import build123d +from OCP.BRepOffsetAPI import BRepOffsetAPI_DraftAngle +from OCP.StdFail import StdFail_NotDone class TestSolid(unittest.TestCase): @@ -254,5 +262,66 @@ class TestSolid(unittest.TestCase): self.assertAlmostEqual(obb2.volume, 40, 4) +class TestSolidDraft(unittest.TestCase): + + def setUp(self): + # Create a simple box to test draft + self.box: Solid = Box(10, 10, 10).solid() + self.sides = self.box.faces().filter_by(Axis.Z, reverse=True) + self.bottom_face: Face = self.box.faces().sort_by(Axis.Z)[0] + self.neutral_plane = Plane(self.bottom_face) + + def test_successful_draft(self): + """Test that a draft operation completes successfully on a planar face""" + drafted = self.box.draft(self.sides, self.neutral_plane, 5) + self.assertIsInstance(drafted, Solid) + self.assertNotEqual(drafted.volume, self.box.volume) + + def test_unsupported_geometry(self): + """Test that a ValueError is raised on unsupported face geometry""" + # Create toroidal face to simulate unsupported geometry + torus = Torus(5, 1).solid() + with self.assertRaises(ValueError) as cm: + torus.draft([torus.faces()[0]], self.neutral_plane, 5) + self.assertIn("unsupported geometry type", str(cm.exception)) + + @patch("build123d.topology.three_d.BRepOffsetAPI_DraftAngle") + def test_adddone_failure_raises_draftangleerror(self, mock_draft_api): + """Test that failure of AddDone() raises DraftAngleError""" + mock_builder = MagicMock() + mock_builder.AddDone.return_value = False + mock_builder.ProblematicShape.return_value = "BadShape" + mock_draft_api.return_value = mock_builder + + with self.assertRaises(DraftAngleError) as cm: + self.box.draft(self.sides, self.neutral_plane, 5) + self.assertEqual(cm.exception.face, self.sides[0]) + self.assertEqual(cm.exception.problematic_shape, "BadShape") + self.assertIn("Draft could not be added", str(cm.exception)) + + @patch.object( + build123d.topology.three_d.BRepOffsetAPI_DraftAngle, + "Build", + side_effect=StdFail_NotDone, + ) + def test_build_failure_raises_draftangleerror(self, mock_draft_api): + """Test that Build() failure raises DraftAngleError""" + + with self.assertRaises(DraftAngleError) as cm: + self.box.draft(self.sides, self.neutral_plane, 5) + self.assertIsNone(cm.exception.face) + self.assertEqual( + cm.exception.problematic_shape, cm.exception.problematic_shape + ) # Not None + self.assertIn("Draft build failed", str(cm.exception)) + + def test_draftangleerror_contents(self): + """Test that DraftAngleError stores face and problematic shape""" + err = DraftAngleError("msg", face="face123", problematic_shape="shape456") + self.assertEqual(str(err), "msg") + self.assertEqual(err.face, "face123") + self.assertEqual(err.problematic_shape, "shape456") + + if __name__ == "__main__": unittest.main() From 10ec85bcf502aa38f15909955a761f8d18648ee1 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 16:16:14 -0400 Subject: [PATCH 309/518] draft - adding missing init files --- src/build123d/__init__.py | 2 ++ src/build123d/topology/__init__.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index 9ca383a..209c248 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -163,6 +163,7 @@ __all__ = [ "LinearJoint", "CylindricalJoint", "BallJoint", + "DraftAngleError", # Exporter classes "Export2D", "ExportDXF", @@ -197,6 +198,7 @@ __all__ = [ "add", "bounding_box", "chamfer", + "draft", "extrude", "fillet", "full_round", diff --git a/src/build123d/topology/__init__.py b/src/build123d/topology/__init__.py index 11d00d9..6471c29 100644 --- a/src/build123d/topology/__init__.py +++ b/src/build123d/topology/__init__.py @@ -61,12 +61,13 @@ from .one_d import ( topo_explore_connected_faces, ) from .two_d import Face, Shell, Mixin2D, sort_wires_by_build_order -from .three_d import Solid, Mixin3D +from .three_d import Solid, Mixin3D, DraftAngleError from .composite import Compound, Curve, Sketch, Part __all__ = [ "Shape", "Comparable", + "DraftAngleError", "ShapePredicate", "GroupBy", "ShapeList", From 55341a4c679e6b33ce1608d15bb2dc3250d99add Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 16:25:13 -0400 Subject: [PATCH 310/518] draft - add another missing file, fix typing --- src/build123d/build_common.py | 1 + src/build123d/operations_part.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 947885d..d2d6942 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -155,6 +155,7 @@ operations_apply_to = { "add": ["BuildPart", "BuildSketch", "BuildLine"], "bounding_box": ["BuildPart", "BuildSketch", "BuildLine"], "chamfer": ["BuildPart", "BuildSketch", "BuildLine"], + "draft": ["BuildPart"], "extrude": ["BuildPart"], "fillet": ["BuildPart", "BuildSketch", "BuildLine"], "full_round": ["BuildSketch"], diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 31a47db..26a9095 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -85,7 +85,7 @@ def draft( ) # Check that all the faces are associated with the same Solid - topo_parents = set(f.topo_parent for f in face_list) + topo_parents = set(f.topo_parent for f in face_list if f.topo_parent is not None) if len(topo_parents) != 1: raise ValueError("All faces must share the same topological parent (a Solid)") parent_solids = next(iter(topo_parents)).solids() From 3949645e5c1efd386277527d98c06c73d252a11f Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 16:57:23 -0400 Subject: [PATCH 311/518] Adding draft example to docs --- docs/assets/examples/cast_bearing_unit.png | Bin 0 -> 152827 bytes docs/examples_1.rst | 22 ++++++ examples/cast_bearing_unit.py | 86 +++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 docs/assets/examples/cast_bearing_unit.png create mode 100644 examples/cast_bearing_unit.py diff --git a/docs/assets/examples/cast_bearing_unit.png b/docs/assets/examples/cast_bearing_unit.png new file mode 100644 index 0000000000000000000000000000000000000000..231aedee330e64fbdabbe1684a7235fc938adf23 GIT binary patch literal 152827 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 LElU_XCIm6?9Z35pFRg#H9uK& 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 UJgVNrz`(%Z>FVdQ&MBb@0J}-it^fc4 literal 0 HcmV?d00001 diff --git a/docs/examples_1.rst b/docs/examples_1.rst index 75a58b4..3de1337 100644 --- a/docs/examples_1.rst +++ b/docs/examples_1.rst @@ -34,6 +34,11 @@ Most of the examples show the builder and algebra modes. :link: examples-canadian_flag :link-type: ref + .. grid-item-card:: Cast Bearing Unit |Builder| + :img-top: assets/examples/cast_bearing_unit.png + :link: examples-cast_bearing_unit + :link-type: ref + .. grid-item-card:: Circuit Board With Holes |Builder| |Algebra| :img-top: assets/examples/thumbnail_circuit_board_01.png :link: examples-circuit_board @@ -204,6 +209,23 @@ The builder mode example also generates the SVG file `logo.svg`. :end-before: [End] +.. _examples-cast_bearing_unit: + +Cast Bearing Unit +----------------- +.. image:: assets/examples/cast_bearing_unit.png + :align: center + +This example demonstrates the creation of a castable flanged bearing housing +using the `draft` operation to add appropriate draft angles for mold release. + + +.. dropdown:: |Builder| Reference Implementation (Builder Mode) + + .. literalinclude:: ../examples/cast_bearing_unit.py + :start-after: [Code] + :end-before: [End] + .. _examples-canadian_flag: Canadian Flag Blowing in The Wind diff --git a/examples/cast_bearing_unit.py b/examples/cast_bearing_unit.py new file mode 100644 index 0000000..9075561 --- /dev/null +++ b/examples/cast_bearing_unit.py @@ -0,0 +1,86 @@ +""" +An oval flanged bearing unit with tapered sides created with the draft operation. + +name: cast_bearing_unit.py +by: Gumyr +date: May 25, 2025 + +desc: + + This example demonstrates the creation of a castable flanged bearing housing + using the `draft` operation to add appropriate draft angles for mold release. + + ### Highlights: + + - **Component Integration**: The design incorporates a press-fit bore for a + `SingleRowAngularContactBallBearing` and mounting holes for + `SocketHeadCapScrew` fasteners. + - **Draft Angle Application**: Vertical side faces are identified and modified + with a 4-degree draft angle using the `draft()` function. This simulates the + taper needed for cast parts to be removed cleanly from a mold. + - **Filleting**: All edges are filleted to reflect casting-friendly geometry and + improve aesthetics. + - **Parametric Design**: Dimensions such as bolt spacing, bearing size, and + housing depth are parameterized for reuse and adaptation to other sizes. + + The result is a realistic, fabrication-aware model that can be used for + documentation, simulation, or manufacturing workflows. The final assembly + includes the housing, inserted bearing, and positioned screws, rendered with + appropriate coloring for clarity. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# [Code] +import copy + +from bd_warehouse.bearing import PressFitHole, SingleRowAngularContactBallBearing +from bd_warehouse.fastener import ClearanceHole, SocketHeadCapScrew +from build123d import * +from ocp_vscode import show + +bearing = SingleRowAngularContactBallBearing("M17-47-14") +screw = SocketHeadCapScrew("M10-1.5", length=30 * MM, simple=False) + +A, A1, Db2, H, J = 26, 11, 57, 98.5, 76.5 +with BuildPart() as oval_flanged_bearing_unit: + with BuildSketch() as plan: + housing = Circle(Db2 / 2) + with GridLocations(J, 0, 2, 1) as bolt_centers: + Circle((H - J) / 2) + make_hull() + extrude(amount=A1) + extrude(housing, amount=A) + drafted_faces = oval_flanged_bearing_unit.faces().filter_by(Axis.Z, reverse=True) + draft(drafted_faces, Plane.XY, 4) + fillet(oval_flanged_bearing_unit.edges(), 1) + with Locations(oval_flanged_bearing_unit.faces().sort_by(Axis.Z)[-1]): + PressFitHole(bearing) + with Locations(Pos(Z=A1)): + with Locations(*bolt_centers): + ClearanceHole(screw, counter_sunk=False) + +oval_flanged_bearing_unit.part.color = Color(0x4C6377) + +# Create an assembly of all the positioned parts +oval_flanged_bearing_unit_assembly = Compound( + children=[oval_flanged_bearing_unit.part, bearing.moved(bearing.hole_locations[0])] + + [copy.copy(screw).moved(l) for l in screw.hole_locations] +) +show(oval_flanged_bearing_unit_assembly) +# [End] From ff39e37052559797d8367bb6823095c0bc7acbe7 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 17:01:25 -0400 Subject: [PATCH 312/518] Adding draft to cheat sheet --- docs/cheat_sheet.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index ecdd42d..ebec505 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -99,6 +99,7 @@ Cheat Sheet | :func:`~operations_generic.add` | :func:`~operations_generic.chamfer` + | :func:`~operations_part.draft` | :func:`~operations_part.extrude` | :func:`~operations_generic.fillet` | :func:`~operations_part.loft` @@ -228,7 +229,7 @@ Cheat Sheet +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.Extrinsic` | XYZ, XZY, YZX, YXZ, ZXY, ZYX, XYX, XZX, YZY, YXY, ZXZ, ZYZ | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ - | :class:`~build_enums.FontStyle` | REGULAR, BOLD, BOLDITALIC, ITALIC | + | :class:`~build_enums.FontStyle` | REGULAR, BOLD, BOLDITALIC, ITALIC | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ | :class:`~build_enums.FrameMethod` | CORRECTED, FRENET | +----------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+ From e842b321f3f4b64974c0b4004d55e0920a591656 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 18:46:46 -0400 Subject: [PATCH 313/518] add Vector.to_tuple deprecation warning --- src/build123d/geometry.py | 38 ++++++++------ src/build123d/operations_generic.py | 4 +- src/build123d/topology/one_d.py | 6 +-- src/build123d/topology/shape_core.py | 6 +-- src/build123d/topology/two_d.py | 4 +- tests/test_build_common.py | 70 ++++++++++---------------- tests/test_build_generic.py | 20 ++++---- tests/test_build_line.py | 46 ++++++++--------- tests/test_build_sketch.py | 18 +++---- tests/test_direct_api/test_axis.py | 6 +-- tests/test_direct_api/test_edge.py | 2 +- tests/test_direct_api/test_location.py | 8 +-- tests/test_direct_api/test_mixin1_d.py | 12 ++--- tests/test_direct_api/test_plane.py | 4 +- tests/test_direct_api/test_shape.py | 4 +- 15 files changed, 111 insertions(+), 137 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 414c1aa..d733010 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -274,6 +274,12 @@ class Vector: def to_tuple(self) -> tuple[float, float, float]: """Return tuple equivalent""" + warnings.warn( + "to_tuple is deprecated and will be removed in a future version. " + "Use 'tuple(Vector)' instead.", + DeprecationWarning, + stacklevel=2, + ) return (self.X, self.Y, self.Z) @property @@ -728,11 +734,13 @@ class Axis(metaclass=AxisMeta): def __repr__(self) -> str: """Display self""" - return f"({self.position.to_tuple()},{self.direction.to_tuple()})" + return f"({tuple(self.position)},{tuple(self.direction)})" def __str__(self) -> str: """Display self""" - return f"{type(self).__name__}: ({self.position.to_tuple()},{self.direction.to_tuple()})" + return ( + f"{type(self).__name__}: ({tuple(self.position)},{tuple(self.direction)})" + ) def __eq__(self, other: object) -> bool: if not isinstance(other, Axis): @@ -1028,7 +1036,7 @@ class BoundBox: if isinstance(obj, tuple): tmp.Update(*obj) elif isinstance(obj, Vector): - tmp.Update(*obj.to_tuple()) + tmp.Update(*obj) elif isinstance(obj, BoundBox) and obj.wrapped is not None: tmp.Add(obj.wrapped) @@ -1120,7 +1128,7 @@ class BoundBox: def to_align_offset(self, align: Align2DType | Align3DType) -> Vector: """Amount to move object to achieve the desired alignment""" - return to_align_offset(self.min.to_tuple(), self.max.to_tuple(), align) + return to_align_offset(self.min, self.max, align) class Color: @@ -1733,8 +1741,8 @@ class Location: However, `build123d` requires all coordinate systems to be right-handed. Therefore, this implementation: - - Reflects the X and Z directions across the mirror plane - - Recomputes the Y direction as: `Y = X × Z` + - Reflects the X and Z directions across the mirror plane + - Recomputes the Y direction as: `Y = X × Z` This ensures the resulting Location maintains a valid right-handed frame, while remaining as close as possible to the geometric mirror. @@ -2144,7 +2152,7 @@ class Rotation(Location): if tuples: angles = list(*tuples) if vectors: - angles = vectors[0].to_tuple() + angles = tuple(vectors[0]) if len(angles) < 3: angles.extend([0.0] * (3 - len(angles))) rotations = list(filter(lambda item: isinstance(item, Rotation), args)) @@ -2716,9 +2724,9 @@ class Plane(metaclass=PlaneMeta): Returns: Plane as String """ - origin_str = ", ".join(f"{v:.2f}" for v in self._origin.to_tuple()) - x_dir_str = ", ".join(f"{v:.2f}" for v in self.x_dir.to_tuple()) - z_dir_str = ", ".join(f"{v:.2f}" for v in self.z_dir.to_tuple()) + origin_str = ", ".join(f"{v:.2f}" for v in tuple(self._origin)) + x_dir_str = ", ".join(f"{v:.2f}" for v in tuple(self.x_dir)) + z_dir_str = ", ".join(f"{v:.2f}" for v in tuple(self.z_dir)) return f"Plane(o=({origin_str}), x=({x_dir_str}), z=({z_dir_str}))" def reverse(self) -> Plane: @@ -2845,9 +2853,9 @@ class Plane(metaclass=PlaneMeta): global_coord_system = gp_Ax3() local_coord_system = gp_Ax3( - gp_Pnt(*self._origin.to_tuple()), - gp_Dir(*self.z_dir.to_tuple()), - gp_Dir(*self.x_dir.to_tuple()), + gp_Pnt(*self._origin), + gp_Dir(*self.z_dir), + gp_Dir(*self.x_dir), ) forward_t.SetTransformation(global_coord_system, local_coord_system) @@ -2901,8 +2909,8 @@ class Plane(metaclass=PlaneMeta): local_bottom_left = global_bottom_left.transform(transform_matrix) local_top_right = global_top_right.transform(transform_matrix) local_bbox = Bnd_Box( - gp_Pnt(*local_bottom_left.to_tuple()), - gp_Pnt(*local_top_right.to_tuple()), + gp_Pnt(*local_bottom_left), + gp_Pnt(*local_top_right), ) return BoundBox(local_bbox) if hasattr(obj, "wrapped") and obj.wrapped is None: # Empty shape diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index c2b2e50..e5b0e9f 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -758,9 +758,7 @@ def project( # The size of the object determines the size of the target projection screen # as the screen is normal to the direction of parallel projection - shape_list = [ - Vertex(*o.to_tuple()) if isinstance(o, Vector) else o for o in object_list - ] + shape_list = [Vertex(o) if isinstance(o, Vector) else o for o in object_list] object_size = Compound(children=shape_list).bounding_box(optimal=False).diagonal vct_vrt_list = [o for o in object_list if isinstance(o, (Vector, Vertex))] diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 9b5ef43..e33e0cc 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -2635,7 +2635,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): for edge_index, edge in enumerate(edges): for i in range(fragments_per_edge): param = i / (fragments_per_edge - 1) - points.append(edge.position_at(param).to_tuple()[:2]) + points.append(tuple(edge.position_at(param))[:2]) points_lookup[edge_index * fragments_per_edge + i] = (edge_index, param) convex_hull = ConvexHull(points) @@ -3029,13 +3029,13 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): projection_object = BRepProj_Projection( self.wrapped, target_object.wrapped, - gp_Dir(*direction_vector.to_tuple()), + gp_Dir(*direction_vector), ) else: projection_object = BRepProj_Projection( self.wrapped, target_object.wrapped, - gp_Pnt(*center_point.to_tuple()), + gp_Pnt(*center_point), ) # Generate a list of the projected wires with aligned orientation diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 43ae9c6..d473668 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -660,15 +660,15 @@ class Shape(NodeMixin, Generic[TOPODS]): address = node.address name = "" loc = ( - "Center" + str(node.position.to_tuple()) + "Center" + str(tuple(node.position)) if show_center - else "Position" + str(node.position.to_tuple()) + else "Position" + str(tuple(node.position)) ) else: address = id(node) name = node.__class__.__name__.ljust(9) loc = ( - "Center" + str(node.center().to_tuple()) + "Center" + str(tuple(node.center())) if show_center else "Location" + repr(node.location) ) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 1df34f7..cd973c7 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -994,7 +994,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) from err if surface_point_vectors: for point in surface_point_vectors: - surface.Add(gp_Pnt(*point.to_tuple())) + surface.Add(gp_Pnt(*point)) try: surface.Build() surface_face = Face(surface.Shape()) @@ -1387,7 +1387,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): """ solid_classifier = BRepClass3d_SolidClassifier(self.wrapped) - solid_classifier.Perform(gp_Pnt(*Vector(point).to_tuple()), tolerance) + solid_classifier.Perform(gp_Pnt(*Vector(point)), tolerance) return solid_classifier.IsOnAFace() # surface = BRep_Tool.Surface_s(self.wrapped) diff --git a/tests/test_build_common.py b/tests/test_build_common.py index a4c6e0e..318092a 100644 --- a/tests/test_build_common.py +++ b/tests/test_build_common.py @@ -237,18 +237,16 @@ class TestCommonOperations(unittest.TestCase): def test_matmul(self): self.assertTupleAlmostEquals( - (Edge.make_line((0, 0, 0), (1, 1, 1)) @ 0.5).to_tuple(), (0.5, 0.5, 0.5), 5 + Edge.make_line((0, 0, 0), (1, 1, 1)) @ 0.5, (0.5, 0.5, 0.5), 5 ) def test_mod(self): - self.assertTupleAlmostEquals( - (Wire.make_circle(10) % 0.5).to_tuple(), (0, -1, 0), 5 - ) + self.assertTupleAlmostEquals(Wire.make_circle(10) % 0.5, (0, -1, 0), 5) def test_xor(self): helix_loc = Edge.make_helix(2 * pi, 1, 1) ^ 0 - self.assertTupleAlmostEquals(helix_loc.position.to_tuple(), (1, 0, 0), 5) - self.assertTupleAlmostEquals(helix_loc.orientation.to_tuple(), (-45, 0, 180), 5) + self.assertTupleAlmostEquals(helix_loc.position, (1, 0, 0), 5) + self.assertTupleAlmostEquals(helix_loc.orientation, (-45, 0, 180), 5) class TestLocations(unittest.TestCase): @@ -256,11 +254,11 @@ class TestLocations(unittest.TestCase): locs = PolarLocations(1, 5, 45, 90, False).local_locations for i, angle in enumerate(range(45, 135, 18)): self.assertTupleAlmostEquals( - locs[i].position.to_tuple(), - Vector(1, 0).rotate(Axis.Z, angle).to_tuple(), + locs[i].position, + Vector(1, 0).rotate(Axis.Z, angle), 5, ) - self.assertTupleAlmostEquals(locs[i].orientation.to_tuple(), (0, 0, 0), 5) + self.assertTupleAlmostEquals(locs[i].orientation, (0, 0, 0), 5) def test_polar_endpoint(self): locs = PolarLocations( @@ -329,7 +327,7 @@ class TestLocations(unittest.TestCase): self.assertAlmostEqual(hloc.radius, 1, 7) self.assertAlmostEqual(hloc.diagonal, 2, 7) self.assertAlmostEqual(hloc.apothem, 3**0.5 / 2, 7) - + def test_centering(self): with BuildSketch(): with GridLocations(4, 4, 2, 2, align=(Align.CENTER, Align.CENTER)) as l: @@ -390,22 +388,18 @@ class TestLocations(unittest.TestCase): square = Face.make_rect(1, 1, Plane.XZ) with BuildPart(): loc = Locations(square).locations[0] - self.assertTupleAlmostEquals( - loc.position.to_tuple(), Location(Plane.XZ).position.to_tuple(), 5 - ) - self.assertTupleAlmostEquals( - loc.orientation.to_tuple(), Location(Plane.XZ).orientation.to_tuple(), 5 - ) + self.assertTupleAlmostEquals(loc.position, Location(Plane.XZ).position, 5) + self.assertTupleAlmostEquals(loc.orientation, Location(Plane.XZ).orientation, 5) def test_from_plane(self): with BuildPart(): loc = Locations(Plane.XY.offset(1)).locations[0] - self.assertTupleAlmostEquals(loc.position.to_tuple(), (0, 0, 1), 5) + self.assertTupleAlmostEquals(loc.position, (0, 0, 1), 5) def test_from_axis(self): with BuildPart(): loc = Locations(Axis((1, 1, 1), (0, 0, 1))).locations[0] - self.assertTupleAlmostEquals(loc.position.to_tuple(), (1, 1, 1), 5) + self.assertTupleAlmostEquals(loc.position, (1, 1, 1), 5) def test_multiplication(self): circles = GridLocations(2, 2, 2, 2) * Circle(1) @@ -416,25 +410,17 @@ class TestLocations(unittest.TestCase): def test_grid_attributes(self): grid = GridLocations(5, 10, 3, 4) - self.assertTupleAlmostEquals(grid.size.to_tuple(), (10, 30, 0), 5) - self.assertTupleAlmostEquals(grid.min.to_tuple(), (-5, -15, 0), 5) - self.assertTupleAlmostEquals(grid.max.to_tuple(), (5, 15, 0), 5) + self.assertTupleAlmostEquals(grid.size, (10, 30, 0), 5) + self.assertTupleAlmostEquals(grid.min, (-5, -15, 0), 5) + self.assertTupleAlmostEquals(grid.max, (5, 15, 0), 5) def test_mixed_sequence_list(self): locs = Locations((0, 1), [(2, 3), (4, 5)], (6, 7)) self.assertEqual(len(locs.locations), 4) - self.assertTupleAlmostEquals( - locs.locations[0].position.to_tuple(), (0, 1, 0), 5 - ) - self.assertTupleAlmostEquals( - locs.locations[1].position.to_tuple(), (2, 3, 0), 5 - ) - self.assertTupleAlmostEquals( - locs.locations[2].position.to_tuple(), (4, 5, 0), 5 - ) - self.assertTupleAlmostEquals( - locs.locations[3].position.to_tuple(), (6, 7, 0), 5 - ) + self.assertTupleAlmostEquals(locs.locations[0].position, (0, 1, 0), 5) + self.assertTupleAlmostEquals(locs.locations[1].position, (2, 3, 0), 5) + self.assertTupleAlmostEquals(locs.locations[2].position, (4, 5, 0), 5) + self.assertTupleAlmostEquals(locs.locations[3].position, (6, 7, 0), 5) class TestProperties(unittest.TestCase): @@ -744,12 +730,12 @@ class TestValidateInputs(unittest.TestCase): class TestVectorExtensions(unittest.TestCase): def test_vector_localization(self): self.assertTupleAlmostEquals( - (Vector(1, 1, 1) + (1, 2)).to_tuple(), + (Vector(1, 1, 1) + (1, 2)), (2, 3, 1), 5, ) self.assertTupleAlmostEquals( - (Vector(3, 3, 3) - (1, 2)).to_tuple(), + (Vector(3, 3, 3) - (1, 2)), (2, 1, 3), 5, ) @@ -759,16 +745,14 @@ class TestVectorExtensions(unittest.TestCase): Vector(1, 2, 3) - "four" with BuildLine(Plane.YZ): + self.assertTupleAlmostEquals(WorkplaneList.localize((1, 2)), (0, 1, 2), 5) self.assertTupleAlmostEquals( - WorkplaneList.localize((1, 2)).to_tuple(), (0, 1, 2), 5 - ) - self.assertTupleAlmostEquals( - WorkplaneList.localize(Vector(1, 1, 1) + (1, 2)).to_tuple(), + WorkplaneList.localize(Vector(1, 1, 1) + (1, 2)), (1, 2, 3), 5, ) self.assertTupleAlmostEquals( - WorkplaneList.localize(Vector(3, 3, 3) - (1, 2)).to_tuple(), + WorkplaneList.localize(Vector(3, 3, 3) - (1, 2)), (3, 2, 1), 5, ) @@ -780,7 +764,7 @@ class TestVectorExtensions(unittest.TestCase): with BuildLine(pln): n3 = Line((-50, -40), (0, 0)) n4 = Line(n3 @ 1, n3 @ 1 + (0, 10)) - self.assertTupleAlmostEquals((n4 @ 1).to_tuple(), (0, 0, -25), 5) + self.assertTupleAlmostEquals((n4 @ 1), (0, 0, -25), 5) class TestWorkplaneList(unittest.TestCase): @@ -794,8 +778,8 @@ class TestWorkplaneList(unittest.TestCase): def test_localize(self): with BuildLine(Plane.YZ): pnts = WorkplaneList.localize((1, 2), (2, 3)) - self.assertTupleAlmostEquals(pnts[0].to_tuple(), (0, 1, 2), 5) - self.assertTupleAlmostEquals(pnts[1].to_tuple(), (0, 2, 3), 5) + self.assertTupleAlmostEquals(pnts[0], (0, 1, 2), 5) + self.assertTupleAlmostEquals(pnts[1], (0, 2, 3), 5) def test_invalid_workplane(self): with self.assertRaises(ValueError): diff --git a/tests/test_build_generic.py b/tests/test_build_generic.py index 46a6c34..94367dd 100644 --- a/tests/test_build_generic.py +++ b/tests/test_build_generic.py @@ -72,7 +72,7 @@ class AddTests(unittest.TestCase): # Add Edge with BuildLine() as test: add(Edge.make_line((0, 0, 0), (1, 1, 1))) - self.assertTupleAlmostEquals((test.wires()[0] @ 1).to_tuple(), (1, 1, 1), 5) + self.assertTupleAlmostEquals(test.wires()[0] @ 1, (1, 1, 1), 5) # Add Wire with BuildLine() as wire: Polyline((0, 0, 0), (1, 1, 1), (2, 0, 0), (3, 1, 1)) @@ -94,13 +94,11 @@ class AddTests(unittest.TestCase): add(Solid.make_box(10, 10, 10), rotation=(0, 0, 45)) self.assertAlmostEqual(test.part.volume, 1000, 5) self.assertTupleAlmostEquals( - ( - test.part.edges() - .group_by(Axis.Z)[-1] - .group_by(Axis.X)[-1] - .sort_by(Axis.Y)[0] - % 1 - ).to_tuple(), + test.part.edges() + .group_by(Axis.Z)[-1] + .group_by(Axis.X)[-1] + .sort_by(Axis.Y)[0] + % 1, (sqrt(2) / 2, sqrt(2) / 2, 0), 5, ) @@ -680,12 +678,12 @@ class ProjectionTests(unittest.TestCase): def test_project_point(self): pnt: Vector = project(Vector(1, 2, 3), Plane.XY)[0] - self.assertTupleAlmostEquals(pnt.to_tuple(), (1, 2, 0), 5) + self.assertTupleAlmostEquals(pnt, (1, 2, 0), 5) pnt: Vector = project(Vertex(1, 2, 3), Plane.XZ)[0] - self.assertTupleAlmostEquals(pnt.to_tuple(), (1, 3, 0), 5) + self.assertTupleAlmostEquals(pnt, (1, 3, 0), 5) with BuildSketch(Plane.YZ) as s1: pnt = project(Vertex(1, 2, 3), mode=Mode.PRIVATE)[0] - self.assertTupleAlmostEquals(pnt.to_tuple(), (2, 3, 0), 5) + self.assertTupleAlmostEquals(pnt, (2, 3, 0), 5) def test_multiple_results(self): with BuildLine() as l1: diff --git a/tests/test_build_line.py b/tests/test_build_line.py index b473077..309b99d 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -205,7 +205,7 @@ class BuildLineTests(unittest.TestCase): l3 = Line((0, 0), (10, 10)) l4 = IntersectingLine((0, 10), (1, -1), l3) - self.assertTupleAlmostEquals((l4 @ 1).to_tuple(), (5, 5, 0), 5) + self.assertTupleAlmostEquals(l4 @ 1, (5, 5, 0), 5) self.assertTrue(isinstance(l4, Edge)) with self.assertRaises(ValueError): @@ -214,22 +214,20 @@ class BuildLineTests(unittest.TestCase): def test_jern_arc(self): with BuildLine() as jern: j1 = JernArc((1, 0), (0, 1), 1, 90) - self.assertTupleAlmostEquals((jern.line @ 1).to_tuple(), (0, 1, 0), 5) + self.assertTupleAlmostEquals(jern.line @ 1, (0, 1, 0), 5) self.assertAlmostEqual(j1.radius, 1) self.assertAlmostEqual(j1.length, pi / 2) with BuildLine(Plane.XY.offset(1)) as offset_l: off1 = JernArc((1, 0), (0, 1), 1, 90) - self.assertTupleAlmostEquals((offset_l.line @ 1).to_tuple(), (0, 1, 1), 5) + self.assertTupleAlmostEquals(offset_l.line @ 1, (0, 1, 1), 5) self.assertAlmostEqual(off1.radius, 1) self.assertAlmostEqual(off1.length, pi / 2) plane_iso = Plane(origin=(0, 0, 0), x_dir=(1, 1, 0), z_dir=(1, -1, 1)) with BuildLine(plane_iso) as iso_l: iso1 = JernArc((0, 0), (0, 1), 1, 180) - self.assertTupleAlmostEquals( - (iso_l.line @ 1).to_tuple(), (-sqrt(2), -sqrt(2), 0), 5 - ) + self.assertTupleAlmostEquals(iso_l.line @ 1, (-sqrt(2), -sqrt(2), 0), 5) self.assertAlmostEqual(iso1.radius, 1) self.assertAlmostEqual(iso1.length, pi) @@ -240,11 +238,11 @@ class BuildLineTests(unittest.TestCase): self.assertFalse(l2.is_closed) circle_face = Face(Wire([l1])) self.assertAlmostEqual(circle_face.area, pi, 5) - self.assertTupleAlmostEquals(circle_face.center().to_tuple(), (0, 1, 0), 5) - self.assertTupleAlmostEquals(l1.vertex().to_tuple(), l2.start.to_tuple(), 5) + self.assertTupleAlmostEquals(circle_face.center(), (0, 1, 0), 5) + self.assertTupleAlmostEquals(l1.vertex(), l2.start, 5) l1 = JernArc((0, 0), (1, 0), 1, 90) - self.assertTupleAlmostEquals((l1 @ 1).to_tuple(), (1, 1, 0), 5) + self.assertTupleAlmostEquals(l1 @ 1, (1, 1, 0), 5) self.assertTrue(isinstance(l1, Edge)) def test_polar_line(self): @@ -252,38 +250,38 @@ class BuildLineTests(unittest.TestCase): with BuildLine(): a1 = PolarLine((0, 0), sqrt(2), 45) d1 = PolarLine((0, 0), sqrt(2), direction=(1, 1)) - self.assertTupleAlmostEquals((a1 @ 1).to_tuple(), (1, 1, 0), 5) - self.assertTupleAlmostEquals((a1 @ 1).to_tuple(), (d1 @ 1).to_tuple(), 5) + self.assertTupleAlmostEquals(a1 @ 1, (1, 1, 0), 5) + self.assertTupleAlmostEquals(a1 @ 1, d1 @ 1, 5) self.assertTrue(isinstance(a1, Edge)) self.assertTrue(isinstance(d1, Edge)) with BuildLine(): a2 = PolarLine((0, 0), 1, 30) d2 = PolarLine((0, 0), 1, direction=(sqrt(3), 1)) - self.assertTupleAlmostEquals((a2 @ 1).to_tuple(), (sqrt(3) / 2, 0.5, 0), 5) - self.assertTupleAlmostEquals((a2 @ 1).to_tuple(), (d2 @ 1).to_tuple(), 5) + self.assertTupleAlmostEquals(a2 @ 1, (sqrt(3) / 2, 0.5, 0), 5) + self.assertTupleAlmostEquals(a2 @ 1, d2 @ 1, 5) with BuildLine(): a3 = PolarLine((0, 0), 1, 150) d3 = PolarLine((0, 0), 1, direction=(-sqrt(3), 1)) - self.assertTupleAlmostEquals((a3 @ 1).to_tuple(), (-sqrt(3) / 2, 0.5, 0), 5) - self.assertTupleAlmostEquals((a3 @ 1).to_tuple(), (d3 @ 1).to_tuple(), 5) + self.assertTupleAlmostEquals(a3 @ 1, (-sqrt(3) / 2, 0.5, 0), 5) + self.assertTupleAlmostEquals(a3 @ 1, d3 @ 1, 5) with BuildLine(): a4 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.HORIZONTAL) d4 = PolarLine( (0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.HORIZONTAL ) - self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (1, 1 / sqrt(3), 0), 5) - self.assertTupleAlmostEquals((a4 @ 1).to_tuple(), (d4 @ 1).to_tuple(), 5) + self.assertTupleAlmostEquals(a4 @ 1, (1, 1 / sqrt(3), 0), 5) + self.assertTupleAlmostEquals(a4 @ 1, d4 @ 1, 5) with BuildLine(Plane.XZ): a5 = PolarLine((0, 0), 1, angle=30, length_mode=LengthMode.VERTICAL) d5 = PolarLine( (0, 0), 1, direction=(sqrt(3), 1), length_mode=LengthMode.VERTICAL ) - self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (sqrt(3), 0, 1), 5) - self.assertTupleAlmostEquals((a5 @ 1).to_tuple(), (d5 @ 1).to_tuple(), 5) + self.assertTupleAlmostEquals(a5 @ 1, (sqrt(3), 0, 1), 5) + self.assertTupleAlmostEquals(a5 @ 1, d5 @ 1, 5) with self.assertRaises(ValueError): PolarLine((0, 0), 1) @@ -292,7 +290,7 @@ class BuildLineTests(unittest.TestCase): """Test spline with no tangents""" with BuildLine() as test: s1 = Spline((0, 0), (1, 1), (2, 0)) - self.assertTupleAlmostEquals((test.edges()[0] @ 1).to_tuple(), (2, 0, 0), 5) + self.assertTupleAlmostEquals(test.edges()[0] @ 1, (2, 0, 0), 5) self.assertTrue(isinstance(s1, Edge)) def test_radius_arc(self): @@ -333,19 +331,17 @@ class BuildLineTests(unittest.TestCase): """Test center arc as arc and circle""" with BuildLine() as arc: CenterArc((0, 0), 10, 0, 180) - self.assertTupleAlmostEquals((arc.edges()[0] @ 1).to_tuple(), (-10, 0, 0), 5) + self.assertTupleAlmostEquals(arc.edges()[0] @ 1, (-10, 0, 0), 5) with BuildLine() as arc: CenterArc((0, 0), 10, 0, 360) - self.assertTupleAlmostEquals( - (arc.edges()[0] @ 0).to_tuple(), (arc.edges()[0] @ 1).to_tuple(), 5 - ) + self.assertTupleAlmostEquals(arc.edges()[0] @ 0, arc.edges()[0] @ 1, 5) with BuildLine(Plane.XZ) as arc: CenterArc((0, 0), 10, 0, 360) self.assertTrue(Face(arc.wires()[0]).is_coplanar(Plane.XZ)) with BuildLine(Plane.XZ) as arc: CenterArc((-100, 0), 100, -45, 90) - self.assertTupleAlmostEquals((arc.edges()[0] @ 0.5).to_tuple(), (0, 0, 0), 5) + self.assertTupleAlmostEquals(arc.edges()[0] @ 0.5, (0, 0, 0), 5) arc = CenterArc((-100, 0), 100, 0, 360) self.assertTrue(Face(Wire([arc])).is_coplanar(Plane.XY)) diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 52a6194..b2eeb54 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -92,9 +92,7 @@ class TestBuildSketch(unittest.TestCase): with BuildLine(): l1 = Line((0, 0), (10, 0)) Line(l1 @ 1, (10, 10)) - self.assertTupleAlmostEquals( - (test.consolidate_edges() @ 1).to_tuple(), (10, 10, 0), 5 - ) + self.assertTupleAlmostEquals(test.consolidate_edges() @ 1, (10, 10, 0), 5) def test_mode_intersect(self): with BuildSketch() as test: @@ -263,9 +261,7 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(r.align, (Align.CENTER, Align.CENTER)) self.assertEqual(r.mode, Mode.ADD) self.assertAlmostEqual(test.sketch.area, (3 * sqrt(3) / 2) * 2**2, 5) - self.assertTupleAlmostEquals( - test.sketch.faces()[0].normal_at().to_tuple(), (0, 0, 1), 5 - ) + self.assertTupleAlmostEquals(test.sketch.faces()[0].normal_at(), (0, 0, 1), 5) self.assertAlmostEqual(r.apothem, 2 * sqrt(3) / 2) def test_regular_polygon_minor_radius(self): @@ -277,9 +273,7 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(r.align, (Align.CENTER, Align.CENTER)) self.assertEqual(r.mode, Mode.ADD) self.assertAlmostEqual(test.sketch.area, (3 * sqrt(3) / 4) * (0.5 * 2) ** 2, 5) - self.assertTupleAlmostEquals( - test.sketch.faces()[0].normal_at().to_tuple(), (0, 0, 1), 5 - ) + self.assertTupleAlmostEquals(test.sketch.faces()[0].normal_at(), (0, 0, 1), 5) def test_regular_polygon_align(self): with BuildSketch() as align: @@ -303,7 +297,7 @@ class TestBuildSketchObjects(unittest.TestCase): poly_pts = [Vector(v) for v in regular_poly.vertices()] polar_pts = [p.position for p in PolarLocations(1, side_count)] for poly_pt, polar_pt in zip(poly_pts, polar_pts): - self.assertTupleAlmostEquals(poly_pt.to_tuple(), polar_pt.to_tuple(), 5) + self.assertTupleAlmostEquals(poly_pt, polar_pt, 5) def test_regular_polygon_min_sides(self): with self.assertRaises(ValueError): @@ -325,8 +319,8 @@ class TestBuildSketchObjects(unittest.TestCase): def test_slot_center_point(self): with BuildSketch() as test: s = SlotCenterPoint((0, 0), (2, 0), 2) - self.assertTupleAlmostEquals(s.slot_center.to_tuple(), (0, 0, 0), 5) - self.assertTupleAlmostEquals(s.point.to_tuple(), (2, 0, 0), 5) + self.assertTupleAlmostEquals(s.slot_center, (0, 0, 0), 5) + self.assertTupleAlmostEquals(s.point, (2, 0, 0), 5) self.assertEqual(s.slot_height, 2) self.assertEqual(s.rotation, 0) self.assertEqual(s.mode, Mode.ADD) diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py index 2f76612..b6ece42 100644 --- a/tests/test_direct_api/test_axis.py +++ b/tests/test_direct_api/test_axis.py @@ -192,7 +192,7 @@ class TestAxis(unittest.TestCase): self.assertIsNone(Axis.X.intersect(Axis((0, 1, 1), (0, 0, 1)))) intersection = Axis((1, 2, 3), (0, 0, 1)) & Plane.XY - self.assertAlmostEqual(intersection.to_tuple(), (1, 2, 0), 5) + self.assertAlmostEqual(intersection, (1, 2, 0), 5) arc = Edge.make_circle(20, start_angle=0, end_angle=180) ax0 = Axis((-20, 30, 0), (4, -3, 0)) @@ -226,10 +226,10 @@ class TestAxis(unittest.TestCase): # self.assertTrue(len(intersections.vertices(), 2)) # np.testing.assert_allclose( - # intersection.vertices()[0].to_tuple(), (-1, 0, 5), 5 + # intersection.vertices()[0], (-1, 0, 5), 5 # ) # np.testing.assert_allclose( - # intersection.vertices()[1].to_tuple(), (1, 0, 5), 5 + # intersection.vertices()[1], (1, 0, 5), 5 # ) def test_axis_equal(self): diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 6507cbd..9a524e8 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -234,7 +234,7 @@ class TestEdge(unittest.TestCase): for i, loc in enumerate(locs): self.assertAlmostEqual( loc.position, - Vector(1, 0, 0).rotate(Axis.Z, i * 90).to_tuple(), + Vector(1, 0, 0).rotate(Axis.Z, i * 90), 5, ) self.assertAlmostEqual(loc.orientation, (0, 0, 0), 5) diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index 1c6e666..bdfd225 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -265,10 +265,10 @@ class TestLocation(unittest.TestCase): loc1 = Location((1, 2, 3), (90, 45, 22.5)) loc2 = copy.copy(loc1) loc3 = copy.deepcopy(loc1) - self.assertAlmostEqual(loc1.position, loc2.position.to_tuple(), 6) - self.assertAlmostEqual(loc1.orientation, loc2.orientation.to_tuple(), 6) - self.assertAlmostEqual(loc1.position, loc3.position.to_tuple(), 6) - self.assertAlmostEqual(loc1.orientation, loc3.orientation.to_tuple(), 6) + self.assertAlmostEqual(loc1.position, loc2.position, 6) + self.assertAlmostEqual(loc1.orientation, loc2.orientation, 6) + self.assertAlmostEqual(loc1.position, loc3.position, 6) + self.assertAlmostEqual(loc1.orientation, loc3.orientation, 6) # deprecated # def test_to_axis(self): diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index 106c805..f064ac0 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -53,10 +53,8 @@ class TestMixin1D(unittest.TestCase): 5, ) # Not sure what PARAMETER mode returns - but it's in the ballpark - point = ( - Edge.make_line((0, 0, 0), (1, 1, 1)) - .position_at(0.5, position_mode=PositionMode.PARAMETER) - .to_tuple() + point = Edge.make_line((0, 0, 0), (1, 1, 1)).position_at( + 0.5, position_mode=PositionMode.PARAMETER ) self.assertTrue(all([0.0 < v < 1.0 for v in point])) @@ -119,10 +117,8 @@ class TestMixin1D(unittest.TestCase): (-1, 0, 0), 5, ) - tangent = ( - Edge.make_circle(1, start_angle=0, end_angle=90) - .tangent_at(0.0, position_mode=PositionMode.PARAMETER) - .to_tuple() + tangent = Edge.make_circle(1, start_angle=0, end_angle=90).tangent_at( + 0.0, position_mode=PositionMode.PARAMETER ) self.assertTrue(all([0.0 <= v <= 1.0 for v in tangent])) diff --git a/tests/test_direct_api/test_plane.py b/tests/test_direct_api/test_plane.py index df4f31b..1fd2168 100644 --- a/tests/test_direct_api/test_plane.py +++ b/tests/test_direct_api/test_plane.py @@ -275,8 +275,8 @@ class TestPlane(unittest.TestCase): def test_localize_vertex(self): vertex = Vertex(random.random(), random.random(), random.random()) np.testing.assert_allclose( - Plane.YZ.to_local_coords(vertex).to_tuple(), - Plane.YZ.to_local_coords(Vector(vertex)).to_tuple(), + tuple(Plane.YZ.to_local_coords(vertex)), + tuple(Plane.YZ.to_local_coords(Vector(vertex))), 5, ) diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 835b70b..76622ac 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -317,8 +317,8 @@ class TestShape(unittest.TestCase): c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) c1 = Edge.make_circle(1) closest = c0.closest_points(c1) - self.assertAlmostEqual(closest[0], c0.position_at(0.75).to_tuple(), 5) - self.assertAlmostEqual(closest[1], c1.position_at(0.25).to_tuple(), 5) + self.assertAlmostEqual(closest[0], c0.position_at(0.75), 5) + self.assertAlmostEqual(closest[1], c1.position_at(0.25), 5) def test_distance_to(self): c0 = Edge.make_circle(1).locate(Location((0, 2.1, 0))) From 8dd13369485671025261f1e3c300f0141f77686e Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 19:13:44 -0400 Subject: [PATCH 314/518] Adding draft to operations list --- docs/operations.rst | 93 +++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/docs/operations.rst b/docs/operations.rst index 924a0c7..e7532b6 100644 --- a/docs/operations.rst +++ b/docs/operations.rst @@ -21,51 +21,53 @@ The following table summarizes all of the available operations. Operations marke applicable to BuildLine and Algebra Curve, 2D to BuildSketch and Algebra Sketch, 3D to BuildPart and Algebra Part. -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| Operation | Description | 0D | 1D | 2D | 3D | Example | -+==============================================+====================================+====+====+====+====+========================+ -| :func:`~operations_generic.add` | Add object to builder | | ✓ | ✓ | ✓ | :ref:`16 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.bounding_box` | Add bounding box as Shape | | ✓ | ✓ | ✓ | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.chamfer` | Bevel Vertex or Edge | | | ✓ | ✓ | :ref:`9 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_part.extrude` | Draw 2D Shape into 3D | | | | ✓ | :ref:`3 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.fillet` | Radius Vertex or Edge | | | ✓ | ✓ | :ref:`9 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_sketch.full_round` | Round-off Face along given Edge | | | ✓ | | :ref:`ttt-24-spo-06` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_part.loft` | Create 3D Shape from sections | | | | ✓ | :ref:`24 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_part.make_brake_formed` | Create sheet metal parts | | | | ✓ | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_sketch.make_face` | Create a Face from Edges | | | ✓ | | :ref:`4 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_sketch.make_hull` | Create Convex Hull from Edges | | | ✓ | | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.mirror` | Mirror about Plane | | ✓ | ✓ | ✓ | :ref:`15 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.offset` | Inset or outset Shape | | ✓ | ✓ | ✓ | :ref:`25 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.project` | Project points, lines or Faces | ✓ | ✓ | ✓ | | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_part.project_workplane` | Create workplane for projection | | | | | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_part.revolve` | Swing 2D Shape about Axis | | | | ✓ | :ref:`23 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.scale` | Change size of Shape | | ✓ | ✓ | ✓ | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_part.section` | Generate 2D slices from 3D Shape | | | | ✓ | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.split` | Divide object by Plane | | ✓ | ✓ | ✓ | :ref:`27 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_generic.sweep` | Extrude 1/2D section(s) along path | | | ✓ | ✓ | :ref:`14 ` | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_part.thicken` | Expand 2D section(s) | | | | ✓ | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ -| :func:`~operations_sketch.trace` | Convert lines to faces | | | ✓ | | | -+----------------------------------------------+------------------------------------+----+----+----+----+------------------------+ ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| Operation | Description | 0D | 1D | 2D | 3D | Example | ++==============================================+====================================+====+====+====+====+===================================+ +| :func:`~operations_generic.add` | Add object to builder | | ✓ | ✓ | ✓ | :ref:`16 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.bounding_box` | Add bounding box as Shape | | ✓ | ✓ | ✓ | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.chamfer` | Bevel Vertex or Edge | | | ✓ | ✓ | :ref:`9 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.draft` | Add a draft taper to a part | | | | ✓ | :ref:`examples-cast_bearing_unit` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.extrude` | Draw 2D Shape into 3D | | | | ✓ | :ref:`3 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.fillet` | Radius Vertex or Edge | | | ✓ | ✓ | :ref:`9 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_sketch.full_round` | Round-off Face along given Edge | | | ✓ | | :ref:`ttt-24-spo-06` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.loft` | Create 3D Shape from sections | | | | ✓ | :ref:`24 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.make_brake_formed` | Create sheet metal parts | | | | ✓ | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_sketch.make_face` | Create a Face from Edges | | | ✓ | | :ref:`4 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_sketch.make_hull` | Create Convex Hull from Edges | | | ✓ | | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.mirror` | Mirror about Plane | | ✓ | ✓ | ✓ | :ref:`15 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.offset` | Inset or outset Shape | | ✓ | ✓ | ✓ | :ref:`25 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.project` | Project points, lines or Faces | ✓ | ✓ | ✓ | | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.project_workplane` | Create workplane for projection | | | | | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.revolve` | Swing 2D Shape about Axis | | | | ✓ | :ref:`23 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.scale` | Change size of Shape | | ✓ | ✓ | ✓ | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.section` | Generate 2D slices from 3D Shape | | | | ✓ | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.split` | Divide object by Plane | | ✓ | ✓ | ✓ | :ref:`27 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_generic.sweep` | Extrude 1/2D section(s) along path | | | ✓ | ✓ | :ref:`14 ` | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_part.thicken` | Expand 2D section(s) | | | | ✓ | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ +| :func:`~operations_sketch.trace` | Convert lines to faces | | | ✓ | | | ++----------------------------------------------+------------------------------------+----+----+----+----+-----------------------------------+ The following table summarizes all of the selectors that can be used within the scope of a Builder. Note that they will extract objects from the builder that is @@ -104,6 +106,7 @@ Reference .. autofunction:: operations_generic.add .. autofunction:: operations_generic.bounding_box .. autofunction:: operations_generic.chamfer +.. autofunction:: operations_part.draft .. autofunction:: operations_part.extrude .. autofunction:: operations_generic.fillet .. autofunction:: operations_sketch.full_round From cdaf1caa4c72436ebfe0907e1fb05e246d568cbc Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 19:21:59 -0400 Subject: [PATCH 315/518] Removing bd_warehouse dependency --- docs/assets/examples/cast_bearing_unit.png | Bin 152827 -> 65651 bytes examples/cast_bearing_unit.py | 21 ++++----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/docs/assets/examples/cast_bearing_unit.png b/docs/assets/examples/cast_bearing_unit.png index 231aedee330e64fbdabbe1684a7235fc938adf23..e0bebf1835b25058352aa9cfd7e11add4a127e8c 100644 GIT binary patch literal 65651 zcmeAS@N?(olHy`uVBq!ia0y~yVEW6zz~som#=yXE^&FQJ0|Ns~v6E*A2L}g74M$1` z0|SF(iEBhjaDG}zd16s2Lwa6*ZmMo^a#3n(UU5c#$$RGgb_@&*x*$c)MX8A;nfZAN zA(^?U48f&&3Pz?1zKN9zMg~Tv3I^s@hL%<)<_ZD63a&08mNON_7#I{7JY5_^D(1Y| zo4G;ddgZe3^Cm}@=9_y=5Lqf=>Emgv9;BsgK7^F@EKq{sP%FVsPL6_-2@_#zCF6u4BZ@rx6z zU>d(vBPaK2x>{ z1LJ{ncb~6G-+r%xx#6h(-$U$-`_(xZHJ4WRvg+;mSN@}we@}k>e+efJMQ_)L?C1R) zEdowrPFlDA-@X5bA=R?UR7~K2v3`xVR|#X|^Z0+<5sMSoHVOz`i;`HJxOVN7T^##a z9xc6NzpeS&eOaakfrirkt7><#uVGy>;bW(c{DWDi??3&|+t7NnU`OZbd!IK8I3+y3 zkQnoCvpws~)DxRz*8l(Tdya{K(}_t7UZ}TBU@m(0#!_bAlOUU~Z$6*+%(!Gq#lPtL zZ5O5V_kOcov8jb2VNI(kn-hmb@+ylx`+1@x)E^w~TkE*!&0QA8tIlDsD~?AMf2i*e zFqWIP^>4S!3vR_#osA+_ldoP|@h*~MX6W}duG3OCY&fw==6c*uxs0U-cWxZmI(@%1 z!-rz~&yyJroMcpNkr4nz)lBD(bN1E$Qun;PwB1RwRXqMLU(dCQZ%4x!EIwwf{n%u? zb4e7#HG3h~-D?+pdUtTgPD5^ice>7}0<6Mx9Xb9-%#gY9V-17L+j;W?B2Jv~6 zg(U^jDL)y)_x_%HqMbRW{%PuthqJV2xVdmBf`WIAVEVavhqv$le%&DI@z4BP>F4p4 zys3c)A||^`4ZQ2#@hE({=j-5-6Im03j-BUra!50J;>CDqsYqn@V>6@E3M~gp!(-cY zPJg&9|JT6nwz#FFLdzOnk-sey?iD_JV_Eb5|4+MZdi(l5udiX(-}6WO!m1L%3VnvH zL3OWptw>+8PrgNzSXH-d>1P) zk6m@4di`E5qthR5&bDjPUB)8l6vp6cub84ar{YiiLY-}epE~Ue{jBcYj>~=;q|#F; zn>}-xbCtskh7&seTy2cnEJm7zcSENuo@f8@#ofN=ZFhcwkON01sEqSaw)yd7{sM{I zhmFDU&8BQ#yFK<@lydrY|DI;6()=%TBcvy!=7}n-Vf%6adVHlHeKg&R<0UgFjn)?b*_iJzRkd&K zKdDnmA+`_K8nLqQ6n|1)c|f|J$DyR@rhd|M-*0E?*gHO+uesOKIGOeT&ENkR4(46E z*|zJr{f~XG3tu1qr@3zbuTP=#wG@{u29@_^XJ>AH{^3;l|9l%zVe#Qq_J!1ky`^(n zJHPsFT$Q)|wX^CA?T31)X09i?Z>@K|q;_%t?zz{#&+`-Ud30e*-()65)szC3Ppt2P zJW`q&*X{mf`{Rsy9rNP1-9F4pEpMc{>YPr*_|<-{KYCRDufTWvPofgpix@UDED zI-F#*>9%^)0`cUgxOdt{{uk}Nzr6pkX$j+OL#uyhzt#o`%xS#TcW|M_kGAY}4%43Q z_-X#H*pGoju^3cm`4qglxZZiXYM<>lUXA-A+zc%Od;9mL{ZzO&E$G)Wp93bId+jIs zUfdsl(f+Tf**`D!d5K#yqux4B?_B3#)LlQ_i9vwrdVHy*8Gme(|GgjDJ08B$4y&Bi zGC|DgqCW>CgN*gx(u}nQ|CRlnR$oegvt!@lV>5p2)?c#HJn+u>rbYV~&eaS1a=ylQ z#tNy)citUOIk1$G^Tq|;8@js{rFjbeUY-7U+w8m}yw?ku95@!fP)}LA^Zi0~21c8L zSJ|Bx+O-dSU9{r0;NOr7;oHA!^lSc-zV))m<^LMn))GbGaMoS6D@*I|OESEE#gM?j zk;7wNc(^qD(KPA$slp6S*FfdLwVvue+op%l6lE+6Z*|MO-rc6O>|;sji}Xsq1FrUm z_iHKz1^QgvAN@<`*Ydeu8gARShBm(QWxG?Z@W(ZR!$V@RfkfVeU90tvFSq-oy@pXC zM6cE-ak|?__Hzpkd*LS)7A+FZq5!4uisg|J0tq@aln`N-KD~RjkkZhw)xtO zbG}STTmlb*zO^(=5xO4xF|X!b@cvfmbvui$F8APwWD@z?@|9|0KvvtF*1GnD!FgfWnD6-Bux~^4Vox}gX*W9(s(nL>(R}3j@ThADI%zXH3wcg>k`~Ma$`!8@QQR5fqONHZd zf34=#eY2TY`B3%w!uu0r{wjP}>QnS7T`RQfU+uffg#lmA-%Q|NRR1S2J9q8sg4+T? zyY{PVHeTSoDYfVSuk6Cx>iH=j^%Z4X7R{f)SNP<}VvCPQ%;)~@+q$oETFKEC-K{s* zEPcBp`YW%-FL5^4|M$Lc(Yh!vSCDk;npFGN-iUZ+ZVyJr#)HS$?v>xY`r}3WKgHtz zoG&><{}Qd@%i?>zTa|HN@i!d{G@Y*e;ul> zxAyim46Y6OqP~97i~HB_RqOw{oLkE!z_2BAh1~kX8?PyyFTPW7cIuD0(RN+g>npx< zo$nJc;_j+*iaMqo|KGUg<%_}INY7w7NkT2voj9j|>c z-rD2q-~7`XVuk--v${V2jOgEg|DN0RuD<{I+|_vsic8pB?G<%FCI8V{e*4a(>eJ@u z8{f~ky>4lpV(O&%_8)WJUjLG=`HTOW zf45q{oyE|xR$hF$#cSNEJ3*Ec3P9gojmYb-l~srjJ5`~Cl0YuEqpT9=+%dP8QtxV~)a~i+C?=0{7SKCn+ zvE5Tz>3`s#-wEyZ%k6jk-TdQ=dwuQF=WZVN7rszmqWG@%Md6+A4<28rOK4u9^m6r= zo8_x{CLfx;sQzEJ=C9c|G+qA(xz@iuc-4;~=wrU_1kX7FR@~iq1MNohn zfCGF^jmRpEJr~$pCTO3(IbZAB-<|QG&bAwy^I)2Ml$y`%%`*vILTjS126BgAUzaI3( zd}DCezp35-O8UjLXEKEBwaTjRCbCfSN%z7p2ahN8mMTSi z9hfzhcM-##CCoQGb&oIC`1O20)IHn%z8r54Q}{PIDgNQ^3IDJ7@0s~%{sdOXi~c7V zEs7qAysLe|X>WHc;~-~3>BU+@wOq|#kJUu}R<|#zKgU)p_V?q;s~z>4swwlF9YEcj zJ++q~Y@GaE?{5spOW~sDz8s2=Z36VMYcU0V4&>6xtCuj6KkOX}YnT(VDZF75cTynl^{?vulcW@cs!r!;AC|GCn? zzf;q`waDLMvjs2WrJOuYoGIlt zcXK|)^SuJAH;f>C5B6Q~+%CcBR{?Y37d$YExyL+4l)#QBceshjZ6kg7_GGk3Y-p_kH=SxI{bP zi?C6vvbx{nfA0I3LdEPhsVr{2qs3AmD;4nN{g$_D?goB&FWdFcQaa#^dzjL{+AH^? zxU+d#8s`73&QCqXuV}oWnqM(l#;F5jvEfHDg_Mb6IU&-T;&8n$t_igom4p5G}bgprNnbSr8Yhu%P z|6j3NxkdjP>zc^8Eq6s1+>}h3wW$7;ZP&lK-yjvS!$te#%NxI6yU*!VBgqn9KQlGJ zl`)(5-#`C-y{`LG)-HUZo_(_Z=lwt2HebJN-mqa^K>5ko(&pPO$~ms&8!O(%GC6UiMDlTq-?$j{ zQ2vj){jnAHk=7c&PTmq&W3kp$J9A6w+L;s0TrS$@zwWFS`D^_aQXw@gsz0{Oy8B;& z{$!!Ef1dg&ZRTN6U|BHrP(re>dF_wsh0ov4k398}GtyM#udV71QP60`o-en)FE}l9 zEy||)U$pS;D3vDv1!aZX{wdCUy5rrc?>pRUN}k=)zSp~!dp)zm>cy&{Zg{i*Kh1eo z-*p%mHC0`nvF^X-ZONX^+hb^~6fN@i^R{_A+%N9GJWrg<_5U1RjbG_GyQ(kpOV@mx zuKe#VmwrM|Z=bz+Otq?A^=0=c+djcf92&o@PtDx?yx`x|_X_eniE9snx|GxR{hfXx z%8{dSlf+N%OuogTI%1-MKRYBI&RdoK=V-i_;a{hG-Ay$Ni(`Km&wM^1Na-~Dj!&`n z%-jm{JRjGU|6!^7_}so>E%*BMPnv$U>fh_V{Qp&bvlh4dw_2}$)6I+Cb*py#WpMpJ zMO_ox5^}jXe@~t3B723!*XuSP@!NOoKm>C(kC{3D!}>q(-!1x}zPD}B{-<|-KX`oN zlMHD5!Ao;a{ZrG7r3qV_CR}puf2cR_n!C@cq>zWoQd3{pWTaT@^t0Vzz2)TblAVY9 zVZZdhElbWM^tjo{JOYKNjr@aOtM!lbUXN)sulvz_OmEY7+b=BpYThVrx0v|k{d%tt z%p!k9{+?W|@$386@~(gXy6PAhJp% zJE!(rWkmMJ57+;RuUOP@jZ5*l+70WdWX2GtczsRR)b%Z#P2C&P>mQ4f}5}o5$3$wlLhQKfHCv zzgOBHj`8o`zxw2X_kTCrAGw)6ul%>zzTJ8oM6CTD7rUf)xpe(Ii4t}DR2SLL>6mac zXwToJQw$}hKDXSaA9rAR-jWaMf14N8ch)@YE`NMU{&(S?AFs+kzUkI?)@D7>8K{_g zrr-RS&e{W8d|ReA>YNVHG$~g+XS7|*K!T_6YIU7h^Fe{_f3B^+n#KC>$G*uG53XEK z=;`Z?JfxBp*>qoG?hEIxe=pAmeUX1~bob5AP77bm-^}RxzsFZx`Ijz(;u3k`S*~f4 zEew3IMVfVAn)kPcaoK;rT+iP>chB~Z$-OB3HN7G6#Nxx>-!kTSK&7_u+9sK*IS;PSm@rx7 zZ}GgPFYFI=mv2TYwe-Tiv>#t`MoRyasFQ*`U*eY64_1eC_Vzmem|p)QKKRGvbIup{ zD}YBY79C(-zE8+Cq2zMpBKbeR693Lftc_b%@|t1ai=7)6M{y^YT#5vBBs5(A`@veH z*TcUsE8bO~|7q6IN&Ia4+)g{J77}2Z|EIV9kWKxi%vt}ReVL(O^D%GF&$ao-H@fd< z3!OG~fv}K)$S>c=LFFbbXXccyi0E_f-+GOg$-!8wTfpf=$Qr|dWe(H$rF_2!rgrL_ zpTNu3AaEhIakBrv^9&9T{jIoN|J&{OKT-YTq0{RhoyL{5%-~g2T{1y${p`TMPZb%~PAQN6&>OQR_s*p&oORdD6OFF6 zytLiwKJ(t@%jag?+kAen@!s^km#bgx*V&|#Z+HIw?Y5} zT6Cnk{>2tNd9oPf@Wd&f;_Dvjg*XMg(Vv*KrPX}z)7%^Tezf_&EaZ*Rxvzr5n)pDx>fxC*z_XYAw1{`l|p`h(N|xBuUF@v+b* z4~<{X3%)#A3>qw0xV327#B=$Z&3!lRaxuJhNHxEX+bvpLag!)V-P){GlNZfjR4-q> zazD5Sw*1BN7xOKeN_n?!sxe57?^Z4;D?e+byUFL#EbV(|JM3Tbi2Mz=CAzM6br`$FKjUp?>sAFt;h*~@Ro#t;{>Yx^+?vrAE;pG#e7=e0 zpg)J=l4yy?>+Xm0PgU!CXwoRaG`szNi;et)H#?sfJUR06SfA$!rHJZ_^-rEG{_*KA z|3aDGm{%QV6dox37Wut;u|)1e-|73#KK<}}$~*zpe50lA*{z!vJWy|$pcgF0%U%C= zR)JP%(uPV7qthSU-TNPN$M4y_FXK&vc@SBZp$j%qd4Xnjg9)ue5W^o?gV&U9*F6u}Gi&uTqAb z2d=kH-s=2koPPe{LG}ME{&TDK#9p=?^PASYHOg_?bB*qa-yckG5MXdw95~zSgRm3F zOYT%dr)m5XQqP`{T`cnHp}@@f5gv;*|9ECcYG15>-`xLj-s9y7Yri(#U)r0ow5-lB zlIvQ=l-6i7(YO!0^Nz1m^b*cky1|k?qGfnBq+P(tLqA{@OM>+0 zPuFjic1}0?eCkxtkIC0AR$r`t_Qn!4>}T`&&~}BE&9{UuMHXHv-|rg1%`MGcmYPw0 zZ^Hxqu3Urm`2tSA`afyT@#Uz0EnUvG`+bc;%M?jJn{U1hBL9}ieu?^W|NDo@JD%S- zY!GD~E;s*NvgVKIqZz-I*bXn$-X>(Xmi_FqFCk6y1)NUoS`ZS+`d_Tal+B~0ZGzCx zf{ylmzt$VxxN%_a{QqYT^?RO(d$IP#{^vh5Wi0EsJ_J5i_%ZX`WxcM8Vr|m1-}Mz} z+B$KF|IFWzF9QmkHR`S#dmk2TPJF1(xZ}0~8^6sb(TMDi?Azm)ntHTLu`bUayi|9aAv)?Vl72Qoy@ z`&TTVr)Ix;(+#=J|3s24|0b=;)Uy6`&i=gS@pSilbIXqP?fHGj+WONb<@ZMfCq2IA zzwlPG>~8&~M-p~eKE2Vcc)ECcXhQFL`4A1a+Z7-G|F{fF=zd?;SzZS@=SAn`sW;+< z59%*iMrl|j;)qB5CXq11j$kDR*|HU{ITh1KMxcj0jUm`u`L!iR>_7j_A>TB+w zgjlP!cX`)`bb+8F`qA;O^UlP4Pnem$V$s#rnqIu8m;5Z?$Zq7xn;HCD@UBq%Wbcw zXnj%oV*U4x?S=189-kwd{^^g+DLi9>OT-{j;LL$*Wf#<%uy#ER{k;`KvhO`7tbV;Nka+2!KERKc^FV!hXHnX{Fyz8^VH z`E*gu&wuRFmU4=lUu>CVQ}!!+$MYvIHM*RWmoIxOC+%J_eLA1pm*<8uc@9&T{@>&B z$J}hz@%?+Ro~YwgZ28iiRK42pp?pwuuygP3e%nKb;x>g?Y5zJu$F^Nx);4hG7Y4np z>}QvDPWU_dx#gCiduApjcSL*3-1OW;{9d{mBqH?eRNyxnq~l z&&_`_qowC^ZP^=YdS6J0Nom*765eRly&>~nE~>jd^K;1l%Wu{1RJ*)V zoxf}G^}W}$pZ)$4&cD>|#K~zN&!12;zq@VmTJCrAl{Vc_R#hk!|9a6fDKWbA|L5+1(LLMrc0CHv|JEvCu+6gm`?3w! zEW&5!o!eXHI`6sP2j+L5xz2g57T9pc2+R)iO)xQNHho_vNxL%=u*7!c_nL zuzU7>^0Sw7Uf35sGMQ)le^Y-`chtn}$-Z-E9gw&?<3ld@E}f)sC&krPthW=Q`n4i< zcylPG{GZ}#+^C%FWBTs*EVG$UEvi15a94XiF7f&@-?CcoRt)F-OOIVriZhjb6MEW$ zSaaCJ)xNd$u9moTd&*Ib`s8nO7N1*IA?U=B$-io$XmYlX47YP^(lq{pFHe#!ioeAu zA6H>{G2?~(zZd2Sy}tW&@;cXeKf0O0x>v3B*wKvJ%XLGq%~9NRk>%KnV~dPi1e~sQ zZ;~*brj^yxxiv-4_2$Wq|6k3oUpVoxAXACQ7yHkLwimqnIbBHGTQIn0*Q0BTw?@s@ zD4Ef5^vmiaep^?b&#r#$r2Jd8MPSoB6VtezU#^|Xi}B)|nOgC<-Tpu=|Hc*5O`OwR z{=fgbx&B@2k`+pS?|s_H9g(~sbmyzf5nPMca$iUlRL@ZQnW@!Zzom5J#J@sL9Fg%` z%5P*gO?cKUAyeGAX?MTvr4t`HUbeijulf|YV$p|x+pZc(NR>21svOG@Ir?pte{v>I zoAdXb73Hc7y=D)!xSxF#cH+ov+azHs^wInngPCvSvvVdrXQsR_l6^&5ljK=P~-$gt=u;$u?Q2)FQB{W|mZX&Z8%fb=Jlv zzL&pzvfaetwd?=seRA!AR%HdELA&InWII2t-t@xf>_H`s(@bJ!dZBH*x}Poj1I{wD zmaa6BPxj%N#Hl$URdPv*{g-#@-OIi%`hPThKR3sH9sSIdn=a2!x+Z_AGVPS&Y2TRV z_#^3c+TuU2gC%@96jQcNIcny^oZNTOs_d^=(5^*snuXt)`5$t}@2P%xT=}*4zE{FC z+Kb;<%KyEqeN{i<;=i<**D62Uqs0Tn7S9r|*SVLgacaL`sZfi6Q&|5sE~Dr@B}QJ% zmr7r575gW_G`n3t^2f##zb?J<_&;5~;zaoN-IsfI{&7%`slKMU_W9ZTO6#65&-N#$ zqPA|-sBf3rB6z<{pxsUh}iDz2MQue7!#vDYltwU)Y1E(LaiE z%w%*>{r2$D-`w-hf--b-~a8p_dwI^=_|I^Q*Ldpd?D1cZ9Bt)ZCZyl>=j!k>6X_MaZ{KiVRKKEKH6ae)w(_4EH(6Wj2?0iACnxYs)qpDz;203+mY>W#=?i ziad$v5BA`0Nger|K;Nm&~NPzgfROmysYO!&4f$!CU{P`C5^`iv9bSNgr?7 zm(AcB=4vT*P$G77Q0Zio+pmZf+tKHm|1)kmb11gR$UN_RUi@2lGfy(lzqi5u>wkUmV9%WUV!rA$?Y;Sow|hOR>?GFx z5)tdWD0M8#Lvf-RALpa}6R*r;o94%<*fPQO;uVY3l1mH2xjbe%dUY-?pHwbma!#F_rp_I%5Z-K8q7xaeBB+1#@(Ker}j@hi4W_U*^03XBoA}Shj8cF88x3V;+XjG1!vg{)#}Bii~cXo|F62}x^=@!qfO4fyMIl2 zl-%1G#JXfk$JX73ckcTv*?(i-jt{j$P8^D{2P9%ITOZtRf4W#=@ynb3-&|h1)EnOV zv^io&)4eSd#2tQJ*SCIj)&7pfmRG?M980BkrtM~Ubmp{qNQTy__28gf!rU{9E2z~i z_MVM1*Gp5Of|E=0GoQ^^GJVS>pSY>4EHM|oRH90vLJq|{q|IDkkgp$u6@MUXf`R+a^Y5a7fZ5;pi*=jRqY4*HtJ}Z23S5QuV z;*Om+9Oj#{DgEvH8CsTX(l@VyXZ!zezTCEQFZI`o{AF6fT{r#0vpiO9|Mh=cr#PH; zwP#5A$soYAZ1JJ{8N72#9<2T9DZsR?@qEKd+a>xeg6~~+dE~v1U7|nhuiXA`yJVj| ze>}M<>rg`WWOhF>j+uSjZ+34q@7)-gU2uM*d%^FuBL7m-qtt)J|N8cQ!6~7i$Cmwm z+{U`5K_Ihb|1M1{p||V}I;RyGUhq}jTwTPX`81`s)&G6wlNqaA(!0!0+zJx^@?rbm zWZ4~hy3HTIFRZICIwqjT8RX^1<*{5MH$J9jiG9U1?)jf&j>SCWuCer)6nn|);{MW) zrPnLhU7L9QP?X`l1=kht9Jny`U}&19!j~(lKh2bD3b$s@3fs!c|MO4xxtG^h&DK_0 zQXi3=ux905c8wRaRrYLu_x+7$c;J(M{m0tb~RbdDDUG=>CWn0oh@Ff*dqS_ZT$4j#|~soUh+|8-b&uN zcHI@8!4b(dm(9N~?qWLnP3%+>%i2>voDbfQ?I~QnGS$#2vL_%X-%*q`B+xAFl= zpUo<-y|36Co|6Cc`)Y4&tCGpby&n7pO4{u{qm{+-<}wtJJqFVEjD`>*fwntFnbc}LaPSDw;YH)7*oy(*PG{Z`)H zMARsrVU^C^B`zF3`fC(YzOqd8FZBQBq_az}>qo>44i3%7T1Dbvsh-vui`33O{hD5o z<#?s|_tGPu_5U9|)bIJreYMN~nag9U{C8~0S{maXZNIs6|FJdJkG1D$yiMA&|7=ct z&Ed7%eq?&SIWn84!S{;l22JssogZwMpHS~s`)AwxH`Y^gvM8e;(}|*u*PPOXuI;#J z@h83asPXyzTV7pOmR%6KNZ#SBs`F~0p9u^Lx;`>reH9k^AiC2}Q#B!XyX%1&)-Sbg z-mvNEUjP5X?d4(bt!EcaOci#q>%MkkmBBHeH5?~&%CEcmF?lqFX^BnJpEO~Ugwo#+ zi~(%cC-X8wKRr5q|L^xe7q-ZiA(Fa^xmOo!Pxa7;+KC!RiBAbMQ*tf7uyTsimIl8Areqa2T^IBBI+auf0Y+C9z zb_(8*AiF%%8@k%rG%k_~(q+xce@`y{czyHp_{d+D6Z0-= zU95k%^Yg#3y)NO}tv2!&8zuMt{`+~M`IQ^ujz1&|;`eS_Yq((r%j7S5!a-@=ZzB`7 z9I80Eg~PmI>QdQ>c|vo8G`^giWmqkwP(5*y*R&oEUN6~eQ8vFHoz}Khy;K)9^|Jly zrmIoin|O9kQhWC4_Kj`aGd$jlH=K$3c0OC+u{2++o5|5@M_1hphuxHDRlM#Tj&5l9r0yC>Gl6(>>u;a-i7a zsL8=j$1+2g)XPOpmEd7p7j^f4V|T*U&I{|a_atAhimtfEa&5|M{}ZOAF7`_-mP+xN z2li~6D^NvcPn=Au^-o<~-2|ayxcdRO9VAt1H+4Z(yg5naxHCr##{dvTau$QyXR&nET7VX1J z)=kv@m?Ed^T{S=Hu(8{Rx9qEIws}5O%rakkCMmjfQ?(O+oL8+7N974OO$q&9oQkIv zeHeOz&iT!}zyIrD{u6pvxBZ*adUUh?-d%r+mF6x?o%m1kkgcOO>&(j8UYd$ILN~XU zojGybzmZi!@+N!K>L<3mt6X)r`%F7te^!dU?NKc#u;EbEPL)YL z>e`D)LB znv4Kbi9Cj5Oq(XnKUleJ8`FcA$%ogeZT#pI^jBVZyXX9lmBoMN30$(2_#3ah>VjR1 zYl+#FsI|Y&cywo;6-`{V{Y~E?dzWv%J>L$uMSh4_HDUXgHMc`1RYqjL>fO2G>u+x% z%_R@im;5&PwLj`p%}4EPP90t^+J6g5m+~oY&ggxy|4Xj@zUS9hD4D!*%DKV%V_EFh zUuyO44HNrg7fqe@sKuqKb-s%A!t+fIPQN<3|NTB`!(DIPw_>SD`|(Tiv$Q8vZgFE| zH=nR~L5QX8`g*19`8tYnl^Ic*)0YYy>GA*Gxsp5Cy>P$8 z+xxPY7yT_=@!PtAbxmT(d;z1**$h7MlIp+Jvo)62$7t^~soyX3p1bnA%~22gnSR+W z|JQu^c$Y&oR7{w6x6|cyt2T(Qh_3K*`}6!kRLAn%ov${shHIYzp^A9{F?JRNhmzMVv9@n2J(e*j0-+^L9VEw0+&9Hy-R6tuM-bg!^}kPf@G5 z?AQCnzdvC^;`N*@TC1(i_RJ49dvau@t%{($6NjaM$ba@l6CYeXQW3pAjfG*U_livs ze>QsRXH0ywHCd`YKPf1?cauaYtC#ii#k;2{J^Ob4$ThuRr?by(-B`Kf;@|Im2Io~< zCb%Ac?VY{i*E>J|T0YDF>GLb=PNuu>P1NNpxcxmJ+IJV) zFDYyh=w0$dz=2ZFN@S^>ld2O``mv%P_I8Ez+a5X~>G=BHF^<6MW z=Y@KWtl643?V>bo{@(f7DmVK}d)SJ*t0o>fsIOp^c|-JQeZcRnoeoU8HtGSvMZc2g zx>QIw1h2HydA9a2<1~RwZWXyvLP>wpLes@37cBkY$yc3S;&rV(tfOwhKliEw3HGNp zu{`=GbkOR#sm_bJM_k38*~tHQpOrLA-&nC_3oqlcDz;fGyoDVlj&85Gv;MyA`TmA8 zi$%S@`{q|li>;K~sx`Uk-jU_@rJrWbU^KWT-*L`1>CEoRTWd~6b+D=V96syJeLwyB z0|qaSmr`p!XR#UHJEO5S&}WlmNaXvC&K_RcF7`d1N}szA{(We@X6x4Zo_D5qip?tx z2|Q5#ZC>cH*ZY|rpHfwf`T>aXGZ+Je+i|7>|`Mx;rKy>Njuj2FD?rkpBekSVVz{Tm7 z$)Q;5z_qi?aiQ8V-RaLb84hhv_H0_xIYrQDaV7suZ*7Ep%NJh8jbV@KZ+O`K*YOSdYF@-x z&%9Q&$B=uolltGJr?0-9xmn!6&@BwbZ@YZ&Go&B;RWw5 zMmc)S?6|0Pa(P|%8}Wzi&Rlg)9`h4#J^CkTv}T9;yUKer4X%17eVx>|WzN0-tr<%N zq>Cdbi+nm~^e+AIx`wS{yL1>7lg#>m+g{^2a?35ueOAYeEv$+vOU_(V`{l}^=+tp9 z{=3-Q^ZW|SF8Hkym9P4IljoL3%Z2~X9(s$_%Psl5#p_GA<#)a&ty5WHbIwgkzgfZM zu%_^^-rR~W;dOr>-kl|MU;M1-7qi6LZC)DRI2B*}#jkHZ`{eWK7pL_bqGoMsSP@f` zW6PTn^^HYwZNRo`w_LOSaE4skuzK3{`0gLq1-E=)dBC+XVeR%0Gv}YWyq){UqKQSd zpQ1PwQ`DDC*t=?Bc2a57F@_~GCTNLqocwcckqt*Jqs`wp+}!r!mukcQ)a5>ICGBI6S{wE?n{kaS`=ghOG_9w3Y_cZ>e>dI$-?lG^@nc((war=3fS^ilMZ?1oO z{O*EDbLtfK&?5cJ9uC ziLDbJ#S7juzu0m2<)X#vzRIa>I?^RY50qLaToqdM?`~vjzS1dv70qLz=iag;elhjB zZo-qh;H1f|m0nVRqI-=Kt#vQi%N;CJzw|Zr_}>Y2EJhvIExf({G+v(ez)*WtqsaW; zyd^(8W|{`wcHmHa-O{mg;@jndv;BT-G~rwBInC+p?E8Ttx3^w5T0Y+=`RS`CN5l7R zo~(Js>0;DEovy05daqlTtafhHM03fM6PxyYUA@e=$N$jsZ&#W!49}?viSu$R&eFiFqt)V}5m(2S*Lqy2w zgc0Yv^xWQG=Ap%6ye2-kq}4mW{Z70kCB5Bqp}+l1H}8-)A@Aq7X?ow^aC(XEE+^*o zoxw$Y5!pI#+!pIPv`m@ztN2~s)JL2Bu4PA>WxP#r;ZUqyxVG}2uj|j&DN`j@_3qpz zmM$E$;0E8;iHp=0oC8&|D>nySl%FYRy3GVG7(*f>9_cMHtF-}-+?vA>t< zv(?w`UrzTtyT|`<@7dP(#rsd_INM3AyUNlo;1t$5MRHTkg;~2+rg2wX-njJL$@wJ` zUhn+-T)~61J16E{Zp!!DusF(2?^b@6>t17<8l~5h9|gNlRn3}zd5`DJjAeo17y3lz zo9UYhJ9*46d}&vy9i%mz!{w-keL!T2GUw`_4$&`+mxM_2daV+?bvLPtUvfDs*S2Xg zn?kl|sn0HDELES+nS1+v#{PMtFSm=OZk)U3fXX>{kNei&y&X(0FDyTL@t@9V%^#eK zDMvkKDxPoGwrxMQ_|Mj=Sn0DShyJ(DNIJ9AC0XQ>ZJ5@t&j$P>%FC$Y1q4qyFj{9?Lu&$o7_dz{?oH>75H@0@q>-`nndmD4>_FUU{+ zGw)fB-}IT!CiA!L^?Rw*GC@zc<^QH*PaYmi<7v>H6s7lHBr`?u)6ctXUcQ~5u2-iD z1tl+C^>wFs{K`c~i*Nau_l9w$8m#~&i| z1>S5wS+rQT``hA`8UG757d`|}@p`t)IdNoKI&q{_em-P>x|pZ!tjkYViE`ElZo$#g z@rM^TRIiZfefIA2%jf6x|JZnLk6ige-}^he_MiXZnrm}b6!n`;IXOLdRbhR2aKx$w; zL$dbUgf9M>DO(rqPu(2wRJzRf$=7!MxLZuOA20g*SK!~db(`yE&M3QhV_(I=rQbU; zC;kih8a{dPvPFNJS>0o2Wo-iuG*_lX?ki}YtJdVxATRIQQRO%N)#GzbyFWfKKXy!Q zMGJ$r*k6D9@_nVj7dPolnpvv)>9J3B%_1d+nP0V!roVDG3X=)xo0Gm@(!0Lv{jCVE zkl>4T35DWGpxM}${M{n|njfYqA6zZ*)LkMzefjCO%Up0PLVHo@^NK0)XR{Vrrf$f4wa3#ua^;KloUg0Ih%E)H$Rd0 zo;p`)LX&>|+?$WT&A0#irt#dwFWpmDUa721TfNRgKL3X4vl*s)w>Jpv&AnmD9on~w zMI(C^_f;J!pH?Xz^KYtmKG$6EI4G{zGU3~Vr@w{&t*h8RbBmmZ9rt~g{>;gdyLb7U-v|ADQ>{Q2OnlmG%l&_EpZ0Fow3|x;cg}rwYqHq;SFs`= zu6@sZdyaK~N^QpU)aPf8PwT(Nm74W1a(>zMZK5Z8^`a|g-I$U6-9vNnf%$uOT$w$q z^_X(dDYova^6fm@scxWf$vzg>QlDJ;C&(|NWZAO@!ydCVtssBfvJT1Z%>MSj4=MT0 z{L(VD>)$f#RdOQPC0o~+9X=+!V)^ec+Y+zyoJx8k(|>GEUlQY`BTh>*)_ChPJZbKg z)xTnNI^vEChhnzZH2$)f!gHHsekOc;+#+y@on8I6$kC5ROGKFi(^qV|Gu3zbjLP;2 zqTT;Mn`>?;zx~B+ddy*}-mhHWyUXj-7T;rw&AN5)N&1pd&g^5C<}F(*apXW-Lr%yK z{`60@8y9_MTn{Pp5ZZ<(gn zCAKiFU-#<|Z(aL;F%R$VOLOX^ul$R6ey`(2+TnFK%@R0`uL+$lYWY=^Vx&3i!yET4 zmbqR(_|2EaZ)gY4T0XG)?pIr5@b_c0(B&$duW#mQO0xXh7q+|mlYjF|Tb0z>PXT-m zFBkuPESs+WwC=0uyU@eyR#yJ|Dx|Vjq-BCl@-{2e*2$;$TX^1stEYBu6-yPGAe{WudfP6~6Mbt!W|pb0 zk6LXM71ZbcOM6ac&@0$lfX3JI-Cq_aUf;9oeV61hL!VoR?#{;EB4$5rrOw!v9- zmz*}~_G_!IH3>MKIOn1H*kU4oTkqOS-kOV#mHX;W{?E!Qc$^U)`CYUDDVeB$VqL!E$6>{Mc|T6rQMN&&jHDqwky@^J3bu$Xj1z6 z<9_Xj`3tTtNj|UFFO`4xb+^m4?x|Xr;(r|YJ%PW?IOf6a*05D#H`jOmjeNAfn|JrI z?(T12tP*}7lAd}r;_OR~8D`uZ?b$|W+Xb9BX1Y&qRGj%#Z?Agb@3?D=SMjg8RC!0X zdDD%^59eh~|1#VzTkf*SCQPpF-`r?Bv(?{&Uw2%alDu}4_C)DzYeI6TOO^Hd$9(%d zafjH$cT8z(9CfQ6*7-`wb!zROF92FgHj_VtvqfRSZ_d!dsn=ciiuq~VTCYvl+U%aQ z_R7BV^S^XYU43zr#L?Ti*Z)TKn!a(et;k)jbt}*0&8(MqHuv+pPF=b?LbcUn<^6&) zZ`tp-UTB+r*Rx%zMZoEq;?ggfwhskgi~oPy5+~s=d#~U1xy8c`=`SBR+h~VJl;8U& z`J{Q3^}RUjLwd6~TqdF;ud*kaP@!Sa8H zr>6DWxR`PR_=ZF~5S-Aj*T zI#vIFbUQ=ze*X_S-~4nohaai_^Y71pF7mHMz{$$>jlFR3_v0&VejMl3pY!5-Q$7D- zd3Uc((NT)O-tYLDHviwHx%PKAty%Opv#;unoAo{u^;>s0tnOT*wKis!|Jkn^GCF#> z%iR52>YM-lZ4q$t5Vo-YcVwDz@2BHu<`t?t=>Kq5zQ9`iZRT_Feg2nxqZY5q`~P;f zfrQ!PiMLszR^FNvbM{#ABX8-Rce|ei7^gCA>p!vkqSUb$t1_n>Zn)-h&|dPp_{9ef z9yb?$?-p=6VKupRmPzB0wd@~cH3Of1ZkZx?|I6hFiM8M7UNg4zec{J2RcHFQj(^el zuVPZdr>@&&=NsE8Hg6+%fN9(1g=vC*jGHyOFV2vae3cmx%(bA^|Fd9F*}M0k{8<%f z`Sl8SxvbgF(DIjsvc+$6*!Qw>{3t#@*ZzYYXh40|uE*DATZ_Hb&)!+FG2yDQY4zT2 z-rZ$q-_%dnI=%7x%2^U;tL6v&uj8tB;!w;@xwKL}*G}b;#q?LLt5z;AHM?%wKKECI zmEoo?$#S*VZHx!}bvQC-zNmlPZa?EpPo||-$(hxa7s6w|zWQ1DZuO00ZL!@MXH5Cm zPWA5mwDxH7+ru;d2hP=cN*H zx%~l6-}9U6JvFqL+817`_WJ)CQ-fn~?6#Ke(W>YN9o%t$z3ShErChHby|zD8@c6eT=e2Mz4{GN}N zmFu|dr>-|_uHkOf<%>fe#?rNG)+rPi(=ijYM&!_Bu)f6G>V)_4{UgUfs zP?==7)cuskhu(`TEWaGN`a0_mzozZAS*KW*{M_8TeV*0#J3@W#xBRlNSJyqC*8k}A zcl$T9tV>%q>D1abH3|q_+r{0|`v28W>3zS=7_M(P9cvKQJVEH`wQc*2|D_1Cm+bGk zXb|OiN`_4=NUin40T&hfJN@sMPC2oO=hzI@SR2kv{X`)fIhP4P?bME6`+A)rV7FQ8 zagNAvt%LfLPS{Q0n-;oXE`;&GgX8(JE%tTmgA6x(-+c3KH-8DwCG#k4aGt*N|3tWz z>aVR@6ZwlcJpLaQ7g+S^^>!wKumfFHSK`xdo?;8pRNWF67nj%-#&v>qNx^j&k4}R` zuP3!{x1FB(W$oF`JV6{1Yc>CPzMp8+d?Mvf*pXk;QkrZEv+ae;rPcVw4lGzFzUMK= z1NC>uc6c7*Vis@FVOC^W;{SN2>W{l+_ZBXncJ1+{hTgC_Hj}4bI`w7Vfn4+Z9S@Hk z10|{*Tc)N|=I@El=N11JA9{G5f`r(shr1V_SmExnCFtv&I)==?|4(jD6Z1WJW9xLw ze@py5G$%f_++=e+VMpV`XNpe_D{iV0s1FOhASd-K^(Vv60_L9u9S@%=^0Y}y@U*YZ zb?`V*Cm0mgB=7m|-;EuUyZ+4jV7|_HZ_w}8J9cx-tNYeERd)84_OSSw`TujTFWnw2 zHqYy-j%IdJ{j?wPfrs@pRf9rp|MMK_xxG96*6KMQ%1_T-r&_s{$12~`Xix0MZ2h-3 zp2sK76#pqLeS+<9#eVJj>xD)J5=zoMhBpd?naZxJ#j5e@v>uB#JYkaC<2ASH(( z#oYXb|0KQIp`n&1^We|n%tF&S3!W~LXR!M^k$+)!>WkD!1+kAzoxb6(0+^SC_oSM? z;R^isQ=G~0>odJ?`JT_(t;QL?VQcO=WC{#@vX{9eu|rUj80GBZ$Hs~ zxMIIQhvJ`8E`2#0Zi#X^ee?4DQ2l+!l|`GAE;Zk0^80YuY3k8auHP@8H@xI;rSR+h zuFrgbE}gGm5G*ziT(2(r-xzT*KKUf??n@f`v-vjN>YTduTB+)ncWmz#&GebVbn!&G z&LgFmKojYTiDr+3;*C<6)$49QxVKg3l3Ml6ga)0{GpD&nd5iq=!4N|Bn0B|I8C~SHE)6`u;~@iM%rH?e-$OuTJ~dlGZ*6cjr__j>$q|pC_GL zvFQHaH_JCvzW4x2?MD{HsZ9L0l6Uu|q+4myWt^Ifn#rdwzS9jX-zA}&x8PdT@$Y(F zweb(4ue!Ay4r|)~i?Ic?L~YZ&ryi5P2_N~litCGY|9plIdzDWwi_+w4viE(v(&P2H zSK5~|Tk1Qn&Ds5D)tX)F8rIA^*HOo?^K~neE;$Le{n0ee#$*{H)y3~_qXfU{DcZam;P4R^()}V9MCC!WffBM(U9PV{q zZP#nNaI(zTSp{=v-IuS`kS_ix5ahB`$6)X2XH)8wwGU>nE-vZ$a(s$>wwCac8K0V0 z?GR_`5Pz%iC(^`Y)?uUmX%qaES{&YSpI%!2eB#1mD*qJvOuyP0*(p3-{Abr3wIAZf z?{pT)JkYsZeQlm!XC1?iuaEzW9PT|EI{(1{H+UUx3D{rT1~yCS2^PBXhquA_VXek|9t*9*5W30F)hjNtmGDiC}AN8DsqrKLT7 zQKs%YO1@g$wDUc=b=kaYk6HH5tnfXx&TW1yU*Kcsn|X1^zQ|p&y!ik3{NE;QhZB!W zl}$}<+B$E#o$mJioiz`BsT}H@TC3~)?pu=aza#hF{8rw$asg(dpLr){!DXX`$0&6>Cf4-P+|IHoL#GPIloHnv~sWUgke*TXS`uc|*ix#dpB!1?WN|1o->mNLKYFCQi-QewVU9O&oTikH| zzOQfozS(g0oxbPp`X{!HHcNb1aPDm4UqUh4}R|weS1BbcXyUjy^*i#oro!|=^k$j*V!(dr?5m!RlH+wT!Ppu zYn%U-$z^>%u3uVuDWiVUWBsKiKWCr$tX_Sfv}f6keC~A%=f_ocDZS)7wEmk_wBP*Q z`jZ#k{g`z3gZ0+OCQ~2G|L`zhnmr;{{qK^=i{u&V-Yu`+RP4I<+KVd2_dEx!=B?S( zk+J{vf$mvvQ}6Cw9w}D3*6^4^_EY_RyTsnE|D_mG_b+c|*tJWw3QO|$1@SVpoH;D9 zImw;Rh&$Qz%e=oAPVRbm$+|dx#cb7ozgILld;IzF*dSK)ZQGyP2=35#N{8+nP4t~# zcPVmf@%6do54O$De-n3jUBbi6SF8=j-d9+}9zA)ibgMIdg~Q$n<$~hNTjL+NybV8) z!5cd5o^Ec;kJ($UXc@Z9>iNN~|8Mi1pFfRX`5!C1nBscye$g7$JKAl>U~g3kcTBFG&oab&L6j(7joy8Cj2R@~$xqc*=1sW5$Lf@}T4}ZYIN5{x;X7G(rt(mncU(w%5NFEzmzf=;wk@_xvwcUb=EV;cr;9Hs3+Z z$t+XWe63H8ofQ-IxN7^k*(Q$9MbEvz^Xa0W>u<&%8l@RGLTd#dU%z_w-x4-{y{Q#Rpur)az`Qzfpg9-IcBC6|vIU*}Xew z72JswTcuOmxPG%j@7oL6tJUq!+h?xUYiSVKRP^)XTB&NMsi}|tTc6!uuXEP@&HBXaDZ9ElB=wz2a(Cu`V+~-}|8FqS=-ShyUnfI- z7JGeDKDOvzP)Hu1QTnd)R!O~%kwG86H#Qxre>)*aNuF=6W3xo}hvk)j<_QRFT6i-| zx7>co=PAL~*UjBGA6&LPCM)UBe>d6iZhEdp z*W1wfOpywIY_2yy*gL=V#XcGDhd!UbJ7@VnIv4!(jdl2r3;b@=kH#F_e`o81qcU&% z`{d$J)Onb{Y<`2|T>Vxms-!|+B?)>Yp;(J$;GGq zq(#A*bb8%C=DAw0uAVY|!*r>8Lbcu#aku6356DTCEmgXzwwnE6_x|5=zUKKZTT^Oz z^IVqU#%O8nPp+TrmP}lb_9~^$J%c~0@(>R5eee=3UzcA|IPNvcd=*K^I6uu@nPEb zqTktpb@}Fz+b{d9EV}qz=&k&Fwg-B3*W3?CW!>Dq%CF&M;g%o+FIVsLRY&YS%e~@s zCQX?y@RnasVCq(N>8h`s$tJFe=QU3Y+CP?4tQBxe`}%sz>a&wfH_CUI%}KsqKiT5z zi%mXNMQ0?p@EOcAH52i>`*BN4#CM6se_wm9pK=;hSf8(Zq&&CloAi5;p!XWDJH8+P z`d@GH-^8Q<$zrQ+BlGzJSC8f{UmYOLe0#Tz`r4`Q=R`csJT|{D`@Es`c8RzCi~bwE zeDb>M=&c{mChT4C;)=6}dPnQ7=EOaA;hMIdzSGVmF{rowaE{Tfcz@jRAZu$#;FsN; z^XsKI*|4`9P>%n-`RY9WNY1@Ne;GdPp8r?Gj9)hHYv!BIs>AD++$dR;7{2u1Q9bFh zrGfu8#5bO-blKX~aO=IE;p;iM88g?F+P=zPWmDg>$1miioxlfXj~Of}SN*3|M(w@!N-mVJg-F@eA;Jg0# z31t^IoEFt@z0MrEyfC_0-{ZSv-T5~cwV&OaTO2s+`R>a$*P=3>7Mb>%8r-^~{Qsp3 z_llqzh7&5YM7obmI;MY9VTaq7Pp_|Jdx^bYC;Dg4?)Hw0e;xNcTXxRIXs7OylI!nE z*u}Q4+Z8%@dSjSw=ezgi26GJMZhz^MxPQnhnTvsc&aYQ?{64$9^g~ZQxBpwn({}gN z+wxZDZJ%cP7ynjQ5}5kmum1{dns9#K_jz^I)uFSK9vsWq-?KXDx@+=V zk!t_PvUQW(^zL0{xBIHzYhuaXxp4OkqgVGid&1sId^j1DxMjaIi}bk*Dc)+1(+j2j z9#-FE=ve(!jjQJE(K^w)=EodX7j?d~;qH0U{c7gl-n)t7Owsv&IxhY*T|6Dsnfcs# z|3E=<@zv!U)lVIYKJ9v3PJVj-qxw&#o2ANjIt6#%+Qg_e`&7{u)8{@%-s!2aU)ok3 zDIB45@LKT7OV5j69XaS&ebBzlZslhGX}&s!?N0Y4rY<_||9YXTy5d`vWq!{pgMz0j zu3f!q-Oh6}my11R`!nOEu0?O-RlWNAUyE-pm3@9m@1b?iPVSP=8?S|Z&2V}!alP^O z`nfOGzWD$5e63XT!wt#2yH9nx1%2Hz&t&`lu5bR?H%xsCj`1D1mbBq;OUC(|z3lre z%xX*L-r4^-Nw4O}^(%`U4xU~3Y?;XYPp9sx$0qSTif5TFAD`oPtNmJ5|F)VX`UXdr z@Aa6OXmF?C;@>r^<_jtAExI%Fcz>~>&$L_lZSretr^HuVpWFL2H^c0AooPfwcsE<4 z{Gay!;_iNP;=XE5RK1w(`l*xu|EE{G&%F~At@)iSqBNIb$BL>(tjtfl*l%pXNFu;d1Lgn z7XNG6(q829@V?rTGZXmDC-AeEPSoFgM9*^d)Az@_tCC7(rE?`^kM1+gOWm&1-Dh?? zE8&g7wf*PMU3@?9@p7?xo=aX;x{yxdBli2(*JkXO%f4Z1dg;Bu$=*z{d6UcLFO-~m zWTE%HJqwKIRk?NFo<5^uiQtxN8m9wwj~+jEKXYTg(Z^3KgN!PEaZ9qVp7BlDI3=?0 z;4!wN_1y_^=8CJ`f3ZdXENIXX{5>^zR?k7viC4m}O69alS;(L5PrC2^=jx&E((f}&5j_bl+uUUayIk6RUFa9%KcpcgR6oU3T5_{K)e^{1eeDeKz*ZIe#%0kcChSoaV zm>Z_r^;Y-4)s=6X1gutN_Zn)r-!_N}y<0PxQRT@$=9MS?U;NQ{Ex1zS$Lgmqbxu#@ z*ZjvBX_|V{^S+i~;G5rj{vP48j4{3}Ke6NvZ_CFEPv5-m{NfWTvitnq_ol%?wQGw% zOpcU$eYMa2+gZ^$(vfC+#s8Mytz^&J{qxv6(>GjV^N#)ea$LjsnDv{gNg4HT#H=UY zexldsbyoNnTnarhm}etC~SxsSt{CRph#{PfL#b_J)V+MK$SV<+mR z4Zb{6PkG6*xH)3UY?p7V&podU+A-U=;{Eb-Wf$kB>y+=m7rFiYn?xSZXbFZ1Mpu?| z{<(YqUwzNF^^AMP|1uQ(UTa=@Zo7R%McagbZ`xuVQtyZ6-w@TC@^Go1)ZD|J^~O)X z#wI6buN0P8yYSSZ%HPKi9y#(XPR;XY=X_qL#+kx@Bh5g&vNzu;{rI)X{`99A-wvPn z|4H+iRrtixM&bQW1BHJ_#)-Z>Rp5JO!c$A5NLDwe;3FHdWV3J8+}n4}>e;*Y>@WY% z-`mZ4x@hk6#QVES&fj~^)G$d>yHg}QGO;xsAo=riCDi39Zl=vJbJYek#T3W5eU$|3gvQX;GjXBFjLXS>M3ZCYz z)LDG)-sQX5Yi-t4`=8H!KlA0gng6X#)4zZDl3IGcm&TQ0nE`}}ST7AdZroi)ez z&A7hk%KyWu|90okFg&)beD!k2pXSEX=Fhl)|Cx(HXZWP%&KY@nDf0?$)&@PDf5N`e z;f8s|SG$zQg0iRfc|2b5=yP|Y>b%>OHV(*{0Cz)dAnPmmR-%r0u!b3$M-p zW`4-A+FRV+RP|kk-TBx0njf4~+#hS*xO$~Dt|xKX zvYTXXWY>n~pP!bOsr+c$F$ojj-d(fYj@sK4glI4&Z`qp6xIxw+&-f>YqGHO!IL|bB z#kIRsQzcj@JXLuXpeDf4BB-SLdy_^kS90F_;vg}qH(=wCSM^iA&lNA~23r(ff3^OZT7j~$#)$58RE(>>7d znCqX{yNY6BmHqEa2A5Ygt%yxmQ14OW>t|v}Hn^pu!D_U8-S-%tjyZWdHIHS4TwW>L zc=6)1#ZyjiXQr12j&WPlmR)(C_e{S75-?m3JcCPYl{*y(m*4y_r z``@p~lwPaM!@%zP%l_BH;|F(0gmax=cCuJtx%e8xypDBKFEX4vFQ2x2-{)`Xx+=Hj zPvqu^+49?ETwO5FZ|$Wg?bAaiuMCJfdSyP3-d1(-2To32oPi<&t`FPx=02D;!H-q> z>3j!;9*#TVO8Q_s4GNeb}{5pwrqZ zWnFlW?Jf7GqIGLS5B=|zHoc+$=9jeTu>~u&vVR8pu3>r^`d{b38M`f$Z00W%76`h^ z`J16-c7A6)Pr>F>^^$HJ9O=hz1pN@&#ytBZ!UFrOSMnYpFHiw z_H9$u+&5gCJ0stIS-`fid4Vji=CKy%y}rHUHv4M($BrRh+A{wB?;ZrtuS?{vR{PT1 zto---y10Y&e;$AD)mjm5x-KDn*|*IPDpM97e|Kt1vA5ji4e{^0x4c%=e6f3H^r<_# zZw=i|-4?G~wqp5Zi#KmV>aSjTca`P;{`Uoym)_U@4HA1O`svqc8!-p3nag)8fAUwD z!`Z~~f2QD{UrWz!)|b60eyA_zScGc!$BC|z@3S3mme<#^#tOGi`ttPsT;JH%8LQsP zTq!fVEgm#+J$KY=1&L*@=l_(1`hL6`|G#>7rcUB=3yVwq4E8_%=F7zftk>sy8d?{x zYSzb4ak`Ij&Qcb=AJ-+A=dSpDx9;Cft{ukSYig43Y_@*Ebs=iuta(xIGiP15f6JmG zrtp6Ob4{cEJf6SdD2a%^LPi}}WD%j}xtuE!gvnto~=hIum|F}N7{d~iD zRh6(4Oa66+eXDyZ@^9C=fSngF&pUs>@A|zfcdcLiE;f^J`+c`qUCg2Qi9C;Q>|^cy z-|BN#xV9{Opx|lGQ1fP{dSOY;!uM%wSg%IB-|;uwX_^GX!iMQDZ1Q`?9qg>>h{x6t_FR|3m7l%7FjP zZ_EK0R3hiZOQ`xxg)?>#>BYdTXTQUx}f#?H(CpXOBny zt2kU=es9g{%Ug48cJJDpn`Zx9c|H!b&f`n_at-193{FeU-&^^~&psf1SH@ ztuHI;_%WyO+FZ+EDl&L3yOHzfAmZ~TjZ(t7bX^el)U<7%9Ve%jFQrf zH4pakKX?{iw-b~@*NXJ%$2i6MDss=4JoxP1)m<}R-u<0;-9mZ44L=rQxQT!T4{ z*AB7qa;K{oNzUEztjtz%!4zG&H16Kg=VkZYMV_+w+P>W_*&_QuAhd2iU&NAWyy-_D za_;PQ-LgpCUhg%N?PTesS(1M3Hotc+Jzmb%b1h?*lmVO9YQLwI?+rgQyyM@bG5O9P zo0QMYZ@!<}x#7MxI}7`gDF(+LO#gq+yx?ut{#^Ar@-Dv;gDd_W-2X$Y?)B^a$=wOP zEWW|FAH;@NoQ~UHDR1w6H#NpfFZq*0oKC0UE!J&2FVB^^AX$EB&-43Q@jZndiyAK4 zq$DRrIT!Ptll^&Js_pZHi^uQpk=)*TUE;BxG4p2Dn=_br*psE)BzEsJYy6YF?7$9g zzUh~aiYSDL-z$%J6#xA$&!K6G?k2OU<9_JGH||kaxwraD42SfQnIUJtF7B}V%;$Y# zpFUgW7TLsWQHM3Ol~~^I+paEE-JdxtD`IBFwid?1UrRYM_axrd-NDgnFPVIkqo-W3 zK(XNU?)%4{$Ng6QbB0~+&DysupPN1QACCUF_x)k>e-}Tl@c94bN#AL^lsCS&3>d=R zhOg@6HkzjL%+$cZP+gxnOli&BZl3g<1P|Xx@qI79v8`UP{M0Y4R6*t^e-2yx&~yFs zTJFXf)~g3?uhc4RFXK;m%ymCvt9>6&#nf}F%kK2@NGQHJEW@_z=6yki?2n1tgne&# ziyTcc^?uy(@bA};^A5;%ibpaYD3JGD*1W2J#k=EQ&IKxLNOJVCm6!8hCgde$c$UpB)Dx2ugU(-ZDBOHZ-8 zZ+W8qeQSp@`#wJgX6`4B9+I0_CC{X_N?GrDmDxX&^{Vy_sXzH0PcOfGZykT`@AO#p zI<3EZm+wFLWmiI-Xv+S%>+Tn2m*~%yDop>e=R->P4vT5EE$@H)epKTmrY8{Gl5l3m zP48PGQF({3Mv=Htm+IIILe@bFiGLHs(bCpQ--~F1I_}5S(E-V|B6Vp2u_fAAULa zcHiucVtx8?Y;&s4&zUuq@8Qpd*8FU2OQl1Wt6%VX+ES`RR#$GrG@IOV|9p^X$a4m|a`4cm8^Ra`pY-4-ZyF@Lo>mzT|eBZ=vCZQ_BU; zCNnmLUw`wRgQ1}yNAa(&_oMi4Q@_lvQTkmLeShoBndy_Zt3|46D$Vd|FaKwAoApkW zT8?_o;UiD~em`))$@}(_()$y%zCE-%u((w{?t7=Z}SfP`8^}@&b&ANcKScJo_|yQ z?Uv)8+VXeSJIyw+seWIv?(K{vsmC6Cvb`^?YxB}0;M1pViRWeaoSn?gC-Ff3&#&oe z=hzZu6qfF1O*W}3Psyqe4*#a6@A8QuN5Hw?Dt`z2dKH-+9fvr*p9WN-~WRjB`3M zA@lg^pW6zig@03R(NI`YptV2z>%<>lVxQYBxz=-ZbI7cj?l+a1eS;UvEnQ{*@BWEJ z$78qoyxuDyv`OcXZnI&U=s%N;+h@1ST0VZWXu~zVwX*jgR2+}5z1`N|wSjxWrTdNY zwbzw*d_E>!Yo45Y=kwnGVt#&kjvUp2w{`R!LYVfvJzmCduz~Zh=(2e|JtY(V zZF@Ce$9GBn#k-Zfm+s%2#d~bBqOrTzgXD#x?zd*1eeke7y>@|I!-8iON8?w1SSF`No4&*Vv+sh@{!lx)uA-Buz!k>bjsT=QEiHJ$Dy}aLgX};F!;%)US`qkba z`uGRW`_pM3s?fd&L$#1)IFYjB8|M&T;f6K*i$i(jvNox&U?DFvYca?Z{ zj}wOq+h@r3aW@{n|C?c5>|UedFpk4)te?sr>{ORK%B^3^c(o*E<)3Ajg~ivT$?xeY zmUucPas98|>~Fsv>HD}^BiYg8=gKMGr`7K;$2V#->V|yy!zDiDv_JTQKGwGn%NSlr+4Jn&^zawc$!h;E zkC@gJ@7?!s|MhPinHwb3P74$*SzKV|o1e7V!S9W8mG7~GlP%_K**w3DX^-iJ`~RDD z{Z~6YNzb)5WL<73wJP(%mC`Vsf-MO%?!S!q5}9w2y?D~sNhcTS=$g+kR+^T@qb3{r zjOW;s#SF)%>&;&n+p^Em>%YvM-vS;H{9Zi9_gSM z;d#KX;Mq;FhS~g@f4Ogo&MGilTA#+}ef9r~|KBgi+_2lX{YlGyrIilleWIYg`};oe%&U2le`b#4 zp#sMx^?Y_;Uy6VD6kg9-YO1$Yp5fiUd*;biRqS&jug0sdlr;Xd-gMO~k;bxfoR4Dt zex+~z|0KWj%lV^ip7mzai(mg2byfIZAa~B>ZTc3*ojh`y4vUxhD`ux|k z?3~1#E182P$*-yKRrs*)uw0IH6s!OKukTmeJT)$OutZ)q#U}stnR(~DekEF^EsZuy zw0=FQj`_i%quzR_<+&F-*iFq9sF|^s|97=f!-bD$cC=iZ5cDW}|Hr8_jh!X*PTVtQ z2X!;$|9zbQ=>7j|*DqXo9Q1qj*z7SnRJ)HvS-$b8ez>Qu_Ih*>>V? z*;hhYk7h-`y)MY+{U`Fnw_?SEt}=oGn@ZlNx|y(ij!RC?wT^Q1?|Yl?sl6iYn$m9`ddG%$TIJ? zcX<6|md})$t2_2v2bNQha`>JhI4}PtDW8J*vcn$}T-G5j8-}kQcbuU&n3FXx` z-T1`(35!Ag+swP=TZ8nD9nnv)=JnFt^W)WPP`@o_S!2uEW{>|&e;$0_FBxw?tEcbF z{5y5bM^l;>&53a3wEA*kYgSVdcf|P(_k=dia$oX&VgkS9wcq*1`3C0{mo%g?-AQG5 zbn7@n#HICH*~FQmGB`55H*qU63WmBLlVH(iGCY6P)4I9pS4?{S zZKn7&ehW&u3X?7d$UL9;JK~qdunIQIQ}&J@ef(=v#}TJ6qdBCdL?!+ zzc)YnaQ*TdkFuw??BB4HY5o10UXTAB4om78*TwE_dfYwz!y)hWy?sBfU)I#S`&G@y z-+#d?Hp96}#hJGl4%}eBV#J@X?j1jM*LuH?D~&hQO02zjMXJY?A*W3sk;f$b!L5mP zR~rf$6{SC@iT(8aUzE@Jh-s0=p@1R<(RIJ_U$CgumntaqZP~G-v21UHfQOpS!HtU< zJ?Ahu$TA)}Hz928*HzVPlB9#%-2C@_zokCka?$(dcaOh5Y5tHrO*j8=hoRZD2g{XH z?UtrpHu*N|bEa7+^W45YJ72F{xjJFxX6d&dTl(bEmpzw`uKGCZ=bTM*SiC2$*JM&y z_1$~kfhf)CudXg*O>f&-UDzwFU(b2o{_l;Mw|sBtp18c9>0R~p-vz&W-+#H=v$e41 zrO}cpGv>{UnDlOtr2nMoVH?m9ed!xaLJeXd!%me5M-1WP6+CDl9G_I zU1F%_YCV4yr!3!F9miFfPV6lX7TTK_qAq%6O9V-u6RMg0-KOeo^2a?tQ{tC=HJJ2z zuWZBY(nZ0W-ZPg-FMn6PexLW*H}Ah1XUx3&d{Sem&EEqx{x!SWd8>aNF0&TDJ7Kx~ z$D`$E=idyz{?Gc`?U`yNeg^sPUgppDe*Zc@|Gs`s!NX5?83gJM+q|6c>!QYPh6`sr z6CSN^mbj4p{^*?In!o1zZ|&quj8Irw&ua7i$>JY3&+qF|>r9hp_RHJbxM+*n{AKIb z@apgN-{GU5xvlT$m*O_NJch>?zaPJR>FdM4{~bh)nmf+KO_)&s^2GjNrPqsiKEHYH zdWK7-`$DE?anovtxLIe|rm!ibnKBAxJN2+%_<7j9!$L{Gh+k9ULI*>lT~cY(6RzFo zGcKK4HF?tScdu@6?)=VGw_=L!q}SfJ)!rS-0$>dRth?dtbwb2!WE-_I^A`ptVJ==HVB@26f}w$XBi zvFo1Tm;RzZeKr3UTHg-(^*sD#jQ`8?B0tw%>^f(5Ha|S)(6*`nW-`ybKjYezUdDn| zD&h%E)}clxzdX+6+|(hqAb>SQEwuVFgA3dI&(kXuym{nq5*`txr!!o&(@iyrEp zn;5U-@6ouWV4mt9yU%`yHY7N?hpmqIc$`?j*GyyRh0p1pU|!P~AoZ_TXUH9_>v zrDJRj(!Kn4Kk~G0m=;X9v|njnlG=gxCF!L(}K+gznk_B*@> z66796uFKDN{Tctp?WR)O+UM_gmD)X6zjF1Am&Z$4Zf$GVVO=q0!aCstOB<%BrUc%o zbd_A=g&W)KZWuA6mlH=9yOSl*w zFkLQ{_*isg-@1z?-<~da{&i*-*Xi~HW#512y|P;I$NL+f7Nn{IoL$}Zfh$!JNau>QZ$;xFxyJ73M$sbyQbzx&I1t^dZ+5z#NxW9x5O=WVZfm%cmb z*K?VNhwiRf_T{{!?~LL(cHEr>EXNyKBN(3PIPUwjUW3a+QL#%XNNn04an+XD-xf1v z8Y*d@b635*dTx~IG=Y_DtNO07$6JbANNiCMlf4w_esFbg-4<lg+nJI0AWZmHMLGde-P&M*FQe#_$EiTPV!>Uh-`@vPSP>*VFr*T<-`s&3YN`=4iGa~$Pac0^UoHlM~IwbJF@4k zIwxD2jmBc53H8hWO&30~$mQZY4h})?lMFNc?LS*z-zI$FN@$mbHhLMc zZ{5VY^{r#2>g$LFI%k*{*`CncD5lmU#BgHS%4UIytKa%f{C@C3-=5`SEC(jlOn9+@UAoa3lAQ+}%U zea;hIy{fOmUPv5Z*yNzXzL~#_Ermamd3qs-&II1w{@;Jj@jE=>L38ZxXS+3j+jn;< zl}}xGc=b?g|F~@Q&ck^*A zs}l{}*SH97W;$skE4V?Kag)Z~KSn(qA}6gFnj5{JzqDp{EL|Ju?|*THl-0@fJa^WZ zR~H`43^S8Wa_?!_&iRwCU0&0pxmB_uX9~l~6AkjF3=EM^KHu(&O*%Z=@;rA)a6F5y z-tBoany)RG7|wC|{NodWUT6NUd2-0GPSE<+w25D*-Br`*V>AAocBT4QOka(dm0)b^ zx}f`ezs&nB5FWHcWUCU}f_9xyCXU~m-+q_1`(OQW$-Z@3CSOHLLl>@Fp0O-=^&{>3 zFX#9!p4k_2)MU2SYTt|hygEMXAKtTh%ey~+on~!4{%!f=tuvmz`X2sa*CVGh94U7= z=ClbgnaBMTn)t7=$>aa59c5p+^y2nO+kfX?-*@R*aCmTxU7fI>bnE8pqV_Isds>t2 zCR~=#Nm;k}%qy-Q#-M5E+yaj*ayci@``pquxP>e7%#Eh5MJ|SxPA`KlN39MJ?2svc za$)=8m9HO6{}$R+Jlj<^$EhwdKK#I{|JS-6az-f>JFfitYQH?E!CHw%lfDC`et$d~ zV^6H*-;(Px?}s~+{rQ{?FLuSPk*S^}oqpqgME1gMrTwhW?x(W*7`M0_mG9eJ03q`TS{grMKnlE5G-CQWfI!DY~$SPyH*8+ zFE6XI;!U|<&fxSQ_p-xlwbOP}#ZG?mvi~yY&QIqfi3KSg{!rg1dC#GY z_NnP|&vfhSmwnmF=@_1Ma@)dvQ#BQ)a!zLaA7b_9!}RqV=I{JH`)>Zequ>5n-!lAM z>0T|i#XSFz(KGw?b7iaN?4JFtd_#it%iVp&8#r=qemr-xQN1Qn<$(5gh69ssFf2b* z)w->KC0=ZDK>wl{G7Ej;jy~aVt(>A0&35$0Ar|d^zOY`2kj%d~rk-6fi6#D5pOb`Q zfu?)y)`YdZ2{jWpnp6k;+IQFSL^7ArrTM>Vj6cm6`g614;I`-6b8Wfiv+nkty+{3e zP1WA*9rdrc%@T|AV$1j4W?gfs=0~J$$C4SL*2in3bk5x_>e}RERg=1*C6d1`%68WA z!+hIxMW_7UH7jlXvULWwdz+W73J6`k+2#JvFSW03tP7dd_&}QZ>AwF@x+550o;d#~ z^;Z7#U+2Zw?MiU(-t*z%*+~)q;w+%GAnMTjZlz4oW+VUicl@-LnLR8PwYhCJ!y-*+Q`xR7b}aJV4Jy+VDkn%S z*~qw3mxD9#1B(n8cfNAF)5j+GyZ}54%v}dpT65IdaoOJ$|yFJE_*O}Mm zYutKz`GDloXBvOwPIh1Rp88L3XT@PJ`_untyT*I{Z#w^3Eyv^K{QccGw{BbbWpiKg z4vw|5I+D%>nxZpLZ+pZMpY-v>i6x)&qf_tqvrN%ArEG96xyC{Ax%g9-rzt|q))vLM zJ>4-ugR6o20Qa$TO?(m#nhUI46@FwMSeBP%a?fkZgk$RtoV&yPu50^%39Xr?-ik+SyfH1uKb-lZ;_R)W3Ydq@7h`M*MncU z-4v9a9u%xz_xt4+760F_R^2f>caC}aC;czJXKOaOF0Fs}%zWXO^Xs;BHO9d_1X729^(pS64} zvbiZ%&#VhF+9>))N&po2^J*Uj#?-&$Ua{=*zS%`;S4vw?eq>D#_7XYL5PIU#ukLyL z%o8uLHy^f;Z#S! zg9lX=SOTV)?VPBiGjY1mH)94p$MlMsPnI%j2%itMWqqZ!Ze~b7&P%8& zI{t6&JeEuE-&(C&7Z7?m;%=B}Kvvy?+$fjR)!!JWl^o+>XSFu4Yhq*(dsCQOoj3bM zb&gW+hKskf{;Ea&-4eE=;ODyH{Mj2UCtRxc19kWmyAMkgKD?9~a@9nm(bv>hPk9pmlz**J|J|n4 z=~&KS)c#vHCFk6qnYN{G_dk|dx8zIu@3>`OqNm>PZ)w`N#?G}y?O6KpRjfOwDT=+> zBxY{k^<%sJH=TJkKWv}hvwQeQ;ZnU{&8y4$51y|7$Mq^}PS*YjLdV7RAAUKPYp!x# zMeEw9LoqJD#J6TT?sgLH_@W=5Y_muE*r z!=eob7cYG+!tpRk;8a=HMT@G0c=rjc29`{xlpnmf(I+NTynw}^@ozMf#+`UZ?+LeM zTO?-fk~o!{9Q@(PUPqO8b^AP@{XU;}knfz&@@s6Swp;60YtH$4Z1tz*W^1!z7q63T zEN|R=k7=q{;^wQl**^a7wyX*A4eM59i^yKFi!ZWd!kP01rv=i}w{P^lwExz*={fT} z{%UEgc8;`;CI!&monB_6Kob~_WF_|{jJtIEP~_r0fj-^8=nGkTYG z&f2N3a_r6)fkVqCrRZp$P;oNII%A})m~z@mMP*CaHfO=2qq`Zx!Ueph2}@hNVd~B; zTj+VhB*d@pZpNV_Q5}5^CpU&ZoXRvK{IP3~{)01<{(s|Ws*hLbGuZK@%2>92W%bHy z-rJu`W;q9DYx5sqICsR z=QhQhzMyv_l~wvS=Z`n5^2@wI{?9-2$FJQd2TrPEu-IA4J^3+r zfG@9J#R;uV0^O|7L=AaX+4qFK;b1S_aQdM&GtY*POun+`E{YVkFeE6JE(twbF)8%K z@0+pD*>pR9HR$;L;k5B>#*d3d?0yTDzs$c>GP{9y$7;X#7NK`q9wpxs zdz@UC^E8iHK7fZgy4S)oe3|RH+J>B1-`sS?8@ZDfr5YRzmglr(sHopicHeRKf}VEC zccT5Wie+{Gwr@Cm)Aw0%SJ9;UDY4J*p5N$O@iX{GQ*6)9b8U$R1_8dVnl|hVpT6V^ zeBb-JcE{gi<-hWd%><38uDU$gV9LDT4v;Sd0+gqm!Qe?yECIN@!9^JJMV*} z^dF_neq*Q0aV5LZdH31G z?Mmfxz9}C2Yq4jmSm~0BSEACdhpkD`Uej^BV#a(kHJQ|^yW7?ou0CbGX>J%(+3n3+ znR^~fW~L?z-&giK%+R}PZRX8VzBN-Xm#-|~)-dPBrW}*C$Np5iS9`L?=Ev34PIM)#DJ)9rb$ zmAZa@GkZsmVcC-cZV&FV!gF(ZCpc=h!iGK9zL~y3X33X)iSKqF4E*x$zuGOC-Zo*I z{EE=Y8nr8x=4=1{9P(r8)PFs@&j`(oEOPd$f46^+bW78> zZ@jtIR&kofA?dJRkE4TrJwI=^{1U&;-$&OpFKi8XnZNgL%O!q>&zcvRmexP>|IHl{ z|ML9z)U@sMa|}}6c&GfUjOl0miq2W@wQbb`8S8MFf}^d;C*Jx+V-*J#WcHX*|&S9+xPy= z6s~K}SbtltCrojM1kVG#wil0LzvtB6Z^;vQdEdb9-<#kWGVu<9(@u-aX>7S>v9Ch& zN3(g`*7qB4@6zP|t>~a2z|peLVBPZuf7LmfzxjCXGC$n-=zE#qntIPm3=9h=CjU;hfHIWDQ^uK0idhrhZ1jPjnBCuL{XeOM!Lq_$X~S3!V-<_d-|FJKy`Zwe3bJ;~Ti9efe z@4G%vv^kTb(Lq7Lt)J00*y8zwO&sraua|r6|G(dP%k9?b`+3)YW9A5xKWCY@=g-o) z+n-)=TvG21D!b;@J`y~Uv?t3xLG=ITM2GU@rG{nU!i^3Rc5IcKB~li%wHD7`xQ=&D z;$kPU#w*5hoOZJ}emU|ow({rg3#XpFO4rS=4-Vf^_j&8w?awDTE~)SS@uFS6eL~XD zCgx)|J^!0IFzx_FuLNh9=iNQuw(VJ~9`@~<-M^bTww*_hCoGTqXU5~B@b}*1^Q}kH z+8i^_Bq(Ej(qcN z4$nvF8@aRBtXdNZc)G?QGhOL6vjKF1~X zr+0jMs2<>REcfF~#?$|DvWi>w9^ktFOmAO-mZgV;$%}Q{*Wb8dZoS;BZ%S+MSHY=& zO@jM>pAo8KzuZ54KkwSo9*YP6j((hZzFu8f7 z(LsXu+k!Za?>$nptKgcF%L#_USSuwoCkBHUGgTrxW%w&Eok4SI%R} zS?6ZVxA$+K`JtBKZ`IG+7jE@gr2MNh*z@C+{-e+9|7V?Fd%IrX<$Xc9`uEHaoW9-V zImDPKvCGe2q0adRchAT6Jv+_%KfXBM_wC}d_qE&P-aq#DEY5n(DADtqJ$dR^yS;y6 zJ6Ly1Jm_=HZ1umtpegn?+r)pe4{u%7-cj=NUE#71Z}xo7Q`Pxi@a|LbpIO=YPXr1S z+C3F|m=Et!sO~qs{U}q=si`=z)9AbPsn7Sy%@6S$I(^@5cY?SCbGg}k>Gc5t@68;S z)VEiBX#5>0*L(T){vUN^$9CVHbk%I;+c!PFHx6+9O?2^972se#Sa;97ZQ{GiW99pq z)~sDVBk+6k^!m0B#|`7wwmp8DudI9HDR-x2@`p#y_unc${Y~2CS9wQv`1%Jk`E5-6 zw*KEE@o{p>5npwIbNss)IBFAa@88{eTmD>soQL<1gEdv>Oe)MLJ=2L@zWHm#|33nW z++{OoCa-+WWgfSzDfTwg#DB7n-{x0qpQ=57d;i4WPYd#Pfzt8~5wnW?``40_6#C`$ zRCWk>szyIi*%`X#7|YcA4yI?%-QKOoQ{$k&=IPYJ0= ztdd-JXuguzn@11kq(6W9%Qxuvc1ESYwhw+Tmv7ej7W`IT=%;j0GzSY)qk*ztKmY4( zwO5}`erh4UkmLHAc6mkp`mE=ilbO$4+sqMpP;dH7j-H3dPOlF z>u8yt(XNv4qdU%vB%dj2TJY|(f&Gtrw~uEWst@qpd-+=)SJ+$kNxdiJ9(S+b*B8Db z;kujSlKt*`-ru#C)O+>!m|ETuX_;Wz@5PM{791B+tN1RQl$Mo9p78X@(>2c{yZp8@ zI5kdhk!ZgVYkTL*oYe~YH;x{#Y`?}ef8RguTJzlX1spxa8$bnKpMI>|^jr2jq@s$W zjOMVt{9tc;k{Ztr{jvFAQRDX(5-_5Z63K4k5;tvhG2W5SM)Mxt+Sv2=Xl zXZU`EWI6iN5Ppviqjcw$dc={OQGfkyEC<+5Y#p=dV*b z=IT6qR^<11)_nNQ{MKD>#(NgUo-Bcn_VyiL_*ug3{;+hNyr63r`$E~6KQVs8&HQ)~D*a_XwAtULE6K=b>;IS+yUO)u9v9OsZ&+{{)C`b5X7%j%=e+a! zha^%0ZzbGS(Ou4e%h&jNiowOx>%X5kZqM)bTHx{n<6jxM1rI;P)|%&DQMhEU04kO> zPMzElRIzR2`8Or=`+FS}a%4-mEprUcDW*&msGBEv+vI=UytT)7NX6(CgukAL!Tn)ezZf|7w}1UseS5NPyjOP3uVc@D<=x6~TvDF^ zO2~S#`>I(qZPG8!|6X*WT2X-GFjMT$md^=)@AE&uBX(ct(9a*Wsj($DDs_JPGnX+Q zcyU3j6dw)Ftm4otU53%v>`^s{N!{K`1fm6$q zZZ;{~FVFd^{9sP=>5zxwh7MB;EB0F@^W@I1Q}~nhKd5+J*P4Xsn;j&RKPZX5u@dh1 z!Y^=rUED!q`HGAwS@q&>b=B`VORjOSILY6*xHmm`w`9TprsBlaZ@C_By0AspcIRC6 zWh-2G?p&4fdh34l?&bqxZ#K=H@A0p3*~-GdYNBtV#9e-|cWvMQcCAMHwC(?W%+K2@ zt*7cPAK zRR8{vY)*&U2e|e<3j(KPaNIPmvm5XM-`jd z-Irfy$1iD$&2I4cf8gVp$NY=t$b7xq!`oEqGdGd@<9^rO5;|@dT$ma+gkFeEuzvA= z50~P>)-5gb-M#rIEx23xA=A?N<67p^S2lC?Ty$8G%V6GgsPN;uYEUw9SW^Gs$B)ha z4_`c5T9;!t_xtjR_AA`()i56{(NN0oQ0Rx#cGOF`*7~J+VChk-BIJl(b#)+=N4`~w0wQ= z!F8byOX^vE9GRM4@bJ=8Mz*hg@6PR$Fm5lN_xSea;?0^DG9~3tg!xFwl$9z+?vbCp z@Hp$6s?zz#6YlCf=9%Pu^7;MmWpeI6JRipQMQqT1?_=uQdVY`7&6;VA9{)W)obdm9 z-{8L zw$4BJ?0x#2$Hz{`zuKMI%r^0#;KP5v-yQwzZ{L=bF|~@B@8!c1kKA+^>oIrl3bs`p#My1VIC{%Hx}kMRsjf0YkU<+o>y zJh5-~MpuEEYCSSvWYh)B+8J$xc4Yki-m3g_np5SX_syl3qYv;rye_qBUFU~9&IX_jtZNbKt1v{?#i~b;R!9ABkj* zQ=STc9G{+NDy#hRe!1K~pNHGaesG@|!by!|D0ezvoIY$LuHxzwaxp(($EV zAl&YcMOV=!Z?5yTdp53T5lZD?VM=ViaqeCpbn6xQ7le||p_k30Un{^RvudG{VTEU8~o@#^9ChVI&JKXb&{Z&xY`aJ0-# zXx;tBA^*r6?v6zzD-|lYAL$vaR)CK32nG&}z;7YThZ`T2eSZ7-F|FYo#N(%anSM|tbbrdXb15;gC-|9ju}l@{sv(k}rkkF&G>ZMIGn+#m4!ZU3}Vy-)n4MYWs4|{CCfX+`j+y&D}$vca+|bO`h+<7sfVs z)#t`@@(aZ;@aM-CoC};H>=EgbI={F;ZPObYos>34r=Q_Vxb}a3FFkwi@|D_NCvP(I z2wbgGs3|v(`&YD|S6ZOsOTP@L#bNj9%I~TZPYzoxyB3vu*Oaq`v7v5r@-fA_YH9mt zwicZ|#U7D2UhSIGUNYzHt6g@&JP+pB+&jd){L}Uv+g+J!9{Idr%{-`guHswt-n!3Q z|4ErC7&za(xc7kdzhBN4wmbLkjzsW28ls{v?^>g{L8=q32 zy-iq}u&*-y>mo~S!O4C3i7%_Pw^SUh&6l~Yk{n&>rE_ydWa;+P+l_yhwd&5^ng48k z?zH^sG;eL$luNH#PnXNR$yz%;}6dzHdBs^4)pM=K?`d zqBD-${NCyGhWGc$S9)KUegD9`ao4(wQeK)8n?Ca}If*S4m}STol`XLtw5|By*45#^ z^5WJjEUowd@P=L9&C>GKM%HSD|2%BY*3+G{`5PT1Y}m?fKbYe@O*JJlDmA|2!NdN_ zAF=8RxqE^?)vk)@#Y0AXz z*&;pryjcD-=4!tj&gzmWpvt+iu`arWS269G-~$`=-;E!NrwRO5Nf3W~#)i#J`}zI# zC(ju>q_FN5aLihx$0~pUGcina+hB zSogIfd+CJ`(VLZQee0TH83L|fZq~cux}^R*xN>>6_wNxlb1tj7EQjVb>AhQe*EO@Xas1{rkSYdhK(w|KDG!Rhio=rnLAbZA%bmf6g@j z_aptUcemVgSWo8L#2qcv~1p5JVk=)Z5Rt!0l)b!7mH)B1$IH>Zn|_Wq80 z=zqd4VqTx|l3QMHtUqj<_hHlf*==39y}a8JrqBJxdW|RN;5zX*t20fpF2BADKfT?yMe|qwQv3dK^|Eb8 zw{?8z7h(&1o4(=aZ_D%@A3sh1l^3P2aA|-0j{p0rKmG~sUnt?UG!E1`QU12gf77kT zx6eL=-#IpTB`q&C#X7#- zUZ;1b;^zmhvcST1w#WAJ+q6u+ovv|1G%IZ*>wDp+byp9?ygT3XY`#eOthJxF#1*bH zxf=C)^3A)Y+Y$q#pPkDveL1IfXB6woXJQMZcFg|vePcrW+m)q8lBKotyD$8Es}o!I zPbl3||LxP?n&-BvTAA*86m!~q&#lXu-bZ(CIvS>Pj#VeO_7jUHnr~B%|kaWmwYKdueh}S^Nmx%Nk84b2fjRiJwEj1_S5fXUy}c}>B)>W zz3y#qw9VdEspQ)ow@cQ^JH7h%v8DG)BrEqUdcXI#$LDv#H}7Y2XeO^^{a&5W^H4Z^ z-ofDhKPC6i-sbdpdB51^>xb$Ct#>|z-G1{(CMUT!bb4fUnBunVx7pmMg_K_G5&R~6 z`$uZO^X%JSI0~a;ygLqQ{j`(j@0YBKII&;8+mO}TU*XTK${(Urg1`5M1^6~EQ+oeT zQQ`Zy+xNS}xa@!5oc=rS);Uo2_}Hm^{?Vn_?>VZi&zCu>6c{h~?4j^Rn(y_hZ)S3l zeg|5&IPP+a;N};>=FhTrHQN3k* z)~sgD8?HP9SGzGFGMpvaUxx8p z<+r)<_JQA>%j6d4O8Ko?RXw4Db$8O8c0;!L)o%^B$^>89Gu&v3<$j5!N2J3EC6?D!srEN2Dx}1ptg+GiyR7J?S?@-z`c)r- z7w8=nd$UQ|T8HyZ?klP5`S0ov>M8wYZvuCGj!)V?f5#8G=6x|tjR^-W-2;6TP767C zc+8Bb+!6Y#a?zXO<>#0fBsQ-Uk6vPT_Q>R@%8=N=iMmV-(u%@eTN%yHYA1to^6%Um zd=5+gI~0KWKs(jt@9sSNJi)+AZ}(%j{!cQ3RfofJuYE~=BOJpaGFf@`o6}5(CfBAv z7WB08%YL~rO!~Abrey;5-yZtOHTzU&su5}hQ$wM%w{ zt(b9o=hm0juU!{tyj#zE;cW5S^r@wjZT_sv^th>h#x-oi=^KH{$s+S=Uf5PgZ|I)# zkNNOsf1947q8TD(DzLQxTfS9QukBuY{tu`*YVzW9-?3H)OUou5?l$ASwO1N+fp7c z?H%s?zwH0u$+hz5;%~gJzWAVCyWi#Id#y8~+pMkEZ*9M;{a1EL{l)@+uliqs&;LDp zm#5+Ne@@usOZRz$euc*u>n^>&H~O)~`9)vK-xa@H^*s1j?K9ccPj)NBtbek7N-cxu zE#LBOX!{$90m;gqv`l0*N^nCX6Xs_q8YmiZw2^un+77W1wBdQa?) z(xv)_A4lBhA8hrW{+#XWI@kH)Ro&!oVf?8nmgnEYsOy*a>VPu3 z!^ac;e_6Vcu8Pciyg|9Ak$rti=FPu;oGgbTHf(-fxpR9TcjKoQ5>GD*b}df!&{Pyo zjsNv!_9l*>-*OxD_!pnGTfXn2nR5Tv=jPiQ!h)j@-PbTbul2{*^^{#=aR=+}J^SyM zdDwry_5W7+WivjdzwBM0?&D5%dE4-V>*f}pbgla*8eRO)Ot@K1fTNvz{VV^zzTAX$ z6CT(duM2c)TNGua@psPdE3*$Co*#C`)R5u&)0^8h&62hJmP%-%`)t}TI_c)wcFK_h0q_^5K^#0Fp$!_!1e*ElwBfO2X zdBr#5immnk!9`lao%;KGEB>uK9+0yo=>1KPm)};rvE1$>GuuHyMx#YwhELz(Rr=f> z6Iq^5Q%wnMIKAQ(xBs`D+N+KVY+lUrb>B;moi|(h8u;(!zLN6IZ7%0*$yL(5@$_n4 zvJUHxf0x96=iNKzplQvy<9lO!LD6l|H(ARQN~X=4ajwvFm){od;#BFkH_9TkqxbAR zu=7%B+54h{I@dRy;~$8+|_em8fX`gl%n|C80RyRM&8 z{UtN)*0p7tsn1_!=UJyd&*Gg?xjU#)k2zd0yumu!FTh@s`LWW9?+MplB?sq6MYlZm z(c435uDakasA%mN#$ZeS!_<{C3l?P_PvaofzMMP&eZModl`S_-%t57_Ip2<9}Ba5XKAglw4VFMv1Qx8wJ0pL-}Bn> z<@2WIMn|z!j!nLud&8&Hx=sGFx#jKdLlO7(EoQzMKJSk9)QNw$C_A`rExN&!CgXF& zFLclI^L;z?)&72-`j6pza@W>tm+sHtmtgz*)}od(#I3CycGoaBzg>AU$(b$v$Q<+-*E4pI>zc1ey!{Q<=Vx|4{BMt0i}NR+?=+_2;*5?9JBE{5d8{e* zb65H|j(EpN56N4vn74fA-MRg~-1du7_TL|A*P6e*qp)>LMwUxnM_Omzt{WgbJ`)~Jbf3N>m+!HVD-^n}qlKt*$ zyS(bN?k3(zdziTH(~9jcm#o^i_0tiXUvXEq-%g#oO;)}_`kwmbI9=bjw(akvzo*PB zmYW~zxHrA9%E4>@e;b`#p9sC4FK-0rp1E50TbyBD^{2p?pC5#6x4(OH<9wdfL!XKd zbH6*EO8P9VW?6G&fquV1k<0`C8)8Q$&5(&LIJ#MHfrh%qY0rRn-6sXRikePdH0&y3 zirn>c>Dm>icldA3^j~18=DmDnOqy(HxY^ZZ-g_ml)XtxKeEHKatNt+x*JaOsh6o0eGAG9GUR~ZZr?#^en z`dgx7**^^rJ`-*#X0=Hkby?*(=VAcG~m-oM^2#e5*Zn62h`12RxYlo-pV}5;He8MJ| zmpYbq53YqBnY%zkE$>$7(b6zE`?sr~RV}?=wV^lo#aiCu;m2~b@}I6;_-9L2%raTg zd%u&Sj)k5J^%b__Z|8lyNFid`m-gprkDlJ&wtT<;4~d4SGher{=YQ-pFD=)}b9r-b z`~Ru`q{`g_6!aGgpZ_2JUw7X>{(64jyIVLODqX7Ib|^-B;=iA3uGHGSZ*y8Q-{b$E zt({-iH*948v`y@$i^BU$Tc?}UTy?mYa9i_~&qDsLefmqLKDqS$X8fK>^VzzWHFn;5 z8vp&(p05v9$J{lS+ErM8xgqAe_%YE-M!!XmRLcD*et7bcfXDx9%$1kV``G3FpLIvs z-l%24y^<8~Y@44Ss@=jjbic7}@!RuNzutb|$Fuc35^1$Fb-!Frk9T-;exq5Vg8~nu zlNSSzlgD%=W3lv2l4VL8zdwoNklgz-lQp*d_~m&|X3ubsUpeK8`Al7R>)(CXxD2FD zMOHp|W6f~EWb4{ztN6_|wsYI9zPOKNbDq?&xCv>r1X#b{yTRp;0ba zv*GhWme=!`w-wCpY`yQsuy)GZ3GCi;a=)kB{}+{s-O<6n_x;|#W(B+x_O@>jcwh0n zS@CJqt7wmQ<%wtRw(V_y`u}Xw#QF92^tLCxk31F>USPWIeBt*tvxN6Ellvqm?M*+( zoVf07=Fw#n_NMdZeC6DDgl)6?H#zAF>CitDQq@^*6*YWx_+a^5U=u^RR~@Kiy6v{8 z^6=#H$2r!gR{qFL)LHxH`9I^?ZJSSOKexKwXL#(__t?BzC-W^uS6hs^{ny0!e4Cf? z{-dEvUDT;0lQMa|7Tfp7qHEriDzzNBUibKPt$BXxgiHPr9iR<{dwzNE=Q}1bYguG* z?xwp-A{zDHEf8g4O1#Z+v+zK`l*tS3u&Ead`64{+QS13y#_Rd}(rV}Mt=9Y-ICb8| za^u8p-b?RJxMUyBVAp-g-aS4p@MZkE&-z*U*?O9PKR=&vX@BH|OZRuy{L%~ADJm3n zN@vA1cGq~8=sw+fp?m8$l-4Nt8Y-84;BHD-pN%+>s5 zxFP&@!yVhzt9JQHtPQ+=c}at?=HJ&^f9vW3ecS@q^b|7|h`ArS^Yy6Z@%;b!>%ZUK zGu2_q{0&0)K37O(S5zF;!(U-87cWF9ql@n>`29XxRR^`EVr3OAnE z{aVNmT4L~ed!u%Phkc^zpF8RC2fO3{99^JRI_ck1%U_dMwl3Mq9{iW$nhQ~^O z{CboQRW#^(Jb1^zjYVQe|FP+t;{brwLQz%SkHD14!>|J z{gq-4mv1cNF$b~K`@WGJ%#(Xh85&5W+5W$tUsw2HYL(|p^);>ge@(XMJ=a=0At&nP zd}Z^=m+b3jp8K|DN!9n&pgT*~7tASs21g3~#Y94;tbJ?Eb2cLb7P0#LkQ-U=5`#$j3 zm3AL`!RFv)pQu~&#kv2n@%;ZrJ0_%`cxPac`ee@8n}09zy!j)@!OT$3*l^M4a7==3 zyT+2!t>=rBhS zHs!io`tQri@_sW{-hS(w65+ot7t6W!tzYV-Qonn}>&*MUH>$5(6>+tExm&V0aSNL; zQ=8#|BYct!ANU2zrn2TpSWHBYx8(!iPQ2%pe-q;+uWD#PhR@Y$BFya zRa?X5n$JUjJ>PB}pR~g3zm@moOZ94RW?sr~zbLt5L%n3O*>T%sy{q##KU9gUZg4$c z`)F@^-XnRFT)wdj*J-@h^6F7CU;`C+60?nW_HqZ2h&-|A&^r0zGV?dL z|MzAyzdT?kFP*4b;d-yRkdbZjmq|Jcr*AqT^2Ow>YDCb=Yd@cUzVp4aX?|4kjs_jC zjztcEQ_7;M{N6Ro>QnsgK8Ls0 zf^}#635)zTS-R}|uWI?a56{(4PY&B&9q>G>Tw>QP`GX7@)%?i~7uiZp-&|A(`o)=k ztp8tn|Du)4{W^_gxt_}`-LJZSUii!T@&Q-x)o1^feH**xPhRB9^x|#z=WW(qTHhFD zk}s^C{e7)$j_=F(oyCrt*5Pf{PA3-eOtU-a`p55XezXVY`jlTe=7C>JR@E-*V|sVX zHzfESb9$`bZJOFePCPVnNp=UhRa-6ORcyi^jj_T z{pw7GFRNAtUf;U)-IYSg{d@FpEt!>ZHc;`wwfE{mKOXRY^IGk{du7RqSI#fQFJHEv z_G9v;`99nK=efO{?rNEFNxt^)iJHIHs+ND)IRB>tXuj!pUYfecOZ7RD|1balaR0&M z`seSPxcSyzUwdu0o|wRIJ3|ZB-TiD|tA!+z4IC9BE>4N! zt0}e1xQ-=kaq`NF_;9)SLl48oBcIPL=2hSLXi3Y-dap?Cx*XUa`33M72EUZ;`8COay-Knzd-2-$e`6{VSKRm>YYX{pK;7pOp*O znB>>Z3w5_-de7;-=-JM{Z zI`NXfg?Qb!&H9fwudfqjC^mQHzxMHYkJo>usrCEj-(R~qcWM1cuC>eFIK51NEBRUa zN?m!{()w2RhhkIf>Y0W0cGMJ=FmBQ)s47wqzVK#A=)El$XL_Yg*(U9KYvm-aD|f5s zUEU_E@ptm$pRGBk7AIRj%zHce@#78Wi;Cvx=WJQMMb^{C*icvYF^_Ad2*;NvFK&cR z^Id&r*{PcBxJ9=%m&i_B_xy4qSN2}bwSSNK`Ok5Rci?F7b|`508UDI`!PaWc-`iI{ zWJ+DTec!reGv>`(Fl!!YyOynOY07_*(oojfeP`D^4*8?9*-t7&+Kp|>sW+C9N2C28 z%>5);RJ}Ul@3b7{!|h?b%a)f5xNY-zd4JU~enE&Vf{u|}O z){b8G4`Y5rpSR`JW3l`EY5IZI8$X!ey!p~0GSj)aU)R!hC+{2v*FdM0Y{$j*Z~GmX zd;0@_%E_c($G$x5ozU5u%3mgLa%xAl{^r@YMd}d|Gdf;vt4;g;c0p=kXXEnN z9VOpqTRqz*e`li1k2fawni4!WbXDHDyK0_C#iUoc)=ke@mt9J@R#eoI|M#N&qxGLw#q4V zZq(L&vlf+k)tdTt{uA*HwT!R(@?g2+HoFbiet)R_xaP{V#kEtT=SCI2S#xebZzJ$heU7yJ@0t9M{QEL1sAm*9((ZR+}oZvi(S85o*ve# z`es&Raoa5)=FD)fRv!J8{CC+W$;rl-wA`5V^5n&hs+Ziw6`Z$8%ziw#kZ-o@jAbc^Z$I|Z#-;g(NbOb-D`Pd#@{z9e12VGnDToyqshCa3?Wi0mQTCj@89^c zbN)Q5M|q;ZZwda$s*>9Lv|@ejWcDk|=GDws3pQPw6wbNRzdM69_1=<$Tl^$V8GJ(C z1z(--pzub1*Sy(hdS6Hs{5kjjZ?e+gmcK`P{r`Udv9Wx={MV4^M~lLPH*fQ@IDRIL zz454eLC*5+nOS#!z1!aSzD}AUz^||1<0sn*shn)gir#m2e!c5=iT@bmxjFf^T0b-N zA3y)NBj)lIfq4p23#@Ei1E)DkPIv8m+&#VU`u9DYpxsxGQWJ_;JQz)GY29~X+O*-? zv?)2iGuK-@<@?6bIwym9Vv0Y*921A!hGaewhIfMB*0U6FJ@|1c{!sk~<$6y0ONDV; zZ|608JhCnPe!28@KJ$WW(~f8_zh=Hw_50P%La{l*AuC1IKi)Pk^=Z!h{J{L+vBh(P zmAQV|JptKG=jJLu6X>kIdX5*{E(L1tlYgXPEGp5E#9!7 z<7+&e_z|;wA9To#Yxm!Kx-rR%VTORII&@6ZR43Yj~{(+vpVIzWc~(2@CfODK)`CkVawdSEU!slmf_V) z%@&=gBYTUcriMD*6OOMjUcKY@8?%f0^0}tB@{h0lwE6U_GurcS=EvM|3VBqkwbvve zz`f{x(A(ODs~z6?is*5)^XheIy_ItQ_WAdk)Iv69ZpO3U_UHe*Y=5Kna2UhiNu1J0 zkI%2=>M4$?f7zXIXQqId(Eq~+yl!S~+sA)s)d#al=KKDp{|NtoC@pKpYv251Pku<0 z*PoAPc+RwHWnt0puw{>`mH7StJWShZIhP|+Cr52=Ra6VZjp*rbcLhfT-Dj|1{16*4 zebNMnz+K`w#}_ngeIoJfN_Cp&e@^xs9xK8OEwjtUhE^pvb=Z-aF}At$)}!>zxxfNS=>SnkCU(Wpzd=*5wzc z^zq|$&zc(yL9Nn*u>q%(j@q*ZUJrb5VBfN3>prIc{}s=~@bB#YKgtH@KHBF0+a4$< z`}mXX{p{w9t;fEo@bdM&-tAKQZsCL_dyLs`O}wycR@;FX13{*$ud3c(B-hM+mcljX z-p2JWJHP%qEu_(PgV7^Ki{a5GU*3@A>V8Y}3!Z-~FRXel=9jlO@$w8Kw#BA9CQNhD zW?dSq8nLwS;kw-i|NsAX&&F%h>wWKk->bgAdeuA01{R+nCE2+Z!l{MK9()c5)$3I) z)$J_(bX+H?>Mi5!;?`*QTVkNzEn~IG%vel0(oZ9Zfzu(z@X11!fX*io{|;|^qS$8p zV&1%WksI8EQX`*RO!7!tw)@rI>imB@URQrzwYzHBuGPDK{kD|2@^96yv|X=$NAExM z*KW2>MCYNq?`P((e{}l#m#3?L-4S1&+wocD&+*pUy7-iA1J{Z*=dZO-oAW_U;{Q+Q zLjOE5&Gh|q`$~epv3;)N{B3Nu@A2%~mWB;^x?gsF&ff9@Q@hGwGUL*0sqcQ0=0=%dYzx zIeTv2{rdOQ!rEgF*}V_n@m{&A@%2#jeyO`m+nT%)w^cT&W-xLEBbry z_rm9oJa_DmZhbD7p0#~isQbsMQ3W^B{rQBKa((~p=x6iRtL5xJ`EzgIUpJE1_;qsO z$IkwLBKQ6;m=u6Vf+959}l$K^{8LJ7Tf=S-{HONkC!F4_OZ{Kv*YoTKTAF*JUKgm-_Pa$ zpx*%Tb=7!a`Q-UiM?VU_-wNBx3jkLOKpmf4j{ zSIzRC=hzZ2he=zP=z2JwGmqKPobdhc+Q9d-)4W-XKebHooU-@dp7=xic4Vnfx^=!F zw@vS5kjT@E`*+kXc%j~Y?s)Tu{Tm+EN2Y22dCr(>Jabx>$&vm4AKSD1llW0y|G{QS z2-wly@!xVIY-_Fk?tTlJv+J#@!7*0Gg{eoSdM^g-o;uZyInj10zd*^_$6BWaSTsUi z4jbH!DwN#zs^!eCby^Xt@7}AjKclszMWn-dZ{E-SEH%6N69U7PBO)^HXC2nDvDBQh z*RDli<1Y8K?x3TG(tjQ|`<|ltf5)1GQXQ;QuXq1kb>h;;k2;U_mo^>LsrutT>5HAG z{p(Lby)oGb$*9c-^yOwD9O9fT{+|{hjXoR-nEnAaofso?)J65w)4`jZ}S#uBqkbu zD&{DZxcU96_scuYxewXOyEjc=C8EZAzUZoIWLiu&zw7_R3$NFo`K|hNzAKvG z-tl*yoWpUZ)?~l+_66_ulgmab=t-QDY8zV9pVn>!U3-=AI|(66<9B|B5;(_epMv-u5f?R}WW^~WLq@thU6 z7@&6q>~mbM;dOo9^YGGRy4D|df0&s6u<&->p;u=wTsoZ4pu@ay)3q;mJ@(1)PTn^y zy`5uz>%-sL)}`B*NXk#F&wF;iT2v-f;@efnO)!|+lr#W@rBgLmC~&Fqjh@yq;vrUS9-|LWDenqQYvr@w=_ ztFGvY&4-2c54QjEuz2jVx&OudB}M9Op&Y6QVRK%k8x2#5Wtw<{WDh=!bH2Zg9?Z2(^TxHSC zWefL8zkheGG-R>hmURr>Id%*Bbe+wl4bJiI^wIlt_^TPKN@nZw)|Igf4z6Ob^xJX2 zan>UH{cjr<#jj#|HN!$~^`es59L&96Pw(8gz&m5lzuo`2V5r zf0=D66K$t`xij6?wf_6XJf|=Id-PrZ8$D>_QjPm}>ivQFzqf@i)Tq9(^PetHdHIG- zRZ^>Tf>j+vH%bY#J#G2U#vtJ8m2s8R>E2eBs}k>Gj=$@Dohcmf)bH?yf*Twn@8p}h z0yrJ6J-b}+IyY2h&f>gZN~NKU`&Bza88$>;5mPPZ=Ox5^PTfgaCSy}h9|Hp26fAPPvZ}O4i*AXIr zf7?mA{!h9nzvjWY>HCFJ>l>!u`Dyg#&JI3J)x4V5(h_ra@p_3y*w#uf(Yh1k5P6I- zQ8QLRz;9|ufGeZqHpZ)4g@5jHiw%u?^ZTr0Cs({$=n^_kP0%8tF2x~LxNsDPQ zo)pkw;WX>`6CnE`euG=K_?(RIs;9dcW}55mxGM6OUEuGz+M12#U!SZ{+Un1xcq~n* z=l%|{Uq8#s^Bp)l&)#49LVd}>-~V^>KhE~gWl-9x*b*<(_3xUg$lu=MpATmn?fu74 zzVA_JfNSHTH;mVkp8wjOka$skj?>N8jwh#lWzR7=HgQvfKtl-YFYVP8N9X_NmtJ&q zhQWqqcV7j(J+l8|=_;0#P{!Eb!Li3*IaI9KdQQ}03&&IG#!r$A>hIQ8zY7a>sNUc3 zp~9un@x;Xk|JGhx@Z$KsMe!V!YgqnA=C_uAwzdG471*UST_*n$Fm&SC9&Jg)YU z9QS@F+c$DcM>iDo)qM1xw`hMQuWS9|kAFVQ>WiyqP*iXEu{`aZeS=3g1gE&foldLn_w;1THn?@SwAjPx!Q}m4`U~#wO@H>w_=!wECs&cu zkBjn^>}C0TI?n(5mA_MHrnq3*yPG>7e|Ib``LNfrFJ!UeK0_&{`d512*|m54?VJAa z*Y~hO-|u@4Gx%cVfGsp4^!)lUpC(`Dyy+M*Dw5x5Ia5n7;X=YPHGdf6JcV zCNt|U7QQ+6`|Whr_$xmDr^r8JKl|nVN7ae<5Am-*>?o>Q_1BKYMJ9o}cE`f~p`KHj z7(*=%$}=@>l3C5Q!{OlEw&a$gdWoLXtTijRS`rgvkJewEA)DPZD6p_7CO_ZHdPnnxiBH;b&U0Vn!&?L?_L>dG*Xo_zBr4AKn-sTHt(m;}rfQS&liT zi9Om9tdZh@@fC( zJm(3Ym=FBibzwu~iBPVX&;@tpMB3W!zWr<4-uC!I!5m?aw~m<^7OX6>^O!Ov{C`_E zif|n1b#%QrOLoC>hMTi*Fe$lQevs)IvCM16m$o*gut2B1OBOc?YDp^=3fyPD&K;sN zBOV4l{F^ zxf&UyL>ZrIF|GP=XrCy@k5vv_Y?~G)hB}F6?w+9K)xj9Ub}#*1>GKO8Ry?$s!`8m~ z*&K(vvqU)>9g^)9R8L)T`q$SaZicySp3>$%?{0;*7KmArVoEe!Av0fe!lisBt)S`v<4RQ|rfl zOgBs4u40hjm=m(bxB2m*@J);f6Sv=ykl)a9In~L7Q?O}64U0jD_~j4H(|_%&O4cn| z+qh@fb91q;;eN7r`3+cQo~RygD}H|c!^!itlCP()V{rJ>AoKsj&GZT7hb~;+(!A&K z=iR?~_q_YgX!r7Kna%4K=Tg3_eugKkf4blJZQ7k#_if|h!U@w=)WTS&^jvLx7ujf( zEqKa|BQ>WmQhb4R-$CZwp>n%-P0z zbK?R9V=?B0%`+LTcqcn>ObHESDEMsrS>j3W;WrLEe$%F2u}TjST~g?DR0 z(@pQ>Zu#BH`27Ei^|kzRe_H3yeC&U%WoBJb4yfM@!aokw|KI=U1Rc32!;MCt=xq8E?CPAJRW|#@Fib@o>%GS6sVw#srD^b9C=l-&HmKo4oy=)3W+i z?gp3rjhw{%Rx$;7tT4(E$jaycRLm4v9l*o#C+eaA&x*3@3Gz~Wj%~MZDef^S*R^~+ zk15hS;B>gc8i8K6 zNptGXZu9-sv+CrQN$&Vlk{kQX5M&rLvB0e4Xn}0mR z;>hCo8YZ`F4u(VN3||9lX3Tw3^40U-&66=5&W95N@}5_%;Sx!ecj6Lpoyo*tuRkG; z_0l(msayYV`OAE0jl(^;D+UtUULB2-10QzVr+izS?l3p1HAZ2=AJ(MmfVsDt53O;q zGr5z)zbSco?nA%sP2#NkzeP8{FsU(G*kNxGq;`_2EA)xNIivsbp?`TrP0;We%+ zW$dY;4HF74$<=Xc&V9gt{kcV@3`>WJ%H_P^*qt?B>g zh4Duhr_b+*th@eSJ3-oSUvSsIT9ywV#s2=@s`VDsDP$M_%U;RiYCls~Q9`38dV-c( zF8`;`OshJa54{atv{5Kv+QpPL4>cErIQu-Q{^L8ht?jdA;~rg&t=vzGnKFAb*6=*} z%=9*^VWYvpV1;t2b8*}aXC^l^GFVD-$baCT$^WM9eR%z>^-s>kmTzv@Eyr8y(0iuQ z;>-W#$G`q&{`2Ylf0cK;zn=;Gzhdr&z3n=z_1|sZADMmcgOtsm*7)PC-M0F ztrRTU#QFE*;)i~F^7d#wFy|<>;@xh;+Ld%abdgp*|0lNORrVkJ4p)XQ$j+!}*%c`2 zanPYa;@Yl0M;9KpHIm$HyXLeN8wzjhIdJRD{DyfQ-NG_mU7HaWw~{?q#U?LSr4eA*oUY5x?aQ~Bl{)_-Tdl;3~E$6k?P(&Y_0 zTqkbGsU&?hxG(dhsZrtGXUoP#fvg_PM>1DLh-PM3d=Y8yS#)vN#oza1l%p1|YvY~% z(860Fyz^PE<4?AQA*>SLMLAY;d@qnqR*l_)7ZOr>RlVO9W*AJf=4HP5 zZ9z@Oj=t#TlGxv&i|&OdI8_Jmu$6Ezee!jBYql_EPsHu+!@bMaC7%{p&6F~6V$d&! zxL>@s1vmfZWQf7cB0N5dE;o zHiY@pS;vQ4R<&g|SX6Pn*cjR9m*1G-bR~;ltIOoZjI|=XO&*)I9G>|^9bFmI(6?u< z`w^~^3x9S7@kdwbY*N@!EdT$;=0(OF5egc=P6mBG@HhW(?D|?$xqpAwKR)C-|LgR1 zPtp?m6VBe$se7FNNP_#Dqw|SPg1l3D9BnshO|axW-ItKC#&*Sts0Jhc#!YA1I-C^( zj_A6$1~Mg?Ze^FeEF&fNS>!|w>#M*|au=-FSabawcX*kwFvt2GZq2UL@X_C9?Xo;^ z@;m<%iI04~d#Qg|+LF`pH(}q^ED_#Zt3);f?uxY=FI=r_+CSU1*eK24-qNt<(Z%zR z5Bk>&UYlXEM*ZoJ1@9ZHetpljyMKRH_WybR_Wu5P*|++vYRUZr^Xi=V=6_t(;BwJ> zGtm!IZ!-P+5?-Cngba(X2^Q*9oCfCaLi$L&C(1r;|I}ApZ-4EP!P(P zU2}U&eSHaU_Y~RG&<3C8-?mzp7Ub#uDt@dh7_;s3-d}6C&fz_nzwGpf_nVJCS1sRH zGtK^;uH!|2Kau>(&(a^S-v7e{?p%KL4zF2u(uD0}&)hqojH?CDZ)lh>`Ba?WVa40= zB9X2RZDtFvX$4MgYTTl^qCu4|C*x+H+n+ZbjLpuy z^g=A~M|dEC>^-YNQ=__bzj?u>lK2~p)2 zavq-yFMhV#`tZ*?!i(SVZ}_?X|NF)Di>(&CP*7w1g-otHOEIF$Nfv*@C`o0;A^ED%p;>)N*8!A@Ht)=7oOl}YT_ zkA#Ft%N@*2)@*+3c(G^AwYuyJ_nZ%33|IIP^PKN+?(#(Lb6h%#3+?UyREq^UF|16t z|96{b`s~#f((iUfu8y4Hd@+jo+M;!C@2u^Gf16EXHM;oTKhasCaoS{kS9?Y7v+Hes zvHm%={QRy@^945knah7D@JsWe`4d>v&SXmbyijmm>tb4UK%Row-PY56s~kRva4_j? z^MB%eI8!-bpQ*?7&@aL(+?4H=C-C!S+iM%hakxz0xJP#JM*q8goONrnBXSqHbFXGP z-ag@ExU1xUUgk^(^R!>l%)9lr&Nup~CY3wWEjp4zubJJ==Tm9dzbkwuo?mVk*w5y9 z-?iz;())kY-Tz)Ib-L*9act-3>>pS4|FuQG&)jnR<7@8@u?Ak%{mw#v?|xtQ;(b-> zp9e}QRY{=-*cno9&JpD}*l;S1b;&6$hF->padXTw`1r*$!w$T6FZY~mV)BNqUHeL+ zZ^kpNnBGlO7bQ;3$l=X8%XP%TA>BzYSD>hv>4e^MN5@_JKT5`VEj+52@^z}#oxZ7W6HzHhy68k+aCq_709SHFJkHrjA}5M_RPyU(dQ(0`2r zFYoIaH~A(1?+O)__$<<)?Y@rR-({?;{7Pqt@D+CJX@I4mt|;=b&e zFV$1{>s|`aKlFV5kKFCcuix77|5ob1xA)}5xaYmRzdPcfkG-P$#Fum0obyW`YBBF~ zU17@|Fy-wk2f?}R&e4JM4zf<@+)@*!kj*c(nyX~JP%a;Dx^zoP80U$m#v9*dwHWL) z8pL}VdTZ}b@!gylvzNV4e{$qvi4q3tK2eC7W_vm%_zsswccY$+wy5 z?rN92YzqT(#JLVS91d1sVHR#{o4mZiSKF!9_0Y5B*VfB@UH9(diq6o+T2AI?2bb`j zXe)FMIvYOY!T;LUvo;T_#S0jnvmS4Z6tkakEVX|7&gzmA?|v_QA9I9x=8N}lp1v3O z+gmnI?_&Pm7ytjY3jED^ub9GR_iZ9SXe7tx(+%Mr8+Nj;zWZza2gM~Jg8LczX1Qv~ z3OP-id_m6S%Uj2ew~lXDIo#jQYRY?T)@m2-d@VCMjvd<;gvfF@A1(Z_!`xxLy`70n zEt8YNgx$QqLl-FuT)6pQ!)(zHk`Mb{9ayq3@$x+36WZ)|2}2-C*JJ_T5s?AAKtVtR(tiOCycSix8$UomEGF4!&+^-C4-q%}1HCPySE^k=(*y>_UMnt;v;bn#z+e$ zQ2nYY0RauBAG;?CIQcO>4sD!vdBc6KD`irAfA4Oz3Yc=wdV%JT?v2|Pm{?zslM-XL zH+f?lF7?*YYPK*(uH)jwJ$E>mURm++O26$r_37FI0gfBnE*IQVm}1Sl`}@hxgO9H$ zsr~LPQHhSyzg5 zZED|S&Tv6WYF+SY|9xg#Dv6; z_F>Pv=e(iP55u=C^QpVBa=r0I`6K&GZ~d>8O)C4VcB^7dWWxz&nJ20#X*=fqKmPH` zQfBu}$ZINjR5H0x3n32OTWh@b# z*BoFXrhV(61OMB`hl}1U-KOxgsry2-T<@Gsp^MJhTC8RZiJUzlUi;QMjv2e!PVV9S zBsRr{p`-cGLS4<-tS6eAR~Q>JYcLopbj)wRTw{MeR6{fE5KYRb@S+j_~jn~K(GT@YEtXsi#l*cpv4{NMjw+wrf!zN^k@ z+8ofR*avaB<451F-dJ?oKxAT(&S(FN@83IK^yiq_!0y&wDI z_p7hJcl=nd`HM5M>fGG;!;AZE8<(5u@785>coQtTFJ4HXQ2U65$lv64W>_;q%Wvb(eX(&2E=0>2dV0c2kmC)2g%I=j|G` zZTgb;wVtk0+_^EzR_bWj$~)DL*GrwB9QU=c)A(S&#QNm9-{lWqxYmpO@9014x?juN z<_EWZ^Y3@I#S7|BZ*FVe(;{P(c=b6b!9C&bfBfj_^4PTH>;AAOYfbc8nvk?!U9n|C z^Q5-6ShtD}X@&`@OSwHX_e?nZ>%!8OEEeXOJ0k*3%vg^ee7L9~D}=r4#_oHjCU2hY z30ivK?zI@htS#rBF>cyd7JK;0t*;wr+kCzs%gZ3pTKnoW|5|Imzo&BotT@X>YXzOm z?DO1DZTjI`*uN(CK!j2+!oCQhbO$9TPBZGSIpUB1pOGvK@0 zCELqq@4hS7XXLoO=kyKdnhV$M&N1n}S@1&rNymw!{}-q4Z`#^DJ)xIjLE`4U$DBM) zEMjSC_O_Tg+-n8`cSyywhztX3lAIz5Y#Mr9!s|kIKb(wc?F?Of^1>dmMD& z-}{dtHNRn#cp6ug;pM!Ezh35w?OF0oaXN4QmS0bD-EO)mF~Zx%Ya* z`4cBR{94f-(`fJ_C+X3uPcwgInYftVIa;v&P{xkti)jpw4GawO6`n4RA@BIy{_VP0 zAbzz#{AxzW#RBu&eNWhyJg)nj^EWM)x7Kw@_5OcxF3jt9PF}>s_~6du>@#14i!Plw z`u}kJkJ6aBci#i~+fN>F?pU)$YXR5OD)Hr}zpc)!ImDEz!=d;jtaBdI;k@OEks=eE z97Ol-u+@<2dAiyq^x>S=&$>>A5+2blzqD7s;0-f~ux$NzN|Ptd-*KvH)nCS6+N@Qz z3*IoNp8u=K<)G+;Rw;x7LQM}>TQ{s%`dklJbgl|!Pp z;US;Ft+g9>7c*bY=(sDbpH%*wt=obNITwUq>nD9bR?1VpK6%IEqkjv;4?pB{ z+r4{5^M&h~y_p%eIiL4lT+!wnkzL#W&u(^m+KDX>59+oHeq=Zl?)i)#)V(?|(|n&? z`n?}jbFBBbov-<6Uik7>vBbMO9jk4ZiWo#4pL^U(^s)7SPQ?}(sfVA-MCP6F+m(+ZHa; zkxol;z3Ch|P2*JE8Uc~Lc2$2H=gYoWs8fBhTw%VvMwigFL+X7^J42;-`kW8$I+Rf^ zzW8F^o3rZ|&+u1E2`!7gu_5{JheErIId9MLZ)T6WzV@xvzyH1bAIp~Q-i^_d z|J`g^GUKIsilb%m_t%Bb-d#U_@Bi7;=MNp?&32UFm|Ui@``-UUy#J;6{tG#su;Dzs zZficjkoCjOQppD!a&k|fyqj}5>cTU#g?D7MciubY)~dMfOHR&r!$P++Ro`!KTfE_< z4NFOcq!d$IP46;8y~FX>KU$V7majKFmYII=ifQZKcRLs?%hG;vTDq;t&3SmxfBw;5 z*F+CPKv)g>NI_7=C*rr+5zmtAa~(46$8dnHPz&))sC*gWBJbJGR8Rj&otu$F`#{IRCY z;8fQQzRLaXVs`h8-uu+o-L{+g@6TSD@2(luY9%SZ*185x+wo=hf1b}Ri{?*AKJk-V z`p1*!`+9ocX20XgPEbs$&-~HU;PLvF&uXR%pU#|`vGs+0g0q0Dy<*DA8{S{qvoF=| zUSIAhTRyj^@z9UtrBeBi40fF>U8~+1oE+3&yE$kM_sfsR+cy91{&#KTGu2sr43(xYe(F^(G+s(W&`uN zo~60l-<>|ZEp`>CeKujH)5ZC6msKz2yM9@|*N3V@2~y$M>k^e$E{y|J)WBV;n1ARz2W`;=|MjgA6(kXaFKC_fYS-ZN5{C+rf-Y9 z!!qHwXMe`V7a;*(gg3QpVQz4jt7cjiQ1R+fDg)C7wq0fhPRn^6>gJaOE(^{7(0JhD zMhP~x76B)*iG`fDdso=;{JdLxX5E5gQQgJ<>kL6@#O4;`f%SDC%@tY>+&VVx^?P%v zLmVv+4JNZP1aX|W6w0_IZ#$!)6Ne&8!}b4f6%NFI`?=<_{?5lQ;=|co?G@EK${0Sp zxVhdzt97~AcEy&GXql|->6UBSiVrrt{;wbM(*AIa+~bVZ3@rjqe7(wVoh_fJ@1A;? zThRQ&j^;Oo8*1krKgyU_tF^|}R_gAP?peGde_Q4R9MfWm|HaFpxN%$I$*1e`c5=e-fv zbcQ7%J1TxgiF`UHalk6wO;NQ+;2z7FT((J0yBZ%Pa2;c45OB(4JZGV6=J{!RHdE}u zhOJ`pw{O^-61M>PY>A^B1H%DOfA)iT9q%!ToS0p&e*NnGc-x|xdqV^7qx)JM3So>( zL{@BVW6)-75!f`x=kjx-+s^0uJ@s?Cz9*b(l==Qe*lF3bJ3mdQ>}9n3`cpso@1?0P z>@sv0NgF84VXZ0X{qpU@K_|Pn=4P^v4%OvfZ>$vrm4|)Y=G&L=e|-3Z!S^q_xs$ga zE3SU`QhtA4PP^|u_xd*tvemyH$Ih~2dMo=o_IS3{zh}qKmA%^@pI*0ToA!H_^0@Mx z+q>dl7u|WDuNd0+)^gXUpfAEsd9#Y2U*AyqQ!*#VzPI=7YJ*z`aJ2C;zBA=T|9MmPi}L-2+KcZ0wchdP>iuJT7Q9ez zInx6g)Vz3nUW1vb*|v4Ai`Rc>72ovlWzjpnJ8RfHG=mft{B>LSX6KKCt{j$n0bk7d z3k)vKm#y}?_+Bq6g+D9x)n{?Lxi8Ki{Ws$U|9bo4r@m7^h_HAlZt%V6&k<>MZf?Bu zdiw+F_TN);;wsq|KNL9o-e@Ar{{KuOPRFJx2>K zQQV3xzY|21_&CZ#nPV6xFfnH9E-7Gih!a$3nc&*AXn$qH<9RRr`z>d@NU!Esd~!r+ z6=VOrzg%vM74>2(#Y#<^CNN#QapN1aLKurnxaxs$&Xy?+{7OArHykq%P-r!Lk|dYkioRli*nR_xVcUUwVs$w3zfXChRlSSR?Xw<-UB~Nh?Z^ep7HdaWZY4=7UI` zr}IBa{Jg6+cmB=KX0bKzD<4beJ>yIR<&~6$oQwx%zpsnkqsPkBe>m#Fqo>OkzUJ!H z>Au=9!Qhqy2PbbyIMW}lK#s;mI*)xEC8W|q8w8x59lrRZn6slSG)c|9bp77Qf*JY6 zpn;?(Hw-leG^%TJa$*nvx+c0NKeqI(%`tX{f6cb>idQ7Wrd7@k_#{3d$Z4gWjt+~; zmURal8U!|#=&WIW*Yx=Q_7C4U8O*Bn#b4%vieVjAMFETA@2{n=&$r&+wzXH+=JW6R zmMoJaOIM#i{Nh$62gefA1z`*qG7Bt<#qz>fSy~uQZDRlKsb5o&xZt=<8>m6X`Mcz% z%(PE=a=RXPZpuj5Q1z-H?#Psa3DX6N9&x;NYd?E`^BlK-skz&k>SxZg~g_Nv9)|| z+0U65h^#T(5cNa<=^CvG`Fu{FggFj2tma}6kSLZ^Ynjk2bjxGf^uu0f{jJ|xt3}39R&WJOWd*3Z_7&~ zotpB1Pa+Hl5*j9`rc4Yk(>pfrU)eHy*@|s5|NYq!JM-V48tvEnub=yOu5@l@=<=;% zd;c*=|Nmre;6LM~ddmdcj?l*4$5t~p6GO}zpK1_aqkq)fG@&MCm1;! z9p0%ks3dP(UjM#7AXGUgC${*Jz4o#8sSDnzl*^o()5gfLa?j-r87xdCQfe(a%H3O@ zs;Tc=$Gq2}{P`cn_0?bF=lsmJ)&R8xjFfL3OLB-({dFR_|FBf|+12L{L|s3Yy!L;P z0bAIP&v_vZ2Nq>n@iN;f6dXR{8n{a_iQC@d%)&&c6P^h%wdbu8W|ZuiT{~})&T+HT zXPLi&+$Sj9-lm`T@KkXr$ozop6bhVc9Bf$>%TLylj83fBv~==P%x2E158_u6#vi)z8D3|7KjdEuZ&0 zJAWrT|G!7)lkR~d&;3l?TgSck82IhKSui9d|DLs)NkUe-rRU#TqUFCqJ9^>j6{bBSlr?{@<;C8Zhtq0{8%CYC!TasL_kbNb(FEiE`NeZRo?e3b?`z710*9gMgsosj%n>zaP-!K1n1 zk`1N?w|+%3&fe6g^n}ZLPFpKOOV6{UhZ_|I5<(jUHl5(;NE3ZrFh9q}K%ij~>%E`N z^^Y^+4vTEq+b-ZVZN|3C8%)`xr_XORJ$9Dec@x&fwmeZ$<ZIxbKYmlJ_#^Rnk^I_!|M;HYd$TL9z9IhK&-q98=I`R}W^%PxY!P5ssRgdN<7)Y?W#q)w ziiJsE+0_w4ey*J+}zPv{8*~%U#rmHn@bHZ z&YyeV|I6?Bjw_k+EsM?VK3<%ENC`9orXSxvTb|H54M*SmOs;a+*+HU9^1`@i;mx(PGPLH>5) z0}WnkoR%}&wmz};wU*g>8}978-xRWWS|%ljHj411%wsxntMyRT#WR^VA`Y)&u)H?M zoQ;>}xM^tWf)-xuuo_vcTDTkJcrr6TwKuiO5pv3xIYH>i?nnJ}~P-Jhru zscqMiYCjt(sFuW5Z%+_rZsA z-76MvRQPgn1xt%!(o46l#V;ismM3mHp|k6Sy!f-n+nKqwK-I4Hug4$x-M_RSInuoU zhcWlo+4k*=<_kETm?+%Vrk`iu>wSG*vnku_=(YuB;`L(PT%aT{p;gh6*PbypbVtcs z%NJ41A6~oIo>V>%&NP9Q-KmF_d0i-Ia=mX(bH~55_5VK#{$0B`<@$ToU$@!kHonN0 z{rt?O{@j_(J@7K*t zCo^~KbTYZEFom5t$m!Q9ha2m2d)Sy6jk0H1|I++5TfD#XMSp*8SDoTt86lQ`FVFuy zawzw8rt?LA4#g)Cpb2|W+ve2gdWMMZ-qYt9t~q4$DzdKGxKTAD$L;{rgqfEM%xrv? zCmMNc{F*&|ws`;g7w0E)*8l$fzxdB~`(JT7R^W)4*7m~WPwVkS#+V&Dcomy6whIVs zP!f;JbUP566UO=}bkW1I@Wh1B1|N3U`p-q5AN^ZoUv|kyd}!^}jrm>wUw6y8!jGRWGqAkM5}Difd0}Gt zrHg7$@~7Xcy>XVS!S8U2(rKk%lRfh87V<6H|9Z#VMf*Q4N>~1M_?kgB&%WpPjDOs4 zx9fQf&Z-lHJ=bu}sbzA@&dG`GZo13+i>V>w9FI$|;l(u^9y7I=6(c6(W!#Wp=5V;q z!{(>NF7#K}>{m&w>qYyQm1^Dpwq3Aa@q+){qia%gcK-hQW9t9E%M0g#8ruR+HqXzk zU#L;NW5-{UYunc`Fqmzd-*)j}X2e0MyO{>l*qI(~yP>CIygYG-LqlleWJcHey1RCZ z_7}cr?)JoCMb^MAbXf4Bo&1hl+qE|$7?Y^(S`fvD@} zG9x(5O>|hCZpvq{F+JS1hj)c6&w*XK3JZk}I3(=65&xz9?Th@l`=wVub^haJG7u)5lWtfTvMZ6BC(R zP0Na<%D!*iut7%3?iwgV$#==_cejX)y7*px`ny>!`-8ZSNkk-n*jN7V!bZtkZ=1jd z&J--n`0+?=-QExR3tw|d-@d*m*aDnXTV#yZX&D??oIbx{tC+Zc{O3b= zt(GTp&;NM7sY!EA+u;PomV&qJYq)e|ME?FPWf%PW(lbBo%kJ)npS~=L|HW|oh19XA zJ^yE<|6m3u*Ap@vp^a~s#~=8$RC|L!MOLx20F&GG2|=Y+yvsuup5=8q!NjP!L_FYH zEu{;Q)JZm99bQfKV00f$bNrbp=9oo2u%OFg&pqR-> zqF>R1ce9p3w#Ki|uf_boa6fH((R*z}*x{%Ly6N{?`fH!mAKU~?(sSK}MQ}T4$Bsg~b-*n)>dXcF{I|W|vVtUS!H}9#)-VKd zAlo^>MD%o1qX5T+%!;bM-WT&%u!;M8IlfxG^WV2@Iq|E2h*U2X%Xoya1m(1h2wKHu|a$O}8LUU`b{@`vkI9jJIcVK%6_d|U2`3hQd7&Sfw7 zwWFlJpLln>w)T1`xAL#QH+Odadt>pt^WTT}q1n9If2CrxKhE3#x7mC4-SZ1ysJ93> z`Dv`v+R)@KS8Y=)#kR#P+3#>+>k5ynjfKk}ZgJGG`L?8*OGf(Qd%co-%JZz3EwVrV zCOSLj|31S2*G~C=`u`>`J@@W8xJ*)15t`F>T|f5d(bLyAR6dQASe)3~x=!2UeSnpn z{DpOFCe6%>Dov6zUoW^Mx zn|!iMcp`c)Zn*a7Ozir@<$sUb*C%cIZ3#}^96L3gLLW@r?9Xs5>GP@0E8Lx*vnKE? znP5=%f0e^K2O0LRzhCph9{dPn1tp$5*DvYkEgiq?K2sO5|0UC<5AXB8UU~at_WzH2 z)q~!!gOj#^k+D-~!sk!Md94}^%gywiJ*J=J&lbAfe9*y6Ss}$(;zTVg!;EARjyWYRe}3rJjGOQI z!#?)C|NXk+!M~^XPZ{e%{5_L-}8y*RTc{a@A8KtB5&TB@Nk?smKz!B zaOPa*k0sszj%^L@s8bA;`ms&y*sizM*SPB*|NfS!8xr{FZvJ1pnE%h_2fp!Vge00i z)t_1yPoMuMw&3&?^&j#d)V}|-konINNKK&V?Rq=2BKh~M_{SN7Eoo8$e4i}0 zG9EpUz`y+A2EL;G4h@UyW4?%|uK!q`*wfb9`c=uEt3Eq%ZD$<6{ikp82fFY72u}N& zFVt1%#G%-tV+*PYb$&ItQ^G zHdOao>uRFSeei&%_}`$FSE@v-KhIrYuEvwgd~KPpUyxNjo2KZy{}10Uy)a);USUF zzp8dnuKd~Wy+4ofKVbT4u&(fCUG|;xDh=QF{AJ%z{n+Z?J?8iGPM-IWf!LrZc`@_H zM)ib;bK2Hktecy`tFYzglh2HgmnFyg9bT8pA@Jc~!}$j11HXA##QeW_i?-}Nf9Lmn z)0~Tj2SrwIjXfSEJzu@T_{gd*ffwJyKlJ^7wf=E*{WtY9FXSQ3Sq{bD7gliD{AV{f z_GsnVT>WdMMxxT${7&tM3&I2i7MWTrELtEYpr;|waPintsZ1tDh6S%*O{>!j74e%8 z?cnv)#cEBt-?o2SJ@lWgE#Fo8{iMF~{&W0~j``RzWZzk!x29FAddL6ve`;;J%|9Ic zez)Fx{d^zL6jzIY(+S^6VV!n-4xj;`yIO(o#iV_Xed2N`4paCp=CFpR#MZ54;p1tU zGp)sro$I%}dF=J4(~l)9*Png-)$>66xms=s>E@;nHy$i{)5H;eP@~HB&evJtkJnwV zQ7AR}4t2IA}b3l^Y1Z9OBfnTp~vBuQ?d%fXU!sAbuCj?o=Gw$aSsf!Lc z@$YyfqyD<$mG^HxzrXP3@oleUX@?P1pD!E(5i~Qs^0L)m}!>kZ1i@5m3MBE$=b2ZR?II-W1_lP#AY0_dubz zRa;H&HNKS1Is3Qf8Bb)GqLZ-pXzcph(ir!u@2~%9CFr*P6>5YlXZ_@Vqjok@O1TaS?83{1OU4WweA1_ literal 152827 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 LElU_XCIm6?9Z35pFRg#H9uK& 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 UJgVNrz`(%Z>FVdQ&MBb@0J}-it^fc4 diff --git a/examples/cast_bearing_unit.py b/examples/cast_bearing_unit.py index 9075561..51f40a8 100644 --- a/examples/cast_bearing_unit.py +++ b/examples/cast_bearing_unit.py @@ -47,16 +47,9 @@ license: """ # [Code] -import copy - -from bd_warehouse.bearing import PressFitHole, SingleRowAngularContactBallBearing -from bd_warehouse.fastener import ClearanceHole, SocketHeadCapScrew from build123d import * from ocp_vscode import show -bearing = SingleRowAngularContactBallBearing("M17-47-14") -screw = SocketHeadCapScrew("M10-1.5", length=30 * MM, simple=False) - A, A1, Db2, H, J = 26, 11, 57, 98.5, 76.5 with BuildPart() as oval_flanged_bearing_unit: with BuildSketch() as plan: @@ -70,17 +63,11 @@ with BuildPart() as oval_flanged_bearing_unit: draft(drafted_faces, Plane.XY, 4) fillet(oval_flanged_bearing_unit.edges(), 1) with Locations(oval_flanged_bearing_unit.faces().sort_by(Axis.Z)[-1]): - PressFitHole(bearing) - with Locations(Pos(Z=A1)): - with Locations(*bolt_centers): - ClearanceHole(screw, counter_sunk=False) + CounterBoreHole(14 / 2, 47 / 2, 14) + with Locations(*bolt_centers): + Hole(5) oval_flanged_bearing_unit.part.color = Color(0x4C6377) -# Create an assembly of all the positioned parts -oval_flanged_bearing_unit_assembly = Compound( - children=[oval_flanged_bearing_unit.part, bearing.moved(bearing.hole_locations[0])] - + [copy.copy(screw).moved(l) for l in screw.hole_locations] -) -show(oval_flanged_bearing_unit_assembly) +show(oval_flanged_bearing_unit) # [End] From 86849a329bcee8249de3d888c7880480ba23b208 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 25 May 2025 19:41:11 -0400 Subject: [PATCH 316/518] Fixing bad localization test --- tests/test_direct_api/test_plane.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/test_direct_api/test_plane.py b/tests/test_direct_api/test_plane.py index 1fd2168..a2220b9 100644 --- a/tests/test_direct_api/test_plane.py +++ b/tests/test_direct_api/test_plane.py @@ -273,11 +273,13 @@ class TestPlane(unittest.TestCase): np.testing.assert_allclose(target_point, local_box_vertices[i], 1e-7) def test_localize_vertex(self): - vertex = Vertex(random.random(), random.random(), random.random()) - np.testing.assert_allclose( - tuple(Plane.YZ.to_local_coords(vertex)), - tuple(Plane.YZ.to_local_coords(Vector(vertex))), - 5, + v_x, v_y, v_z = (random.random(), random.random(), random.random()) + vertex = Vertex(v_x, v_y, v_z) + self.assertAlmostEqual( + Plane.YZ.to_local_coords(Vector(vertex)), (v_y, v_z, v_x), 5 + ) + self.assertAlmostEqual( + Vector(Plane.YZ.to_local_coords(vertex)), (v_y, v_z, v_x), 5 ) def test_repr(self): From 83cea3938d842ac2aa17ce269433cbf05909b6d4 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 26 May 2025 14:27:43 -0400 Subject: [PATCH 317/518] Deprecating Color.to_tuple Issue #155 --- src/build123d/geometry.py | 9 +++++++-- tests/test_direct_api/test_json.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index d733010..5b395cc 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1266,9 +1266,14 @@ class Color: self.iter_index += 1 return value - # @deprecated def to_tuple(self): """Value as tuple""" + warnings.warn( + "to_tuple is deprecated and will be removed in a future version. " + "Use 'tuple(Color)' instead.", + DeprecationWarning, + stacklevel=2, + ) return tuple(self) def __copy__(self) -> Color: @@ -1332,7 +1337,7 @@ class GeomEncoder(json.JSONEncoder): if isinstance(o, Axis): return {"Axis": (tuple(o.position), tuple(o.direction))} if isinstance(o, Color): - return {"Color": o.to_tuple()} + return {"Color": tuple(o)} if isinstance(o, Location): return {"Location": o.to_tuple()} if isinstance(o, Plane): diff --git a/tests/test_direct_api/test_json.py b/tests/test_direct_api/test_json.py index e253148..1099158 100644 --- a/tests/test_direct_api/test_json.py +++ b/tests/test_direct_api/test_json.py @@ -52,7 +52,7 @@ class TestGeomEncode(unittest.TestCase): c_json = json.dumps(Color("red"), cls=GeomEncoder) color = json.loads(c_json, object_hook=GeomEncoder.geometry_hook) - self.assertEqual(Color("red").to_tuple(), color.to_tuple()) + self.assertEqual(tuple(Color("red")), tuple(color)) loc = Location((0, 1, 2), (4, 8, 16)) l_json = json.dumps(loc, cls=GeomEncoder) From 2e0c193aa8a7c667c976e0d6dec49cdc4a0312d6 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 26 May 2025 15:56:01 -0400 Subject: [PATCH 318/518] Deprecating Axis.to_plane, refactored Plane constructor Issue #155 --- src/build123d/geometry.py | 131 +++++++++++++++------------ src/build123d/topology/one_d.py | 2 +- src/build123d/topology/shape_core.py | 10 +- src/build123d/topology/two_d.py | 4 +- tests/test_direct_api/test_axis.py | 10 +- tests/test_direct_api/test_plane.py | 50 ++++++++++ 6 files changed, 137 insertions(+), 70 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 5b395cc..599d117 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -758,6 +758,12 @@ class Axis(metaclass=AxisMeta): def to_plane(self) -> Plane: """Return self as Plane""" + warnings.warn( + "to_tuple is deprecated and will be removed in a future version. " + "Use 'Plane(Axis)' instead.", + DeprecationWarning, + stacklevel=2, + ) return Plane(origin=self.position, z_dir=self.direction) def is_coaxial( @@ -2523,85 +2529,89 @@ class Plane(metaclass=PlaneMeta): return Vector(normal) @overload - def __init__(self, gp_pln: gp_Pln): # pragma: no cover + def __init__(self, gp_pln: gp_Pln): """Return a plane from a OCCT gp_pln""" - @overload - def __init__(self, face: Face, x_dir: VectorLike | None = None): # pragma: no cover - """Return a plane extending the face. - Note: for non planar face this will return the underlying work plane""" - - @overload - def __init__(self, location: Location): # pragma: no cover - """Return a plane aligned with a given location""" - @overload def __init__( self, origin: VectorLike, x_dir: VectorLike | None = None, z_dir: VectorLike = (0, 0, 1), - ): # pragma: no cover + ): """Return a new plane at origin with x_dir and z_dir""" + @overload + def __init__(self, face: Face, x_dir: VectorLike | None = None): + """Return a plane extending the face. + Note: for non planar face this will return the underlying work plane""" + + @overload + def __init__(self, location: Location): + """Return a plane aligned with a given location""" + + @overload + def __init__(self, axis: Axis, x_dir: VectorLike | None = None): + """Return a plane with the z_dir aligned with the axis and optional x_dir direction""" + def __init__(self, *args, **kwargs): # pylint: disable=too-many-locals,too-many-branches,too-many-statements - """Create a plane from either an OCCT gp_pln or coordinates""" + """Create a plane from either an OCCT gp_pln, Face, Location, or coordinates""" - def optarg(kwargs, name, args, index, default): - if name in kwargs: - return kwargs[name] - if len(args) > index: - return args[index] - return default - - arg_plane = None - arg_face = None - arg_location = None - arg_origin = None - arg_x_dir = None - arg_z_dir = (0, 0, 1) - - arg0 = args[0] if args else None type_error_message = "Expected gp_Pln, Face, Location, or VectorLike" - if "gp_pln" in kwargs: - arg_plane = kwargs["gp_pln"] - elif isinstance(arg0, gp_Pln): - arg_plane = arg0 - elif "face" in kwargs: - arg_face = kwargs["face"] - arg_x_dir = kwargs.get("x_dir", None) - # Check for Face by using the OCCT class to avoid circular imports of the Face class - elif hasattr(arg0, "wrapped") and isinstance(arg0.wrapped, TopoDS_Face): - arg_face = arg0 - arg_x_dir = optarg(kwargs, "x_dir", args, 1, arg_x_dir) - elif "location" in kwargs: - arg_location = kwargs["location"] - elif isinstance(arg0, Location): - arg_location = arg0 - elif "origin" in kwargs: - arg_origin = kwargs["origin"] - arg_x_dir = kwargs.get("x_dir", arg_x_dir) - arg_z_dir = kwargs.get("z_dir", arg_z_dir) - else: - try: - arg_origin = Vector(arg0) - except TypeError as exc: - raise TypeError(type_error_message) from exc - arg_x_dir = optarg(kwargs, "x_dir", args, 1, arg_x_dir) - arg_z_dir = optarg(kwargs, "z_dir", args, 2, arg_z_dir) + arg_plane = kwargs.pop("gp_pln", None) + arg_face = kwargs.pop("face", None) + arg_location = kwargs.pop("location", None) + arg_axis = kwargs.pop("axis", None) + arg_origin = kwargs.pop("origin", None) + arg_x_dir = kwargs.pop("x_dir", None) + arg_z_dir = kwargs.pop("z_dir", (0, 0, 1)) + + if kwargs: + raise TypeError(f"Unexpected keyword arguments: {', '.join(kwargs)}") + + if args: + arg0 = args[0] + if arg_plane is None and isinstance(arg0, gp_Pln): + arg_plane = arg0 + elif ( + arg_face is None + and hasattr(arg0, "wrapped") + and isinstance(arg0.wrapped, TopoDS_Face) + ): + arg_face = arg0 + if arg_x_dir is None and len(args) > 1: + arg_x_dir = args[1] + elif arg_location is None and isinstance(arg0, Location): + arg_location = arg0 + elif arg_axis is None and isinstance(arg0, Axis): + arg_axis = arg0 + if len(args) > 1: + try: + arg_x_dir = Vector(args[1]) + except Exception as exc: + raise TypeError(type_error_message) from exc + elif arg_origin is None: + try: + arg_origin = Vector(arg0) + if arg_x_dir is None and len(args) > 1: + arg_x_dir = Vector(args[1]).normalized() + if len(args) > 2: + arg_z_dir = Vector(args[2]).normalized() + except Exception as exc: + raise TypeError(type_error_message) from exc if arg_plane: self.wrapped = arg_plane elif arg_face: - # Determine if face is planar surface = BRep_Tool.Surface_s(arg_face.wrapped) if not arg_face.is_planar: raise ValueError("Planes can only be created from planar faces") properties = GProp_GProps() BRepGProp.SurfaceProperties_s(arg_face.wrapped, properties) self._origin = Vector(properties.CentreOfMass()) + if isinstance(surface, Geom_BoundedSurface): point = gp_Pnt() face_x_dir = gp_Vec() @@ -2609,6 +2619,7 @@ class Plane(metaclass=PlaneMeta): surface.D1(0.5, 0.5, point, face_x_dir, tangent_v) else: face_x_dir = surface.Position().XDirection() + self.x_dir = Vector(arg_x_dir) if arg_x_dir else Vector(face_x_dir) self.x_dir = Vector(round(i, 14) for i in self.x_dir) self.z_dir = Plane.get_topods_face_normal(arg_face.wrapped) @@ -2623,10 +2634,16 @@ class Plane(metaclass=PlaneMeta): self.x_dir = Vector(round(i, 14) for i in self.x_dir) self.z_dir = Plane.get_topods_face_normal(topo_face) self.z_dir = Vector(round(i, 14) for i in self.z_dir) - elif arg_origin: + elif arg_axis: + self._origin = arg_axis.position + self.x_dir = Vector(arg_x_dir) if arg_x_dir is not None else None + self.z_dir = arg_axis.direction + elif arg_origin is not None: self._origin = Vector(arg_origin) self.x_dir = Vector(arg_x_dir) if arg_x_dir else None self.z_dir = Vector(arg_z_dir) + else: + raise TypeError(type_error_message) if hasattr(self, "wrapped"): self._origin = Vector(self.wrapped.Location()) @@ -2638,17 +2655,19 @@ class Plane(metaclass=PlaneMeta): raise ValueError("z_dir must be non null") self.z_dir = self.z_dir.normalized() - if not self.x_dir: + if self.x_dir is None: ax3 = gp_Ax3(self._origin.to_pnt(), self.z_dir.to_dir()) self.x_dir = Vector(ax3.XDirection()).normalized() else: if Vector(self.x_dir).length == 0.0: raise ValueError("x_dir must be non null") self.x_dir = Vector(self.x_dir).normalized() + self.y_dir = self.z_dir.cross(self.x_dir).normalized() self.wrapped = gp_Pln( gp_Ax3(self._origin.to_pnt(), self.z_dir.to_dir(), self.x_dir.to_dir()) ) + self.local_coord_system = None #: gp_Ax3 | None self.reverse_transform = None #: Matrix | None self.forward_transform = None #: Matrix | None diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index e33e0cc..4e96d7f 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -437,7 +437,7 @@ class Mixin1D(Shape): if all(a0.is_coaxial(a1) for a0, a1 in combinations(as_axis, 2)): origin = as_axis[0].position x_dir = as_axis[0].direction - z_dir = as_axis[0].to_plane().x_dir + z_dir = Plane(as_axis[0]).x_dir c_plane = Plane(origin, z_dir=z_dir) result = c_plane.shift_origin((0, 0)) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index d473668..2a5b975 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2599,29 +2599,27 @@ class ShapeList(list[T]): if inclusive == (True, True): objects = filter( lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z + <= Plane(axis).to_local_coords(o).center().Z <= maximum, self, ) elif inclusive == (True, False): objects = filter( lambda o: minimum - <= axis.to_plane().to_local_coords(o).center().Z + <= Plane(axis).to_local_coords(o).center().Z < maximum, self, ) elif inclusive == (False, True): objects = filter( lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z + < Plane(axis).to_local_coords(o).center().Z <= maximum, self, ) elif inclusive == (False, False): objects = filter( - lambda o: minimum - < axis.to_plane().to_local_coords(o).center().Z - < maximum, + lambda o: minimum < Plane(axis).to_local_coords(o).center().Z < maximum, self, ) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index cd973c7..5981d58 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -235,7 +235,7 @@ class Mixin2D(Shape): while intersect_maker.More(): inter_pt = intersect_maker.Pnt() # Calculate distance along axis - distance = other.to_plane().to_local_coords(Vector(inter_pt)).Z + distance = Plane(other).to_local_coords(Vector(inter_pt)).Z intersections.append( ( intersect_maker.Face(), # TopoDS_Face @@ -729,7 +729,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): axis = self.axis_of_rotation if axis is None or self.radii is None: raise ValueError("Can't find curvature of empty object") - loc = Location(axis.to_plane()) + loc = Location(Plane(axis)) axis_circle = Edge.make_circle(self.radii[0]).locate(loc) _, pnt_on_axis_circle, _ = axis_circle.distance_to_with_closest_points( self.center() diff --git a/tests/test_direct_api/test_axis.py b/tests/test_direct_api/test_axis.py index b6ece42..c0bbd46 100644 --- a/tests/test_direct_api/test_axis.py +++ b/tests/test_direct_api/test_axis.py @@ -113,11 +113,11 @@ class TestAxis(unittest.TestCase): self.assertAlmostEqual(axis.position, (1, 2, 3), 6) self.assertAlmostEqual(axis.direction, (0, 1, 0), 6) - def test_axis_to_plane(self): - x_plane = Axis.X.to_plane() - self.assertTrue(isinstance(x_plane, Plane)) - self.assertAlmostEqual(x_plane.origin, (0, 0, 0), 5) - self.assertAlmostEqual(x_plane.z_dir, (1, 0, 0), 5) + # def test_axis_to_plane(self): + # x_plane = Axis.X.to_plane() + # self.assertTrue(isinstance(x_plane, Plane)) + # self.assertAlmostEqual(x_plane.origin, (0, 0, 0), 5) + # self.assertAlmostEqual(x_plane.z_dir, (1, 0, 0), 5) def test_axis_is_coaxial(self): self.assertTrue(Axis.X.is_coaxial(Axis((0, 0, 0), (1, 0, 0)))) diff --git a/tests/test_direct_api/test_plane.py b/tests/test_direct_api/test_plane.py index a2220b9..e9e7faa 100644 --- a/tests/test_direct_api/test_plane.py +++ b/tests/test_direct_api/test_plane.py @@ -123,6 +123,8 @@ class TestPlane(unittest.TestCase): Plane() with self.assertRaises(TypeError): Plane(o, z_dir="up") + with self.assertRaises(TypeError): + Plane(o, forward="up") # rotated location around z loc = Location((0, 0, 0), (0, 0, 45)) @@ -211,6 +213,54 @@ class TestPlane(unittest.TestCase): self.assertAlmostEqual(p.y_dir, expected[i][1], 6) self.assertAlmostEqual(p.z_dir, expected[i][2], 6) + def test_plane_from_axis(self): + origin = Vector(1, 2, 3) + direction = Vector(0, 0, 1) + axis = Axis(origin, direction) + plane = Plane(axis) + + self.assertEqual(plane.origin, origin) + self.assertTrue(plane.z_dir, direction.normalized()) + self.assertAlmostEqual(plane.x_dir.length, 1.0, places=12) + self.assertAlmostEqual(plane.y_dir.length, 1.0, places=12) + self.assertAlmostEqual(plane.z_dir.length, 1.0, places=12) + + def test_plane_from_axis_with_x_dir(self): + origin = Vector(0, 0, 0) + z_dir = Vector(0, 0, 1) + x_dir = Vector(1, 0, 0) + axis = Axis(origin, z_dir) + plane = Plane(axis, x_dir) + + self.assertEqual(plane.origin, origin) + self.assertEqual(plane.z_dir, z_dir.normalized()) + self.assertEqual(plane.x_dir, x_dir.normalized()) + self.assertEqual(plane.y_dir, z_dir.cross(x_dir).normalized()) + + def test_plane_from_axis_with_kwargs(self): + axis = Axis((0, 0, 0), (0, 1, 0)) + x_dir = Vector(1, 0, 0) + plane = Plane(axis=axis, x_dir=x_dir) + + self.assertEqual(plane.z_dir, Vector(0, 1, 0)) + self.assertEqual(plane.x_dir, x_dir.normalized()) + + def test_plane_from_axis_without_x_dir(self): + axis = Axis((0, 0, 0), (1, 0, 0)) + plane = Plane(axis) + + self.assertEqual(plane.z_dir, Vector(1, 0, 0)) + self.assertAlmostEqual(plane.x_dir.length, 1.0, places=12) + self.assertAlmostEqual(plane.y_dir.length, 1.0, places=12) + self.assertGreater(plane.z_dir.cross(plane.x_dir).dot(plane.y_dir), 0.99) + + def test_plane_from_axis_invalid_x_dir(self): + axis = Axis((0, 0, 0), (0, 0, 1)) + with self.assertRaises(ValueError): + Plane(axis, x_dir=(0, 0, 0)) + with self.assertRaises(TypeError): + Plane(axis, "front") + def test_plane_neg(self): p = Plane( origin=(1, 2, 3), From ce3e6ba3a4c221c2b75d37886b4de4f4070bc4be Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 26 May 2025 21:02:01 -0400 Subject: [PATCH 319/518] Deprecating Vertex.to_tuple - Issue #155 --- src/build123d/build_common.py | 2 +- src/build123d/drafting.py | 5 +---- src/build123d/objects_curve.py | 10 ++++------ src/build123d/operations_generic.py | 20 ++++---------------- src/build123d/operations_part.py | 8 +++----- src/build123d/topology/zero_d.py | 11 ++++++++++- tests/test_build_common.py | 18 ++++++++---------- tests/test_direct_api/test_shape_list.py | 3 +-- 8 files changed, 32 insertions(+), 45 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index d2d6942..096a9c0 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -1111,7 +1111,7 @@ class Locations(LocationList): elif isinstance(point, Vector): local_locations.append(Location(point)) elif isinstance(point, Vertex): - local_locations.append(Location(Vector(point.to_tuple()))) + local_locations.append(Location(Vector(point))) elif isinstance(point, tuple): local_locations.append(Location(Vector(point))) elif isinstance(point, Plane): diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index 176e6e6..18821fa 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -277,10 +277,7 @@ class Draft: if isinstance(path, (Edge, Wire)): processed_path = path elif isinstance(path, Iterable): - pnts = [ - Vector(p.to_tuple()) if isinstance(p, Vertex) else Vector(p) - for p in path - ] + pnts = [Vector(p) for p in path] if len(pnts) == 2: processed_path = Edge.make_line(*pnts) else: diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 0eaa4b3..199cdc6 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -32,7 +32,7 @@ import copy as copy_module from collections.abc import Iterable from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize -import sympy # type: ignore +import sympy # type: ignore from build123d.build_common import WorkplaneList, flatten_sequence, validate_inputs from build123d.build_enums import ( @@ -456,7 +456,7 @@ class Helix(BaseEdgeObject): defined by cone_angle. If cone_angle is not 0, radius is the initial helix radius at center. cone_angle > 0 - increases the final radius. cone_angle < 0 decreases the final radius. + increases the final radius. cone_angle < 0 decreases the final radius. Args: pitch (float): distance between loops @@ -564,7 +564,7 @@ class FilletPolyline(BaseLineObject): if len(edges) != 2: continue other_vertices = {ve for e in edges for ve in e.vertices() if ve != vertex} - third_edge = Edge.make_line(*[v.to_tuple() for v in other_vertices]) + third_edge = Edge.make_line(*[v for v in other_vertices]) fillet_face = Face(Wire(edges + [third_edge])).fillet_2d(radius, [vertex]) fillets.append(fillet_face.edges().filter_by(GeomType.CIRCLE)[0]) @@ -1095,9 +1095,7 @@ class PointArcTangentLine(BaseEdgeObject): tangent_point = WorkplaneList.localize(point) if context is None: # Making the plane validates points and arc are coplanar - coplane = Edge.make_line(tangent_point, arc.arc_center).common_plane( - arc - ) + coplane = Edge.make_line(tangent_point, arc.arc_center).common_plane(arc) if coplane is None: raise ValueError("PointArcTangentLine only works on a single plane.") diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index e5b0e9f..9fd524b 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -376,14 +376,8 @@ def chamfer( object_list = ShapeList( filter( lambda v: not ( - isclose_b( - (Vector(*v.to_tuple()) - target.position_at(0)).length, - 0.0, - ) - or isclose_b( - (Vector(*v.to_tuple()) - target.position_at(1)).length, - 0.0, - ) + isclose_b((Vector(v) - target.position_at(0)).length, 0.0) + or isclose_b((Vector(v) - target.position_at(1)).length, 0.0) ), object_list, ) @@ -479,14 +473,8 @@ def fillet( object_list = ShapeList( filter( lambda v: not ( - isclose_b( - (Vector(*v.to_tuple()) - target.position_at(0)).length, - 0.0, - ) - or isclose_b( - (Vector(*v.to_tuple()) - target.position_at(1)).length, - 0.0, - ) + isclose_b((Vector(v) - target.position_at(0)).length, 0.0) + or isclose_b((Vector(v) - target.position_at(1)).length, 0.0) ), object_list, ) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 26a9095..2fc2126 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -392,12 +392,10 @@ def make_brake_formed( raise TypeError("station_widths must be either a single number or an iterable") for vertex in line_vertices: - others = offset_vertices.sort_by_distance(Vector(vertex.X, vertex.Y, vertex.Z)) + others = offset_vertices.sort_by_distance(Vector(vertex)) for other in others[1:]: - if abs(Vector(*(vertex - other).to_tuple()).length - thickness) < 1e-2: - station_edges.append( - Edge.make_line(vertex.to_tuple(), other.to_tuple()) - ) + if abs(Vector((vertex - other)).length - thickness) < 1e-2: + station_edges.append(Edge.make_line(vertex, other)) break station_edges = station_edges.sort_by(line) diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index f0bd1a0..bd19653 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -54,6 +54,8 @@ license: from __future__ import annotations import itertools +import warnings + from typing import overload, TYPE_CHECKING from collections.abc import Iterable @@ -132,7 +134,8 @@ class Vertex(Shape[TopoDS_Vertex]): ) super().__init__(ocp_vx) - self.X, self.Y, self.Z = self.to_tuple() + pnt = BRep_Tool.Pnt_s(self.wrapped) + self.X, self.Y, self.Z = pnt.X(), pnt.Y(), pnt.Z() # ---- Properties ---- @@ -272,6 +275,12 @@ class Vertex(Shape[TopoDS_Vertex]): def to_tuple(self) -> tuple[float, float, float]: """Return vertex as three tuple of floats""" + warnings.warn( + "to_tuple is deprecated and will be removed in a future version. " + "Use 'tuple(Vertex)' instead.", + DeprecationWarning, + stacklevel=2, + ) geom_point = BRep_Tool.Pnt_s(self.wrapped) return (geom_point.X(), geom_point.Y(), geom_point.Z()) diff --git a/tests/test_build_common.py b/tests/test_build_common.py index 318092a..dbdabc5 100644 --- a/tests/test_build_common.py +++ b/tests/test_build_common.py @@ -435,27 +435,25 @@ class TestRotation(unittest.TestCase): def test_init(self): thirty_by_three = Rotation(30, 30, 30) box_vertices = Solid.make_box(1, 1, 1).moved(thirty_by_three).vertices() + self.assertTupleAlmostEquals(tuple(box_vertices[0]), (0.5, -0.4330127, 0.75), 5) + self.assertTupleAlmostEquals(tuple(box_vertices[1]), (0.0, 0.0, 0.0), 7) self.assertTupleAlmostEquals( - box_vertices[0].to_tuple(), (0.5, -0.4330127, 0.75), 5 - ) - self.assertTupleAlmostEquals(box_vertices[1].to_tuple(), (0.0, 0.0, 0.0), 7) - self.assertTupleAlmostEquals( - box_vertices[2].to_tuple(), (0.0669872, 0.191987, 1.399519), 5 + tuple(box_vertices[2]), (0.0669872, 0.191987, 1.399519), 5 ) self.assertTupleAlmostEquals( - box_vertices[3].to_tuple(), (-0.4330127, 0.625, 0.6495190), 5 + tuple(box_vertices[3]), (-0.4330127, 0.625, 0.6495190), 5 ) self.assertTupleAlmostEquals( - box_vertices[4].to_tuple(), (1.25, 0.2165063, 0.625), 5 + tuple(box_vertices[4]), (1.25, 0.2165063, 0.625), 5 ) self.assertTupleAlmostEquals( - box_vertices[5].to_tuple(), (0.75, 0.649519, -0.125), 5 + tuple(box_vertices[5]), (0.75, 0.649519, -0.125), 5 ) self.assertTupleAlmostEquals( - box_vertices[6].to_tuple(), (0.816987, 0.841506, 1.274519), 5 + tuple(box_vertices[6]), (0.816987, 0.841506, 1.274519), 5 ) self.assertTupleAlmostEquals( - box_vertices[7].to_tuple(), (0.3169872, 1.2745190, 0.52451905), 5 + tuple(box_vertices[7]), (0.3169872, 1.2745190, 0.52451905), 5 ) diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py index 7ccf4a5..535e034 100644 --- a/tests/test_direct_api/test_shape_list.py +++ b/tests/test_direct_api/test_shape_list.py @@ -32,7 +32,6 @@ import math import re import unittest -import numpy as np from IPython.lib import pretty from build123d.build_common import GridLocations, PolarLocations from build123d.build_enums import GeomType, SortBy @@ -304,7 +303,7 @@ class TestShapeList(unittest.TestCase): def test_vertex(self): sl = ShapeList([Edge.make_circle(1)]) - np.testing.assert_allclose(sl.vertex().to_tuple(), (1, 0, 0), 1e-5) + self.assertAlmostEqual(tuple(sl.vertex()), (1, 0, 0), 5) sl = ShapeList([Face.make_rect(1, 1), Face.make_rect(1, 1, Plane((4, 4)))]) with self.assertWarns(UserWarning): sl.vertex() From 421dc667845509401ba308b6294333d91c25ea6a Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 27 May 2025 09:43:01 -0400 Subject: [PATCH 320/518] Deprecating Edge/Wire.to_wire and Face.to_arcs --- src/build123d/topology/one_d.py | 12 ++++++++++++ src/build123d/topology/shape_core.py | 4 +++- src/build123d/topology/three_d.py | 6 +++--- src/build123d/topology/two_d.py | 9 +++++++++ tests/test_direct_api/test_edge.py | 4 ++-- tests/test_direct_api/test_face.py | 22 +++++++++++----------- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 4e96d7f..5cff57d 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -2231,6 +2231,12 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def to_wire(self) -> Wire: """Edge as Wire""" + warnings.warn( + "to_wire is deprecated and will be removed in a future version. " + "Use 'Wire(Edge)' instead.", + DeprecationWarning, + stacklevel=2, + ) return Wire([self]) def trim(self, start: float, end: float) -> Edge: @@ -3106,6 +3112,12 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): def to_wire(self) -> Wire: """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" + warnings.warn( + "to_wire is deprecated and will be removed in a future version. " + "Use 'Wire(Wire)' instead.", + DeprecationWarning, + stacklevel=2, + ) return self def trim(self: Wire, start: float, end: float) -> Wire: diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 2a5b975..fda2700 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -1916,7 +1916,9 @@ class Shape(NodeMixin, Generic[TOPODS]): ) -> Self: """to_splines - Approximate shape with b-splines of the specified degree. + A shape-processing utility that forces all geometry in a shape to be converted into + BSplines. It's useful when working with tools or export formats that require uniform + geometry, or for downstream processing that only understands BSpline representations. Args: degree (int, optional): Maximum degree. Defaults to 3. diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 32f1561..b0d86f4 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -665,7 +665,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): builder.SetMode(coordinate_system) rotate = True elif isinstance(binormal, (Wire, Edge)): - builder.SetMode(binormal.to_wire().wrapped, True) + builder.SetMode(Wire(binormal).wrapped, True) return rotate @@ -1271,7 +1271,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): shapes = [] for wire in [outer_wire] + inner_wires: - builder = BRepOffsetAPI_MakePipeShell(path.to_wire().wrapped) + builder = BRepOffsetAPI_MakePipeShell(Wire(path).wrapped) rotate = False @@ -1339,7 +1339,7 @@ class Solid(Mixin3D, Shape[TopoDS_Solid]): Returns: Solid: swept object """ - path_as_wire = path.to_wire().wrapped + path_as_wire = Wire(path).wrapped builder = BRepOffsetAPI_MakePipeShell(path_as_wire) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 5981d58..4bfb5e0 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1627,12 +1627,21 @@ class Face(Mixin2D, Shape[TopoDS_Face]): Approximate planar face with arcs and straight line segments. + This is a utility used internally to convert or adapt a face for Boolean operations. Its + purpose is not typically for general use, but rather as a helper within the Boolean kernel + to ensure input faces are in a compatible and canonical form. + Args: tolerance (float, optional): Approximation tolerance. Defaults to 1e-3. Returns: Face: approximated face """ + warnings.warn( + "The 'to_arcs' method is deprecated and will be removed in a future version.", + DeprecationWarning, + stacklevel=2, + ) if self.wrapped is None: raise ValueError("Cannot approximate an empty shape") diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 9a524e8..8599c44 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -37,7 +37,7 @@ from build123d.geometry import Axis, Plane, Vector from build123d.objects_curve import CenterArc, EllipticalCenterArc from build123d.objects_sketch import Circle, Rectangle, RegularPolygon from build123d.operations_generic import sweep -from build123d.topology import Edge, Face +from build123d.topology import Edge, Face, Wire from OCP.GeomProjLib import GeomProjLib @@ -122,7 +122,7 @@ class TestEdge(unittest.TestCase): for end in [0, 1]: self.assertAlmostEqual( edge.position_at(end), - edge.to_wire().position_at(end), + Wire(edge).position_at(end), 5, ) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 5106228..162eda2 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -183,7 +183,7 @@ class TestFace(unittest.TestCase): happy = Face(outer, inners) self.assertAlmostEqual(happy.area, math.pi * (10**2 - 2), 5) - outer = Edge.make_circle(10, end_angle=180).to_wire() + outer = Wire(Edge.make_circle(10, end_angle=180)) with self.assertRaises(ValueError): Face(outer, inners) with self.assertRaises(ValueError): @@ -192,7 +192,7 @@ class TestFace(unittest.TestCase): outer = Wire.make_circle(10) inners = [ Wire.make_circle(1).locate(Location((-2, 2, 0))), - Edge.make_circle(1, end_angle=180).to_wire().locate(Location((2, 2, 0))), + Wire(Edge.make_circle(1, end_angle=180)).locate(Location((2, 2, 0))), ] with self.assertRaises(ValueError): Face(outer, inners) @@ -423,15 +423,15 @@ class TestFace(unittest.TestCase): with self.assertRaises(ValueError): Face.sweep(edge, Polyline((0, 0), (0.1, 0), (0.2, 0.1))) - def test_to_arcs(self): - with BuildSketch() as bs: - with BuildLine() as bl: - Polyline((0, 0), (1, 0), (1.5, 0.5), (2, 0), (2, 1), (0, 1), (0, 0)) - fillet(bl.vertices(), radius=0.1) - make_face() - smooth = bs.faces()[0] - fragmented = smooth.to_arcs() - self.assertLess(len(smooth.edges()), len(fragmented.edges())) + # def test_to_arcs(self): + # with BuildSketch() as bs: + # with BuildLine() as bl: + # Polyline((0, 0), (1, 0), (1.5, 0.5), (2, 0), (2, 1), (0, 1), (0, 0)) + # fillet(bl.vertices(), radius=0.1) + # make_face() + # smooth = bs.faces()[0] + # fragmented = smooth.to_arcs() + # self.assertLess(len(smooth.edges()), len(fragmented.edges())) def test_outer_wire(self): face = (Face.make_rect(1, 1) - Face.make_rect(0.5, 0.5)).face() From f445de32c98f6df1fab1bef5b8a5b8211f9df205 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 27 May 2025 10:43:33 -0400 Subject: [PATCH 321/518] Deprecating Location.to_tuple Issue #155 --- src/build123d/geometry.py | 49 ++++++++++++++++++++++---- tests/test_build_common.py | 10 +++--- tests/test_build_generic.py | 2 +- tests/test_direct_api/test_json.py | 1 - tests/test_direct_api/test_location.py | 39 +++++++++----------- 5 files changed, 65 insertions(+), 36 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 599d117..81f4075 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1345,7 +1345,8 @@ class GeomEncoder(json.JSONEncoder): if isinstance(o, Color): return {"Color": tuple(o)} if isinstance(o, Location): - return {"Location": o.to_tuple()} + tup = tuple(o) + return {f"Location": (tuple(tup[0]), tuple(tup[1]))} if isinstance(o, Plane): return {"Plane": (tuple(o.origin), tuple(o.x_dir), tuple(o.z_dir))} if isinstance(o, Vector): @@ -1457,6 +1458,9 @@ class Location: def __init__( self, *args, **kwargs ): # pylint: disable=too-many-branches, too-many-locals, too-many-statements + + self.location_index = 0 + position = kwargs.pop("position", None) orientation = kwargs.pop("orientation", None) ordering = kwargs.pop("ordering", None) @@ -1549,7 +1553,7 @@ class Location: Vector: Position part of Location """ - return Vector(self.to_tuple()[0]) + return Vector(tuple(self)[0]) @position.setter def position(self, value: VectorLike): @@ -1574,7 +1578,7 @@ class Location: Vector: orientation part of Location """ - return Vector(self.to_tuple()[1]) + return Vector(tuple(self)[1]) @orientation.setter def orientation(self, rotation: VectorLike): @@ -1726,6 +1730,30 @@ class Location: ) ) + def __iter__(self): + """Initialize to beginning""" + self.location_index = 0 + return self + + def __next__(self): + """return the next value""" + transformation = self.wrapped.Transformation() + trans = transformation.TranslationPart() + rot = transformation.GetRotation() + rv_trans: Vector = Vector(trans.X(), trans.Y(), trans.Z()) + rv_rot: Vector = Vector( + degrees(a) for a in rot.GetEulerAngles(gp_EulerSequence.gp_Intrinsic_XYZ) + ) # type: ignore[assignment] + if self.location_index == 0: + self.location_index += 1 + value = rv_trans + elif self.location_index == 1: + self.location_index += 1 + value = rv_rot + else: + raise StopIteration + return value + def __neg__(self) -> Location: """Flip the orientation without changing the position operator -""" return Location(-Plane(self)) @@ -1793,6 +1821,13 @@ class Location: def to_tuple(self) -> tuple[tuple[float, float, float], tuple[float, float, float]]: """Convert the location to a translation, rotation tuple.""" + warnings.warn( + "to_tuple is deprecated and will be removed in a future version. " + "Use 'tuple(Location)' instead.", + DeprecationWarning, + stacklevel=2, + ) + transformation = self.wrapped.Transformation() trans = transformation.TranslationPart() rot = transformation.GetRotation() @@ -1812,8 +1847,8 @@ class Location: Returns: Location as String """ - position_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[0]) - orientation_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[1]) + position_str = ", ".join(f"{v:.2f}" for v in tuple(self)[0]) + orientation_str = ", ".join(f"{v:.2f}" for v in tuple(self)[1]) return f"(p=({position_str}), o=({orientation_str}))" def __str__(self): @@ -1824,8 +1859,8 @@ class Location: Returns: Location as String """ - position_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[0]) - orientation_str = ", ".join(f"{v:.2f}" for v in self.to_tuple()[1]) + position_str = ", ".join(f"{v:.2f}" for v in tuple(self)[0]) + orientation_str = ", ".join(f"{v:.2f}" for v in tuple(self)[1]) return f"Location: (position=({position_str}), orientation=({orientation_str}))" @overload diff --git a/tests/test_build_common.py b/tests/test_build_common.py index dbdabc5..922b041 100644 --- a/tests/test_build_common.py +++ b/tests/test_build_common.py @@ -282,7 +282,7 @@ class TestLocations(unittest.TestCase): def test_no_centering(self): with BuildSketch(): with GridLocations(4, 4, 2, 2, align=(Align.MIN, Align.MIN)) as l: - pts = [loc.to_tuple()[0] for loc in l.locations] + pts = [tuple(loc)[0] for loc in l.locations] self.assertTupleAlmostEquals(pts[0], (0, 0, 0), 5) self.assertTupleAlmostEquals(pts[1], (0, 4, 0), 5) self.assertTupleAlmostEquals(pts[2], (4, 0, 0), 5) @@ -331,7 +331,7 @@ class TestLocations(unittest.TestCase): def test_centering(self): with BuildSketch(): with GridLocations(4, 4, 2, 2, align=(Align.CENTER, Align.CENTER)) as l: - pts = [loc.to_tuple()[0] for loc in l.locations] + pts = [tuple(loc)[0] for loc in l.locations] self.assertTupleAlmostEquals(pts[0], (-2, -2, 0), 5) self.assertTupleAlmostEquals(pts[1], (-2, 2, 0), 5) self.assertTupleAlmostEquals(pts[2], (2, -2, 0), 5) @@ -341,7 +341,7 @@ class TestLocations(unittest.TestCase): with BuildSketch(): with Locations((-2, -2), (2, 2)): with GridLocations(1, 1, 2, 2) as nested_grid: - pts = [loc.to_tuple()[0] for loc in nested_grid.local_locations] + pts = [tuple(loc)[0] for loc in nested_grid.local_locations] self.assertTupleAlmostEquals(pts[0], (-2.50, -2.50, 0.00), 5) self.assertTupleAlmostEquals(pts[1], (-2.50, -1.50, 0.00), 5) self.assertTupleAlmostEquals(pts[2], (-1.50, -2.50, 0.00), 5) @@ -355,8 +355,8 @@ class TestLocations(unittest.TestCase): with BuildSketch(): with PolarLocations(6, 3): with GridLocations(1, 1, 2, 2) as polar_grid: - pts = [loc.to_tuple()[0] for loc in polar_grid.local_locations] - ort = [loc.to_tuple()[1] for loc in polar_grid.local_locations] + pts = [tuple(loc)[0] for loc in polar_grid.local_locations] + ort = [tuple(loc)[1] for loc in polar_grid.local_locations] self.assertTupleAlmostEquals(pts[0], (5.50, -0.50, 0.00), 2) self.assertTupleAlmostEquals(pts[1], (5.50, 0.50, 0.00), 2) diff --git a/tests/test_build_generic.py b/tests/test_build_generic.py index 94367dd..d3248e0 100644 --- a/tests/test_build_generic.py +++ b/tests/test_build_generic.py @@ -403,7 +403,7 @@ class LocationsTests(unittest.TestCase): with BuildPart(): with Locations(Location(Vector())): self.assertTupleAlmostEquals( - LocationList._get_context().locations[0].to_tuple()[0], (0, 0, 0), 5 + tuple(LocationList._get_context().locations[0])[0], (0, 0, 0), 5 ) def test_errors(self): diff --git a/tests/test_direct_api/test_json.py b/tests/test_direct_api/test_json.py index 1099158..b18be83 100644 --- a/tests/test_direct_api/test_json.py +++ b/tests/test_direct_api/test_json.py @@ -27,7 +27,6 @@ license: """ import json -import os import unittest from build123d.geometry import ( Axis, diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index bdfd225..40f0e0a 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -26,7 +26,6 @@ license: """ -# Always equal to any other object, to test that __eq__ cooperation is working import copy import json import math @@ -34,7 +33,6 @@ import os import unittest from random import uniform -import numpy as np from OCP.gp import ( gp_Ax1, gp_Dir, @@ -51,6 +49,8 @@ from build123d.topology import Edge, Solid, Vertex class AlwaysEqual: + """Always equal to any other object, to test that __eq__ cooperation is working""" + def __eq__(self, other): return True @@ -59,7 +59,7 @@ class TestLocation(unittest.TestCase): def test_location(self): loc0 = Location() T = loc0.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 0), 1e-6) + self.assertAlmostEqual((T.X(), T.Y(), T.Z()), (0, 0, 0), 5) angle = math.degrees( loc0.wrapped.Transformation().GetRotation().GetRotationAngle() ) @@ -69,19 +69,19 @@ class TestLocation(unittest.TestCase): loc0 = Location((0, 0, 1)) T = loc0.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + self.assertAlmostEqual((T.X(), T.Y(), T.Z()), (0, 0, 1), 5) # List loc0 = Location([0, 0, 1]) T = loc0.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + self.assertAlmostEqual((T.X(), T.Y(), T.Z()), (0, 0, 1), 5) # Vector loc1 = Location(Vector(0, 0, 1)) T = loc1.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + self.assertAlmostEqual((T.X(), T.Y(), T.Z()), (0, 0, 1), 5) # rotation + translation loc2 = Location(Vector(0, 0, 1), Vector(0, 0, 1), 45) @@ -103,13 +103,8 @@ class TestLocation(unittest.TestCase): # Test creation from the OCP.gp.gp_Trsf object loc4 = Location(gp_Trsf()) - np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 0), 1e-7) - np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) - - # Test creation from Plane and Vector - # loc4 = Location(Plane.XY, (0, 0, 1)) - # np.testing.assert_allclose(loc4.to_tuple()[0], (0, 0, 1), 1e-7) - # np.testing.assert_allclose(loc4.to_tuple()[1], (0, 0, 0), 1e-7) + self.assertAlmostEqual(tuple(loc4)[0], (0, 0, 0), 5) + self.assertAlmostEqual(tuple(loc4)[1], (0, 0, 0), 5) # Test composition loc4 = Location((0, 0, 0), Vector(0, 0, 1), 15) @@ -119,7 +114,7 @@ class TestLocation(unittest.TestCase): loc7 = loc4**2 T = loc5.wrapped.Transformation().TranslationPart() - np.testing.assert_allclose((T.X(), T.Y(), T.Z()), (0, 0, 1), 1e-6) + self.assertAlmostEqual((T.X(), T.Y(), T.Z()), (0, 0, 1), 5) angle5 = math.degrees( loc5.wrapped.Transformation().GetRotation().GetRotationAngle() @@ -165,21 +160,21 @@ class TestLocation(unittest.TestCase): t.SetRotationPart(q) loc2 = Location(t) - np.testing.assert_allclose(loc1.to_tuple()[0], loc2.to_tuple()[0], 1e-6) - np.testing.assert_allclose(loc1.to_tuple()[1], loc2.to_tuple()[1], 1e-6) + self.assertAlmostEqual(tuple(loc1)[0], tuple(loc2)[0], 5) + self.assertAlmostEqual(tuple(loc1)[1], tuple(loc2)[1], 5) loc1 = Location((1, 2), 34) - np.testing.assert_allclose(loc1.to_tuple()[0], (1, 2, 0), 1e-6) - np.testing.assert_allclose(loc1.to_tuple()[1], (0, 0, 34), 1e-6) + self.assertAlmostEqual(tuple(loc1)[0], (1, 2, 0), 5) + self.assertAlmostEqual(tuple(loc1)[1], (0, 0, 34), 5) rot_angles = (-115.00, 35.00, -135.00) loc2 = Location((1, 2, 3), rot_angles) - np.testing.assert_allclose(loc2.to_tuple()[0], (1, 2, 3), 1e-6) - np.testing.assert_allclose(loc2.to_tuple()[1], rot_angles, 1e-6) + self.assertAlmostEqual(tuple(loc2)[0], (1, 2, 3), 5) + self.assertAlmostEqual(tuple(loc2)[1], rot_angles, 5) loc3 = Location(loc2) - np.testing.assert_allclose(loc3.to_tuple()[0], (1, 2, 3), 1e-6) - np.testing.assert_allclose(loc3.to_tuple()[1], rot_angles, 1e-6) + self.assertAlmostEqual(tuple(loc3)[0], (1, 2, 3), 5) + self.assertAlmostEqual(tuple(loc3)[1], rot_angles, 5) def test_location_kwarg_parameters(self): loc = Location(position=(10, 20, 30)) From 560a5369b718242d7b8d547e1a00e4519e40aac1 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 27 May 2025 14:38:21 -0400 Subject: [PATCH 322/518] Convert Shape methods to properties: is_null, is_valid, shape_type --- src/build123d/operations_part.py | 4 +- src/build123d/topology/shape_core.py | 61 +++++++++------------ src/build123d/topology/three_d.py | 8 +-- src/build123d/topology/two_d.py | 8 +-- tests/test_build_generic.py | 4 +- tests/test_direct_api/test_compound.py | 4 +- tests/test_direct_api/test_face.py | 10 ++-- tests/test_direct_api/test_import_export.py | 4 +- tests/test_direct_api/test_mixin3_d.py | 12 ++-- tests/test_direct_api/test_shape.py | 12 ++-- tests/test_direct_api/test_shells.py | 8 +-- tests/test_direct_api/test_solid.py | 2 +- tests/test_direct_api/test_wire.py | 16 +++--- tests/test_mesher.py | 4 +- 14 files changed, 75 insertions(+), 82 deletions(-) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 2fc2126..7a196f7 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -304,11 +304,11 @@ def loft( new_solid = Solid.make_loft(loft_wires, ruled) # Try to recover an invalid loft - if not new_solid.is_valid(): + if not new_solid.is_valid: new_solid = Solid(Shell(new_solid.faces() + section_list)) if clean: new_solid = new_solid.clean() - if not new_solid.is_valid(): + if not new_solid.is_valid: raise RuntimeError("Failed to create valid loft") if context is not None: diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index fda2700..52377b6 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -422,6 +422,14 @@ class Shape(NodeMixin, Generic[TOPODS]): return True + @property + def is_null(self) -> bool: + """Returns true if this shape is null. In other words, it references no + underlying shape with the potential to be given a location and an + orientation. + """ + return self.wrapped is None or self.wrapped.IsNull() + @property def is_planar_face(self) -> bool: """Is the shape a planar face even though its geom_type may not be PLANE""" @@ -431,6 +439,18 @@ class Shape(NodeMixin, Generic[TOPODS]): is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) return is_face_planar.IsPlanar() + @property + def is_valid(self) -> bool: + """Returns True if no defect is detected on the shape S or any of its + subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full + description of what is checked. + """ + if self.wrapped is None: + return True + chk = BRepCheck_Analyzer(self.wrapped) + chk.SetParallel(True) + return chk.IsValid() + @property def location(self) -> Location | None: """Get this Shape's Location""" @@ -543,6 +563,11 @@ class Shape(NodeMixin, Generic[TOPODS]): (Vector(principal_props.ThirdAxisOfInertia()), principal_moments[2]), ] + @property + def shape_type(self) -> Shapes: + """Return the shape type string for this class""" + return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) + @property def static_moments(self) -> tuple[float, float, float]: """ @@ -1188,7 +1213,7 @@ class Shape(NodeMixin, Generic[TOPODS]): """fix - try to fix shape if not valid""" if self.wrapped is None: return self - if not self.is_valid(): + if not self.is_valid: shape_copy: Shape = copy.deepcopy(self, None) shape_copy.wrapped = tcast(TOPODS, fix(self.wrapped)) @@ -1332,7 +1357,7 @@ class Shape(NodeMixin, Generic[TOPODS]): return None if ( not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null() + and shape_intersections.is_null ): return None return shape_intersections @@ -1352,18 +1377,6 @@ class Shape(NodeMixin, Generic[TOPODS]): return False return self.wrapped.IsEqual(other.wrapped) - def is_null(self) -> bool: - """Returns true if this shape is null. In other words, it references no - underlying shape with the potential to be given a location and an - orientation. - - Args: - - Returns: - - """ - return self.wrapped is None or self.wrapped.IsNull() - def is_same(self, other: Shape) -> bool: """Returns True if other and this shape are same, i.e. if they share the same TShape with the same Locations. Orientations may differ. Also see @@ -1379,22 +1392,6 @@ class Shape(NodeMixin, Generic[TOPODS]): return False return self.wrapped.IsSame(other.wrapped) - def is_valid(self) -> bool: - """Returns True if no defect is detected on the shape S or any of its - subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full - description of what is checked. - - Args: - - Returns: - - """ - if self.wrapped is None: - return True - chk = BRepCheck_Analyzer(self.wrapped) - chk.SetParallel(True) - return chk.IsValid() - def locate(self, loc: Location) -> Self: """Apply a location in absolute sense to self @@ -1677,10 +1674,6 @@ class Shape(NodeMixin, Generic[TOPODS]): return self._apply_transform(transformation) - def shape_type(self) -> Shapes: - """Return the shape type string for this class""" - return tcast(Shapes, Shape.shape_LUT[shapetype(self.wrapped)]) - def shell(self) -> Shell | None: """Return the Shell""" return None diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index b0d86f4..e4131ce 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -259,7 +259,7 @@ class Mixin3D(Shape): try: new_shape = self.__class__(chamfer_builder.Shape()) - if not new_shape.is_valid(): + if not new_shape.is_valid: raise Standard_Failure except (StdFail_NotDone, Standard_Failure) as err: raise ValueError( @@ -343,7 +343,7 @@ class Mixin3D(Shape): try: new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): + if not new_shape.is_valid: raise Standard_Failure except (StdFail_NotDone, Standard_Failure) as err: raise ValueError( @@ -485,7 +485,7 @@ class Mixin3D(Shape): # Do these numbers work? - if not try with the smaller window try: new_shape = self.__class__(fillet_builder.Shape()) - if not new_shape.is_valid(): + if not new_shape.is_valid: raise fillet_exception except fillet_exception: return __max_fillet(window_min, window_mid, current_iteration + 1) @@ -499,7 +499,7 @@ class Mixin3D(Shape): ) return return_value - if not self.is_valid(): + if not self.is_valid: raise ValueError("Invalid Shape") native_edges = [e.wrapped for e in edge_list] diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 4bfb5e0..9aad804 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -374,7 +374,7 @@ class Mixin2D(Shape): raise RuntimeError( f"Length error of {length_error:.6f} exceeds tolerance {tolerance}" ) - if not wrapped_edge.is_valid(): + if not wrapped_edge.is_valid: raise RuntimeError("Wrapped edge is invalid") if not snap_to_face: @@ -1016,7 +1016,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) from err surface_face = surface_face.fix() - if not surface_face.is_valid(): + if not surface_face.is_valid: raise RuntimeError("non planar face is invalid") return surface_face @@ -1443,7 +1443,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) from err surface_face = surface_face.fix() - # if not surface_face.is_valid(): + # if not surface_face.is_valid: # raise RuntimeError("non planar face is invalid") return surface_face @@ -2021,7 +2021,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): # # Part 5: Validate # - if not wrapped_wire.is_valid(): + if not wrapped_wire.is_valid: raise RuntimeError("wrapped wire is not valid") return wrapped_wire diff --git a/tests/test_build_generic.py b/tests/test_build_generic.py index d3248e0..ac02ca5 100644 --- a/tests/test_build_generic.py +++ b/tests/test_build_generic.py @@ -522,7 +522,7 @@ class OffsetTests(unittest.TestCase): def test_face_offset_with_holes(self): sk = Rectangle(100, 100) - GridLocations(80, 80, 2, 2) * Circle(5) sk2 = offset(sk, -5) - self.assertTrue(sk2.face().is_valid()) + self.assertTrue(sk2.face().is_valid) self.assertLess(sk2.area, sk.area) self.assertEqual(len(sk2), 1) @@ -881,7 +881,7 @@ class TestSweep(unittest.TestCase): Rectangle(2 * lip, 2 * lip, align=(Align.CENTER, Align.CENTER)) sweep(sections=sk2.sketch, path=topedgs, mode=Mode.SUBTRACT) - self.assertTrue(p.part.is_valid()) + self.assertTrue(p.part.is_valid) def test_path_error(self): e1 = Edge.make_line((0, 0), (1, 0)) diff --git a/tests/test_direct_api/test_compound.py b/tests/test_direct_api/test_compound.py index e4eb6f2..9f93460 100644 --- a/tests/test_direct_api/test_compound.py +++ b/tests/test_direct_api/test_compound.py @@ -51,10 +51,10 @@ class TestCompound(unittest.TestCase): box1 = Solid.make_box(1, 1, 1) box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) combined = Compound([box1]).fuse(box2, glue=True) - self.assertTrue(combined.is_valid()) + self.assertTrue(combined.is_valid) self.assertAlmostEqual(combined.volume, 2, 5) fuzzy = Compound([box1]).fuse(box2, tol=1e-6) - self.assertTrue(fuzzy.is_valid()) + self.assertTrue(fuzzy.is_valid) self.assertAlmostEqual(fuzzy.volume, 2, 5) def test_remove(self): diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 162eda2..6e57a55 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -65,7 +65,7 @@ class TestFace(unittest.TestCase): bottom_edge = Edge.make_circle(radius=1, end_angle=90) top_edge = Edge.make_circle(radius=1, plane=Plane((0, 0, 1)), end_angle=90) curved = Face.make_surface_from_curves(bottom_edge, top_edge) - self.assertTrue(curved.is_valid()) + self.assertTrue(curved.is_valid) self.assertAlmostEqual(curved.area, math.pi / 2, 5) self.assertAlmostEqual( curved.normal_at(), (math.sqrt(2) / 2, math.sqrt(2) / 2, 0), 5 @@ -74,7 +74,7 @@ class TestFace(unittest.TestCase): bottom_wire = Wire.make_circle(1) top_wire = Wire.make_circle(1, Plane((0, 0, 1))) curved = Face.make_surface_from_curves(bottom_wire, top_wire) - self.assertTrue(curved.is_valid()) + self.assertTrue(curved.is_valid) self.assertAlmostEqual(curved.area, 2 * math.pi, 5) def test_center(self): @@ -303,7 +303,7 @@ class TestFace(unittest.TestCase): for j in range(4 - i % 2) ] cylinder_walls_with_holes = cylinder_wall.make_holes(projected_wires) - self.assertTrue(cylinder_walls_with_holes.is_valid()) + self.assertTrue(cylinder_walls_with_holes.is_valid) self.assertLess(cylinder_walls_with_holes.area, cylinder_wall.area) def test_is_inside(self): @@ -377,7 +377,7 @@ class TestFace(unittest.TestCase): surface_points=[Vector(0, 0, -5)], interior_wires=[hole], ) - self.assertTrue(surface.is_valid()) + self.assertTrue(surface.is_valid) self.assertEqual(surface.geom_type, GeomType.BSPLINE) bbox = surface.bounding_box() self.assertAlmostEqual(bbox.min, (-50.5, -24.5, -5.113393280136395), 5) @@ -877,7 +877,7 @@ class TestFace(unittest.TestCase): with self.assertRaises(RuntimeError): surface.wrap(star.outer_wire(), target) - @patch.object(Wire, "is_valid", return_value=False) + @patch.object(Wire, "is_valid", new_callable=PropertyMock, return_value=False) def test_wrap_invalid_wire(self, mock_is_valid): surface = Cone(5, 2, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] target = surface.location_at(0.5, 0.5, x_dir=(1, 0, 0)) diff --git a/tests/test_direct_api/test_import_export.py b/tests/test_direct_api/test_import_export.py index 9b22dd5..8f9f29e 100644 --- a/tests/test_direct_api/test_import_export.py +++ b/tests/test_direct_api/test_import_export.py @@ -40,11 +40,11 @@ class TestImportExport(unittest.TestCase): original_box = Solid.make_box(1, 1, 1) export_step(original_box, "test_box.step") step_box = import_step("test_box.step") - self.assertTrue(step_box.is_valid()) + self.assertTrue(step_box.is_valid) self.assertAlmostEqual(step_box.volume, 1, 5) export_brep(step_box, "test_box.brep") brep_box = import_brep("test_box.brep") - self.assertTrue(brep_box.is_valid()) + self.assertTrue(brep_box.is_valid) self.assertAlmostEqual(brep_box.volume, 1, 5) os.remove("test_box.step") os.remove("test_box.brep") diff --git a/tests/test_direct_api/test_mixin3_d.py b/tests/test_direct_api/test_mixin3_d.py index 5e04e7b..1bee8fc 100644 --- a/tests/test_direct_api/test_mixin3_d.py +++ b/tests/test_direct_api/test_mixin3_d.py @@ -27,7 +27,7 @@ license: """ import unittest -from unittest.mock import patch +from unittest.mock import patch, PropertyMock from build123d.build_enums import CenterOf, Kind from build123d.geometry import Axis, Plane @@ -67,7 +67,7 @@ class TestMixin3D(unittest.TestCase): face = box.faces().sort_by(Axis.Z)[0] self.assertRaises(ValueError, box.chamfer, 0.1, None, edge, face=face) - @patch.object(Shape, "is_valid", return_value=False) + @patch.object(Shape, "is_valid", new_callable=PropertyMock, return_value=False) def test_chamfer_invalid_shape_raises_error(self, mock_is_valid): box = Solid.make_box(1, 1, 1) @@ -111,7 +111,7 @@ class TestMixin3D(unittest.TestCase): d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( None, [f], additive=False ) - self.assertTrue(d.is_valid()) + self.assertTrue(d.is_valid) self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) # face with depth @@ -119,7 +119,7 @@ class TestMixin3D(unittest.TestCase): d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( None, [f], depth=0.5, thru_all=False, additive=False ) - self.assertTrue(d.is_valid()) + self.assertTrue(d.is_valid) self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) # face until @@ -128,7 +128,7 @@ class TestMixin3D(unittest.TestCase): d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( None, [f], up_to_face=limit, thru_all=False, additive=False ) - self.assertTrue(d.is_valid()) + self.assertTrue(d.is_valid) self.assertAlmostEqual(d.volume, 1 - 0.5**3, 5) # wire @@ -136,7 +136,7 @@ class TestMixin3D(unittest.TestCase): d = Solid.make_box(1, 1, 1, Plane((-0.5, -0.5, 0))).dprism( None, [w], additive=False ) - self.assertTrue(d.is_valid()) + self.assertTrue(d.is_valid) self.assertAlmostEqual(d.volume, 1 - 0.5**2, 5) def test_center(self): diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 76622ac..f159fbb 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -29,7 +29,7 @@ license: # Always equal to any other object, to test that __eq__ cooperation is working import unittest from random import uniform -from unittest.mock import patch +from unittest.mock import patch, PropertyMock import numpy as np from build123d.build_enums import CenterOf, Keep @@ -100,7 +100,7 @@ class TestShape(unittest.TestCase): Shape.combined_center(objs, center_of=CenterOf.GEOMETRY) def test_shape_type(self): - self.assertEqual(Vertex().shape_type(), "Vertex") + self.assertEqual(Vertex().shape_type, "Vertex") def test_scale(self): self.assertAlmostEqual(Solid.make_box(1, 1, 1).scale(2).volume, 2**3, 5) @@ -109,10 +109,10 @@ class TestShape(unittest.TestCase): box1 = Solid.make_box(1, 1, 1) box2 = Solid.make_box(1, 1, 1, Plane((1, 0, 0))) combined = box1.fuse(box2, glue=True) - self.assertTrue(combined.is_valid()) + self.assertTrue(combined.is_valid) self.assertAlmostEqual(combined.volume, 2, 5) fuzzy = box1.fuse(box2, tol=1e-6) - self.assertTrue(fuzzy.is_valid()) + self.assertTrue(fuzzy.is_valid) self.assertAlmostEqual(fuzzy.volume, 2, 5) def test_faces_intersected_by_axis(self): @@ -245,7 +245,7 @@ class TestShape(unittest.TestCase): # invalid_object = box.fillet(0.75, box.edges()) # invalid_object.max_fillet(invalid_object.edges()) - @patch.object(Shape, "is_valid", return_value=False) + @patch.object(Shape, "is_valid", new_callable=PropertyMock, return_value=False) def test_max_fillet_invalid_shape_raises_error(self, mock_is_valid): box = Solid.make_box(1, 1, 1) @@ -526,7 +526,7 @@ class TestShape(unittest.TestCase): self.assertEqual(hash(empty), 0) self.assertFalse(empty.is_same(Solid())) self.assertFalse(empty.is_equal(Solid())) - self.assertTrue(empty.is_valid()) + self.assertTrue(empty.is_valid) empty_bbox = empty.bounding_box() self.assertEqual(tuple(empty_bbox.size), (0, 0, 0)) self.assertIs(empty, empty.mirror(Plane.XY)) diff --git a/tests/test_direct_api/test_shells.py b/tests/test_direct_api/test_shells.py index 6c9023b..d465433 100644 --- a/tests/test_direct_api/test_shells.py +++ b/tests/test_direct_api/test_shells.py @@ -41,12 +41,12 @@ class TestShells(unittest.TestCase): def test_shell_init(self): box_faces = Solid.make_box(1, 1, 1).faces() box_shell = Shell(box_faces) - self.assertTrue(box_shell.is_valid()) + self.assertTrue(box_shell.is_valid) def test_shell_init_single_face(self): face = Solid.make_cone(1, 0, 2).faces().filter_by(GeomType.CONE).first shell = Shell(face) - self.assertTrue(shell.is_valid()) + self.assertTrue(shell.is_valid) def test_center(self): box_faces = Solid.make_box(1, 1, 1).faces() @@ -71,9 +71,9 @@ class TestShells(unittest.TestCase): x_section = Rot(90) * Spline((0, -5), (-3, -2), (-2, 0), (-3, 2), (0, 5)) surface = sweep(x_section, Circle(5).wire()) single_face = Shell(surface.face()) - self.assertTrue(single_face.is_valid()) + self.assertTrue(single_face.is_valid) single_face = Shell(surface.faces()) - self.assertTrue(single_face.is_valid()) + self.assertTrue(single_face.is_valid) def test_sweep(self): path_c1 = JernArc((0, 0), (-1, 0), 1, 180) diff --git a/tests/test_direct_api/test_solid.py b/tests/test_direct_api/test_solid.py index 640bf31..a0fa0f3 100644 --- a/tests/test_direct_api/test_solid.py +++ b/tests/test_direct_api/test_solid.py @@ -59,7 +59,7 @@ class TestSolid(unittest.TestCase): box = Solid(box_shell) self.assertAlmostEqual(box.area, 6, 5) self.assertAlmostEqual(box.volume, 1, 5) - self.assertTrue(box.is_valid()) + self.assertTrue(box.is_valid) def test_extrude(self): v = Edge.extrude(Vertex(1, 1, 1), (0, 0, 1)) diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py index 3391b88..51e398e 100644 --- a/tests/test_direct_api/test_wire.py +++ b/tests/test_direct_api/test_wire.py @@ -191,26 +191,26 @@ class TestWire(unittest.TestCase): e1 = Edge.make_line((1, 0), (1, 1)) w0 = Wire.make_circle(1) w1 = Wire(e0) - self.assertTrue(w1.is_valid()) + self.assertTrue(w1.is_valid) w2 = Wire([e0]) self.assertAlmostEqual(w2.length, 1, 5) - self.assertTrue(w2.is_valid()) + self.assertTrue(w2.is_valid) w3 = Wire([e0, e1]) - self.assertTrue(w3.is_valid()) + self.assertTrue(w3.is_valid) self.assertAlmostEqual(w3.length, 2, 5) w4 = Wire(w0.wrapped) - self.assertTrue(w4.is_valid()) + self.assertTrue(w4.is_valid) w5 = Wire(obj=w0.wrapped) - self.assertTrue(w5.is_valid()) + self.assertTrue(w5.is_valid) w6 = Wire(obj=w0.wrapped, label="w6", color=Color("red")) - self.assertTrue(w6.is_valid()) + self.assertTrue(w6.is_valid) self.assertEqual(w6.label, "w6") np.testing.assert_allclose(tuple(w6.color), (1.0, 0.0, 0.0, 1.0), 1e-5) w7 = Wire(w6) - self.assertTrue(w7.is_valid()) + self.assertTrue(w7.is_valid) c0 = Polyline((0, 0), (1, 0), (1, 1)) w8 = Wire(c0) - self.assertTrue(w8.is_valid()) + self.assertTrue(w8.is_valid) with self.assertRaises(ValueError): Wire(bob="fred") diff --git a/tests/test_mesher.py b/tests/test_mesher.py index 65edaff..0be4ccb 100644 --- a/tests/test_mesher.py +++ b/tests/test_mesher.py @@ -208,7 +208,7 @@ class TestHollowImport(unittest.TestCase): export_stl(test_shape, "test.stl") importer = Mesher() stl = importer.read("test.stl") - self.assertTrue(stl[0].is_valid()) + self.assertTrue(stl[0].is_valid) class TestImportDegenerateTriangles(unittest.TestCase): @@ -221,7 +221,7 @@ class TestImportDegenerateTriangles(unittest.TestCase): stl = importer.read("cyl_w_rect_hole.stl")[0] self.assertEqual(type(stl), Solid) self.assertTrue(stl.is_manifold) - self.assertTrue(stl.is_valid()) + self.assertTrue(stl.is_valid) self.assertEqual(sum(f.area == 0 for f in stl.faces()), 0) From ffc97ef6f0f7e60f23909391300806d5190e20ea Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 27 May 2025 15:35:34 -0400 Subject: [PATCH 323/518] Deprecating Shape.relocate Issue #768 --- src/build123d/topology/shape_core.py | 6 ++++++ tests/test_direct_api/test_shape.py | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 52377b6..a7abb07 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -1623,6 +1623,12 @@ class Shape(NodeMixin, Generic[TOPODS]): Args: loc (Location): new location to set for self """ + warnings.warn( + "The 'relocate' method is deprecated and will be removed in a future version." + "Use move, moved, locate, or located instead", + DeprecationWarning, + stacklevel=2, + ) if self.wrapped is None: raise ValueError("Cannot relocate an empty shape") if loc.wrapped is None: diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index f159fbb..715680b 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -347,19 +347,19 @@ class TestShape(unittest.TestCase): obj = Solid() self.assertIs(obj, obj.clean()) - def test_relocate(self): - box = Solid.make_box(10, 10, 10).move(Location((20, -5, -5))) - cylinder = Solid.make_cylinder(2, 50).move(Location((0, 0, 0), (0, 90, 0))) + # def test_relocate(self): + # box = Solid.make_box(10, 10, 10).move(Location((20, -5, -5))) + # cylinder = Solid.make_cylinder(2, 50).move(Location((0, 0, 0), (0, 90, 0))) - box_with_hole = box.cut(cylinder) - box_with_hole.relocate(box.location) + # box_with_hole = box.cut(cylinder) + # box_with_hole.relocate(box.location) - self.assertEqual(box.location, box_with_hole.location) + # self.assertEqual(box.location, box_with_hole.location) - bbox1 = box.bounding_box() - bbox2 = box_with_hole.bounding_box() - self.assertAlmostEqual(bbox1.min, bbox2.min, 5) - self.assertAlmostEqual(bbox1.max, bbox2.max, 5) + # bbox1 = box.bounding_box() + # bbox2 = box_with_hole.bounding_box() + # self.assertAlmostEqual(bbox1.min, bbox2.min, 5) + # self.assertAlmostEqual(bbox1.max, bbox2.max, 5) def test_project_to_viewport(self): # Basic test @@ -560,10 +560,10 @@ class TestShape(unittest.TestCase): empty.moved(Location()) with self.assertRaises(ValueError): box.moved(empty_loc) - with self.assertRaises(ValueError): - empty.relocate(Location()) - with self.assertRaises(ValueError): - box.relocate(empty_loc) + # with self.assertRaises(ValueError): + # empty.relocate(Location()) + # with self.assertRaises(ValueError): + # box.relocate(empty_loc) with self.assertRaises(ValueError): empty.distance_to(Vector(1, 1, 1)) with self.assertRaises(ValueError): From c5d5f443a662548b83c41b8646b6ca5290f94c8a Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 28 May 2025 10:17:10 -0400 Subject: [PATCH 324/518] Fixing _wrap_edge start, add point to _wrap_face Issue #998 --- src/build123d/topology/two_d.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 9aad804..186ec3f 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -338,17 +338,26 @@ class Mixin2D(Shape): loop_count = 0 length_error = sys.float_info.max - while length_error > tolerance and loop_count < max_loops: - # Get starting point and normal - surface_origin = surface_loc.position - surface_normal = surface_loc.z_axis.direction + # Find the location on the surface to start + if planar_edge.position_at(0).length > tolerance: + # The start point isn't at the surface_loc so wrap a line to find it + to_start_edge = Edge.make_line((0, 0), planar_edge @ 0) + wrapped_to_start_edge = self._wrap_edge( + to_start_edge, surface_loc, snap_to_face=True + ) + start_pnt = wrapped_to_start_edge @ 1 + _, start_normal = _intersect_surface_normal( + start_pnt, (start_pnt - target_object_center) + ) + else: + # The start point is at the surface location + start_pnt = surface_loc.position + start_normal = surface_loc.z_axis.direction + while length_error > tolerance and loop_count < max_loops: # Seed the wrapped path wrapped_edge_points: list[VectorLike] = [] - planar_position = planar_edge.position_at(0) - current_point, current_normal = _find_point_on_surface( - surface_origin, surface_normal, planar_position - ) + current_point, current_normal = start_pnt, start_normal wrapped_edge_points.append(current_point) # Subdivide and propagate @@ -1861,7 +1870,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): for w in planar_face.inner_wires() ] wrapped_face = Face.make_surface( - wrapped_perimeter, interior_wires=wrapped_holes + wrapped_perimeter, + surface_points=[surface_loc.position], + interior_wires=wrapped_holes, ) # Potentially flip the wrapped face to match the surface From ed0ec6175a0c095490b1f66b6836ca000bcb6755 Mon Sep 17 00:00:00 2001 From: Vivek Gani Date: Wed, 28 May 2025 11:57:27 -0500 Subject: [PATCH 325/518] Ensure tolerance is passed to wrap_edge function... In doing some corner-case testing (wrapping a long ellipse around a cylinder), I noticed an exception regarding tolerance came up and was referencing the default tolerance of 0.001 rather than a user-set one. --- src/build123d/topology/two_d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 186ec3f..a7c5fb1 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -343,7 +343,7 @@ class Mixin2D(Shape): # The start point isn't at the surface_loc so wrap a line to find it to_start_edge = Edge.make_line((0, 0), planar_edge @ 0) wrapped_to_start_edge = self._wrap_edge( - to_start_edge, surface_loc, snap_to_face=True + to_start_edge, surface_loc, snap_to_face=True, tolerance=tolerance ) start_pnt = wrapped_to_start_edge @ 1 _, start_normal = _intersect_surface_normal( From 87048fabc4fc9a105149884823b05c38ad61cc60 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 28 May 2025 14:43:30 -0400 Subject: [PATCH 326/518] ArcArcTangentArc: correct arc in situation where RadiusArc places center on incorrect side to resolve #983 --- src/build123d/objects_curve.py | 14 +++++++++----- tests/test_build_line.py | 9 +++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 0eaa4b3..ac6bc06 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -32,7 +32,7 @@ import copy as copy_module from collections.abc import Iterable from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize -import sympy # type: ignore +import sympy # type: ignore from build123d.build_common import WorkplaneList, flatten_sequence, validate_inputs from build123d.build_enums import ( @@ -456,7 +456,7 @@ class Helix(BaseEdgeObject): defined by cone_angle. If cone_angle is not 0, radius is the initial helix radius at center. cone_angle > 0 - increases the final radius. cone_angle < 0 decreases the final radius. + increases the final radius. cone_angle < 0 decreases the final radius. Args: pitch (float): distance between loops @@ -1095,9 +1095,7 @@ class PointArcTangentLine(BaseEdgeObject): tangent_point = WorkplaneList.localize(point) if context is None: # Making the plane validates points and arc are coplanar - coplane = Edge.make_line(tangent_point, arc.arc_center).common_plane( - arc - ) + coplane = Edge.make_line(tangent_point, arc.arc_center).common_plane(arc) if coplane is None: raise ValueError("PointArcTangentLine only works on a single plane.") @@ -1478,4 +1476,10 @@ class ArcArcTangentArc(BaseEdgeObject): intersect.reverse() arc = RadiusArc(intersect[0], intersect[1], radius=radius) + + # Check and flip arc if not tangent + _, _, point = start_arc.distance_to_with_closest_points(arc) + if start_arc.tangent_at(point).cross(arc.tangent_at(point)).length > TOLERANCE: + arc = RadiusArc(intersect[0], intersect[1], radius=-radius) + super().__init__(arc, mode) diff --git a/tests/test_build_line.py b/tests/test_build_line.py index b473077..ea5d9b4 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -729,6 +729,15 @@ class BuildLineTests(unittest.TestCase): self.assertGreater(side_sign * coincident_dir, 0) self.assertGreater(center_dir, 0) + # Verify arc is tangent for a reversed start arc + c1 = CenterArc((0, 80), 40, 0, -180) + c2 = CenterArc((80, 0), 40, 90, 180) + arc = ArcArcTangentArc(c1, c2, 25, side=Side.RIGHT) + _, _, point = c1.distance_to_with_closest_points(arc) + self.assertAlmostEqual( + c1.tangent_at(point).cross(arc.tangent_at(point)).length, 0, 5 + ) + ## Error Handling start_arc = CenterArc(start_point, start_r, 0, 360) end_arc = CenterArc(end_point, end_r, 0, 360) From 2191d0dc6926d0e717dd82b181b15a94b3524039 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sun, 6 Apr 2025 23:42:08 -0400 Subject: [PATCH 327/518] SlotArc: remove duplicated rotation --- src/build123d/objects_sketch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 7e15e48..f5ad11f 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -387,7 +387,7 @@ class SlotArc(BaseSketchObject): self.slot_height = height arc = arc if isinstance(arc, Wire) else Wire([arc]) - face = Face(arc.offset_2d(height / 2)).rotate(Axis.Z, rotation) + face = Face(arc.offset_2d(height / 2)) super().__init__(face, rotation, None, mode) From 1e1c81a09364d00259a20f4962835dd535da06f2 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sun, 6 Apr 2025 23:44:45 -0400 Subject: [PATCH 328/518] SlotOverall: remove width != height else branch to make circle. width <= height ValueError makes this branch inaccessible. --- src/build123d/objects_sketch.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index f5ad11f..4ad3951 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -521,17 +521,14 @@ class SlotOverall(BaseSketchObject): self.width = width self.slot_height = height - if width != height: - face = Face( - Wire( - [ - Edge.make_line(Vector(-width / 2 + height / 2, 0, 0), Vector()), - Edge.make_line(Vector(), Vector(+width / 2 - height / 2, 0, 0)), - ] - ).offset_2d(height / 2) - ) - else: - face = cast(Face, Circle(width / 2, mode=mode).face()) + face = Face( + Wire( + [ + Edge.make_line(Vector(-width / 2 + height / 2, 0, 0), Vector()), + Edge.make_line(Vector(), Vector(+width / 2 - height / 2, 0, 0)), + ] + ).offset_2d(height / 2) + ) super().__init__(face, rotation, align, mode) From 7dfe461d0838f0d458c9ac6d3da39829ae762d54 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Sun, 6 Apr 2025 23:56:37 -0400 Subject: [PATCH 329/518] SlotCenterPoint: change half_line.length validation to resolve #948 --- src/build123d/objects_sketch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index 4ad3951..bfab9e3 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -426,10 +426,10 @@ class SlotCenterPoint(BaseSketchObject): half_line = point_v - center_v - if half_line.length * 2 <= height: + if half_line.length <= 0: raise ValueError( - f"Slots must have width > height. " - "Got: {height=} width={half_line.length * 2} (computed)" + "Distance between center and point must be greater than 0 " + f"Got: distance = {half_line.length} (computed)" ) face = Face( From 811dd569d3bedabe26685f432edc49c1ca8b52be Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 28 May 2025 21:57:26 -0400 Subject: [PATCH 330/518] Update SlotCenterPoint ValueError test --- tests/test_build_sketch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index b2eeb54..58afd7d 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -532,7 +532,7 @@ class TestBuildSketchObjects(unittest.TestCase): [ (SlotOverall, (5, 10)), (SlotCenterToCenter, (-1, 10)), - (SlotCenterPoint, ((0, 0, 0), (2, 0, 0), 10)), + (SlotCenterPoint, ((0, 0, 0), (0, 0, 0), 10)), ], ) def test_invalid_slots(slot, args): From 644200f565c675f56e21a0a5ca2e52fc2e3bb053 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 30 May 2025 09:12:48 -0400 Subject: [PATCH 331/518] Fixed misplaced label for vertical dimension lines Issue #915 --- src/build123d/drafting.py | 4 ++-- tests/test_drafting.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index 18821fa..ea93fd4 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -455,7 +455,7 @@ class DimensionLine(BaseSketchObject): else: self_intersection_area = self_intersection.area d_line += placed_label - bbox_size = d_line.bounding_box().size + bbox_size = d_line.bounding_box().diagonal # Minimize size while avoiding intersections if sketch is None: @@ -469,7 +469,7 @@ class DimensionLine(BaseSketchObject): else: common_area = line_intersection.area common_area += self_intersection_area - score = (d_line.area - 10 * common_area) / bbox_size.X + score = (d_line.area - 10 * common_area) / bbox_size d_lines[d_line] = score # Sort by score to find the best option diff --git a/tests/test_drafting.py b/tests/test_drafting.py index 3d6ab41..1bb97ab 100644 --- a/tests/test_drafting.py +++ b/tests/test_drafting.py @@ -260,6 +260,11 @@ class DimensionLineTestCase(unittest.TestCase): with self.assertRaises(ValueError): DimensionLine([(0, 0, 0), (5, 0, 0)], draft=metric, arrows=(False, False)) + def test_vertical(self): + d_line = DimensionLine([(0, 0), (0, 100)], Draft()) + bbox = d_line.bounding_box() + self.assertAlmostEqual(bbox.size.Y, 100, 5) # numbers within + class ExtensionLineTestCase(unittest.TestCase): def test_min_x(self): From 6b5a2b6f9c1494849376472bfae488959d16ce51 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 30 May 2025 09:25:20 -0400 Subject: [PATCH 332/518] Fix typing problem --- src/build123d/geometry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 81f4075..0404ca4 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1735,14 +1735,14 @@ class Location: self.location_index = 0 return self - def __next__(self): + def __next__(self) -> Vector: """return the next value""" transformation = self.wrapped.Transformation() trans = transformation.TranslationPart() rot = transformation.GetRotation() rv_trans: Vector = Vector(trans.X(), trans.Y(), trans.Z()) rv_rot: Vector = Vector( - degrees(a) for a in rot.GetEulerAngles(gp_EulerSequence.gp_Intrinsic_XYZ) + *[degrees(a) for a in rot.GetEulerAngles(gp_EulerSequence.gp_Intrinsic_XYZ)] ) # type: ignore[assignment] if self.location_index == 0: self.location_index += 1 From 3f1650d041b953d911392a26a484ff0f866e704a Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 30 May 2025 09:53:12 -0400 Subject: [PATCH 333/518] Fixed mypy-1.16.0 typing problems --- src/build123d/build_common.py | 9 ++++++--- src/build123d/build_line.py | 12 ++++++++++-- src/build123d/build_part.py | 12 ++++++++++-- src/build123d/build_sketch.py | 12 ++++++++++-- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 096a9c0..23424c7 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -50,7 +50,7 @@ import functools from abc import ABC, abstractmethod from itertools import product from math import sqrt, cos, pi -from typing import Any, cast, overload, Protocol, Type, TypeVar +from typing import Any, cast, overload, Protocol, Type, TypeVar, Generic from collections.abc import Callable, Iterable from typing_extensions import Self @@ -178,8 +178,11 @@ operations_apply_to = { B = TypeVar("B", bound="Builder") """Builder type hint""" +ShapeT = TypeVar("ShapeT", bound=Shape) +"""Builder's are generic shape creators""" -class Builder(ABC): + +class Builder(ABC, Generic[ShapeT]): """Builder Base class for the build123d Builders. @@ -231,7 +234,7 @@ class Builder(ABC): @property @abstractmethod - def _obj(self) -> Shape: + def _obj(self) -> Shape | None: """Object to pass to parent""" raise NotImplementedError # pragma: no cover diff --git a/src/build123d/build_line.py b/src/build123d/build_line.py index 79c8252..52e9e74 100644 --- a/src/build123d/build_line.py +++ b/src/build123d/build_line.py @@ -36,7 +36,7 @@ from build123d.geometry import Location, Plane from build123d.topology import Curve, Edge, Face -class BuildLine(Builder): +class BuildLine(Builder[Curve]): """BuildLine The BuildLine class is a subclass of Builder for building lines (objects @@ -89,7 +89,15 @@ class BuildLine(Builder): """Set the current line""" self._line = value - _obj = line # Alias _obj to line + @property + def _obj(self) -> Curve | None: + """Alias _obj to line""" + return self._line + + @_obj.setter + def _obj(self, value: Curve) -> None: + """Set the current line""" + self._line = value def __exit__(self, exception_type, exception_value, traceback): """Upon exiting restore context and send object to parent""" diff --git a/src/build123d/build_part.py b/src/build123d/build_part.py index 3120f44..d37bdae 100644 --- a/src/build123d/build_part.py +++ b/src/build123d/build_part.py @@ -37,7 +37,7 @@ from build123d.geometry import Location, Plane from build123d.topology import Edge, Face, Joint, Part, Solid, Wire -class BuildPart(Builder): +class BuildPart(Builder[Part]): """BuildPart The BuildPart class is another subclass of Builder for building parts @@ -80,7 +80,15 @@ class BuildPart(Builder): """Set the current part""" self._part = value - _obj = part # Alias _obj to part + @property + def _obj(self) -> Part | None: + """Alias _obj to part""" + return self._part + + @_obj.setter + def _obj(self, value: Part) -> None: + """Set the current part""" + self._part = value @property def pending_edges_as_wire(self) -> Wire: diff --git a/src/build123d/build_sketch.py b/src/build123d/build_sketch.py index 7509000..496ef4e 100644 --- a/src/build123d/build_sketch.py +++ b/src/build123d/build_sketch.py @@ -36,7 +36,7 @@ from build123d.geometry import Location, Plane from build123d.topology import Compound, Edge, Face, ShapeList, Sketch, Wire -class BuildSketch(Builder): +class BuildSketch(Builder[Sketch]): """BuildSketch The BuildSketch class is a subclass of Builder for building planar 2D @@ -83,7 +83,15 @@ class BuildSketch(Builder): """Set the builder's object""" self._sketch_local = value - _obj = sketch_local # Alias _obj to sketch_local + @property + def _obj(self) -> Sketch | None: + """Alias _obj to sketch""" + return self._sketch_local + + @_obj.setter + def _obj(self, value: Sketch) -> None: + """Set the current sketch""" + self._sketch_local = value @property def sketch(self): From b74f8023a3e92fbe790b2ef73b2068269002383e Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 30 May 2025 10:46:49 -0400 Subject: [PATCH 334/518] Fixed more mypy-1.16.0 typing problems --- src/build123d/build_common.py | 38 ++++++++++++++++------------- src/build123d/operations_generic.py | 30 ++++++++++++++--------- tests/test_build_common.py | 2 +- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index 23424c7..e5edde3 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -251,6 +251,8 @@ class Builder(ABC, Generic[ShapeT]): @property def new_edges(self) -> ShapeList[Edge]: """Edges that changed during last operation""" + if self._obj is None: + return ShapeList() before_list = [] if self.obj_before is None else [self.obj_before] return new_edges(*(before_list + self.to_combine), combined=self._obj) @@ -538,7 +540,8 @@ class Builder(ABC, Generic[ShapeT]): """ vertex_list: list[Vertex] = [] if select == Select.ALL: - for obj_edge in self._obj.edges(): + obj_edges = [] if self._obj is None else self._obj.edges() + for obj_edge in obj_edges: vertex_list.extend(obj_edge.vertices()) elif select == Select.LAST: vertex_list = self.lasts[Vertex] @@ -582,7 +585,7 @@ class Builder(ABC, Generic[ShapeT]): ShapeList[Edge]: Edges extracted """ if select == Select.ALL: - edge_list = self._obj.edges() + edge_list = ShapeList() if self._obj is None else self._obj.edges() elif select == Select.LAST: edge_list = self.lasts[Edge] elif select == Select.NEW: @@ -625,7 +628,7 @@ class Builder(ABC, Generic[ShapeT]): ShapeList[Wire]: Wires extracted """ if select == Select.ALL: - wire_list = self._obj.wires() + wire_list = ShapeList() if self._obj is None else self._obj.wires() elif select == Select.LAST: wire_list = Wire.combine(self.lasts[Edge]) elif select == Select.NEW: @@ -668,7 +671,7 @@ class Builder(ABC, Generic[ShapeT]): ShapeList[Face]: Faces extracted """ if select == Select.ALL: - face_list = self._obj.faces() + face_list = ShapeList() if self._obj is None else self._obj.faces() elif select == Select.LAST: face_list = self.lasts[Face] elif select == Select.NEW: @@ -711,7 +714,7 @@ class Builder(ABC, Generic[ShapeT]): ShapeList[Solid]: Solids extracted """ if select == Select.ALL: - solid_list = self._obj.solids() + solid_list = ShapeList() if self._obj is None else self._obj.solids() elif select == Select.LAST: solid_list = self.lasts[Solid] elif select == Select.NEW: @@ -748,17 +751,18 @@ class Builder(ABC, Generic[ShapeT]): ) -> ShapeList: """Extract Shapes""" obj_type = self._shape if obj_type is None else obj_type + if self._obj is None: + return ShapeList() + if obj_type == Vertex: - result = self._obj.vertices() - elif obj_type == Edge: - result = self._obj.edges() - elif obj_type == Face: - result = self._obj.faces() - elif obj_type == Solid: - result = self._obj.solids() - else: - result = None - return result + return self._obj.vertices() + if obj_type == Edge: + return self._obj.edges() + if obj_type == Face: + return self._obj.faces() + if obj_type == Solid: + return self._obj.solids() + return ShapeList() def validate_inputs( self, validating_class, objects: Shape | Iterable[Shape] | None = None @@ -1381,8 +1385,8 @@ def __gen_context_component_getter( @functools.wraps(func) def getter(select: Select = Select.ALL) -> T2: # Retrieve the current Builder context based on the method name - context = Builder._get_context(func.__name__) - if not context: + context: Builder | None = Builder._get_context(func.__name__) + if context is None: raise RuntimeError( f"{func.__name__}() requires a Builder context to be in scope" ) diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 9fd524b..69d75cc 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -119,11 +119,11 @@ def add( ( obj.unwrap(fully=False) if isinstance(obj, Compound) - else obj._obj if isinstance(obj, Builder) else obj + else obj._obj if isinstance(obj, Builder) and obj._obj is not None else obj ) for obj in object_list + if not (isinstance(obj, Builder) and obj._obj is None) ] - validate_inputs(context, "add", object_iter) if isinstance(context, BuildPart): @@ -364,11 +364,14 @@ def chamfer( return new_sketch if target._dim == 1: - target = ( - Wire(target.wrapped) - if isinstance(target, BaseLineObject) - else target.wires()[0] - ) + if isinstance(target, BaseLineObject): + if target.wrapped is None: + target = Wire([]) # empty wire + else: + target = Wire(target.wrapped) + else: + target = target.wires()[0] + if not all([isinstance(obj, Vertex) for obj in object_list]): raise ValueError("1D fillet operation takes only Vertices") # Remove any end vertices as these can't be filleted @@ -461,11 +464,14 @@ def fillet( return new_sketch if target._dim == 1: - target = ( - Wire(target.wrapped) - if isinstance(target, BaseLineObject) - else target.wires()[0] - ) + if isinstance(target, BaseLineObject): + if target.wrapped is None: + target = Wire([]) # empty wire + else: + target = Wire(target.wrapped) + else: + target = target.wires()[0] + if not all([isinstance(obj, Vertex) for obj in object_list]): raise ValueError("1D fillet operation takes only Vertices") # Remove any end vertices as these can't be filleted diff --git a/tests/test_build_common.py b/tests/test_build_common.py index 922b041..419e433 100644 --- a/tests/test_build_common.py +++ b/tests/test_build_common.py @@ -690,7 +690,7 @@ class TestShapeList(unittest.TestCase): def test_shapes(self): with BuildPart() as test: Box(1, 1, 1) - self.assertIsNone(test._shapes(Compound)) + self.assertEqual(test._shapes(Compound), []) def test_operators(self): with BuildPart() as test: From 6aaadd12a4cccc8b181144ce409d00623a82a312 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 31 May 2025 09:41:50 -0400 Subject: [PATCH 335/518] Adding example of making many holes --- docs/assets/examples/fast_grid_holes.png | Bin 0 -> 54056 bytes docs/examples_1.rst | 31 +++++++++++ examples/fast_grid_holes.py | 65 +++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 docs/assets/examples/fast_grid_holes.png create mode 100644 examples/fast_grid_holes.py diff --git a/docs/assets/examples/fast_grid_holes.png b/docs/assets/examples/fast_grid_holes.png new file mode 100644 index 0000000000000000000000000000000000000000..f402e154b9079e162fec5072bd00d4a4d9e6d70d GIT binary patch literal 54056 zcmeAS@N?(olHy`uVBq!ia0y~yU_Q>kz+}t8#=yWJUdT0(fq{Xg*vT`5gM)*kh9jke zfq_A?#5JNMI6tkVJh3R1Aw4fYH&wSdxhOR?uQ(&W@U63N@qSVBa%=|os zkj&gvhTy~!1!F@6-^5AUJi2vO5A;qc)nGeD|a1e{Jh zOf2$&s( zFR+?>%}&ILLop?=?(6pbf8XY3%d>z2^4jwftA|%thyQr=PWRs3`wyP~KK|p?>h%TX z<=ek46m;THybOsI85z$m#s}TIxBs|%SCZkwCkRewC#Du#&1Fas)%iC~k&|uoK5lF^KWu9V$oX-}}>~ZvK6?PmgKLUl$I=l-H0Hy{=>J z8PV?$Z$!6(y-~zE=Y0B{^Ur;~SF8=l^5sxW>4vB^J9q7QSM^2DPvP;kNA-*pTPB1; z!Z>G2_Vj@0hc+M~-2>npbW_6Jvn$x5--kmn#TViX>7?~=kBdPZ%UkeeiG}N=C+_|8 zH+6%Q3PO}>7lm+c6+Ndc?8Fht1@SJ|96$9r=hOGp{+{Mp$gI0{-`>4PugBN#{iZ1B z#Boy*VqWXQmRSu5Fasv!!+G%g*gY1Bewy0Zz3#8e7#`1R%-+kplAL!3#mJZ{Lot`TO;Hw!DyH%LG=42mV-32@r1h ze4<65CAU=rg<(p7u|c_LR`}?b{g|cJH=^q$e?k4=>N^|G0a1ruHhe#fZ4r zX$1E9P2TG10rk~Yd=F}cbULr!y&G%DX+8gZ#m`Sq+w0|hC*8k$-{7Db*xx(-z&dtT zeVZr3EHAunUf&Ws`vbpKcAE6hnH}r5`|8%`llu$gW(qj1;|9BX-K@P{D}wjg+8%%V zR(IdOU$56apMO4mj^A?rpx5=kK3#48uNRxiUv2+f5TXm>+jWx`s~kP>o8|Rx^ZBi3 zHr9PUYyRVSy1nfL_vdLdy)V5rIr+?HGq2|)dE2^Eplq5W07=EnOaPP)SmN}rozAwJ>qTYj0H{n=ubqYi6ywqG;- z_gMb_jjyv_+7xSDSDXG~|I3b$c>+!zI{zPj-~a#b`|EZbP8^C$+Efzi|DW6+qf%b| z`0iicf3Nrd6Jz)=JO01u{-0mtKYri;H~bIR{zLUYU&=lIENO0TzGLUk%srQ!{gw;= zyRQHL(}EQr-u-*ly!zAT^z*y=!grmu|NBLF-;V0tulM_kd@}$0<(c@OKl%UV>wcX7 zFV3(5RB~v4mcMSt0J6Mgp7y`v>ECyI?b)JTa!yccN3BBWzq@xO_wTlT{M-Eehfhy$ zFVp#6WB0h`-wclZ_Wk_l@Ap6de!kbJ)5^=-zDwQw`;YeY{CnQFi8kqhGek}sC`0TnUFdgRb*jul#@P?2&d98-`pnHBGWmg!;O8^X zKTGPz@4K`2POavSU!4L@*T5Ca1m6wculm@}d;j5A&1=7ks@R2FbE5zKeg6CSRh8Sf zH%>`TzHT9>cCtla6Qnt^rc33h(*L{3Nj!VrOZ8g_XRrLZ+?R+jwcs6TDG5R}88fy<;5NpEV`S+uLHXK1rNzI9z;|Kk!p zPrs+Pmfn0SGbKX5*>95a6^<4Gr+c5}>;C_~|G(~SvqFo&rhLEU!g2d*I=AQFm(wz2 zYqiG?f4p2i|3m$s<^R7Q{{Q{mzh{SSUTsc4 ze`kGVaq;JemHGGg9sU3BcKvRTJ@NDN?Nv^IN)Y>hzh1MiUs(UW{`dC%kM{q2o&WLv zd;5d=b$`SEJiA_BDleS*8I+>y|KF}Zy8eUqpZV+WX&dI{*l{pr^7^74wW zudcQ>Z{0Kf&YPllH=e%#`}uG3pFhtwKivOw_iyR4h1!4Kz3aJuckai(v(qbne$stD zky9~6;M6Kk#TK8$exa=O$|ecLtzt(+tx8*_UH4QyznJd^C_(C7GdyWnmAZRnh_pj7 z`zAf3C+FVJTemP0T(TSkm(40uY}Jk)+P?g``2YBot5@xQ)^Jud%G!zf$AwZo!G{So zcJn`edV0E>rOf2xHP0fwjrx{3(;wJu=H0nY4qDV$K+I{`>%AiN{+hDZJXN`AdRg99 zYj&?%e}4PT=lvx-#j(ki>ldf_FFj&CUE=<|dv-r!i|TaG-FhOlu1={%z#g1acnYoN z+MQ_lK0}0Cd2Yyh?Go=@bG-$kWu0e6U;D3jT==f3SW)NpINMZB1CF(RHalI!{gnRA zYZ2H~4o;6R)6NTJ^{SKv&b{)bW~<7vU8`3KAGu~@-0Du=PSPlDwaN7=D+Eu^}&F1U1{jr&u6TD z=6Y`T4tje}W#_jzci}BT6C1B|>eL80osfH|rS8O`mFurGrLOL@ zIrUZiC@9HXp1vMj9B_fN=%ptmR*VM}Rjz1)(&@{y`W3&w>BjA;Fnq$r8{;)&srBpH zv%7a&gX(ntCCBXNy^kq+E8@AS`1j2EKQG1iRDI=&ul*WYSSI;H>F%u9bApPmbuAMn+kt~p9+D8c=V{j!74M&YBx1>4UH6Oy@3`iAXJz+Y zIN(-!brxO#wCOu)S zo~Qlq+m}5*?q6EB$}cCHbKZ49sSa;9uenz)mip+&?OCyI-X{^shE16f>ylS?^JF$M z?ufBxHuB_C(1nWW1dh>nWt$ci|D2>_u16tk}naJIg$S;%BG& zozLG@rRkefI%&=%G07PM`piqOwM#k>I{cnZ#zLVnK zc_jMu!L_bzr)@SbJ+VObw$HTZ!P1HfEfZ|P`uNVwQ@tYP`NEBF(1i-zxWuLL=5pQ2sjxy$yj=&#TIbtm@4 zU3s-~PWASHXzQi@8^cl*K7vY$P3fRKa>CIfDoDp=x0Cz2{Ed>ZQyDX;MR(KEeNw>dmh?95FZchx zn!h>ru|{~tYn|eCt8cyL$}Mf_dnNHK%->bz-Y=_u4I=~3ZH_BV6;u2{sei)UBCEM} zCCuNah%9&W-P*GJy6CPep}l@DT5ee_dw%}D`Uze43`@V&+9hwRR)|Wv$@ZkLo2T`* zM(?cAbD8bcPv5yOTjHnCG9epWv%ZiKkK58t_^`C!xPy+>ZHoT$XSq5i5X3#jQG0}jR%caNYg?w%`D7CU91 zUw2&eSNHCI&k5=E>)y$I_wq_F3-T_??ba@dN@2M5`OHqG!^_S0GdOHKAyCNI`r>Nv zJlX3{lqc2)J8?t`f!b-CnEMRE|9}ejFF#i9-hD%P^4ikS#W4$)u8x{z+V^6~wlM## zG7DKF_o_^plyVwWo~@jG|90V=omF1Depmm^IotI41k8UihRZK=GL&g9yyl`}X?4*1 z{M74fG`~yj-09t|Y|@aq?!v^mA>EtHyiN*6&5NJBJ9^i%Uw^JyJz4yFZL#0eBW$2_ zpWOuN6vk+RngxPWpLjII++MHUu_nTMJ7dXCr)b%Qm!G@uaB^QaZ_@Rt#R7pT8%iEM z{r>8B*hIz|)~9`H3_R6ZVwk~+?bL;0P%pQ9zJ$AHa^o*hbj^=fIi#xd`OL}^3)Q!) z`pN=r-z4^4IQp#S{!zP#9uiPti;+V+@N<%w^`V7M7 zIIFK0EM7cuZb+rCqWbQsS3N)d&WgP{D>FiKribjp#{Sr=FV=0m5M`TM*fQ<$){;lr zyQhC$JY)6OHSa&|2{+;c)t%8TAP?rqPU>VRz1G@>ARPf7gjIVVap84NLXYeeok4~=^A**Bd24p+R+1t z{Z>sVZV{VVxVn4RE~o5B!wqw^OLP}XzifKRa$fuTxx|-8wqNr*S$z5Rr`wl53q(`aHMsf<{-o z!A=r;R$^7_!2{~tZJc{WTtDu?`?{~^BQw_=6^z>Nmpw01Nb>ZXPdec*E>*`Se+{Xs zi;fM6Re4d^GH+*uGAY#b}x7-lkK~!mUs2?hSPpECq-{P z;^4h;t$b>k>vNgy*CT9IUD@VxOn+cgEWazkWu>X23KOU>GMcD-Ms)hFRm!nfro^=8 zt@K-U;nwEauNO`8*?;L~>feY%vlROFTsQ6J*>vsnu6^GBg zck0qk+kCzV8W~an52F}0f_p%d1FFx=Vz`|bn>+35t4n_eE&dM#(i(r&Hm6UyICv0E0%{v>ks@+Vurm%X3C3o4yBK%Vw6sOHVd zUU%Wr*UO%5Tf1i^`Bp6AnVrQMoBwF8T1BSOD_x@}af_$$Y>`>mxJUa-#ze*y>*swc z3$itS=#*=ACwN7sZ1~C(2E|`RHXc-&DPY6|DqlFA&Wqab+<8AViN|J6C2P*+DPiFm z{fWU>@?sPEOu~|1F3GyIPOBkJeCwC0Yf8>nAV z7JjjsX!QTe$~iwewB`vq^|6A?mVBa7d~~m8-&W>~(w1-UuKD(>zFjqK(wvTU!D}b4 z>gHK{z}CEb*6XHilM-s{7RN5kes6k8^wzHXyFybKUKN!(ic2s=PfXmBd~#i(4yYQc z02exQGb*3PO-@o=G&#yBXO*hutScK%zT$donse*bE6oR&zGzQ(Si1SN!_L*WjL)y> z=KiGdy!_%KttA4SGG*VCuCq9vvopi0 z`i@bKRAK8jDKpoS*;((u-ile+dPRZP;p3lkC9QIM)h_$hyerO$wPwAt{@^9k5aR{j z|JSLo)yBG?xgqTIjUD9k!U7h~(k_*l=+{e@d2V|8KJfLbsI$RR>OyPj94>{>PLYpiK_hX2IGB^!*gzfRfLcIo@QN!ia&h-P`%1ZtnH6!*yoGjFcdE{gWPu0Nf}RpRj(uOgL$o6CYsmo92ND!S__$6EQu_LHwWRJL66lr3z% z=2?^n>euY%-@p25Xs&41rR)`^(sq{();b1d+FyFE20Ppn-4&X0 z;kkKwMcCxk)uB8NbDBT){Jl1YL^jWSZ4x4!E|%Di2&&8oq6 z^Az3i3{StPHs7TxnafPJsh^ZI%sHiMb5AepUB#EjmsT$?Fsy+Z z=dPV#*$EmhdLs`u5i|;&a9!xtlox+@Eq#}?McX96uczsx>y+4E`!XW80-$=XI&mfU`MU(xBA{o$21d)qX&<~gr4 zRs0QV4LmV;Q@d_Qiwf7`#ydPaGfs;}oqzOA%IxYcTUGar%C(Z0ZiJ~{oqQtN>Z7Vx z>{XBO7qfUO%G5)HU$2UaS@<-6zOlz<5y^XZ@AI5DK3|Z^{>qgtsLj(z@i(Y7mGb?? z&PO3uyWER5Pgz`aAR{y9-B$1F3EoRU9h9xtH)wjL*(jg%octt4JhraibzAPsMc>3E zr$yO5t^FGp{vv3i;`e=fj}<$u&9=$jH}6J=QIT>>4l^iF?rwU%GwHNWYM$8T$ttf~ z+`G6hUW)i>yY;|*EAPy?>DwgCPM%+S{Y=L8j5d?7wJK`& zik-LH*tD2>87th|&4msaZZ5o zg3l`yJ?x8O?W+DviA`}b(Kr|$0GcYUeV%31T2oc+!|FkI06>c`nx>#tuA(EG@iqs7+f`N;^B zbj(0y^G%!OmtQ&`DqgZAqJ!gHx|*fXoaHB19N(Zhw{y!br|W5&mtVU~x_8RO|`hrR2sFAejLj9r-hd*;^5#hqaj6HDe*YOh}I#a3clRBq%pMN(c- zg%6b7d^eYKmabg=YNl(h;>qhglNBrf&WaJquy$hJrnidacl@1NAC>CZh1EiHz+oDlcA1yblRnDvPTY193%G`4C6tp#AVdu+MTL^@8( z=uBDacZ)my66YDGKmY#q=QO_?Y!>}KC(1yvb5muP^iK88`Q_6tNzK_Vv#@x*uxf9w zPf=C#=csVgL!wdY*2dxfS9f(g+!l=LyJ&S@$CYh;a^V#1FVE-yF<5#+;r;#H_jf({ zaHpu1EkM`k3D3qamOTcyx=XbD*Ds7I46?q%T>A3cy?2i{cYNYhX!!!pm73pd!efeB zr#*;Lw|+EBJ0f=B+P(|FD%_YiN)}z5roE+n+NE2a{=4fKd|cTQYSe73PJTR<5*>T> z-rZeNwRP8HY_ArzOiO-S2r8M~OL)?EY~n8Btqk{n`FZtvN41k?Am3Gi>ZP0}aD#Yi z!0UHP0q=fgt^p;#THpHZepO0kuemn+w6)BNF;P{&%N8)#Rd?^a^z(U7Uah=TJ@+YB zZ1m&ML$A2*7PZtB70dsMYt2|*v|hVpRT4u%V2Xt7Opk7!Y>8!&ZmKNjjDIh@GHXI9 zC^#eM?maKcoIE$gyWri-rE6H9JKWr`O6BgnRHG}emUtQDc`niUe8!=cKj)XlE!V4O zCLGJMS-rd{Hq?8eTBvb_%)-mh`&F2Y!~7X@K@E$8Mn)Hd3>h@UB;ABp-KzP!__+Ua zamf?aGgO2(>419us~0}+y3CO8@1km{8lK^uFmLwKEjygH^UN;dJns|!V&c0+M@4sC z{pu}Q+PY5COm}0|spymp)ssd4yyic>^Ru_4_1>vhE2F}%2CdK(mDJh%Q1Dps+V56H zzOS-7(qhY$p8ere%mwuU#L~|fAGMq|p_^-3q*r#qyPM3j|7{Ok`SFa3`);T6T1HDe zi_R&mEv;J|voO6R$adWYF=ngv+9hWj^#1PFdwS|!<=>cv$0ln$JD1<`agN=-$aQZ% z{i^?WS^kFQJJ2-f8Bjkm#ZYCz-Q6u#scF|&nSVIX`dsetvY11{Pq}peui094%E~*l zv~^qA-y+wxi+O=tOw69n&fiz~e*3z&tMYb2+GHt7$7*V`)naT|pOk+Uk^J&&UDQOy zZRMXw;XLa zciZ)>Z2!^|0-+l;EvH6z^EBk9912QV@%PS)=LX;7PD)IP5*7k=15Sv1ny)4u0N!PPjpRZjPe|kfviol&yuT};fN-k}k*0-okXPSF|;^h_EC0f0` zGuG?xblPsUQtGbkR*CbRy3D&~uDcNE_f+h$<=<+Z@0;&U?7Z~1C-$+Wfu~xE45$z* z_@=cm&$Fj=!Q4|h*#|8dzUwS4*U##G;kQcFVtS-kx3b9t{&U%zr)004_vz1E9nYf9 zpm5XWX)pG+Wf?t)y!8FcXZ87WgTk*q=6V}zJ=M|9Nu%v!bYGOdk=|f->$~?SnbtkF23fiI%HKRoJA6ID)-))E;mx`WOV?#h(cWUF z5mWp%q{{wsf6<(46FJ|nV42yT-qIlO3A7w!LgF{Ah1b5Y{gdldPMEz^hWA`)xT*LI zcXdnE$qS#Kw=Y|7)8=a${$f({#(#g6-uAsY;_jUsoaOh_^3pmjhGKEk@RSToC+5OQ z=OkAzU$gFlvTNHU%b-A2 zw)*apy=q4td?p1Kw|=v7V%~Ol*UR_kOG6t|V;8y$<@*=p&0H!|*y=ZVZut7RwU<0u zle&49K632(6Z31P{M3?jck+2}Sgo8jhjH#zQLCf3LVJr^=OsRx9_ReB_W$wEb1Orf zZhS639_G;I>U$xa^P)zbo&>r8#ZvDJ3>HN92u&PD91o7GYIY^G=54yWqx zuembQw_NS?zaPGK^{n5!`{K+mdiGrvy|pN5!t?7shqI2)kTQGP#pAtm)9L%Sk{r@Y zTepdUnzJI;SA4DG+rFhrOa1PZetA^Dy|d&blPCGoYx2?NJxc zMZc%lCU(wY{_PW<%-oZ(%E}|SE|GF!q$I} z-aR(G6r3XQQ|8>OCDURSDtGf(nmT8OEDAYt^A)HmV57c2Ii*()+}DUX^kjxW&{NQi zQliQgRm&$C0*1-|{9hEd=DjUHt6Cv6XL-b~RTGQ$NqY7j6}=Ue!0_ht8C~}bh4>T( zflXDf&e#8Po)NrL?+U{+d3M zRiB&x{Uh_xI$OkREoUXD^zoRu_nc^Sx@L6WzO4;b=H8ahQrugv8%AF9J82jlwvFNI zf*5sc%kUQyzbak4bYn``q{)-!#Ydi1zOqiSH~oCx677$$<(8?k_rz zCeQwTSLIk(_=_tWR$g(>{0h|5YJ5@XXD%t6#nQGnaI8ZP|THaNPyD zo!gE*=8DxeTJqeymbY7bQ|k-AtbXkh-(9h<7hPMoFerTMm-5)8uT!qpoO{KU3u@fV zcC-2z9c4SUxP>i2>q>^Hb9R}f>Z->U*ek*;8shX~X1d?*RScWfUGUzq$-e5(m&562KUqf|wX-ar7RXuoM)S%Q z4b6nK-gy(urbJCvKJ;Y9gyzlHcP9C|OiC_n{U%`+`Fy7C<|)R$ZHt~P5?puT*Pm}? zfyKvF|DTy~?9}^=x7)X!*tT}v1zRn)#4XV#n2x)#!5kl# zU7NUz_*$bT9xSr|EcQE#t;9Io|EW-ZlDheG{}XYEMLs7SZ*Fd}Qq?*+u{f zFO~I)!DlP{GHRb)`Y-m7%QpL~$cK-`5y7obHtcd*e$+Y;xcj5sk z`LRS_x^XZ2(j%_7hS{4+0>8e}v}}tBFAbZhcx&YyYom*=R`vDyEQ!6kHRh&n_VOnd zwytca-xRGoVG#A^^xkkIw#g~rxw;~SK81yT7f-&PHYcQUn~&Isvq613oSyGml|6%} zS46U*hMjxG`Jh*yxsU8}Iv-~n`dTl`i?jcDh2ICM3$CRM>7_wmpBubgGOeuodPZsB z{y(2ir%iM`m-%k5+uhTPp1rnRcVXJ^$dv)fruR;-y$D)}a!z^jUQpaJ7aUm+ZDU-~k7VRSC&A^K*5L7|g;m`Wf%~gum#xIC++KN#++7SL-{`UA5D;20O$yIv?w} zvCHAaw1gs`6MZ*#x9qys+ELVc&F`MK)yh|XouSWG_#ST9mKgkN#w0Zt!Gk}~_^ndu zzIQcvscF#KY>y9Tg7PZAiWJOL>6bFAd_L2=@4|u9L!eQr?GjhAZPfQ0*Z%qWuh8`5 zw|(DZ6!TVI6!tyaaL(B1;%>M8BhD*LZ*u$eao$v1etG4N(_dzNoMp;r)~VdE?2O<6 zlkgW&>ZXT8cWvFbWZH)>C4t4qRi1CZra1qmC+nx`1l@HPb{7BmJ3D=y?S@aqzkUj? zyWqWU-YZ=rhOc^AyZEIyl!h)&IcEIq_2q1h+W$t~*?Z@I-QhHS*DCMz^ClJYyf3|{ z^=+!g-SgkR#O?_7iWcYCsWwAKc$4urt%Z7)E2qh1t&P26BKV~wR5^Cx;>j{|RhGZs zyZl4~=Q+d#oz11#FD%cOuA85BMbt{yNav;}tDRReC_R-3Fq-sWh}>#(BnlO3V}dCq0cz+d2Pf&wsbcGcQ&5O4xoBlZ?v#^6i)H zPE)15T99R;F_zWywb_nMo^$P%^n*n9)yFrie0m~!_R=|-Mj_FlIlyb{uX3HsjxGE9 z<5$h?Hw~5df9p(ETyPgW&>9#1VqWAaj^sHr=Z4hsR(^l|Y=gvkPF44e2cPbox^H?Y zW4%fI{m-}duDh`GcVuqLqEg+qpHvNwqU({afBI5#D(Y6i_hg+^!u#i zR6E`hqY0gW_3QL1@>+L6SN-aw!^Q9REN}B&8|n3z|&uFURC*7qOg|eOs*Lxl#-&}oEG)b&0gNJx1QbIVWlZ}IdDbVjtCV69x(IH zoM>^%XT7S%`I9orO&yYI&WD87U9hrX|Frq^*3Z&A<5JuvEpGlCHSwU8_sf?@u3z(G z{2b=*YBjZg7pMRUTz8?UF8$s1ZENOb-8~-_du5V#322=9hI#fEm0c$oV&a^i2&tU} zuQYzr1)2QipD2+nS#V_5{1xvOT^HSD>V31Q^_^kPtgD`DRV}Y=4KCWFAHVOYKPPNysU{>vm7FPQz3OExfN#ZIUC|IZ{FyoC(u@8tPZ0$^(O6uiD16 zdJFT5sg|cK<_96seNjC{(ipo{y-u32g#p4{8YDJbIDUQ zi?hG9_Ii1~-Rq(jzy8b+KAXjpR~^@1GdILHFFtQ&K(KL67I>Ay;>j|vPqcikyJl?^ zxNH8|DBDo4J;m!TOf#+8I z!~G-EG<9F^eq#Lh=-uD*Pg`!7-tj{0?3*R0vY&S`>mFV<=kVU6qE@k=)y`{Mf*J|W zL?qqZ{iBqHSMoc*uDfPz6d1KQ{MYVtMXBm#8e7$}K~-1phU-frF2t9G&0Kuc_v)_f zpxy4T|LY$Tt!kUBbzyszmhJv)dRgnDIku#09-V1@$g<3B(&F_CCuwiFx`s1@{khPI ztsy)+_a7Cy6!HH4it9NmQXH;pU5V)TKbN1o|DDk4<(JOSt`pH|m74kTtCiF8<0g}Q zatgmrDeaB>Wy$g<`^%!9=jWaq|NFDtenYkl!{n4rpykvz8LFoQWV`L^mIE!7Sz5k5 zugWGf+*JI-S-+w$XVz>#5%4Nu>#n-3Nk=jSjEld9)D-7+nI`dT?*{H z^;X%p3%asptM9w=b@kqJLhIhx)-MiIw_AEORMv2w@Ry&l#a~0tOYOZ>>m%;8*R_o! zGXLG)Np%+eKGQ%m2HKmxFNv73bF$Ee-Jk)Spw7kr?rzm{(R*^c>E&r3Hp=(>E zYV*IWnLFwE{@wdI3tQ(IRs|KeZku&JGpkkVwUq6Hzm<1?m;ag-kmZ{Os{B|j=lUJp zs#cx4ZE{xrqqkEnxR$QVYB?fUv14C$nEKUCRjX8szpy;Nw>9|J3^!}m&0+p0v!73q zpLQVT-1@EEx1v)z3a*Kzt(oWb^p)jdwd{$EFQjK`NM6w0S+#2Wi3?iap6(Gd+4x%Dd)YmPVs=bmg6&ns6R^JT>@f{G=yGF(FlJr&1Bp4mtpK~nE_7< zTg28JtUN6!bz-;E`Dw?hc6ZO4S+H>0hcBR}b*Pq+&dw^(tlrB-uVxl3SbxGm$m5(3 zsG^#ub4Qya6Txisd%BO_s%wxGS2W9laxzd{gxI_pfViRa^;g3uyH;J_P{oz8zQH@QG}PT)?b7d?I^o}D1@BDn zop-!~FCxA7o=$k#!f6%LJ-RJ)^SMFIB2Q4k#`z4?vwo*?W!l^+2bLxVXK&A2nXGtT zx3qH6?y!lVF7>W!U%gkVddeMMHpltho1gZvDH|-DPH*hZmuCf? z+~uZke*TWMa0Jh*6V)1!P*Is+dtP+;!6ipGoK!0GiCt*Bd5Yk{pKJVHNv*rkls?Vq zlxUS3s5`y${M7Vmo764VpAA~Kwdz#XHI^;ASIkp7{Q7h5SE(K?qct0=R+ZRq7Ry>v z@S?P3+H?0FpEFXn7q16IMVx;7EpMWCR&aUsLNn<)UDn`!{pP22$Mm-Fs-0XSu6DeI zWx?~V?>mkqsu+Cml6m_5D$ne!#;Yq5FHiDYH7(MsUmG$1-_#MgdU-?t^$F#%-e+r8 zK0CpEz}8#R^s||>UKZy$+s#vKKc6vW-W7T2#JOkYv)Zm z@3%4|OY_PJ(<_fTWT*1z#v1g7q)zl+wnnNFHT-hZcxbDKrGlifTo8lI>HwP=%CthBoH;LzOJdRva9`<|Lv9LX`QDluIva+iOBjorF7aQtMhB@vvrwwO>!x_B3k9WdikQ5 zg==H4&RlolBJ1UgO3vQAlf)#WTrX#9%=orqQy<^bYezt9Ugo^1TxW4S$ZwV0%;eR- z6&TB3zMotsU)1KSeDLSAIU(M$p|A7q#vN8$zc{}$vM8{Yx6*p0rOw;|yQ9M=tJ&@&|c+-y^y1f_LA%B}-g`A6yc> z_3A_3-ubR4i_&}MZ3&4~@n7Q9`UbQHK*F-C#me=}Vz>PcX(wExh1|Wb`%nJ8d)uTZ zmvo-a@>>jCRdOt>ArFXW)ehP4+ri~P26Z7ct7u6R#u?RTrs zvs7|5wyJ^lSY3LM;aR9B*~M`#UDZ-3qN+TIDHWXKvZn>vGx6_lQC68d(bLcS5yy{| zzIzY$s20a$f1RQ}QGTMuGsudmOX(>uuLkejdrf)Wg}C!9ih^=2 zSG-Ezy2FV(ZnN6Y|4KZw(=1jpRffL^OIUY){dLh>!V|ayg^o)W1@>!iDV=uda_4$W zr{(LnPBFPwJ@>nm+0w zL&~uWznX?<87*EY04z zdnX6gh5J6UkeaicZ>zWU%4banz8HSD66;jH5T3$tO#82~Pg~2ptHCdSZY>F{x4HlD z;^XD9u55q*NUmP)X1#KkuzX<328r{YjqdlR+g$77IZ*U_?Q|`pCo&5e;};$)%Gn%q zv+-Nq>lLO|pJwgN{-R_x?TyrNq0)Sn>!2NEBGuCZrZatx5kI6=c%{wv-rgyJp|>JE z{Z5No9onGD+jHr_o-3^ue-2w-76{2zS6f-WYV*@uT$yV zx*%r$^)JuetUqp!xye|q9vZA|#9;Q=@_?PR+|ArshE( zTbnY^pKw{5A!TSZ(dy1~x5N_?Q=;TS1>A$b)92SzzSq@c(_{YZ5uUMN?=sha<$3B) zJqqF`GwQ!w^2#tLi}m@v$Wt2OFC_g|9XOo5!gO+!llO+`*ehF31iW7LEM{T4sHEE@ zne2kN*S|80=0BDLFO2XK4Jy|9E+)A~S$J!8z3)eZSt{p?QpK|#OK9#46k#~)XZ#^sQ;m zDpt3x42f&!PO;tG71ya8Fpsytq*d=^!}J$Rva&e)mv(E_|DNMGE7Z@*>b%Y2sj@4? zCDV2|eLolUYX9quqL|l9&Kc!wS|#!1r>(N^(sfx+s(tI@*G_(=IU}m8)*;$-$@|Q$ z*&Ez98fEV{eGqLcy7ClL&39uV?&lNxStlnKMQkyCaZh`_pr_yZlb*LgGws#9vlpct zGk&sY?K|i5GN~somTx&>aNBdM`G@zVt$L!8MenPRh+6H+o>Tqz)~l7*be0|$y=ASn zaK611wDmGgsd-NP>tE|8DetpcUuHl1CD&e;i3eYC@P0XK9DV(TZm7Z6RhzPo+F905 z+xzg-`|AGWZ4PgLPX+BJd{O`_1;b`8HnrF;VK$Yi02~Z*W-SXeZnshzTBEu5it!bK#e_pM;c`4%kbL&$ZJj=J+w9dL!c+!4z%uU_Z z%XPjRzdpfo;riFvFS%?tCq%tkl2zo|e9hD(DrH8Xf$ZP9+?AW6+WIwhnLUM=pHKYG zJ2|;X!f&}S!<#s#xtm*YO3=bkhx}4Sor9I?o4%L{-n#n zDH)}q?mf@H6rQxtUOR7-g%k7i?;C?Qo?n$Tp?Y50mK)ozUJYKl=-|YpIa?Q8soHN~ zsn-60qxh)mqPz#jb3z*18z-8cT$wo0f+^Sig~`Lntbh5_w6~;B+hlH`Um7}n&VTQ2 z9h2eP_lLuOk{$raHknJil&_n&*^W-g9tH;!58 zF8qGlk-)n4QmBKk7o_&<8ExU2ed%}P*)=PkOU-(Eitk65|5KTTOPODkwr=b5T5?`~ zY73}gwA*cc=$px(_4do}(3$m&YgypxdJQD8EC3sPgD}T2qAENV(@EF_jRK5R1L|8uBAcIu1D@XU;8a;ZPNVE zqYC!3>-hUrPHyI2w)IGK@UHolJ&y^*gIprQS%Hn)N*8#(9G3Ta!pjz#oJ%TgWz(~+*qRjo>+`2MxBlu} zsx{j+d6xFK-gOs0i~YXzTe9I%Z7FB?w-=^WTa}zwu9jMRDr#3kmZnifNaPbCueIx? z)sCl_zo}do!Tv04=HjK@QkgeIo^tIi0WHLIirBqE>U`X(6%T6M)UO7me3)U%SiA1R zP9^3E^8@GWf~LmgIu{4LUezaYe(CX0Eh86I%dPK}F33&2us&JyTjcJ#txAVGRQ7*~ zTO6}+uWQ?-AI__9uy5(++1iwOgTyDK zCKmauo3|IVL=n1@=jF>q&-zq(1+H=MFjP-u>?mx_I~&wj@@V_Es#VKROb9lvNYh-b z^>y=;MXH_3AO5{(Nw~2=b8lP2=>sEJa$H~m%_^USu{ zJVh`zKw=b8*k}G*wH}@E0qToL4=Ya9_KB=WoddSMX$Rzt6QG zlirfnbG7ceu?DQix_RP4!>azJuh{ft@3~!Sp3-V3uQN_gE}Hr#(rNCdC6lvGI))~5 zo>RT?|Ixc-ft^dVOSYJpeZRHyrs-)vuY+2JXJ(q7{G1ibF?Ubj8SAqzmTXh$lXK5F zpk64Fwdrk)llkqbu{^WaOv*TYqQ&(n0|R6i;V!5129iv-Jo}bi3H>T@{$xFS&SD{_ zmdsmHtCz1~y*wpsqyFE&*G#Jd*Il>>-afb*)CGtLiFDX^LO|4;;ir<)#)Fkl-X4B3 zBSzHStE+YCoDf^{7x#WHj%pBi$hCIzT+_KB(R~++dagZ)>Ee-d&rmogTJ`Of=KH$W zlMWYyntZ&ozgYH6C~+$bx}2?19)IOovBTcgw}j_h@8SWKpkk5@hT$(_CN5kaaQS!K z^eEfV*}UI(IYslzn+l#ha^~XXwW~IHv0mm_y!XrRsXsRMEuQ!kl(L$XJy!&;t5sJ` zm~Oc(E%2%L-e(JihN%7ge_oUXnv1Pq{t?rr7(nXnmXAK@j$bOA0jtKML z`Yv5AH0-?8UXI6>4Y7|iG`8N8^XWUe%yO=uJX7ml^`n`WgkN&)J+iAKsN7KXdh3Mb zH-)X+*f=JxUcShBrS4?m)30WWco*bFT7P}=tj;j=%?Z<+$v39VGTR!naPPs&sFVoh zlN+s^n9Ckp9x&TI=Uk9mkB`np&_0Ldi#5W+GfqqGz4NnoO3FEn8Bwtd*SfN;*DiTm zx2rB5@4f$U~)^R6JwRrX5&STIrM-_|tQ^7k+ zT-m%q?W>oOUVndHHhM6TMLkOI)!fBC^2N`~RV>b*4LVnpn!h%AlZDf1!{{qK4SP=n zOgiyROfqffCg#7cY_)Z&oWeTCikr4(RQa-Aj+uB6G(moJ-?T2q1uKvyj(LI&YWU3O=%7htu^FbMI?(E|$5k6JA#N*Z%)Y{&h;uzivF{+UqtkF>TW4 zM@PF?RV{bTx{*@a`c1_5>;2L;?UIy(SAtSji27E$s|C&Pz9h9*HQawHk9_bNW#O>> z-E*|Mj~uRiQkqcY6ZRZBelqLc0ekT|)u44_{!_HK{MkHh@~TqMioj^*Pcah{ujFJb zo2>Q0F7k`j%4N^5-*WY3t~~H8Kw6aL%!KZ3X@?l^>ny!m;rIVvRCwvytHJZGf0sJX z2^ypOI7gxW{?>5+t6j_F!e5l=PWtm+OmNb<41Gr5lcKv!swQ1}%oS@?6XQKqbY~UU z32~px?)_TbN1RuF{bXRNwtCa?osVRU%Y&HyMV`8r7rXOkRGMb-x(l0^ZnSM|41Khs zK3vy9BKGDaHJfb9l~L)My0Iba6N7)EiD(As0}aO2Y}%?FE*2=3r%^JddGjfxF9 zt)n_Y--zL{&~ebZ!NlO~X_tald=!!Ns-B#F{(mLUY@OJU?!@4=5{ADl@7#K&nLlyi zm&$GDg4|daZJs1k%j+s4x#sA;X^Fv^z4xwhEwfb?Uc2s9PUy8s8(pqQ*$VlGFix40 zSmYy?dcOFm>a>EOsW+8h`(6sN+-|Yr)PFX;$-5^)8rAW(p|h5L0S$LCf4%v1%8Cay zZIiVE%0b&qUcOs#T=Z7*jVs#Belz!0aqXC5!FBEChkFn9OaZNTV|weiO5i0|uB@x4 z{p`h!FV0*IUaHib-W#`G`^%;5FKK75Z;x5Hzy33i!`%;o$-3XRhVU#^VipKC=>1do zwa;fu*D{|?xdn2Spu$e+#or2d&#uOZ;|IYD!>$)kaj!j*#=rOX4+%EtdV>E-AmHGz3L-`4CMo2r@X*MF1= zn7>rUbe?dQYn!T@f6KMMXRM42H@WFAx@}ziWy$sgt{c3wx5U_nr)1nc|K+~vq7_1x zRY|3-+j_h>?o})@ldkJ!4OTm8rm?lJ@uVSV`g+fe*9E0EyuEgHip)araG@^QMkxnwKKCLL^k%jTei}6|Wu9~Yx9o)I>TC2zTw`b-~Q7#J1F36j^^b2V5gloBC zk!u^M0ke6^TBqLaCj@j0bM{_e8t(s;=S5Y_Lfh|~SIpcQ>FIY?^ww(*-SroDwLSU! z;`=o1Sx%hQ$1covz046h&1PMsfv%+8vp99HsjN?y-Zc)1{1lfiD(NA6PWk)c zCo@_Wgd4y8_-yIf47Zqtw$IhY6fZ7SuBs5`O{(9% z=HllV=a(<8Us|kwq%HN_e4Cb&hLTC^gmL3S6ICqM@4YU$?!rV@w(i8>(+zr6Uqe#V zuPPOOITQ4a<@wggQ>HODZCQg~pJ>^-`q!@-=`@@4%Jtr&K8=Qlm(9`MvK%xLWVktD z)#J`D#u=qMu5VeVX!+h@Z-$lk)T!O79r9jl-x^q|#e!B$nxC{)Kk6_iX3Oy>D!c+w zultJbvL6&ua5+_wcEVM6-37Usi?55`3Qp;`S9!i_nUr zLf$)_rt`cgie{_g4t*nazVY*k(it+s##QTncue~h82b5z-zrm!^_DBLK}lM2<>EOnxnw6kdGWvovViZx zyG3<>zg|~!e-SiM(QBQos`%GkPTSKotIJ<6J07BC#87yjbM4jOYri8`cXRFe|2x92 zSatHQi%Ivz!a>V8UOq2K>5XgAF4+>i({(EAjc%U3pmOwATDqwpA| zLuV4wCMh4>SsvRmq3+`Lrq7cSgQXOftQXul*(gZw)?=<%Zh@-Uh2D&Z-u%6`^=fd~ z%*C#cUT7LU;hF8$^jUZ9yi=A}m<&X-w#-^+x_ge$Rm~Zy;#aRv*gkpI;n$$Gfei20 z&tAKB9@DMZklv?tW=2K}&udT6H*zTrieA0E>iUbXt2RCP{=AE4@zH%ZSuf}B`*}>% zdx>i>L+mP@1?K}MA30F@q}{+$%@sTt73CEB%IQo&Yushet)||YZx_{lf42FZ{)UbR zHc?WutKUv~oYs3sCv|Oi)U3Tzo?kup{>;^2<+&l<+FOn~hF%t)vphDG;pU@@L2Ay* zZN4u}Ri2+S(o*bS9D8NT&DG1ZAk$r?t>4ZCxk;Yix@4o^x(oOGviQ6=>VL1ie17`# zXI(sjM^~PBAKtH}T^r*xb!*x|k&e*RNca8UBb7#A!(d6Vw3!Zls7j4R3_GHN{Zh<{Q?gyn5 zT<+GSopdcNh>Nm)s%f+ZG?^WlraAqNr==1&oiVj^JlGSK(lOx}*VcE7B$z9CXJ-ky zFZ??5^i1B~KA$u1mQ1^|JKJTaQ}nJ?7uQ{w=-GE%bl3J10n#%wM18Lpq<*iv|3%_F zzV!ifaV#T6&Z?AJqPG(B@ zUwpJmUG>5=R>pk~?#%kKB))7~XoBDhVrKEBv*ykw)3uU;1Dkb;|B=Sn9Y zRMG~GX2mW{@0~X#W?}Z~loz_+rgrgoi~2Cm=vpQgD%SbDD*f9aLy;vJ=}aYuZ32vxnp`I$dKXlw`lje{ZU=DmRYWsZIAB@ zl=00v`{c&~(Ee)GRljcTo-DLu3M=DRy(~|$n_L1)X**gncCNU-VWp_TmmN;mnOaQe zglx^u>(?%MC$)*?$*28|r};j4fF=~qPwUR|iVaU7#y6c+f z)fewpEEUc#Y+;-5R_c6|?N#X?(eIL*wq{tp;+i|}zG=+OwS5;Ro+bZf@)lmy@t|hfWUUQn{7#kZ6a8>L$Zggfm(#A%)|z|UeD6Kj^Mr#pM(vIF zng3tUX?;7hVQQLYw&%9*d!KU^dY1;7Ze6!(X@K(k`>T^CfRSI} z|2CX@;pwI4#(d##Y(dI5y{&0QH41&xM3^_4Ka5Hcc*u3v$ns?AU!8Rqu06iY=(N_^ z?zX3?`R<&;)^l^6-*V+nv^;hGCFpRI^DjWl=&QSV9QJnKvi6p|$~Z?++;{!LOFHX9 zpWS%O75i${x{XzCOo zz;c)K@~-NZzr1zDd8*U;8KMjH_J`X)+a>T){IE~vy%W=ys$1xn{x!MwHCFYK(qXB& zAqTdVdBq)n%w?N(E6lJSDBiQi&~Z2cNeuzE4DtoA>e=CwO1>{E?&9i`uE-0bZ6H#(0mo^3#9a>QhXhbygvf z#$3x(L&a7q&+ndiwIjOm5f7Mf0(k!x@=jGm&p>MR$PCQ-gy?KiF z+5cZ__UQ__pVvvv-?%=+B=+#s+LYe7l^2+<@X9~kxa`y`-EU`$QrT-(=_tgTY!%76 zRK0k6MwRX=9fkK?Z$neJp5X?qJHGSc`WhwYbqQWIJ!V1I+D?A#yYV@u@a%?_DLfY^ zftI6g^_q7|M%nI<@#HzGF$+rz_@3-PkoDX=sLfdUTV7kBoqOtqP=y=mLK^uTo& zHghf86fJ&2y<%D*r{W>esQI8pgs!`s+*fX@TDMSF#E0>>)ZS@Y-gU={?I+L3Gl4XS zrzk$ZWMFxZv1(n#da*BiivrhcZ&7vl09r+LrKmOTkmprn@0HA}gA!EYoJpTHo2`g zJ%1-C_2mBPT|C}Lgf6bq@t^1@ryLsjM(X$kF)O$3Z{CNW{OG#*I;POeE;N(dk$D?{8oJXq5$Bi;>Y~JmgU@kBwvN)!@x@L)OZ2tUhuv`NkA(9p#vX z*C%v8^Vq#=QVVC;XVddKPkq8)yijs}H;et0?0%VPN%M~iR;~Se?Oyh#|cM} zc4A>SPxj7D+uc;3SVVt5BNsYN=CH@Xo4@1M$4*r}zf#n9aTm{lnozL-y%|i~7Oga& zw?fqSyNv&NHQ%oFYm;>hEcZEq8<}BFb2n|7oTclqp)7Fg<)!XoDvmc^*c2}@30us( zc;4J840Sa$T0K?sLw>K;SR zztl@}o=dk{$+YikFlc3L@Itj(+w(f9S56#RqvEc9a_N(E!6_S9p08DEo^$_B&cAD1 zpkC3>?_m=Y+qAMfn^u0UOOu`XK}7P&^A=b+SdubP@vlsk`~D7I&9n^D^LOvw4OKhF zF!}N7yaGDPR7$dC4>u zIf*NZe-)Fwv`DidP2AMn=%MB;w>!t5SfuyNdy&0jd%`O4Eb6J`l^L^wQ*$>ayt=tI zTXUA%4yV^jhbOUKzIRc7wHEh=pQjB1w{4!Dx3TTy$EgdLU*7SpUk^ImP0jKp@6IiG zE_LDB9v|4AuZ=vl6*N!c3R-Bb3F_@l+y8!+A7stemNP-u(xwM1b@O0(toF8y4i_^6X!L&q%ps3LXMfcdF@%q-dBTf@bcq&5j|zJ1ZtFIPRa z>W^4dYzSwMj?r<|@}O^Q|MsrCU|B5Ot-a-IvBq<=@RSIxlZ-haSINAX{?L`>d320z zYV6|ab$pEfbyBB%ytAfhrQWxvRt>unxUM`uT-{Z>b$C0h0J zYVg{N>#vm`Jn=%@AZ|tG-s>8nViWd1i(XQAO)x2+zuFJ%Uf0>hZ{9X%&Rr_Qd9Ikz zN$l(SRJogs&aqr?;n0V`@+;4A*-_TbJdrE*Y|?9$T78SEf0EiT;|#XnH^L1Wo5axU3{=- z+6CR6lZ8%{E4sxjTnk#g{{^<(S1$ZT7`r!n>ZcjI=TBw2zUY+!Y%Rc*nU`)r*Zw}R znY%P5`OA?-Nf*`!bAvh!K_+vTp1O7E)yk-t2c@msM0~%NZr-ZIoDiIP^7n>2=WRZ^ ztj@5~p4Oo=;@tV1BIM`NAon-QlKB7HRHW zw+ggL%4&sMNnrH*(rMZy{fWWvb{qOmie4YMt*#E>22nJo%CB zMsbkNms76QDt(~Qe3q~mE)S;tJj}%ufLfnb2+2H?zCrU-0o*P zBAw6WpPp&+maDRx=hu6w#2X@etF)$0f66m^jVs%N{FFr|-aFeSzsi_+@HN+5>-`hg zT`-Ql*;rK`7_2obN~JHe;GN`DkNNgR=VxB^l+~TVWEVP34>T=bWV5-8NBRExu<(r6 ze{)h!w=6xe;fU1fiKbPip<($G6HVrUj@kt^ykERHDR)x!s9fa#t%sjfq=Ggl_uQLt zNxJA4E7Om3&9!Q>pe>~NKMbO!tgF>k1Na51cCXm^c$KK+w4$J`EF5Ct8MeZFU&JNd zcpJBEnJjeTd{9*E!o6%I#<2_Ch4Z_$x1@$ReGvPdwRs9?FVwrF^J^Y;XqQygWw%Pb zuU>z$Vfvl?*xmCZuL)#@iaju1&>fU|R?2pzsASdk7m=|GZC%@ziWqpWyU6@$v4*m; zux|a#i{EGcTleL6X}`?Y=rxH&dxVzCF0W4Me3jl86Mj`FB9dpe7o*b@?JqhzGjjiV z^vP~GA9O7(@T;HK0$cCMRayC(1}|pXuVUrcySo&$WpT~ZC0TQq`pDLLH%@d9oAd8` zVCQ2W^{YV>LHXu(=-pQdm7w*@Ge7d|%*a-Y*%kh2cNNdkE2U@Xo%J zG+(t+>+bnQA(2Hn%P(g}>0H#B!Sr@fW?qU?IdARvXPYNnTtD%=*So#%7}btWH?WNB zxcu_V!)Ns^OCn}yrc3%3>9BE!MG7RmUbKy8c1gpAw#iu~6Bnu#PWiv?e7=kL)~|8X zCv-2H!o<@5an3(Uf6y$x?dr){g{|MD%(gZaPs~33USHMb<<8hco?F8oW$>QU-8^OS z!OGPq1ZF;|`Fz&==*;5tQnub3{m(_O&d{=-{O|u_WnuleJqJLCh`8$A3N~Ps`xO(> z`}`7Uv8I;iFAs6i8Q}(7cR0EC)=j4Bm#OF75YTwQ1elFSDjpKf4Gn zIhAA**X?j~DX?2Tc~_hEmIpJJ_7t_woA@MR7yrD-Q(*~HceiCR9*SDM+~%36Sa?SE z#D`yhnuR>#I8z$L`eyZVuh`J_+9mIGQd<%)^QebDcxXC>?VqanO{ukacbTe3Tkb!w zbW-AK@G|SA8CF7|&C1zgK8&*ygR@f>Ej`8b>SzZ?=(RN$h2Otg8FTSUwvGCiH5a9K z_Mg?6amsYd6fJFCqbXg>s-qqr$t#pqJ1%_jvqbf;08ZV*%c2rYvu?Tv&@8^v?_hoM+lFJWG~eqiy)FuwFngtI6w&lq zXzB0BU;EsfKF?hDrXlxh$hz0h4RbDC4|p%NS0nsIw#JNYUA1eKoHM5ttp=S;n7u;9 zb*q?f^hcMM65g(tRk@e#+Q55c)h34DQhUE_-kBOImY_d_sj^q$D z%xj=iLh}AHdGB5)c<|>L6?f3M^U6typ4t}dHCk+ybw@zw{KafBHBxkCTYctY@SE(j zLFeLZLtp8+?REkkQ&@eid}^OB6R7vFwQJeDiJhP!r>4!%_vWoU!El3Tc2wU5@70^! z!u*$hY;m2+dc}Qzm7AKE>t)kx5mjA0pQ6@QFs%@m{KhajN#3WA*>bKQ!v=58(#(Gv z;tC9A;V-^?wP9?UH?`xQr=+6zRr4oz#5o>l8%4w}jNYWcAiiFB<7Ao%iHO~38!zp_ADoEM6T6@d#6A8TM z_HLfyJ%i_K%;dPomJ35ndZlJ+tlZR)8t%UpJQJ?}&Mr=V-nw{~jrq@BcxIZM-{r=? zL#JVzn_84sTa5azsE|m9%Hv<}O{gwe)sm7F(|)p0pnAUcHO4txldk^?nyml-($7;f zb$iMJFF(HBH91SuL87#ETS=($F8<9{D}PD7;^Ya^IasNyF#UQ(QE`3YT{pHV6N>`< z3-TsfM)f8YE#dUneK0$B#xqT$h_2e5j~u;T&NE+?HpBG4dW6-=Sz8V;+=yKmY?J*( zDQ4mH2-~TXU!8v6X^`U;3)(Vdx@4m*>t#XE;LzC(E7j+%5S3KoUIseO#b=eyf*SkH z$Aq_DR5{BN8uoUto2busspZQzMBm|`{MhkJOrc)FJ?6!rW!)Jse`Qw1Ec9k{I(f3N zOx<+T35DZ#U;P5*i+SJePN#5uc)Nt<)8;9VjiVh8YQoe*}X9_U+QP`v^e~g z(~{?9t5+{ylhqazxPHo)ue+R{ckyhVG$%~(qH^&T4;fq7%JXU8r4+@#uA6rXyz^e_ zyw1|F)ZSIg(?oo-le6R8U);%NC=H$V=l!)8;akq^4>6d#_7u~f#qsz2YNY1t?ybto zH_()8KUt^_KBaf!lNZvPN@H6BCjE?vSs1-}$}ho=n`^nxcoszoxgWUR_+gjR_LRPC z%av7mzxE2bE66LjNSp9$(Kd6iZgRO)zTbA0%Tlk2mO z?zIsJImxp7Bgh5FAB}t ztA6yrCcjl;ht*#HnfSmodlGopUD#LS=UlcyDH$hE?*W}(cBIg4(&NI`ZDoo!2P>r} zF!Og?fIPGAbKK!&LE)t(+wjExE?SG;>%WVzw-Qw#J>m1dN6&hHUZTJp40MH{j{r!?D_d~e_ z+?qd|+>AW!xfRsr^O9-Yr^IaVZ|SzJ;AQYEVW8_AUVID=zph_fccf~TBxutyXi0^# zu&#SXg01@1rCmHrL7O1I%v!yC(X|&Rv%MxBOun{czWpn%y-!}PR1J-E*qyOz|Ke@y zPMtbhG0(Kh_M^+%j9qRz4`UanYkqU>t@~QT_x+Y>+V%=QpFUn0Pp7#;s=TuvF5%h| zyHJ^D_N4=$o!YS-**83278Y(f7u0vg_<2fSw#CY*>wYH-qptEGR>XtKOyiZ7S*~mc z)CyT@Ha`qh76#2OPUKvF=AzV`Xqkn@LhcN+wP$?m@ww8qOz_}NyZzqcKItnrLHZsm zH>LH?o5Hnh?bYDDt8^09oNx%ewp2^IcFoF7>m=2V7AF?PJk;L-8@?v6rXeL-Fh{+!Pa8? zxuCusE2Fx2CVsA8`tH#hrDo8|xST$==WD-P1?$b4WW0bmA?kjpw$YY%>4LE#34ZEZ zpK{$b_Rf5HBwA*nH|yoKYv)M?f*M^sv-f;-iAsrBoxt^kSH5_Cu=cmgE}oq~KXz0k zbvCUmKkSnEXQ8M+L+WAo1Mx?08tq(ix*2=sun5 zG||06?h9lTT+Yc~O*ydn>7rRthm`C27nbo>%7lFVcp~R)T)2N_%);t)&9C=OlTvR! zpZ{mVUupf+8zH;rSN1;tQut)os-;TKSN5*C5U9}E3eLU*i?qA-sd4*}( zOdig8SA%y3iY$1`HCKBE)3@I@eL};Ie9!it%Gx7sb~R>U_V>*u7vFsJ_2?|ql9&C< zq<8+khs{Lkzfs!LI${>52d2JdE$g1%e6rB#WapP#nP=sf#)f8#UroAkWtOY#PQm!Y zey0S(UxZCe)SRsN{`Gh84DQ8s7mUA0UuUXcXzKm4u=Sh8iY%q3&oe#!UdH8U8lCvL zb=`ZdlS)r3xBkBA6aM0+E8FTW#}}OEyuWY0bicIh;FaK%4AI|3v9`YN{GZ13%jorb6FPNk_zV$!{>hK))87ldx|22GV%OZO8&--q zxYVpX8zcVkt|w;<8^<-hth~M5stz5q>}Or{+7d98abMe2IzQiMuh^6(>hslf z%l2oXoN7m37yfwiqr|HA$D*6bK|DRGmU5XBT*XYJ<}8ox2oex^x+H2+cT}ol!(Gu^ zL5kBqOTB!g@xJuiE6vw+uVWe>++4eQBO8a6=lw^1r)Ftyi4mWt)O;MYUVrBkzf*BL zGyEqm1n=0r3_2U7C^et;pO|~bUn?g~i|u89i%wq1*r*Slgq`>I+Ao>vkjRGmX-231 z6m~XcmP}+^5%0WqQRcgSwzsG5E#Kqy;mF#ZpQT@d_EIn9URJG~E9J50!*l`XE8eE7sPQ1Tq_8gI(wh%vy8d+ zpF|`t&42rHQPlm{m;6@kT(>Ixk%mt04U^TAZ@sdskbS3n)b8irUlP~!jCxAM_a3a& zez;LA%PWF=*=FmN^OTxP`-EOZFWz1nI&FIb*Oarf80Kqv*X=8{?=EYN%llk4qEqdR(|Q-mT7@K zD)ZxJKF*mudE$Zns)Z~yo2P(Ia9~L6{ki{zQnQ}i6A$5eS5(qXEatyl!gYnY-uL9f zYubfV=6^gBFEH!a?gfL&PAD5s(n}1?(gfVyBY!-hKLIK z>bh#vH-^cNa*H}Z2^n(T$V6++#ZMP`?{s>7cURQ3tKgXbS{M24jQmxmmcY)%3%Yr- ztyXT^B@ot`{Eqv+mA7P|<@}qTy1moS6t%Kl2r+!&{@~&L(l3AAc5Pz*nG}D^^Xs~c zpV^+j{LAC8^@PFg6pgChxV0w&Uafkz&%cU0)Kv1rn~TD}Z|kms=4)KrUNpTF3yC~% z*tBY`URKnaZR;-XRtpVVnVG0N>)SEmr5D%Rmi9iib`(n9xon0+e)C=R6Xl_6W3Py0izk(cg+^q5opO8)=ZoUjbE1+BfBsy|$y{Up;d_aEOH_k_ zR^b)!t^qYmP@}PHzCCyn3Y5DzFJ^39{|&ZnKqnQlZD8kT>8p%$E_&wn`c!oD+dP6ia@PdeQ&P$t~}XrU1J7QZT6RKt4?+Os9P&4xrQ}3A!aITOy8n6s%`1p zD}KK*v%FS()NhnZ9b1+y40J0jX2h zEu5zOMQWqV`S025wYQXh@$SuYj06^ z=$K@2t{`aYb={p#?xK>HlIH)3t2}e}JcG_FF55{J)lJ3T7q?um@B^J^SrWuJBVBXt z_l;o(L;l|p1f_#r5rcYjKaaGDxg)cQ?hb5&^Mfu%ty*IupM8X8&M?D_HQ z#@SCI!Y_ZDBEtQPd&QFlt3X2?tUr(5Juba&d6u|h;hNH3_enB$YdzAh>sV{Du0C>6 zi(6}Eh|3vy*VCXasF3Ug@Qk@{*1TMDYZB{8!>HzBO{0obN5Ri$yw}Y8^kxZ* z-MskqM+84eo1HCbmE+}EbC>;Rti#^bSvS|d)-(bQRp}ZrB!jlk9L^BG`Z+GWe;&uy zNU!zUC9gkEQ%*`rdiJ7IZtE*eqbE9XSVwKuCcS=L-vm2|bPVsJ0V3tGLMMfGLp6ft)NxEDm14$ zUDNhpW%jh9wSTWEvtEuntX5lBoYf|H{MCx@vkq^%zY8+=C+4fXYsK2{R);re7Jc!K zcU}yhw?6UyI%rz2z4VJVc-l`jxpVKqB^B~9sYNwYmPkaHoxJ#Dmw>~3aFR5!>|9s3 z&Bss2uTOK@gFR0<<{Hnv{pywG`#*tF3Je)yl52$AYkhW|*x)uPxwM7tjgUKNYr`o; zT7y;5RlD|g643O6s@j%IRM1-S=H@ zp(N!!@}1jTtqIvQUJF{Ot#h#Q zw4>+&*NKVWKuw4j8KCv%?oFRV6gMrKyejlrMyN4Ett(r?o*U+;r^>$2H+u1Vrb=Sd z(F(r}V!rEFCV*BjmOYBrVp|ZCGDFr|=OI_D_N;GZftSBW?3%7C=^fFv?Bc35GMhsp zs~hh=`desvvM@6)KnK3=s?%J&?n0({M(^Ay^OT%ld!IF~R_VVNd1d1F zT~k1Fd>_CECvIJMY|Y#$i=SyKTWbdEC<}{;GEXSq(Z3^a(bGlOCUU;kdFoLxZ}c`zD1x%muluK4{O;&iu`jei1&n|PFn{Qtq z_x9Jxr z+{_qXaa@x2NJGQ~v#ZrKLfpD-$PQ6}@Hbz4HIMX#E*cT|8SCW#$*m zQ?ph*yi7IRKT>8PgF*$Jn7n>iREua1k?-XD1ug(eHW3uq?fhw!~|}Ew6{xgELT>=-3KjU*|kbg$ldYZ zzU=k$R!N#gf{y}x;~02;QPPF;^B;1_hNft&+~c)aUDI~mg{|x6&$%CTu*7X*;*;N3 zSDo^bPhY)>A*GwgTf`?dHff30>FAUbo>Sc)b*^1APwVb^w~)w&_+7QUORU!}J#q3# zMSYHurQNNVjqN5D>~?j9C;y*g<**EYvDR`W=(2^a42f4nt$0Cu-?xJH;6#9<_6cRi=-X$6$EZkuJw_;=lfYf6WORxh7c(5iR$ zypl@a%Z+PyR-Fnm*~;=fDCNc6rAxG4FRn~Hx5jf`dSGg9?$;@MmW57L{eQ2h_1iJw zYZuqQh*-3w;iH6WWOr?~cT@3(=o%ff=`!`7&zdvj{I2Nt`Q`YPjU!O@K%{3M-?_^P zJ5oLbExzh{wawQwGT>!*;j=&YbHX#c8w_4?&E*!jHsk+hF-eBmfjvhztPJas_$vci zG4yQ7D_x^0cIU6@xlB1y7&d9~`h^`z&88Oll4et{y*R5kqiVgU_eOp9wV;K?fx)S+ z9?7lOUaeeVTBWr8t*()a$nP{UAJusuM0^@+CNgFm7j}p|I-#0HuC7nHOKal&^=oH- zusyuw$BY~;%RE-0CyIii&`lQs)4Q|0Hcz>xx9XlJ=MScq6F(PA7G1pcXJTqB%ZGqx zFTlq!y1rl1GpRdDrLU>fY>&Bx{@I{)50|V;Pg9OvxYp?Sm(7+^bIuo~vV%@`0bks; z_n6dPNzZdZ>n^-J;o^NXK+A}MBk;hKeeu&lJ0g7DLn99yUX=Ny8r0Nu>#I9i%ab8( zcP=RPY?o?7(ZP~_15G=#*rRBYGzpCyn%1oK4SS1_07Q8f4 z=-#X@#ufi%7rjf(Ua{#(d8PY)n~i>}gd(k`-H;A?;Bh_E(9lk7ws&9S#+0@%!Nxh8 z*f;{?GmIz6{G23m>0R^jHJl${FaFPfu02|5KH2-Ol9mI;klRl6O6~vOItJoL8efwAx(_vKK?{u$uSA z^-qsZ5G!=sy<*J8{(-N!H8Lw6|iVt6UTNk(xc``Iu9~&(;brr(JFFZS7QYoO4|Km>O*_1PW5O%boKth}ORic2 z+IICWU3uMw?A4pTF-=aIwCUxOh!5vZO^DC|FGo?c-f61f{cefKqL_ucqD3!lmi+(k zQDAr3QxrV%8q1L_ZhBNo!DXk@`i)gyXJ#?{)=6C*pj=;kTIVTbO8y#XXR#INKsfJz zKmSaYceJh_RIKjjos zR)@|M6_lKrI{$Bt*whq(m;Yk*vQTG@wTy%N`IHERKIy$`mfN+*@5?@e%);~Xp=Hm?h}n# zyIt}8tnF!O-(tIz+0&~pJg%R5;gywlEc};q zj;~S2nVnA084sQE%37`WU-P04&Af%&h-5D^8Ho!*HU|@dbZ7cwJ1I1(5G56Yom#E^QTVY ziSC^jas5T){^OV4Z@TwAvLrn0ea!a=+o!RM!+-1aOJv;>3h6$0=xk@Qs(HAR%5g)f zAN^{2QJbgePUb%^U(74;tt{v*=s1BtuP+~0C{j6TuzRx6Ezi&;@3>@Vrkq%R@Py9O ztyU|$zC_D>EssdobO$d}i(9>XO`5ORyKny-d8cTZ>gT(jf^*AN(OcHu zmXlY!oclWGkcscN%I~kIec0i&ebTbkyEZKn2F)y8ThSu)lB?G4`uFJksRp7i)qQn8 zwk*|t&7shB@bKBLgRmmOpK)Dv{-#2)ah)?!!CdF8WGB;KC7RG+`oDL(m-$th8* zz5BFxZQ9nO+Q+d-BF%D&MVQxBC6}W4GtU(ImF#}ep1O1$h-uabPV2M8*KW1w`f+xa%b#@@uBkMi zxLmt=mucCOT^WY+f_3hv8y~EE7Z80rfA6kIT1NZa)<5OSeVL@8Dw%fsZ}`ql+N$9h z+2PZSE=^TUn$H{ml1ujP)T>3Ua=u1a9&vhKD)H8DRBqI0)8NzW6MZ)EugeyTbt0Cg z;V+_8O_!$ZyRvH0wKKE6RIX)6eEMqTP5WtkAM6SLdV1r#YrZF$Sp+rJB)1g>%{9z9 z^U$0sxsPz1~{C;^aqa|~B<~_J$?Y;8*hc`CGt0zf4<$Akz$+QhD z&zGK${`Ke9_sEnYtxc1%WM^vB-pg8)Z*nueaL0Y4M6FBjPi>Mq|CML~}3s zeYrDlu7Rjz^y2VeHr11sY46_D=kzXl@qES>!=9pyLLH~oUp15u?quUoRX?sfH$*qL z@1B^u;QqwRInQdAPR`OjnP6zSQk6F<^vZPo_+7FKUF~>(r2V_FHbeZZ?B{4tHgDEL z(sQ0Csqf#nbk$Wczg5QTE-bA+k#u9p_3~EjFZWh2PrLqNY3JdKk*7r0T?m{S;`^;v z#mDu@qQASQztP@Wp}kk7`NUUMANO6GzT98y$(C)C=xLNA>RoZ|MP%&4^=q|Xa|GzN ziOR&uXm>m@^m>~*ZQBCf@}R5qdd+p0TR^GlbJ(QBXEDW9)|#$MW~Y4EVxhHH zr}AV@#=Bj)0L22u@kkG}k3zcuXey(2eMe@rQ%Wtbz{CvK_+ATiSFYU}M-z!sM7P|Ay&ReN{`ctf0QuN~K<*6^< z=c@X8KNeETp2V}+)8+Ju7WGW4+f$eRkGmaRcUqw<+QEARcrP> zuqkcbwng;%B%X`wE>y3ZcWV9m^pr*6U%lnM&+or_HTc)g*`=-L`ZrHExqEo(-Rk-M zY8SITFLONJ`RB$ruNhq(nweR$GX*vt=eHF6cw|*e=2=lIqmviBXT17cbw7PO$0CVs z58fTwXtc@w+r5`(gQDi$KV7vg;^h*pPbK~}Uw``Fty~z@@F2JF%KVR8^0Eu8gI%u{ z$6nOCb;~o-xFYi+_qq7JRabqDrf3OVwANgF%N2BHwwZgr=++XOmtXJR^4uDd`D&|W z6pv&&@9ebZ&r??~&+=qDFJ-&_F4ubJEjhU_Y*J!cZ`@0{SEYs>YrKtI z{?*Esw&tn&F5b22OJS+b#VFg*S+VErKhLXp^!oDU^A(eMwzt%!KVQuucx*${Zc$Ld z``-0^f0VYvjbins9`^;Kjy&VaB$e$Q8AI3;Db4#i_2MR=v{H&KuxWSlMm;Yp>tT>V4`F_~71d z*_C34uie>d5hif*_k@231NLm5GV!x}^!p_;hB>F24}_`i6IFQgaEX=GYKu=h*PIR7 z=CbYko#@;H)vA(32a`Roy!ctYTjI;l`hD}uTl>BV1!U>=DHVFMtp;suH_F<-)uU$j ziqe!rziQ2_&c}GqdNiJozdk#P1(!KQV)Tzl96OR?^vj4j3_tbK!O7n>w+FMLB zr4nt_H|ZtbidtMAB5-trc*kRwF#EU8uefr5GB2~A4!#OR%V5RKIbWX5h;}SnfAz-h zGA-MAH|_1TZ@GRx|FmoF6x;9@QK6;$>Q^Uf-F_kAxw2dFmguglY&Ne?ty>?Ty)dL| z^TT;!#|1Yp`!XYJ?Yypnn)=`0-d=dM@>0x_qoTX6A5|#Q6#81bcU#NK)RaTFjxIPa zFFA8X?fk3vu1{U}W}ZrOhwe@FOL2>*$KThDSs1S7)6cO;;u~Ax978K@=8a!g2`KCJ zY3_`?9A~Y$cJq{J5B6N$H{-H#juh{|b(!i*Pb_`0F)Z-2O7qrLQdb}CSQKlrzdcMv zGVA+<)M-UmU#+}X_j+y2Lht*aW%E_J(W^7VwsmXmjr7VE{ks3&-(0Pe0#CX2CVg>v zub6)*WXYR?`@7q9Jln3uMqcE+eD6fdcI|AHo8jI@Idctcg)-GAH5s(oI>>}CxLQ@c zXWa#*zxG)xwM%pz1T=R$#Xo+f*{@x)_SJMF={esg@kCp$tV+|Y4!v@v#dAq~>j~`* zf(L(^uAQe98oD<0O4y`@rL~t&IUadaw&jGUYf($$TrH~M5l9)I{Zlamijb5^NF zx!j87`4us1@f_Ki5j(3^sTUP_c?O@p|NPI_J)WTRcSEOwc5ZIhUY#DdV!wHl4GCd;uK-zchW`PIK>_(kE>zWK=N?#n+jVN(?8RG;8kV>%B?Z1zGM1|`eB6<({@rpc*ajoZCp>(Rg? zaiPA=muD_0a^0P={+B@FjgZ^t-^^Wl=alEw-*UY>oVKr8wfR`F*Q}I?ho|(CqHV8w z8&x!YUhglz{&NSoUA1Y_t)lmR1+9MZtEZ*B2n|iY?J_m)YDLM{5WPw1ytAX~xxMOl zM|obJ8ppKNYt{GKSEZ?ylX$9Xqu-vtSDmp`dv{0e*D0l6yqDDSKh3_^r_vHEaI`>M zp-+8A=Id7VZ7Y^^b?jt%SO^NHX-ubY&Yc2Ek#ByNPPK6e5L{M~#<@1MW9qsKo0X1( zZ;Q~{>-JLaRJ6=@KckMGaBGl$%F}YEyz~rV@{B(oHLd2=^H;UZ_t?pb2!g=Gai~|t?6o4dPn4=x}?jkbr+^Z zdQCh%cbRf%$myMVd#k*fU*F+4J!!?s`18izl7X(Gk=ONR)op+F{k+GdgF*x2ryLPr;bMDeR$zNQK>~lLGA3S;wNBmuGnAC$U)9yI`e-0%qFD0$+AMKj`}WGF14hF0lEHn@<58ie`}3722TxqA zK2K$bYNnO7(L{C0Z+Fzn3wN5G&$y#fQdW&wIp5ie-nCpz|H5JJ;SHC*` zsn0Y%9}k-ZI>x}#>H59vD}L@@Z})%YtdtE_bE2Ayv&Ee?Pa0&|EMJq+8w#qLqe8DH z+bsWo_twz~_V$NFt#(bCb) zylQ!Q(Lv;}po5J5q0j6L^Hx}X`j)1-{hp_#)Q^5OzbL+~%Ar>-6?S?Up4_l>@~YHn zo5EeMUKf!xH}B*)x4!Ue$l02e>XTgmY@QOR+o$c)xAdr?>3rdp)=u3$J3*W3zZay= zk6rw{uvL$9o^H&-?LOeZTGKh}mXvM&p^|N~6|RT2Jmt!bT|E6b6Ued%>k ztNr^H?=B6#^m_MlkUKBE;+oqflRruE)CSF4Q)5@|bozd)Cz|j4+6OUDK7GFS+fLe$ zS9@dD*N`gysdmkB?bYvXiu28C_`|>5R5|=cYVXavyEM11TeJ3i^z-}aFBf0Et)z8Q z;O^8?mM_NZ4n^G8Z!x@M)bW^i!PP3Bzn5fv)y|}y+a4hvm@R%*GgQ$ncA+hJb$M6W z#kfh1+9v|re5HQ8dVlSBkmw?@1?$R!V&8JvCf#_lxBXM(DO>QK-CtH~AK3UBeQ{Iu z61^S@Y4*AYro}AO&Hmzcx2-s;DKBlGo#@G>=NFXs&Qrg6-FwzLBb}Z?$31rMuS>&PZyfdvWiHNUJ#^`j#-(|&=UmTog}<=9 zm$Q3tV?W`FCk?RHxKmnJAfs#fO)@D0_S2YVhK97gP@# zzvhaawe-&6se41ep5A!Qc>1&K;xE6R*_+RP6aDm*Uefv{%bs}3oIl~xr z?aLB#qm8Syz3a=hGpm-YGF&9l$M>j$J>u^c{+-%e%D-uddI)}YpZIps(r=q4B?g~& zG)=t%+Bll?a*5Q`ln=X{rmxFiqWwkAZ%sRp^BL9WNHzqtBNQ7}4a z{gjj$zTf7aPyhMz`1{qIQ>XepRsE#mcW-KF*Tt&XNTq*)Q?l6udA>6}s!;bzdgd|n zXtwMB75)Dhr9nsUADcTx>1pJtxPrLZdqpzCL)Vvnozihu^wuj5-AjCHyuJryPb=!b z8hmf7hTysjKfm^76^dkTXUyMOwJJ39>kcPSi?-rl&HtLJd6nH)gBQ=`*_jxepQ7~l z?lqOeVNH3bO{OQhna(#yQR*CaV_h%p3 zu+r4%Vpj2*z3W%U-gIx>ll0bTRcL5>`RiqCjC9V#?|+_hN62R0#LkPW;+JTD>1tVd z&smu>STKIl!>H>oawn!(XoYk?lyj7c=M*z!+E|gUse5o|N66~BUs6h&UcOp+V(t`B zXFv37SYUC{!OhqI%-_oNFtboZ(%b0FHmUVume;(py!21xg>JA}EaU|`qi52tTcWp& zy)%8kJ$3V4x+=@_!rHRb``Nv5R(uA#qPLgjtOlR4TICtsul=P%d5c~BvD=Hv*R2*> z=FS?(^PT6>k5dV9mC|0H>vuM1W!*?wx#-!tz4I6p4~bSyoxJL(=&kGerU-J)=)WGOF)_((B!u!usdQ^iIwEj6qY}MSU zv61f0S%wFMJ05GZP2AHaIWf5qbQDLG@$f2O2M&_O5aotzd7OZGNzwt zk;H>wf#c>5`A2zfbY_WPP1yQuN91BN@0;A`T#wj#OD2jewz0E26+ZvJNL1{bole=4 z4&HipgZtd)xl?{7uRdG2+AC{|b_s9xq(l>o@PnJJPF{$%y*hj8mYVI$)?K(4d5WX_ z_r0BQ!IK=1q}_NDyLkEYT}5B7ym-->nsVqB$69c|OVt-N*deq`X`4#(zA*ip>OuZS zPwuBHO<(uO_~gDzJLMQ%3>_qoeB?c7^T{UKa%I$Q8QXOiOpibM@_qU>FPEK8@t0q% zjQJ9=dd1?+Q?z3jrni>sP4W&c5saU-aO#SalX>Pvp3?Pcb8EgI8UEtVhLf{aWKL9* z{I+6=mMyc@>W_2!CTlEi^Ibgu@YKcXRs5C0%aop~IKP*Zid;N>-}=qZrERN{UY^=i zX4uiw>$7FjGWS(d&o_USTCdQ$7663-9N zNbw||X=2BNJ}J1@>+S!yI%eT^5lhX=CP$Yup;u(GLrqVKR&`$u-t5UXao@+7S6p{z zEfvw+?X*6x_iL9-|HnC(j23hkwdScxZu6QEb^S$T&+`(sm?it3>HhtBBJAzGoo?W9 zE0-rqnF*3JU-WuaOtQGncQvWOuH&&Z>qHwjmx6s-1{pKwJgL8sRZ$kS>`*ZC=ctAa zr$nuG#a_v}aiusQG_C1#(4>Xm_N|MveVSRkWs61CB%bRV3TjylE?0(@h$x+_+ zSaH|!2EDa^&fKxSxbDr%*RO1++_#T&&zSh>xyAbq!HsJ#o{oPmCA>^|cWJceWy!}o zzs$JAat<^=@7Z?ggv(30Pkml@v^tU)tUDe{AOFP8peLDYdTl}K)XA$-)t7o$D$Flz zoi}sooV9jqRxEk-e9<L?h>7Iz3kJg;%HB{i9f}Tzwlb6ellS7ucr~KS1e6F zxq8*s@1{x*vO|ORw)u*MXPm$HVVdzzk4^bgwRd;qe+}{dP|@>T#Q&=PqiUa&`7JB2 z3q~E8_U7{a)%{D~8&C9Z|DEkSC&SW2mhVWNu82-S!-gjan2_da69~^ZHTwgmsP8- z@2c`zl5evdbRcZz-L zzDk^5YX8_1w0HRZ)~Z(>FC;p+lJ}Ym9Al^zIL_V__S(?I;Mbd*)AQV4eEBK(Ix}ob z_p-)7O@j`D94%HiTlb8Kf9Hg3_cFS&YSrSeP_;Qnucz_g-Q__4ye-ql`9(_bUH=911+xzF``uRZ!RW9_;N*CJ0{ z+BJ~_(!vU2zxw53l&kN@EtYN}fv(>oZB325Gda&yFBYn*-EJl+wNrg>oA2J6A37#> z+ML{Q{DtSs&tcZ@?wx2cKY5|3RnGRkuFx{&br+U?Y@hb>diwc&A`^E#Tg7?3)s;48e_0b7 zX{!F`rq`dJHPhzT|M^!Cn!GoTBe@|$;CMOH+H1cT9CTaHyZ-B+?0cS(#jWo`jztkn&ge_hB%J9eRRxPNENw(M$|g|5e%KHr*mcWtyPX_GT z7kI3ATJhbYuOVx_kG$r3dzV={(Dm)y*K2N_ za^&*LG|yS*dVHo_dm+14!(ppLf^5fQ>%*JkShg(`Q|Ji`EH*)mqRP$bzOlMaQ}EzV zuZfG-+itqQYl_K>trq9hB-5BTioRWB8=ldxyrtuAghS!cV_chNb=XbO9g*6Kc&etx<*MF+}W{J$pyceOMt12(69FA+t1m9FJ<(6&A z+Fw(T1h{lR<_iDzWvlzQ=;haMM7e@a`B=5;rPtz_2h1)_jeRM3zVipq>^&#<&0~xO zH?6+!`*-I4^&lbjLlu4(zn7nHS?OU78s>iz8>w_$@Svq?;G04%c2Hqy-4^!x?TW3> zrZTbQcQ4+wH4!}GD9UkEXwK{RzWs@(Rh+$_^subH_h65?_suGKo$mp972l#j6J8O| zHC+Fs`TqLvy2Gjd>remLvwvJY0UE$hTJlQ#E!Wp4(}rgfs@^y%=HuZDR1epE!GQ~AA63~KW~z;^qlo2L86)41D0Kp$=a*i_se*m zmdh0FFLA4v+jz1~tSgASl^?rm)wAoR-PdkhU3a0fXrW3)8u%W<>NWE|S=@>4eeUvX zGS9^9FN?HRDz9E1mHkEMSaH|Y2E9`id7+0)_O@3o%XDW7jW}+fYy6m7$@wx_w>c*Yq!mR=MuZ zI4^o@cFKm3N7ajkR1Ys(QTEn0+&_}{MVgyhRrZ%{YnEtDGp*X2GXJRPuBkmUe80Wj zc>h<2LKovV)q3_7;V{2dklmGQe@$h%nDZ4hu{SF*SpVdNxcJrDU(V>HhOicZeQq`P zXzWw2ySFy)USzs0+_TrmXv>OF(6rK&FzF9rtCwdj7Mi_j!w=Y6fUc)fud3}gx%sdE z{Kn?p zEbW?=G;`@3-gChRFRz-gUchpziu3BT7p3M@PvZGie2Odl#Z}L?d#_ebOAOYx$PfKn z<=J*~<_FQKSN_PIVy<5wIXQja&gUF^K{E+&YW`+S4_><}s_Nef+a=exPf59v^u^`m z{_~gIZO;jU@_NY;=y+|zYvw{8HLuSn-2XU>dWLjAmb2FU{7sL0@7-NHwM*7=DJq$7 ztnxbYedmTVK~<|)SXNF-?DtyL0b1jHaA%oD#I0?`g`o5tW2>69ddadWt5#jp%Ie#? zO6n=s-lMNpPCD?lZhqwC+O>h4sr^@j1+%|Y)!&cyyd3#>=a(H{=KqPwmvu2b@U_W; zO}xLq|7@7fj+9pIFW0O!U0;QU`gbq>S3a@ss=lg{#r>qOQ#>pszFp!z_xXN&cIlb* zYxk|+9J=~N*~P%a%Vs^;sFD@cWLw^{?yYZJtf#N+yUWLg!ooAMCp|p>{k(JU^Qz~& zzP?%+6k2*r^wy`^X-Nb7>o0nLTl#!S|I+uH7ppw}YPHJX+HZkG zo&sBizJt7LuO)v0FO!(|xqhW&Z|d7AMvuAXhKJT$+WUkD+CJZrNlq3pQokjYkREtR0reTwT@dQ9+)}E95(29VtDC*$C7s( zxNVlwWwRXKO2sRv_UljoXDZH~ zA9{87DH=wi&{K4R!|_?5c-+StiqVQ-f7fVwwVH&L-tA{v_F zt9tbnmu>QmklpQ3u{=uC=YL!q=3mM5|DuZXYEXihD`l3eS#;@q{CUBs{>|mQrXT+Q z`tnikW6g5c9-lQ*wliaGMW1rr^`5oty1}6g{Y}9qjfCq$1dcLn=X@mLq_Oq0Y~|ZS zTOV+q`z&_cc5cX8QI6~ay`=+)vI_ zz51y(%v-FlYr|B|%Tc?(33`S%YH}nu+-5A~S$H99FMnpjm$T;gOV0X!`Fn!-&WQ%2 zO|hWm({q>3nVGH^8k+6drZF+tShCBUM&%qPi9ZR{XviL7otkb({5Z@wPe|oHs7%DjPp9FT5;*kpI?*(W*6LB^=s*u zTX(aMN334;ZfDi0M;y9I<*j+4VV_@1XWDE(H8u9*8qjo=>#>-Hw)fKmm4#Ppt$b-4 zBD7d(n;zTIS6sP~i>KGi*L;7L+HpX;cb*KVi{XJn2bse`Gu-#dWrbet5Oa4udRE8}K%iilXmj^V%K5_MO7ronC zqpK6Vd(IeNU$v@w-Mmd!cfQ-T3wpNQOu2vRYVh856Q3)qzp5LvFdO8W<9}{^i?L0expWK5^I0h$$_$?z zH<6mNz998{e09p#kdrkl!(D5Cep-54FzU%=uAe@p+Lxx<)}EdAaZdW%DJO26aC!TC z&9{ASJ2!0)^LJI1{IX;1Vxg>cVwOgMR@apswn{vhq0pCTEO7Gn#iF3Is|A#G`+jYn zrsWdS{dkpEmeic8{;0vu3FS5VYc+Txst{8*VT6Or_bc+ z+_Jh`=`VOu!1;ySZuhB4D!HkJg$2pW%Rl{ozur7FC^(Dnylr^K#4>T`mBA`mYBfh+ zbRHGG^|;`@@3*f!FZx1E-9(sWq>mWp_??X5oG9ZSbvHmMcH!FGzO|*w*SA%9EzvIu z@(R5g7@pw|?iaV7*tpB-yo#jP=QDft+M*^ox;RB8*Z=$Y+hBRodkL@gtE`f3rq5d( zcONtY^VVzC(r(B8tG{g3g2WDJF73*mqWxtR_)hEmuOU^v)pvPb{=W1&$wMAoa@RIk zwB1dRtK>C)yJ*_?BbPx}Y&~yscUiUW!sIYFUUqg>CrF6h|1s_N|OJQMg4|rKp`n%aLyjEQo-F5Zo zg7fQDv+SzBrGA$?wcBOez5KaqYQ>Lt-YNvOg#N_xY??ej2l>75tR z^SloaSwF_b=YM&UN)0+rw(v1@CS$ueM*lrl7UYi^z!T1A9LAS zc}qU!x|`K2yH~w>-G!Gr?^YxRzn057+jc#yYi&vDcdknBP3zs>{?@r9TD4Srw})k7 zm5abph6ana)hcs$3Mb0lbg~i`eaIzyS8vsN?I6B3+rA6Gr1tJz_N)4GvPS1Tn+MU6 zTf4lBI)3oX_PSnfX5oL-FEjsB82F$q2FD$Zv&WG(?M_vxtqbUS~4>H2x6qPMRN z4e_3|u%uQw{m^3Vl|OB#?Dt=(yv5^w!@0?CURyeKPr3eLt&xt6(64@ECATO3ic-F5=`D1Qvw6W;xlzYze zt_I&TtuhVIc%Ad()YV}3rYu8-B?^5HUpcDuU*rZ|2do{H?0W0%BCSJfbT97JT6KKG z%jut;GrE)C$AoX|?vpaxs`c^I37w~FGH;zKyST;q=U=P4l~fBxtDRS7^xU$jSe9pGak`RI`ZRTXkyJ z{as<9Tf+iFbE;(*e*G!9?!sy<&~04)lN8tXeOtBSr%v(8ZpW0p+Fw>(4OU7Ge_^xp z!Y?~%-)~pJ<9Nzlj0;#FN#u1&22ZJWORusG-9M${LCw_3t4{3DE|JRk&NKVcgP0|A zQ#4}lXUEy97Fj-zH_q8~uI>B|C(v?=wez~lTGs`xUNtRdVQ5a3z42PJ2P;~9^Y@po z?N+pRTRLUM#p)Bck4~_!zb0CB6nt}>N!6su_2!XoYG1zhooTx-^~=&(g4u!lh~XWT zEm7~Ammdv$QZ%i|Tm9-C(OX8|nJ@i*JiN>O`PRxH>nAzgk575M67y`EmNp)8j)939p)mpfI>(s&I`_BD+yETP4--l<{48ew_Z>v^lPP5%@e6TXFCDhw! z&AKIB9hK8ACErMyyR;|od;HT=>$c1}<^3cyRB*R;NnhxPH6^X{MDNLkzqqL4tb6nN ztE3CpZ(Z_ED3NKt+R>53@S)kF&G~@MC%YvF_mxjG$}ODDc`kfw_p*aKw@->%d_`?G z+jCp@7qcF8&PnZCvm~my__fZ{9_s@bM?IEM z^~&D6CiIHP+}Lepoi5;ZnCIl$@1M4BROzyf<6$V+uh93<095CO9aa;y(T-WTJ;pYa z>r6EGT#=cPr!L;zwYPY#sHN1L>sooXpT51Gr(Lr0X!J`}Ntb7_3m4BlwRYWwX1%*RL;MjFq#$q&=VM{k)3h)A=3SZYuYHL;4Qu zmZ}%jtRO)zGO|=A8)K)8@O_vkg2WYJGlB(bp*+J7c#@OVK#n_Bu;$ z>DFlTqsb29FS-6+eQqx*tQENK!q4;%?dAF|N3I=JNRppRQFb!sK18K@ms3{6q}pj)gO{3CZRc7f!4TGL(YCwgZ@=N0ZO63MzFKst zs737KR*SwFrY{Yrep}==_jS&K<=?-acm-YF_MAgE$j_+b$POoWtEthTJ8F4;)%1Ui zsghAW7+f76{{H$_HA$CW%EGqcFD`xUEot4i>}v4RK#|oSV{V;&5NTbyTA_ z!SyG(d(SA}zPW0W)I+XZ&zdW%Ko_29l|^knrhVIW>OGyMTf2V6zyBvTDP=}!Yg{1c z^6BWwJe8Lgl=DYU;#vB-dM&8sY~NlPz5cjhR7y_DqG>4+TdP)?$G`V9ikMWp*0jpq z@wiin#Ovp*i98Ie9b^vQbzc2dB2%q?+uEwu6Q0eVH4ZO>9N%f?9l1(tZJh1X+I}}X z@wKb6)^}yu+U?!<{Bz~?tHEN-R^E%AwU_Ik*?d~n(8T(D&Dzz=*Lb$Ys7!ZLt-2n5 z|N2dr_|;i9#=`UZd}MOVcCcPeVz|M4#PGoXW)C^#L*T}a>(S2AX*;j%%3ZnW8_(>j z(5oF&byvIi>7RTscj=a}N4lG*{CvG8r+4m3y(;UFs?e*Fk1dx@O}UZvH6%Yo$u?~D z$2lFjWtRWn3w}Pc8k7P5$lPnTa1&uZFi)Y6(J12YljUKqXIF-Xdhd1%@0KZTl{3s) z6}rLYRh#e18=7YW&z&;{O=Uq^nX%PtL$7}MY0Q)!I_cmeuD7N+S!Wm3eLib0Uzh(Y z!e~MC)Rc~S>%aH-ESYa!tE0Lh%}wpo`^_t2@2U3f>eFNmSuvNhC#+-6pM4stexFv&_o(IdYtb&Ls)baqU$$0Ft;l}8?OlKGjkUAo?#E5N zG6k}jr6T=s>63(#+UZYY(zRBu^f-6i&?{EPw(9$YT~6IwWEW=dz7}4=DZ}~KN4bab zfs}&`vk7QL2JgB3cC|c8paP=l^Hinf*Vf5C<(j)MO!wr4)vMgr?iGyOT&3l2cUH=5 z>#7w?9d>UkTlFPs;_Bsf|33bHb!O-D+D$t^Dqa#R3%+*gU=JT*LQ$uZwRLf8@UNIuWM4Rw8@WY7<;O{*q_uiYBF^?CLCg*GQQ z?3xr+oVs02a?P>g%ufqa9hM&}{`ueD7~C@SsFqpWQl_%x`9srr-u2g#9m=x}pUqdo`mOSOUJDc}=NTB!eNnxS)_tjPx+C=Z%6n*x&*XJ`!UApV0%l^%0 zTO`4d$9cr?fXcLKejVz$#UkLPORUe=MxGK~yHV+FSz!L}#Pwabyo{!>oEKYnAv!c@ z>Yi8EjdE6n28QN*Pn+(2X5IT&b6>x)y;;;M=V>%$lIYIedp$sXW~0W%@3W8iR4nP7 zU!L+PL!pcDftaHVGs{7nPi0@gYmv5UWu4q`(#YE~Nh&O9{ng-mkzW1UCHd2e)?W=a z_G}A0thRUG=G~>iU;f?&-D%&gXnQP9bnCQ~4ROyw!)B|OU&=1v*JdmgopDb&s?c46 z`G9VN1sg|8*z2!LlCC`B(7ogzlVLEO?eW@GS^w@UHG%8OiC2RwL$^NXnj3b(Rc|uS z-fM3=v{uQbuQe?@w$f&AyO*a}{-lGCx#pG|c6b<{+|a7M`@5a|-@F{j3$8nzUVn{! zdP=Y8O{tG&NH^nyYmPF^It&x{^j&=Qs6)FXds@*o(Oo9qJKa^UPEOgd#w0jAquVhm z^I1{Zyq)2ueG#@#eT|;1?$>#}yQN8Tye@_eGOR}o4>;*O^GHx%6uaf>qm0s4zwnz8&t_KlUHElp&#EtXXHO5`UgdSf z&MBd=MbCEs_Gt5?lR%~7l@*D>Z{>tG?%Xha63^zTKR*A|vH$<0)^y>fODp%d+}pKw z_nE1eY$K{{U*B5!<>zK)VfS@X%3X{PG8Fn4%^rOGxG_?fNjiE<_p&W%n&~kMbvIAZ zs!Dr4^LvEt)!XY=Klxo0tz=o+`b|Z0n^1{1@9a-{Y!f#z-aTVeymHm9r>|B9sW+#Z z?fHH;tFZMPcp>`Myyj^4$>v%;Uu&Hum=CONwqU!#5w-UDjZ-Nnv?bhoZ)AmD^$33v zC;j1-*Q!fGHlP-*?S_f#E@;m=^;PcF(T^FE7N*;T7q^~UpTBalV@j{~7dg+iYg<8+ zxW@yH7Fb6e7r2_lU}4me+|cW&(k}?wwFADM=}b^m^XEG&R)&P$&Hj2Ntj$;Tpz-GD z?PWQjfuu8S(W_R>+VSJpmoLThYwlo_p!q zAFpqzS``wy_02Wiole!O>LC5Fm*w7T&qgh=*&TBzs`I_2)AYFX)qk(u`~Kpd@Qju3 z8=DN+8WuNOu}LdO;EK`qJ471)mNI`%3C_tcC9jg z=#_sy&sX8xE~oV~*00|Q>ayNCno!t!?z`M~H&w6e;nvz|leLz%oSnEJiihEY;1R8h-MRue^kXe|E}2woPo zq$|p5nMvd3Q&abDugWqx8L;|Dw7cpjm1ev8w3J0<>)aUvc^C>fA4xoL+rTnO!2i6c zmAH*^TevPL@!G6jp4D_b%JppPg5|5MZi8dxR#EFWE2r)+t5+=jdu{2>0>PVCM61&F z?fY^!Z1tsWyCkyCfA8~I;@P%6|Ng99+IgHVh71m}M+^`29<=#nSCOWomzJuUE`7og>jgUZ)0VA7aNULIHS>ga&Pm-i z~sdR}m) z*V%@1vsPSu$Kfx2Sl4;01j7NgM-mU(997n<^J-;>?w=wUo{{gc@06&O*OL_oHovA6}7Gl4F#>HdiL7Z zlWm{$doeZjQR^PImY){j>8$N6DOw4fesj)n8vtopV0@=l%MB-(8Qc zQ|ZdyJVk5M|BC-U|0=$3_h*_w}d! z)3>*`7un5kUwu6P-kzN+EMDzgmUQma%aUC?)_>+ISU+jjl0tgeLCM}U!%0?YvB8X^E}S+ zzKD8mwOc)ACwrpLRtbg#KCR;n?5#6*TP^~Pv`q~;uk&<`cF8_A&=_vlwTPu#`!tts zO}}2m8@%ytX^U8=p)Y8=uy=@*F&L;k>L?2 zmSw{1dnfMVJk;V&-9EIq#A*?O$YrgP5ze^2F){)~SA z`h1O^SLjvHD(heW-tDbgb?xW`xy46CqrU4^Pv#LkR=l;?mZ>9&p`k+HI77LE+=;H3 zbNdge2Clnc>L~t{>+b3$%btXWzRtV5Cu)WLePNr6tCuTjudLqfv|VPQ>$hmzr#sKP zTZeqoYco0d!1GE(-`kAP4uul;-N=hv+vfnTMTM66yV*eNx!>}ticc|PwKMol_6E8)WR7n0{+ z-dcYz=f}i-k5`B>Gpu1PgUg?bd|f}`xv{c|M4Uj&7g zp1vBKsT%rHRZ?fZcDHtkw&cd7uOV0JUSB)+eBRGF9W?^G_qzD%p1crkU3wZ6#M>AP zc?ymj^uJN(J?GB!sY7ek39E^dyHfmBO;vLbzT0~8S@D|6tNt!so@}=BLOt8$@9muc znyOUUvv&UKeac^im%6mNs$5^SYU1-*mu9WMuHqb(yZ&LMZRwZyt0!q}llsBP&>(-r z@W5Q>)nDz-Y&p5@RzrAb(C5gs*ie(?8%vn<=g0cVN4uOc-hQqW+$mgp{rW4ewViCD zhnH>*_WCCUu1*%uJ+;?*T|e8^B!-5!jxx**9SW1aFG@2@nYpw_ti)@{3CXv9D?&rv zSFfFMGavf^s6*x@ZTWtO#99)k}20S&5xb__jx{nhH8cRKeX z35EoFf#VDxICsu)RLOT+8R=bg4HOY4$y%)-UmD|N#&-rv%!?VYDxQsoEg1fPC?bZYKDcO`$Gmo;XG zBp4E^L8i5az5WZHsow1b8G!NPon6&*?^c!$Xfey`RXY>rtvv$jX!oMZvRwM&O_xRSFcicp^f4~rR;rBFS$AP)V({v&UpF`F+s{nRTRV5vTE3`wV1Pp7o!qmv67q+Plxzc>fnUp`9k~ z(y^~g-@dS^nDxVIt{*6GYBLw|FgRbxlI;(h>gMYAZ{CxnE3Y|plV+!HTQgT^Vv_U+ zE%nFHwEa@--r{u^wyw$o4DlX(XQs)SVJmQ)L4axX{AV3my`q`jbEfOZ&pI>9X;=aNuo|1zUrG&b#daZf6&#F~1DUe)A&x zd(1-H?By=Up3TheyYTa)OGxk3qUp3~dTGh1oh!V|N+vi|MV zC=FjxI62j9kLh_GCGq#=`!3&_loE0ES-lCU%#vX~V#uK5%-YuEvCZ%i7j)G@@>@%% z*Big>;tmRbF)z7r<)dAvM6Ik&K8UrQ8uvKl#y72x%6%6udbTYN>lHl8z;K+YkcZ)P zqTEe?y$@SHt-8W9dtb%BeYeyo0QqtZ*ThETszyZzIWfwirBd+9!FQG zo>WMhoqjDlZDy?A+5T!_(`m)FOsau7xtrM;8eX#&@-WPHSp8LEVw>;9br%F*&!}2= zLC!rx@U~6ydBLdpyF({A#@i=-opR!-&yJ+Iyz^(K>z!?rUz-K0>K^P+=wnO>7C4!_ zg=hAf^V`D$i=%Q6M6a87N_OGp-cUXDN6oaG zvr=}X3V{5?UdY3+dqTIQ%O|rfw^E|}E>zwwcDWi+@4t4^tGVyz7J9D_4ONa^SpD2; zch#z=A?sFLjLdvHMJ`#ta_RfM+q)lzff^}y_&bsrZiqgcxLtjH(>I>kUQOv`VxgI# zLGG>|dLO*n;(t}Uq}&kQ6$0w0bgzlE{d)Deedzb->bUvmpSmYo?6r^ESF`GXat|Xz zANL~(hO+js*R>m@%&wl9rSxoO^y=kGS}X5e4X%7$_I}@*ouJm{_AOPb(r1;afFk#f zdPg$D4k>|?zb9Ecb;pE-Mu&!YOPAc+6}wu>{jAaduloO2NM&oC<+z}g?eh~VhXX;~3IQ`+O%X$6y{r>-PCJM7HuTQ!6YGn+^^$j(8C10;x zTo}c}z#u1ZoT1?J3z-$5EFSGD8W|2AFAw*Bx(;l_%jd3ovI{S}PkbF~t6CJm14D;GALE0B3t6^q=QnuDUp}=eEHs>B*9)(#mAe7<7%Ue5>urP>2J9mxz9DjiP@iy9S+ZbseN)dpG^+){okHXxh*d%{dm zeXvSZa?!1={V|~R9Sja4ARQ)4Z8vp1F%t`aA!q#gjH%=H~0!T@D&eO%|-!x+?45w>3^0t73PDnErcnbGkgshNtCcb~#Ot z+U|Y+diD$3?~B8FKkq%iOOFQ>HJd@+%3E-?O1@~~ob6)K-`>1>wesexgw-y*8*Waw2EA;Wa@p4YKzu%)KJ-h~v4sAyn<^y*dJ?^!Ks6^fB`uyK6*flh4 z?L48MH|7QyU0bzKd&!nqYhS4^&t_IQ$T9U8oHGT3`2jWrS&;K=j&DpQSgSUVHt;WmDYd#hnjiK#4I2l!4yOnM@HRn-$|A!OU>LOW-&IgVXA-VN$9S#?r7 zZL6()?b(^D3eQ2;Trec$gG^`EwAM=9@E2DEqh3mGoO)~j*YxV_<(HmU zuYO|bzD_DTR2~#3*O?wkFf3qRd+qa@bxT%B)c*XGDPMG6aMzR{D|R|XU-SF>^WRU` z^n-6~K2KbIETo%};enK+3^Rj7;KoG?lit>Rf9AR6T-Rgs{CgqS4SV-&yDGZNZ1J1wUy75yB-LET^i;f!_45*;30ST5f^B!b7*qz^?56$ zUcayU`)li;Ycm$Ni-C9gdPss$f#fRdeAOW5nTnwCl5Ppsbi)24V=m6!bGBggmK{a@a3 zV&T1Lu+vIFW?MIS+-sX;P*+hQRH0Sizx;Ch%_sM&7wKK|vf4ezUXB$U8r-1JkWKu0 z+3HfMk5+?j@!?knYo91ZUiXug1uKvSDVTdwdz#Yp+`SLnS07v4ce(P>Bm20$xqrSC zUf7w_V#vU72dqlFG3<53zUt4Hau$U;uRihpk%8Y<2?mCDGwW~uW?*1=(0Tc#O8x)e z_w6}0+26CDY=7@B??ju1U0Uv(yBBZY1xjEHD`c1%Vsy_a_X`J_id9DK|GNMGpZABu zdc7Cju$s-wz))ZU@>w{~+H1*6R!?_J?{jt8_xIcF!{_RQb=epgeux|~WH`Xv;34PC z`rz>4<~>zkPpMA2zo%09|L5EO?W;jU-3$z;K*5;TvFEDP#2n|jtBWVr*v)@h^Y6y0 zI=lJyg}nAb+SZ_~xPbSO1j7S1P-?%GHTU!S^Z$P;9-Lr*&uafX|4+|@OK#8`Y5Tup;@yCxJH!KSZcy|5sbS8+)mga2Qq1Hk=^{KUteFB|0g@KrWVxeX4nR51{6Fu=&z}r;_~rj$)w9K zw>%DHWMBZTCuCr_kX7pn>SQq7U_WBWz)-_5agRLME482k;s9&qYEz|3S+K}!hC&_& zhR_-AamUv`pZw?NznyaojAyX9U5nq|KIK|x0bv3wONCWfni4-D9j9wJbwJRU27A^=M$=Rw)SsT!xH~| z_@J=-GAF1|ENBJAbAm+F+Sg#W?$8D6;Z^#n40hRV7Ldyl?|gox4hqHtxy=@A3=ILF zv^I5|*uVeB+YO;l?C;x8x4&=i4sz%ni;iRlhKNJ9TcW^e&4LfiKlQU_+V%DE^*_EV zcYyjk3q$^i{HSL5LRoe)1(%qfQDxbukSO59>Z}HE^e~kqzg^ntL#^)F;z;4>XwQk|n zSy_e*3Z?EMeJKYAsRKBULO=ib@nd0^j*xNxpVvP# z^*17?xCU!b3xOfrKLz4c1`V)7W+%F-fU_xR1s4ND9^ZLL&@n`Sedap}mgMADov7be zuUEgX9#oJrFbIQ!YDcEm+H3JP_5C2vGKhnOELfg@j*Q!1_xI%gcCe^6SX3nc-kyn{ zf9kA{+Y3r~-ybqCFdXP@uwY{Vfrj1BH}B;Ku^1SjwJV5I@Li#g5yW74@DAid5c9xY zP!NMy4ZA@Z55!_9=Le-Y5c3@<`GXh?cWglxgP1$2L9qa04PFEP@t>N!tZjS5^#qVR NJzf1=);T3K0RYYtnc4sV literal 0 HcmV?d00001 diff --git a/docs/examples_1.rst b/docs/examples_1.rst index 3de1337..364c2fb 100644 --- a/docs/examples_1.rst +++ b/docs/examples_1.rst @@ -49,6 +49,11 @@ Most of the examples show the builder and algebra modes. :link: clock_face :link-type: ref + .. grid-item-card:: Fast Grid Holes |Algebra| + :img-top: assets/examples/fast_grid_holes.png + :link: fast_grid_holes + :link-type: ref + .. grid-item-card:: Handle |Builder| |Algebra| :img-top: assets/examples/handle.png :link: handle @@ -325,6 +330,32 @@ a detailed and visually appealing clock design. :class:`~build_common.PolarLocations` are used to position features on the clock face. +.. _fast_grid_holes: + +Fast Grid Holes +--------------- +.. image:: assets/examples/fast_grid_holes.png + :align: center + +.. dropdown:: |Algebra| Reference Implementation (Algebra Mode) + + .. literalinclude:: ../examples/fast_grid_holes.py + :start-after: [Code] + :end-before: [End] + +This example demonstrates an efficient approach to creating a large number of holes +(625 in this case) in a planar part using build123d. + +Instead of modeling and subtracting 3D solids for each hole—which is computationally +expensive—this method constructs a 2D Face from an outer perimeter wire and a list of +hole wires. The entire face is then extruded in a single operation to form the final +3D object. This approach significantly reduces modeling time and complexity. + +The hexagonal hole pattern is generated using HexLocations, and each location is +populated with a hexagonal wire. These wires are passed directly to the Face constructor +as holes. On a typical Linux laptop, this script completes in approximately 1.02 seconds, +compared to substantially longer runtimes for boolean subtraction of individual holes in 3D. + .. _handle: diff --git a/examples/fast_grid_holes.py b/examples/fast_grid_holes.py new file mode 100644 index 0000000..1d6ca82 --- /dev/null +++ b/examples/fast_grid_holes.py @@ -0,0 +1,65 @@ +""" +A fast way to make many holes. + +name: fast_grid_holes.py +by: Gumyr +date: May 31, 2025 + +desc: + + This example demonstrates an efficient approach to creating a large number of holes + (625 in this case) in a planar part using build123d. + + Instead of modeling and subtracting 3D solids for each hole—which is computationally + expensive—this method constructs a 2D Face from an outer perimeter wire and a list of + hole wires. The entire face is then extruded in a single operation to form the final + 3D object. This approach significantly reduces modeling time and complexity. + + The hexagonal hole pattern is generated using HexLocations, and each location is + populated with a hexagonal wire. These wires are passed directly to the Face constructor + as holes. On a typical Linux laptop, this script completes in approximately 1.02 seconds, + compared to substantially longer runtimes for boolean subtraction of individual holes in 3D. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +# [Code] +import timeit +from build123d import * +from ocp_vscode import show + +start_time = timeit.default_timer() + +# Calculate the locations of 625 holes +major_r = 10 +hole_locs = HexLocations(major_r, 25, 25) + +# Create wires for both the perimeter and all the holes +face_perimeter = Rectangle(500, 600).wire() +hex_hole = RegularPolygon(major_r - 1, 6, major_radius=True).wire() +holes = hole_locs * hex_hole + +# Create a new Face from the perimeter and hole wires +grid_pattern = Face(face_perimeter, holes) + +# Extrude to a 3D part +grid = extrude(grid_pattern, 1) + +print(f"Time: {timeit.default_timer() - start_time:0.3f}s") +show(grid) +# [End] From b25b330c9b2eadc70c90241ed83deba1dd584652 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 1 Jun 2025 19:51:29 -0400 Subject: [PATCH 336/518] Adding global_location property --- src/build123d/topology/shape_core.py | 69 +++++++++++++++++----------- tests/test_direct_api/test_shape.py | 57 ++++++++++++++++++++++- 2 files changed, 98 insertions(+), 28 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index a7abb07..ddd8317 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -50,24 +50,27 @@ import copy import itertools import warnings from abc import ABC, abstractmethod +from collections.abc import Callable, Iterable, Iterator +from functools import reduce from typing import ( - cast as tcast, + TYPE_CHECKING, Any, Generic, + Literal, Optional, Protocol, SupportsIndex, TypeVar, Union, - overload, - TYPE_CHECKING, ) - -from collections.abc import Callable, Iterable, Iterator +from typing import cast as tcast +from typing import overload import OCP.GeomAbs as ga import OCP.TopAbs as ta -from IPython.lib.pretty import pretty, RepresentationPrinter +from anytree import NodeMixin, RenderTree +from IPython.lib.pretty import RepresentationPrinter, pretty +from OCP.Bnd import Bnd_Box, Bnd_OBB from OCP.BOPAlgo import BOPAlgo_GlueEnum from OCP.BRep import BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Surface @@ -98,11 +101,12 @@ from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepMesh import BRepMesh_IncrementalMesh from OCP.BRepTools import BRepTools -from OCP.Bnd import Bnd_Box, Bnd_OBB -from OCP.GProp import GProp_GProps +from OCP.gce import gce_MakeLin from OCP.Geom import Geom_Line from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf from OCP.GeomLib import GeomLib_IsPlanarSurface +from OCP.gp import gp_Ax1, gp_Ax2, gp_Ax3, gp_Dir, gp_Pnt, gp_Trsf, gp_Vec +from OCP.GProp import GProp_GProps from OCP.ShapeAnalysis import ShapeAnalysis_Curve from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters from OCP.ShapeFix import ShapeFix_Shape @@ -110,26 +114,25 @@ from OCP.ShapeUpgrade import ShapeUpgrade_UnifySameDomain from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum from OCP.TopExp import TopExp, TopExp_Explorer from OCP.TopLoc import TopLoc_Location -from OCP.TopTools import ( - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_ListOfShape, - TopTools_SequenceOfShape, -) from OCP.TopoDS import ( TopoDS, TopoDS_Compound, + TopoDS_Edge, TopoDS_Face, TopoDS_Iterator, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid, TopoDS_Vertex, - TopoDS_Edge, TopoDS_Wire, ) -from OCP.gce import gce_MakeLin -from OCP.gp import gp_Ax1, gp_Ax2, gp_Ax3, gp_Dir, gp_Pnt, gp_Trsf, gp_Vec -from anytree import NodeMixin, RenderTree +from OCP.TopTools import ( + TopTools_IndexedDataMapOfShapeListOfShape, + TopTools_ListOfShape, + TopTools_SequenceOfShape, +) +from typing_extensions import Self + from build123d.build_enums import CenterOf, GeomType, Keep, SortBy, Transition from build123d.geometry import ( DEG2RAD, @@ -145,19 +148,16 @@ from build123d.geometry import ( VectorLike, logger, ) -from typing_extensions import Self - -from typing import Literal - if TYPE_CHECKING: # pragma: no cover - from .zero_d import Vertex # pylint: disable=R0801 - from .one_d import Edge, Wire # pylint: disable=R0801 - from .two_d import Face, Shell # pylint: disable=R0801 - from .three_d import Solid # pylint: disable=R0801 - from .composite import Compound # pylint: disable=R0801 from build123d.build_part import BuildPart # pylint: disable=R0801 + from .composite import Compound # pylint: disable=R0801 + from .one_d import Edge, Wire # pylint: disable=R0801 + from .three_d import Solid # pylint: disable=R0801 + from .two_d import Face, Shell # pylint: disable=R0801 + from .zero_d import Vertex # pylint: disable=R0801 + Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] TrimmingTool = Union[Plane, "Shell", "Face"] TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) @@ -451,6 +451,23 @@ class Shape(NodeMixin, Generic[TOPODS]): chk.SetParallel(True) return chk.IsValid() + @property + def global_location(self) -> Location: + """ + The location of this Shape relative to the global coordinate system. + + This property computes the composite transformation by traversing the + hierarchy from the root of the assembly to this node, combining the + location of each ancestor. It reflects the absolute position and + orientation of the shape in world space, even when the shape is deeply + nested within an assembly. + + Note: + This is only meaningful when the Shape is part of an assembly tree + where parent-child relationships define relative placements. + """ + return reduce(lambda loc, n: loc * n.location, self.path, Location()) + @property def location(self) -> Location | None: """Get this Shape's Location""" diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 715680b..3646fb2 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -29,9 +29,10 @@ license: # Always equal to any other object, to test that __eq__ cooperation is working import unittest from random import uniform -from unittest.mock import patch, PropertyMock +from unittest.mock import PropertyMock, patch import numpy as np +from anytree import PreOrderIter from build123d.build_enums import CenterOf, Keep from build123d.geometry import ( Axis, @@ -43,7 +44,7 @@ from build123d.geometry import ( Rotation, Vector, ) -from build123d.objects_part import Box, Cylinder +from build123d.objects_part import Box, Cone, Cylinder, Sphere from build123d.objects_sketch import Circle from build123d.operations_part import extrude from build123d.topology import ( @@ -615,5 +616,57 @@ class TestShape(unittest.TestCase): self.assertIsNone(Vertex(1, 1, 1).compound()) +class TestGlobalLocation(unittest.TestCase): + def test_global_location_hierarchy(self): + # Create a hierarchy: root → child → grandchild + root = Box(1, 1, 1) + root.location = Location((10, 0, 0)) + + child = Box(1, 1, 1) + child.location = Location((0, 20, 0)) + child.parent = root + + grandchild = Box(1, 1, 1) + grandchild.location = Location((0, 0, 30)) + grandchild.parent = child + + # Compute expected global location manually + expected_location = root.location * child.location * grandchild.location + + self.assertAlmostEqual( + grandchild.global_location.position, expected_location.position + ) + self.assertAlmostEqual( + grandchild.global_location.orientation, expected_location.orientation + ) + + def test_global_location_in_assembly(self): + cone = Cone(2, 1, 3) + cone.label = "Cone" + box = Box(1, 2, 3) + box.label = "Box" + sphere = Sphere(1) + sphere.label = "Sphere" + + assembly1 = Compound(label="Assembly1", children=[cone]) + assembly1.move(Location((3, 3, 3), (90, 0, 0))) + assembly2 = Compound(label="Assembly2", children=[assembly1, box]) + assembly2.move(Location((2, 4, 6), (0, 0, 90))) + assembly3 = Compound(label="Assembly3", children=[assembly2, sphere]) + assembly3.move(Location((3, 6, 9))) + deep_shape: Shape = next( + iter(PreOrderIter(assembly3, filter_=lambda n: n.label in ("Cone"))) + ) + print(deep_shape.path) + self.assertAlmostEqual( + deep_shape.global_location.position, (2, 13, 18), places=6 + ) + self.assertAlmostEqual( + deep_shape.global_location.orientation, (0, 90, 90), places=6 + ) + + +from ocp_vscode import show + if __name__ == "__main__": unittest.main() From 10a3a2519d7083193b94593940f23f3f947056c1 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 2 Jun 2025 14:25:58 -0400 Subject: [PATCH 337/518] Adding Face.location_at(point) --- src/build123d/topology/two_d.py | 143 +++++++++++++++++++++++++---- tests/test_direct_api/test_face.py | 31 +++++++ 2 files changed, 154 insertions(+), 20 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index a7c5fb1..5065c14 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -325,6 +325,9 @@ class Mixin2D(Shape): world_point, world_point - target_object_center ) + if self.wrapped is None: + raise ValueError("Can't wrap around an empty face") + # Initial setup target_object_center = self.center(CenterOf.BOUNDING_BOX) @@ -383,7 +386,7 @@ class Mixin2D(Shape): raise RuntimeError( f"Length error of {length_error:.6f} exceeds tolerance {tolerance}" ) - if not wrapped_edge.is_valid: + if wrapped_edge.wrapped is None or not wrapped_edge.is_valid: raise RuntimeError("Wrapped edge is invalid") if not snap_to_face: @@ -529,10 +532,12 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return None if self.geom_type == GeomType.CYLINDER: - return Axis(self.geom_adaptor().Cylinder().Axis()) + return Axis( + self.geom_adaptor().Cylinder().Axis() # type:ignore[attr-defined] + ) if self.geom_type == GeomType.TORUS: - return Axis(self.geom_adaptor().Torus().Axis()) + return Axis(self.geom_adaptor().Torus().Axis()) # type:ignore[attr-defined] return None @@ -790,8 +795,8 @@ class Face(Mixin2D, Shape[TopoDS_Face]): """Return the major and minor radii of a torus otherwise None""" if self.geom_type == GeomType.TORUS: return ( - self.geom_adaptor().MajorRadius(), - self.geom_adaptor().MinorRadius(), + self.geom_adaptor().MajorRadius(), # type:ignore[attr-defined] + self.geom_adaptor().MinorRadius(), # type:ignore[attr-defined] ) return None @@ -803,7 +808,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): self.geom_type in [GeomType.CYLINDER, GeomType.SPHERE] and type(self.geom_adaptor()) != Geom_RectangularTrimmedSurface ): - return self.geom_adaptor().Radius() + return self.geom_adaptor().Radius() # type:ignore[attr-defined] else: return None @@ -841,6 +846,8 @@ class Face(Mixin2D, Shape[TopoDS_Face]): Returns: Face: extruded shape """ + if obj.wrapped is None: + raise ValueError("Can't extrude empty object") return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) @classmethod @@ -987,11 +994,13 @@ class Face(Mixin2D, Shape[TopoDS_Face]): raise ValueError("exterior must be a Wire or list of Edges") for edge in outside_edges: + if edge.wrapped is None: + raise ValueError("exterior contains empty edges") surface.Add(edge.wrapped, GeomAbs_C0) try: surface.Build() - surface_face = Face(surface.Shape()) + surface_face = Face(surface.Shape()) # type:ignore[call-overload] except ( Standard_Failure, StdFail_NotDone, @@ -1006,7 +1015,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): surface.Add(gp_Pnt(*point)) try: surface.Build() - surface_face = Face(surface.Shape()) + surface_face = Face(surface.Shape()) # type:ignore[call-overload] except StdFail_NotDone as err: raise RuntimeError( "Error building non-planar face with provided surface_points" @@ -1016,6 +1025,8 @@ class Face(Mixin2D, Shape[TopoDS_Face]): if interior_wires: makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) for wire in interior_wires: + if wire.wrapped is None: + raise ValueError("interior_wires contain an empty wire") makeface_object.Add(wire.wrapped) try: surface_face = Face(makeface_object.Face()) @@ -1167,7 +1178,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): True, ) - return cls(revol_builder.Shape()) + return cls(revol_builder.Shape()) # type:ignore[call-overload] @classmethod def sew_faces(cls, faces: Iterable[Face]) -> list[ShapeList[Face]]: @@ -1198,7 +1209,8 @@ class Face(Mixin2D, Shape[TopoDS_Face]): elif isinstance(top_level_shape, TopoDS_Solid): sewn_faces.append( ShapeList( - Face(f) for f in _topods_entities(top_level_shape, "Face") + Face(f) # type:ignore[call-overload] + for f in _topods_entities(top_level_shape, "Face") ) ) else: @@ -1245,7 +1257,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): builder.Add(profile.wrapped, False, False) builder.SetTransitionMode(Shape._transModeDict[transition]) builder.Build() - result = Face(builder.Shape()) + result = Face(builder.Shape()) # type:ignore[call-overload] if SkipClean.clean: result = result.clean() @@ -1403,16 +1415,105 @@ class Face(Mixin2D, Shape[TopoDS_Face]): # projector = GeomAPI_ProjectPointOnSurf(Vector(point).to_pnt(), surface) # return projector.LowerDistance() <= TOLERANCE + @overload def location_at( - self, u: float, v: float, x_dir: VectorLike | None = None - ) -> Location: - """Location at the u/v position of face""" - origin = self.position_at(u, v) - if x_dir is None: - pln = Plane(origin, z_dir=self.normal_at(u, v)) + self, + surface_point: VectorLike | None = None, + *, + x_dir: VectorLike | None = None, + ) -> Location: ... + + @overload + def location_at( + self, u: float, v: float, *, x_dir: VectorLike | None = None + ) -> Location: ... + + def location_at(self, *args, **kwargs) -> Location: + """location_at + + Get the location (origin and orientation) on the surface of the face. + + This method supports two overloads: + + 1. `location_at(u: float, v: float, *, x_dir: VectorLike | None = None) -> Location` + - Specifies the point in normalized UV parameter space of the face. + - `u` and `v` are floats between 0.0 and 1.0. + - Optionally override the local X direction using `x_dir`. + + 2. `location_at(surface_point: VectorLike, *, x_dir: VectorLike | None = None) -> Location` + - Projects the given 3D point onto the face surface. + - The point must be reasonably close to the face. + - Optionally override the local X direction using `x_dir`. + + If no arguments are provided, the location at the center of the face + (u=0.5, v=0.5) is returned. + + Args: + u (float): Normalized horizontal surface parameter (optional). + v (float): Normalized vertical surface parameter (optional). + surface_point (VectorLike): A 3D point near the surface (optional). + x_dir (VectorLike, optional): Direction for the local X axis. If not given, + the tangent in the U direction is used. + + Returns: + Location: A full 3D placement at the specified point on the face surface. + + Raises: + ValueError: If only one of `u` or `v` is provided or invalid keyword args are passed. + """ + surface_point, u, v = None, -1.0, -1.0 + + if args: + if isinstance(args[0], (Vector, Sequence)): + surface_point = args[0] + elif isinstance(args[0], (int, float)): + u = args[0] + if len(args) == 2 and isinstance(args[1], (int, float)): + v = args[1] + + unknown_args = set(kwargs.keys()).difference( + {"surface_point", "u", "v", "x_dir"} + ) + if unknown_args: + raise ValueError(f"Unexpected argument(s) {', '.join(unknown_args)}") + + surface_point = kwargs.get("surface_point", surface_point) + u = kwargs.get("u", u) + v = kwargs.get("v", v) + user_x_dir = kwargs.get("x_dir", None) + + if surface_point is None and u < 0 and v < 0: + u, v = 0.5, 0.5 + elif surface_point is None and (u < 0 or v < 0): + raise ValueError("Both u & v values must be specified") + + geom_surface: Geom_Surface = self.geom_adaptor() + u_min, u_max, v_min, v_max = self._uv_bounds() + + if surface_point is None: + u_val = u_min + u * (u_max - u_min) + v_val = v_min + v * (v_max - v_min) else: - pln = Plane(origin, x_dir=Vector(x_dir), z_dir=self.normal_at(u, v)) - return Location(pln) + projector = GeomAPI_ProjectPointOnSurf( + Vector(surface_point).to_pnt(), geom_surface + ) + u_val, v_val = projector.LowerDistanceParameters() + + # Evaluate point and partials + pnt = gp_Pnt() + du = gp_Vec() + dv = gp_Vec() + geom_surface.D1(u_val, v_val, pnt, du, dv) + + origin = Vector(pnt) + z_dir = Vector(du).cross(Vector(dv)).normalized() + x_dir = ( + Vector(user_x_dir).normalized() + if user_x_dir is not None + else Vector(du).normalized() + ) + + return Location(Plane(origin=origin, x_dir=x_dir, z_dir=z_dir)) def make_holes(self, interior_wires: list[Wire]) -> Face: """Make Holes in Face @@ -1609,7 +1710,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): (extruded_topods_self,), (target_object.wrapped,), BRepAlgoAPI_Common() ) if not topods_shape.IsNull(): - intersected_shapes.append(Face(topods_shape)) + intersected_shapes.append( + Face(topods_shape) # type:ignore[call-overload] + ) else: for target_shell in target_object.shells(): topods_shape = _topods_bool_op( diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 6e57a55..66971de 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -458,6 +458,37 @@ class TestFace(unittest.TestCase): face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] self.assertAlmostEqual(face.normal_at(0, 1), (1, 0, 0), 5) + def test_location_at(self): + face = Face.make_rect(1, 1) + + # Default center (u=0, v=0) + loc = face.location_at(0, 0) + self.assertAlmostEqual(loc.position, (-0.5, -0.5, 0), 5) + self.assertAlmostEqual(loc.z_axis.direction, (0, 0, 1), 5) + + # Using surface_point instead of u,v + point = face.position_at(0, 0) + loc2 = face.location_at(point) + self.assertAlmostEqual(loc2.position, (-0.5, -0.5, 0), 5) + self.assertAlmostEqual(loc2.z_axis.direction, (0, 0, 1), 5) + + # Bad args + with self.assertRaises(ValueError): + face.location_at(0) + with self.assertRaises(ValueError): + face.location_at(center=(0, 0)) + + # Curved surface: verify z-direction is outward normal + face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] + loc3 = face.location_at(0, 1) + self.assertAlmostEqual(loc3.z_axis.direction, (1, 0, 0), 5) + + # Curved surface: verify center + face = Cylinder(1, 1).faces().filter_by(GeomType.CYLINDER)[0] + loc4 = face.location_at() + self.assertAlmostEqual(loc4.position, (-1, 0, 0), 5) + self.assertAlmostEqual(loc4.z_axis.direction, (-1, 0, 0), 5) + def test_without_holes(self): # Planar test frame = (Rectangle(1, 1) - Rectangle(0.5, 0.5)).face() From 3f2d0a445d05dc031a328888420f94af067a3c0c Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 2 Jun 2025 14:55:17 -0400 Subject: [PATCH 338/518] Add Shell.location_at(point) --- src/build123d/topology/two_d.py | 22 ++++++++++++++++++++++ tests/test_direct_api/test_shells.py | 7 +++++++ 2 files changed, 29 insertions(+) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 5065c14..0524db6 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -2309,6 +2309,28 @@ class Shell(Mixin2D, Shape[TopoDS_Shell]): BRepGProp.LinearProperties_s(self.wrapped, properties) return Vector(properties.CentreOfMass()) + def location_at( + self, + surface_point: VectorLike, + *, + x_dir: VectorLike | None = None, + ) -> Location: + """location_at + + Get the location (origin and orientation) on the surface of the shell. + + Args: + surface_point (VectorLike): A 3D point near the surface. + x_dir (VectorLike, optional): Direction for the local X axis. If not given, + the tangent in the U direction is used. + + Returns: + Location: A full 3D placement at the specified point on the shell surface. + """ + # Find the closest Face and get the location from it + face = self.faces().sort_by(lambda f: f.distance_to(surface_point))[0] + return face.location_at(surface_point, x_dir=x_dir) + def sort_wires_by_build_order(wire_list: list[Wire]) -> list[list[Wire]]: """Tries to determine how wires should be combined into faces. diff --git a/tests/test_direct_api/test_shells.py b/tests/test_direct_api/test_shells.py index d465433..bd81945 100644 --- a/tests/test_direct_api/test_shells.py +++ b/tests/test_direct_api/test_shells.py @@ -116,6 +116,13 @@ class TestShells(unittest.TestCase): outer_vol = 3 * 12 * 7 self.assertAlmostEqual(thick.volume, outer_vol - inner_vol) + def test_location_at(self): + shell = Solid.make_cylinder(1, 2).shell() + top_center = shell.location_at((0, 0, 2)) + self.assertAlmostEqual(top_center.position, (0, 0, 2), 5) + self.assertAlmostEqual(top_center.z_axis.direction, (0, 0, 1), 5) + self.assertAlmostEqual(top_center.x_axis.direction, (1, 0, 0), 5) + if __name__ == "__main__": unittest.main() From 08a901492312d89b23c7ad2e7db64d9ddf76c334 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 3 Jun 2025 19:07:58 -0400 Subject: [PATCH 339/518] Added abstract Mixin2d.location_at --- src/build123d/topology/two_d.py | 46 ++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 0524db6..db27087 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -58,18 +58,18 @@ from __future__ import annotations import copy import sys import warnings -from typing import Any, overload, TypeVar, TYPE_CHECKING - +from abc import ABC, abstractmethod from collections.abc import Iterable, Sequence +from typing import TYPE_CHECKING, Any, TypeVar, overload import OCP.TopAbs as ta -from OCP.BRep import BRep_Tool, BRep_Builder +from OCP.BRep import BRep_Builder, BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_Surface from OCP.BRepAlgo import BRepAlgo from OCP.BRepAlgoAPI import BRepAlgoAPI_Common from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakeEdge, + BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakeWire, ) from OCP.BRepClass3d import BRepClass3d_SolidClassifier @@ -80,30 +80,31 @@ from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeFilling, BRepOffsetAPI_MakePipeShell from OCP.BRepPrimAPI import BRepPrimAPI_MakeRevol from OCP.BRepTools import BRepTools, BRepTools_ReShape -from OCP.GProp import GProp_GProps -from OCP.Geom import Geom_BezierSurface, Geom_Surface, Geom_RectangularTrimmedSurface +from OCP.gce import gce_MakeLin +from OCP.Geom import Geom_BezierSurface, Geom_RectangularTrimmedSurface, Geom_Surface +from OCP.GeomAbs import GeomAbs_C0 from OCP.GeomAPI import ( GeomAPI_ExtremaCurveCurve, GeomAPI_PointsToBSplineSurface, GeomAPI_ProjectPointOnSurf, ) -from OCP.GeomAbs import GeomAbs_C0 from OCP.GeomProjLib import GeomProjLib +from OCP.gp import gp_Pnt, gp_Vec +from OCP.GProp import GProp_GProps from OCP.Precision import Precision from OCP.ShapeFix import ShapeFix_Solid, ShapeFix_Wire from OCP.Standard import ( + Standard_ConstructionError, Standard_Failure, Standard_NoSuchObject, - Standard_ConstructionError, ) from OCP.StdFail import StdFail_NotDone -from OCP.TColStd import TColStd_HArray2OfReal from OCP.TColgp import TColgp_HArray2OfPnt +from OCP.TColStd import TColStd_HArray2OfReal from OCP.TopExp import TopExp -from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid -from OCP.gce import gce_MakeLin -from OCP.gp import gp_Pnt, gp_Vec +from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape +from typing_extensions import Self from build123d.build_enums import CenterOf, GeomType, Keep, SortBy, Transition from build123d.geometry import ( @@ -117,38 +118,36 @@ from build123d.geometry import ( Vector, VectorLike, ) -from typing_extensions import Self -from .one_d import Mixin1D, Edge, Wire +from .one_d import Edge, Mixin1D, Wire from .shape_core import ( Shape, ShapeList, SkipClean, - downcast, - get_top_level_topods_shapes, _sew_topods_faces, - shapetype, _topods_entities, _topods_face_normal_at, + downcast, + get_top_level_topods_shapes, + shapetype, ) from .utils import ( _extrude_topods_shape, - find_max_dimension, _make_loft, _make_topods_face_from_wires, _topods_bool_op, + find_max_dimension, ) from .zero_d import Vertex - if TYPE_CHECKING: # pragma: no cover - from .three_d import Solid # pylint: disable=R0801 from .composite import Compound, Curve # pylint: disable=R0801 + from .three_d import Solid # pylint: disable=R0801 T = TypeVar("T", Edge, Wire, "Face") -class Mixin2D(Shape): +class Mixin2D(ABC, Shape): """Additional methods to add to Face and Shell class""" project_to_viewport = Mixin1D.project_to_viewport @@ -258,6 +257,11 @@ class Mixin2D(Shape): return result + @abstractmethod + def location_at(self, *args: Any, **kwargs: Any) -> Location: + """A location from a face or shell""" + pass + def offset(self, amount: float) -> Self: """Return a copy of self moved along the normal by amount""" return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) From 62ebfb9262f6ec8a7a1d76c36c9103c1629f3862 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 4 Jun 2025 15:50:11 -0400 Subject: [PATCH 340/518] Revert "SlotOverall: remove width != height else branch to make circle. width <= height ValueError makes this branch inaccessible." This reverts commit 1e1c81a09364d00259a20f4962835dd535da06f2. --- src/build123d/objects_sketch.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index bfab9e3..d159d1d 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -521,14 +521,17 @@ class SlotOverall(BaseSketchObject): self.width = width self.slot_height = height - face = Face( - Wire( - [ - Edge.make_line(Vector(-width / 2 + height / 2, 0, 0), Vector()), - Edge.make_line(Vector(), Vector(+width / 2 - height / 2, 0, 0)), - ] - ).offset_2d(height / 2) - ) + if width != height: + face = Face( + Wire( + [ + Edge.make_line(Vector(-width / 2 + height / 2, 0, 0), Vector()), + Edge.make_line(Vector(), Vector(+width / 2 - height / 2, 0, 0)), + ] + ).offset_2d(height / 2) + ) + else: + face = cast(Face, Circle(width / 2, mode=mode).face()) super().__init__(face, rotation, align, mode) From 82f65f7bb0020bc4f173717e15efb473a3a6b7ee Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 4 Jun 2025 16:29:35 -0400 Subject: [PATCH 341/518] SlotOverall, SlotCenterToCenter: (re)implement and test circle degenerate case --- src/build123d/objects_sketch.py | 27 ++++++++++++++++----------- tests/test_build_sketch.py | 29 ++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index d159d1d..a630e29 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -464,7 +464,7 @@ class SlotCenterToCenter(BaseSketchObject): rotation: float = 0, mode: Mode = Mode.ADD, ): - if center_separation <= 0: + if center_separation < 0: raise ValueError( f"Requires center_separation > 0. Got: {center_separation=}" ) @@ -475,14 +475,18 @@ class SlotCenterToCenter(BaseSketchObject): self.center_separation = center_separation self.slot_height = height - face = Face( - Wire( - [ - Edge.make_line(Vector(-center_separation / 2, 0, 0), Vector()), - Edge.make_line(Vector(), Vector(+center_separation / 2, 0, 0)), - ] - ).offset_2d(height / 2) - ) + if center_separation > 0: + face = Face( + Wire( + [ + Edge.make_line(Vector(-center_separation / 2, 0, 0), Vector()), + Edge.make_line(Vector(), Vector(+center_separation / 2, 0, 0)), + ] + ).offset_2d(height / 2) + ) + else: + face = cast(Face, Circle(height / 2, mode=mode).face()) + super().__init__(face, rotation, None, mode) @@ -510,7 +514,7 @@ class SlotOverall(BaseSketchObject): align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER), mode: Mode = Mode.ADD, ): - if width <= height: + if width < height: raise ValueError( f"Slot requires that width > height. Got: {width=}, {height=}" ) @@ -521,7 +525,7 @@ class SlotOverall(BaseSketchObject): self.width = width self.slot_height = height - if width != height: + if width > height: face = Face( Wire( [ @@ -532,6 +536,7 @@ class SlotOverall(BaseSketchObject): ) else: face = cast(Face, Circle(width / 2, mode=mode).face()) + super().__init__(face, rotation, align, mode) diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 58afd7d..bb898a0 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -328,25 +328,40 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(s.faces()[0].normal_at(), Vector(0, 0, 1)) def test_slot_center_to_center(self): + height = 2 with BuildSketch() as test: - s = SlotCenterToCenter(4, 2) + s = SlotCenterToCenter(4, height) self.assertEqual(s.center_separation, 4) - self.assertEqual(s.slot_height, 2) + self.assertEqual(s.slot_height, height) self.assertEqual(s.rotation, 0) self.assertEqual(s.mode, Mode.ADD) - self.assertAlmostEqual(test.sketch.area, pi + 4 * 2, 5) + self.assertAlmostEqual(test.sketch.area, pi + 4 * height, 5) self.assertEqual(s.faces()[0].normal_at(), Vector(0, 0, 1)) + # Circle degenerate + s1 = SlotCenterToCenter(0, height) + self.assertTrue(len(s1.edges()) == 1) + self.assertEqual(s1.edge().geom_type, GeomType.CIRCLE) + self.assertAlmostEqual(s1.edge().radius, height / 2) + + def test_slot_overall(self): + height = 2 with BuildSketch() as test: - s = SlotOverall(6, 2) + s = SlotOverall(6, height) self.assertEqual(s.width, 6) - self.assertEqual(s.slot_height, 2) + self.assertEqual(s.slot_height, height) self.assertEqual(s.rotation, 0) self.assertEqual(s.mode, Mode.ADD) - self.assertAlmostEqual(test.sketch.area, pi + 4 * 2, 5) + self.assertAlmostEqual(test.sketch.area, pi + 4 * height, 5) self.assertEqual(s.faces()[0].normal_at(), Vector(0, 0, 1)) + # Circle degenerat + s1 = SlotOverall(2, height) + self.assertTrue(len(s1.edges()) == 1) + self.assertEqual(s1.edge().geom_type, GeomType.CIRCLE) + self.assertAlmostEqual(s1.edge().radius, height / 2) + def test_text(self): with BuildSketch() as test: t = Text("test", 2) @@ -530,7 +545,7 @@ class TestBuildSketchObjects(unittest.TestCase): @pytest.mark.parametrize( "slot,args", [ - (SlotOverall, (5, 10)), + (SlotOverall, (9, 10)), (SlotCenterToCenter, (-1, 10)), (SlotCenterPoint, ((0, 0, 0), (0, 0, 0), 10)), ], From fbc170ebdc3128112512d9473b5b4b26b0d8f109 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 10 Jun 2025 16:34:44 -0400 Subject: [PATCH 342/518] Fixing _ocp_section --- src/build123d/topology/shape_core.py | 28 ++++++------- tests/test_direct_api/test_shape.py | 62 +++++++++++++++++----------- 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index ddd8317..4ad12e1 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2162,7 +2162,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def _ocp_section( self: Shape, other: Vertex | Edge | Wire | Face - ) -> tuple[list[Vertex], list[Edge]]: + ) -> tuple[ShapeList[Vertex], ShapeList[Edge]]: """_ocp_section Create a BRepAlgoAPI_Section object @@ -2180,38 +2180,34 @@ class Shape(NodeMixin, Generic[TOPODS]): other (Union[Vertex, Edge, Wire, Face]): shape to section with Returns: - tuple[list[Vertex], list[Edge]]: section results + tuple[ShapeList[Vertex], ShapeList[Edge]]: section results """ if self.wrapped is None or other.wrapped is None: - return ([], []) + return (ShapeList(), ShapeList()) - try: - section = BRepAlgoAPI_Section(other.geom_adaptor(), self.wrapped) - except (TypeError, AttributeError): - try: - section = BRepAlgoAPI_Section(self.geom_adaptor(), other.wrapped) - except (TypeError, AttributeError): - return ([], []) - - # Perform the intersection calculation + section = BRepAlgoAPI_Section(self.wrapped, other.wrapped) + section.SetRunParallel(True) + section.Approximation(True) + section.ComputePCurveOn1(True) + section.ComputePCurveOn2(True) section.Build() # Get the resulting shapes from the intersection - intersection_shape = section.Shape() + intersection_shape: TopoDS_Shape = section.Shape() - vertices = [] + vertices: list[Vertex] = [] # Iterate through the intersection shape to find intersection points/edges explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_VERTEX) while explorer.More(): vertices.append(self.__class__.cast(downcast(explorer.Current()))) explorer.Next() - edges = [] + edges: ShapeList[Edge] = ShapeList() explorer = TopExp_Explorer(intersection_shape, TopAbs_ShapeEnum.TopAbs_EDGE) while explorer.More(): edges.append(self.__class__.cast(downcast(explorer.Current()))) explorer.Next() - return (vertices, edges) + return (ShapeList(set(vertices)), edges) def _repr_html_(self): """Jupyter 3D representation support""" diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 3646fb2..f31ee32 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -33,7 +33,7 @@ from unittest.mock import PropertyMock, patch import numpy as np from anytree import PreOrderIter -from build123d.build_enums import CenterOf, Keep +from build123d.build_enums import CenterOf, GeomType, Keep from build123d.geometry import ( Axis, Color, @@ -460,44 +460,56 @@ class TestShape(unittest.TestCase): def test_ocp_section(self): # Vertex verts, edges = Vertex(1, 2, 0)._ocp_section(Vertex(1, 2, 0)) - self.assertListEqual(verts, []) # ? - self.assertListEqual(edges, []) + self.assertEqual(len(verts), 1) + self.assertEqual(len(edges), 0) + self.assertAlmostEqual(Vector(verts[0]), (1, 2, 0), 5) verts, edges = Vertex(1, 2, 0)._ocp_section(Edge.make_line((0, 0), (2, 4))) - self.assertListEqual(verts, []) # ? - self.assertListEqual(edges, []) + self.assertEqual(len(verts), 1) + self.assertEqual(len(edges), 0) + self.assertAlmostEqual(Vector(verts[0]), (1, 2, 0), 5) verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_rect(5, 5)) - np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) + self.assertAlmostEqual(Vector(verts[0]), (1, 2, 0), 5) self.assertListEqual(edges, []) verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_plane(Plane.XY)) - np.testing.assert_allclose(tuple(verts[0]), (1, 2, 0), 1e-5) + self.assertAlmostEqual(Vector(verts[0]), (1, 2, 0), 5) self.assertListEqual(edges, []) - # spline = Spline((-10, 10, -10), (-10, -5, -5), (20, 0, 5)) - # cylinder = Pos(Z=-10) * extrude(Circle(5), 20) - # cylinder2 = (Rot((0, 90, 0)) * cylinder).face() - # pln = Plane.XY - # box1 = Box(10, 10, 10, align=(Align.CENTER, Align.CENTER, Align.MIN)) - # box2 = Pos(Z=-10) * box1 + cylinder = Face.extrude(Edge.make_circle(5, Plane.XY.offset(-10)), (0, 0, 20)) + cylinder2 = Face.extrude(Edge.make_circle(5, Plane.YZ.offset(-10)), (20, 0, 0)) + pln = Plane.XY - # # vertices, edges = ocp_section(spline, Face.make_rect(1e6, 1e6, pln)) - # vertices1, edges1 = spline.ocp_section(Face.make_plane(pln)) - # print(vertices1, edges1) + v_edge = Edge.make_line((-5, 0, -20), (-5, 0, 20)) + vertices1, edges1 = cylinder._ocp_section(v_edge) + vertices1 = ShapeList(vertices1).sort_by(Axis.Z) + self.assertEqual(len(vertices1), 2) - # vertices2, edges2 = cylinder.ocp_section(Face.make_plane(pln)) - # print(vertices2, edges2) + self.assertAlmostEqual(Vector(vertices1[0]), (-5, 0, -10), 5) + self.assertAlmostEqual(Vector(vertices1[1]), (-5, 0, 10), 5) + self.assertEqual(len(edges1), 1) + self.assertAlmostEqual(edges1[0].length, 20, 5) - # vertices3, edges3 = cylinder2.ocp_section(Face.make_plane(pln)) - # print(vertices3, edges3) + vertices2, edges2 = cylinder._ocp_section(Face.make_plane(pln)) + self.assertEqual(len(vertices2), 1) + self.assertEqual(len(edges2), 1) + self.assertAlmostEqual(Vector(vertices2[0]), (5, 0, 0), 5) + self.assertEqual(edges2[0].geom_type, GeomType.CIRCLE) + self.assertAlmostEqual(edges2[0].radius, 5, 5) - # # vertices4, edges4 = cylinder2.ocp_section(cylinder) + vertices4, edges4 = cylinder2._ocp_section(cylinder) + self.assertGreaterEqual(len(vertices4), 0) + self.assertGreaterEqual(len(edges4), 2) + self.assertTrue(all(e.geom_type == GeomType.ELLIPSE for e in edges4)) - # vertices5, edges5 = box1.ocp_section(Face.make_plane(pln)) - # print(vertices5, edges5) + cylinder3 = Cylinder(5, 20).solid() + cylinder4 = Rotation(0, 90, 0) * cylinder3 - # vertices6, edges6 = box1.ocp_section(box2.faces().sort_by(Axis.Z)[-1]) + vertices5, edges5 = cylinder3._ocp_section(cylinder4) + self.assertGreaterEqual(len(vertices5), 0) + self.assertGreaterEqual(len(edges5), 2) + self.assertTrue(all(e.geom_type == GeomType.ELLIPSE for e in edges5)) def test_copy_attributes_to(self): box = Box(1, 1, 1) @@ -657,7 +669,7 @@ class TestGlobalLocation(unittest.TestCase): deep_shape: Shape = next( iter(PreOrderIter(assembly3, filter_=lambda n: n.label in ("Cone"))) ) - print(deep_shape.path) + # print(deep_shape.path) self.assertAlmostEqual( deep_shape.global_location.position, (2, 13, 18), places=6 ) From 02439d3a3628eb775ae46c1bb10d6d264f009448 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 12 Jun 2025 15:23:12 -0400 Subject: [PATCH 343/518] Fixing fillet/chamfer parent id Issue #393 --- src/build123d/topology/shape_core.py | 2 +- tests/test_build_sketch.py | 3 +-- tests/test_direct_api/test_mixin1_d.py | 9 ++++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 4ad12e1..84a7c3d 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -800,7 +800,7 @@ class Shape(NodeMixin, Generic[TOPODS]): [shape.__class__.cast(i) for i in shape.entities(entity_type)] ) for item in shape_list: - item.topo_parent = shape + item.topo_parent = shape if shape.topo_parent is None else shape.topo_parent return shape_list @staticmethod diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index bb898a0..443d441 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -344,7 +344,6 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertEqual(s1.edge().geom_type, GeomType.CIRCLE) self.assertAlmostEqual(s1.edge().radius, height / 2) - def test_slot_overall(self): height = 2 with BuildSketch() as test: @@ -537,7 +536,7 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertLess(tri_round.area, tri.area) # Test flipping the face - flipped = -Rectangle(34, 10).face() + flipped = -Face.make_rect(34, 10) rounded = full_round((flipped.edges() << Axis.X)[0]).face() self.assertEqual(flipped.normal_at(), rounded.normal_at()) diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index f064ac0..8e917a4 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -40,7 +40,7 @@ from build123d.build_enums import ( from build123d.geometry import Axis, Location, Plane, Vector from build123d.objects_curve import Polyline from build123d.objects_part import Box, Cylinder -from build123d.topology import Compound, Edge, Face, Wire +from build123d.topology import Compound, Edge, Face, Solid, Wire class TestMixin1D(unittest.TestCase): @@ -360,6 +360,13 @@ class TestMixin1D(unittest.TestCase): wire = Wire.make_rect(1, 1) self.assertAlmostEqual(wire.volume, 0, 5) + def test_edges(self): + box = Solid.make_box(1, 1, 1) + top_x = box.faces().sort_by(Axis.Z)[-1].edges().sort_by(Axis.X)[-1] + self.assertEqual(top_x.topo_parent, box) + self.assertTrue(isinstance(top_x, Edge)) + self.assertAlmostEqual(top_x.center(), (1, 0.5, 1), 5) + if __name__ == "__main__": unittest.main() From 344ba7a9ae1c1a7d4544dcb0481a3bdd884ae808 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 13 Jun 2025 10:07:18 -0400 Subject: [PATCH 344/518] Reset topo_parent when - Face Issue #1008 --- src/build123d/topology/two_d.py | 3 +++ tests/test_direct_api/test_face.py | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index db27087..647cbb6 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -200,6 +200,9 @@ class Mixin2D(ABC, Shape): new_surface = copy.deepcopy(self) new_surface.wrapped = downcast(self.wrapped.Complemented()) + # As the surface has been modified, the parent is no longer valid + new_surface.topo_parent = None + return new_surface def face(self) -> Face | None: diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 66971de..7bf2f5f 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -169,6 +169,13 @@ class TestFace(unittest.TestCase): flipped_square = -square self.assertAlmostEqual(flipped_square.normal_at(), (0, 0, -1), 5) + # Ensure the topo_parent is cleared when a face is negated + # (otherwise the original Rectangle would be the topo_parent) + flipped = -Rectangle(34, 10).face() + left_edge = flipped.edges().sort_by(Axis.X)[0] + parent_face = left_edge.topo_parent + self.assertAlmostEqual(flipped.normal_at(), parent_face.normal_at(), 5) + def test_offset(self): bbox = Face.make_rect(2, 2, Plane.XY).offset(5).bounding_box() self.assertAlmostEqual(bbox.min, (-1, -1, 5), 5) From ddb07572be464ec950b248ae064db0ab53730e4d Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 15 Jun 2025 14:05:20 -0400 Subject: [PATCH 345/518] Assigning topo_parent to inner/outer wires methods Issue #393 --- src/build123d/topology/one_d.py | 6 +++++- src/build123d/topology/two_d.py | 10 +++++++--- tests/test_direct_api/test_mixin1_d.py | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 5cff57d..e7b02e4 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -493,7 +493,11 @@ class Mixin1D(Shape): edge_list: ShapeList[Edge] = ShapeList() while explorer.More(): - edge_list.append(Edge(explorer.Current())) + next_edge = Edge(explorer.Current()) + next_edge.topo_parent = ( + self if self.topo_parent is None else self.topo_parent + ) + edge_list.append(next_edge) explorer.Next() return edge_list else: diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 647cbb6..1a1e9dc 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1383,8 +1383,10 @@ class Face(Mixin2D, Shape[TopoDS_Face]): def inner_wires(self) -> ShapeList[Wire]: """Extract the inner or hole wires from this Face""" outer = self.outer_wire() - - return ShapeList([w for w in self.wires() if not w.is_same(outer)]) + inners = [w for w in self.wires() if not w.is_same(outer)] + for w in inners: + w.topo_parent = self if self.topo_parent is None else self.topo_parent + return ShapeList(inners) def is_coplanar(self, plane: Plane) -> bool: """Is this planar face coplanar with the provided plane""" @@ -1654,7 +1656,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): def outer_wire(self) -> Wire: """Extract the perimeter wire from this Face""" - return Wire(BRepTools.OuterWire_s(self.wrapped)) + outer = Wire(BRepTools.OuterWire_s(self.wrapped)) + outer.topo_parent = self if self.topo_parent is None else self.topo_parent + return outer def position_at(self, u: float, v: float) -> Vector: """position_at diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index 8e917a4..df8f2d4 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -40,6 +40,8 @@ from build123d.build_enums import ( from build123d.geometry import Axis, Location, Plane, Vector from build123d.objects_curve import Polyline from build123d.objects_part import Box, Cylinder +from build123d.operations_part import extrude +from build123d.operations_generic import fillet from build123d.topology import Compound, Edge, Face, Solid, Wire @@ -367,6 +369,22 @@ class TestMixin1D(unittest.TestCase): self.assertTrue(isinstance(top_x, Edge)) self.assertAlmostEqual(top_x.center(), (1, 0.5, 1), 5) + def test_edges_topo_parent(self): + phone_case_plan = Face.make_rect(80, 150) - Face.make_rect( + 25, 25, Plane((-20, 55)) + ) + phone_case = extrude(phone_case_plan, 2) + window_edges = phone_case.faces().sort_by(Axis.Z)[-1].inner_wires()[0].edges() + for e in window_edges: + self.assertEqual(e.topo_parent, phone_case) + phone_case_f = fillet(window_edges, 1) + self.assertLess(phone_case_f.volume, phone_case.volume) + perimeter = phone_case_f.faces().sort_by(Axis.Z)[-1].outer_wire().edges() + for e in perimeter: + self.assertEqual(e.topo_parent, phone_case_f) + phone_case_ff = fillet(perimeter, 1) + self.assertLess(phone_case_ff.volume, phone_case_f.volume) + if __name__ == "__main__": unittest.main() From f3f9fd23574072d0217becf3260de9064bbb7a52 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 30 Jun 2025 11:21:11 -0400 Subject: [PATCH 346/518] Improving trace - Issue #1021 --- src/build123d/operations_sketch.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index 0d4c43b..6cdf780 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -32,13 +32,14 @@ from __future__ import annotations from collections.abc import Iterable from scipy.spatial import Voronoi from typing import cast -from build123d.build_enums import Mode, SortBy +from build123d.build_enums import Mode, SortBy, Transition from build123d.topology import ( Compound, Curve, Edge, Face, ShapeList, + Shell, Wire, Sketch, topo_explore_connected_edges, @@ -298,10 +299,15 @@ def trace( else: raise ValueError("No objects to trace") + # Group the edges into wires to allow for nice transitions + trace_wires = Wire.combine(trace_edges) + new_faces: list[Face] = [] - for edge in trace_edges: - trace_pen = edge.perpendicular_line(line_width, 0) - new_faces.extend(Face.sweep(trace_pen, edge).faces()) + for to_trace in trace_wires: + trace_pen = to_trace.perpendicular_line(line_width, 0) + new_faces.extend( + Shell.sweep(trace_pen, to_trace, transition=Transition.RIGHT).faces() + ) if context is not None: context._add_to_context(*new_faces, mode=mode) context.pending_edges = ShapeList() From 742a3dccb372a39d50cb231de481f3add34efcd9 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 30 Jun 2025 23:01:33 -0400 Subject: [PATCH 347/518] Add missing step to Fix #1017 --- .../examples/nema-17-bracket.step | 4030 +++++++++++++++++ 1 file changed, 4030 insertions(+) create mode 100644 docs/topology_selection/examples/nema-17-bracket.step diff --git a/docs/topology_selection/examples/nema-17-bracket.step b/docs/topology_selection/examples/nema-17-bracket.step new file mode 100644 index 0000000..c950780 --- /dev/null +++ b/docs/topology_selection/examples/nema-17-bracket.step @@ -0,0 +1,4030 @@ +ISO-10303-21; +HEADER; +FILE_DESCRIPTION(('Open CASCADE Model'),'2;1'); +FILE_NAME('nema-17-bracket','2025-04-01T21:12:35',('Author'),( + 'Open CASCADE'),'Open CASCADE STEP processor 7.8','build123d', + 'Unknown'); +FILE_SCHEMA(('AUTOMOTIVE_DESIGN { 1 0 10303 214 1 1 1 1 }')); +ENDSEC; +DATA; +#1 = APPLICATION_PROTOCOL_DEFINITION('international standard', + 'automotive_design',2000,#2); +#2 = APPLICATION_CONTEXT( + 'core data for automotive mechanical design processes'); +#3 = SHAPE_DEFINITION_REPRESENTATION(#4,#10); +#4 = PRODUCT_DEFINITION_SHAPE('','',#5); +#5 = PRODUCT_DEFINITION('design','',#6,#9); +#6 = PRODUCT_DEFINITION_FORMATION('','',#7); +#7 = PRODUCT('nema-17-bracket','nema-17-bracket','',(#8)); +#8 = PRODUCT_CONTEXT('',#2,'mechanical'); +#9 = PRODUCT_DEFINITION_CONTEXT('part definition',#2,'design'); +#10 = ADVANCED_BREP_SHAPE_REPRESENTATION('',(#11,#15),#3331); +#11 = AXIS2_PLACEMENT_3D('',#12,#13,#14); +#12 = CARTESIAN_POINT('',(0.,0.,0.)); +#13 = DIRECTION('',(0.,0.,1.)); +#14 = DIRECTION('',(1.,0.,-0.)); +#15 = MANIFOLD_SOLID_BREP('',#16); +#16 = CLOSED_SHELL('',(#17,#348,#513,#567,#616,#739,#788,#815,#869,#923, + #977,#1031,#1085,#1907,#1956,#2625,#2649,#2676,#2683,#2730,#2757, + #2784,#2791,#2838,#2865,#2892,#2899,#2946,#2973,#3000,#3007,#3054, + #3081,#3108,#3115,#3162,#3189,#3216,#3223,#3270,#3297,#3324)); +#17 = ADVANCED_FACE('',(#18,#193,#224,#255,#286,#317),#32,.F.); +#18 = FACE_BOUND('',#19,.F.); +#19 = EDGE_LOOP('',(#20,#55,#83,#111,#139,#167)); +#20 = ORIENTED_EDGE('',*,*,#21,.F.); +#21 = EDGE_CURVE('',#22,#24,#26,.T.); +#22 = VERTEX_POINT('',#23); +#23 = CARTESIAN_POINT('',(-4.440892098501E-16,-20.5,3.)); +#24 = VERTEX_POINT('',#25); +#25 = CARTESIAN_POINT('',(0.,-20.5,49.)); +#26 = SURFACE_CURVE('',#27,(#31,#43),.PCURVE_S1.); +#27 = LINE('',#28,#29); +#28 = CARTESIAN_POINT('',(0.,-20.5,0.)); +#29 = VECTOR('',#30,1.); +#30 = DIRECTION('',(0.,0.,1.)); +#31 = PCURVE('',#32,#37); +#32 = PLANE('',#33); +#33 = AXIS2_PLACEMENT_3D('',#34,#35,#36); +#34 = CARTESIAN_POINT('',(0.,-20.5,0.)); +#35 = DIRECTION('',(1.,0.,0.)); +#36 = DIRECTION('',(0.,0.,1.)); +#37 = DEFINITIONAL_REPRESENTATION('',(#38),#42); +#38 = LINE('',#39,#40); +#39 = CARTESIAN_POINT('',(0.,0.)); +#40 = VECTOR('',#41,1.); +#41 = DIRECTION('',(1.,0.)); +#42 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#43 = PCURVE('',#44,#49); +#44 = PLANE('',#45); +#45 = AXIS2_PLACEMENT_3D('',#46,#47,#48); +#46 = CARTESIAN_POINT('',(0.,-20.5,0.)); +#47 = DIRECTION('',(0.,1.,0.)); +#48 = DIRECTION('',(0.,0.,1.)); +#49 = DEFINITIONAL_REPRESENTATION('',(#50),#54); +#50 = LINE('',#51,#52); +#51 = CARTESIAN_POINT('',(0.,0.)); +#52 = VECTOR('',#53,1.); +#53 = DIRECTION('',(1.,0.)); +#54 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#55 = ORIENTED_EDGE('',*,*,#56,.T.); +#56 = EDGE_CURVE('',#22,#57,#59,.T.); +#57 = VERTEX_POINT('',#58); +#58 = CARTESIAN_POINT('',(-4.440892098501E-16,20.5,3.)); +#59 = SURFACE_CURVE('',#60,(#64,#71),.PCURVE_S1.); +#60 = LINE('',#61,#62); +#61 = CARTESIAN_POINT('',(-4.440892098501E-16,-20.5,3.)); +#62 = VECTOR('',#63,1.); +#63 = DIRECTION('',(0.,1.,0.)); +#64 = PCURVE('',#32,#65); +#65 = DEFINITIONAL_REPRESENTATION('',(#66),#70); +#66 = LINE('',#67,#68); +#67 = CARTESIAN_POINT('',(3.,0.)); +#68 = VECTOR('',#69,1.); +#69 = DIRECTION('',(0.,-1.)); +#70 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#71 = PCURVE('',#72,#77); +#72 = CYLINDRICAL_SURFACE('',#73,3.); +#73 = AXIS2_PLACEMENT_3D('',#74,#75,#76); +#74 = CARTESIAN_POINT('',(3.,-20.5,3.)); +#75 = DIRECTION('',(0.,1.,0.)); +#76 = DIRECTION('',(-1.,0.,0.)); +#77 = DEFINITIONAL_REPRESENTATION('',(#78),#82); +#78 = LINE('',#79,#80); +#79 = CARTESIAN_POINT('',(-0.,0.)); +#80 = VECTOR('',#81,1.); +#81 = DIRECTION('',(-0.,1.)); +#82 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#83 = ORIENTED_EDGE('',*,*,#84,.F.); +#84 = EDGE_CURVE('',#85,#57,#87,.T.); +#85 = VERTEX_POINT('',#86); +#86 = CARTESIAN_POINT('',(0.,20.5,49.)); +#87 = SURFACE_CURVE('',#88,(#92,#99),.PCURVE_S1.); +#88 = LINE('',#89,#90); +#89 = CARTESIAN_POINT('',(0.,20.5,51.)); +#90 = VECTOR('',#91,1.); +#91 = DIRECTION('',(0.,0.,-1.)); +#92 = PCURVE('',#32,#93); +#93 = DEFINITIONAL_REPRESENTATION('',(#94),#98); +#94 = LINE('',#95,#96); +#95 = CARTESIAN_POINT('',(51.,-41.)); +#96 = VECTOR('',#97,1.); +#97 = DIRECTION('',(-1.,0.)); +#98 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#99 = PCURVE('',#100,#105); +#100 = PLANE('',#101); +#101 = AXIS2_PLACEMENT_3D('',#102,#103,#104); +#102 = CARTESIAN_POINT('',(0.,20.5,0.)); +#103 = DIRECTION('',(0.,1.,0.)); +#104 = DIRECTION('',(0.,0.,1.)); +#105 = DEFINITIONAL_REPRESENTATION('',(#106),#110); +#106 = LINE('',#107,#108); +#107 = CARTESIAN_POINT('',(51.,0.)); +#108 = VECTOR('',#109,1.); +#109 = DIRECTION('',(-1.,0.)); +#110 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#111 = ORIENTED_EDGE('',*,*,#112,.T.); +#112 = EDGE_CURVE('',#85,#113,#115,.T.); +#113 = VERTEX_POINT('',#114); +#114 = CARTESIAN_POINT('',(0.,18.5,51.)); +#115 = SURFACE_CURVE('',#116,(#120,#127),.PCURVE_S1.); +#116 = LINE('',#117,#118); +#117 = CARTESIAN_POINT('',(0.,22.,47.5)); +#118 = VECTOR('',#119,1.); +#119 = DIRECTION('',(0.,-0.707106781187,0.707106781187)); +#120 = PCURVE('',#32,#121); +#121 = DEFINITIONAL_REPRESENTATION('',(#122),#126); +#122 = LINE('',#123,#124); +#123 = CARTESIAN_POINT('',(47.5,-42.5)); +#124 = VECTOR('',#125,1.); +#125 = DIRECTION('',(0.707106781187,0.707106781187)); +#126 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#127 = PCURVE('',#128,#133); +#128 = PLANE('',#129); +#129 = AXIS2_PLACEMENT_3D('',#130,#131,#132); +#130 = CARTESIAN_POINT('',(0.,19.5,50.)); +#131 = DIRECTION('',(0.,0.707106781187,0.707106781187)); +#132 = DIRECTION('',(-1.,-0.,0.)); +#133 = DEFINITIONAL_REPRESENTATION('',(#134),#138); +#134 = LINE('',#135,#136); +#135 = CARTESIAN_POINT('',(-0.,-3.535533905933)); +#136 = VECTOR('',#137,1.); +#137 = DIRECTION('',(-0.,1.)); +#138 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#139 = ORIENTED_EDGE('',*,*,#140,.F.); +#140 = EDGE_CURVE('',#141,#113,#143,.T.); +#141 = VERTEX_POINT('',#142); +#142 = CARTESIAN_POINT('',(0.,-18.5,51.)); +#143 = SURFACE_CURVE('',#144,(#148,#155),.PCURVE_S1.); +#144 = LINE('',#145,#146); +#145 = CARTESIAN_POINT('',(0.,-20.5,51.)); +#146 = VECTOR('',#147,1.); +#147 = DIRECTION('',(0.,1.,0.)); +#148 = PCURVE('',#32,#149); +#149 = DEFINITIONAL_REPRESENTATION('',(#150),#154); +#150 = LINE('',#151,#152); +#151 = CARTESIAN_POINT('',(51.,0.)); +#152 = VECTOR('',#153,1.); +#153 = DIRECTION('',(0.,-1.)); +#154 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#155 = PCURVE('',#156,#161); +#156 = PLANE('',#157); +#157 = AXIS2_PLACEMENT_3D('',#158,#159,#160); +#158 = CARTESIAN_POINT('',(0.,-20.5,51.)); +#159 = DIRECTION('',(0.,0.,1.)); +#160 = DIRECTION('',(1.,0.,0.)); +#161 = DEFINITIONAL_REPRESENTATION('',(#162),#166); +#162 = LINE('',#163,#164); +#163 = CARTESIAN_POINT('',(0.,0.)); +#164 = VECTOR('',#165,1.); +#165 = DIRECTION('',(0.,1.)); +#166 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#167 = ORIENTED_EDGE('',*,*,#168,.F.); +#168 = EDGE_CURVE('',#24,#141,#169,.T.); +#169 = SURFACE_CURVE('',#170,(#174,#181),.PCURVE_S1.); +#170 = LINE('',#171,#172); +#171 = CARTESIAN_POINT('',(0.,-32.25,37.25)); +#172 = VECTOR('',#173,1.); +#173 = DIRECTION('',(-0.,0.707106781187,0.707106781187)); +#174 = PCURVE('',#32,#175); +#175 = DEFINITIONAL_REPRESENTATION('',(#176),#180); +#176 = LINE('',#177,#178); +#177 = CARTESIAN_POINT('',(37.25,11.75)); +#178 = VECTOR('',#179,1.); +#179 = DIRECTION('',(0.707106781187,-0.707106781187)); +#180 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#181 = PCURVE('',#182,#187); +#182 = PLANE('',#183); +#183 = AXIS2_PLACEMENT_3D('',#184,#185,#186); +#184 = CARTESIAN_POINT('',(0.,-19.5,50.)); +#185 = DIRECTION('',(0.,0.707106781187,-0.707106781187)); +#186 = DIRECTION('',(-1.,-0.,-0.)); +#187 = DEFINITIONAL_REPRESENTATION('',(#188),#192); +#188 = LINE('',#189,#190); +#189 = CARTESIAN_POINT('',(-0.,-18.03122292025)); +#190 = VECTOR('',#191,1.); +#191 = DIRECTION('',(-0.,1.)); +#192 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#193 = FACE_BOUND('',#194,.F.); +#194 = EDGE_LOOP('',(#195)); +#195 = ORIENTED_EDGE('',*,*,#196,.F.); +#196 = EDGE_CURVE('',#197,#197,#199,.T.); +#197 = VERTEX_POINT('',#198); +#198 = CARTESIAN_POINT('',(0.,17.15,14.5)); +#199 = SURFACE_CURVE('',#200,(#205,#212),.PCURVE_S1.); +#200 = CIRCLE('',#201,1.65); +#201 = AXIS2_PLACEMENT_3D('',#202,#203,#204); +#202 = CARTESIAN_POINT('',(0.,15.5,14.5)); +#203 = DIRECTION('',(1.,0.,0.)); +#204 = DIRECTION('',(0.,1.,0.)); +#205 = PCURVE('',#32,#206); +#206 = DEFINITIONAL_REPRESENTATION('',(#207),#211); +#207 = CIRCLE('',#208,1.65); +#208 = AXIS2_PLACEMENT_2D('',#209,#210); +#209 = CARTESIAN_POINT('',(14.5,-36.)); +#210 = DIRECTION('',(0.,-1.)); +#211 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#212 = PCURVE('',#213,#218); +#213 = CYLINDRICAL_SURFACE('',#214,1.65); +#214 = AXIS2_PLACEMENT_3D('',#215,#216,#217); +#215 = CARTESIAN_POINT('',(0.,15.5,14.5)); +#216 = DIRECTION('',(-1.,-0.,-0.)); +#217 = DIRECTION('',(0.,1.,0.)); +#218 = DEFINITIONAL_REPRESENTATION('',(#219),#223); +#219 = LINE('',#220,#221); +#220 = CARTESIAN_POINT('',(-0.,0.)); +#221 = VECTOR('',#222,1.); +#222 = DIRECTION('',(-1.,0.)); +#223 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#224 = FACE_BOUND('',#225,.F.); +#225 = EDGE_LOOP('',(#226)); +#226 = ORIENTED_EDGE('',*,*,#227,.F.); +#227 = EDGE_CURVE('',#228,#228,#230,.T.); +#228 = VERTEX_POINT('',#229); +#229 = CARTESIAN_POINT('',(0.,17.15,45.5)); +#230 = SURFACE_CURVE('',#231,(#236,#243),.PCURVE_S1.); +#231 = CIRCLE('',#232,1.65); +#232 = AXIS2_PLACEMENT_3D('',#233,#234,#235); +#233 = CARTESIAN_POINT('',(0.,15.5,45.5)); +#234 = DIRECTION('',(1.,0.,0.)); +#235 = DIRECTION('',(0.,1.,0.)); +#236 = PCURVE('',#32,#237); +#237 = DEFINITIONAL_REPRESENTATION('',(#238),#242); +#238 = CIRCLE('',#239,1.65); +#239 = AXIS2_PLACEMENT_2D('',#240,#241); +#240 = CARTESIAN_POINT('',(45.5,-36.)); +#241 = DIRECTION('',(0.,-1.)); +#242 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#243 = PCURVE('',#244,#249); +#244 = CYLINDRICAL_SURFACE('',#245,1.65); +#245 = AXIS2_PLACEMENT_3D('',#246,#247,#248); +#246 = CARTESIAN_POINT('',(0.,15.5,45.5)); +#247 = DIRECTION('',(-1.,-0.,-0.)); +#248 = DIRECTION('',(0.,1.,0.)); +#249 = DEFINITIONAL_REPRESENTATION('',(#250),#254); +#250 = LINE('',#251,#252); +#251 = CARTESIAN_POINT('',(-0.,0.)); +#252 = VECTOR('',#253,1.); +#253 = DIRECTION('',(-1.,0.)); +#254 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#255 = FACE_BOUND('',#256,.F.); +#256 = EDGE_LOOP('',(#257)); +#257 = ORIENTED_EDGE('',*,*,#258,.F.); +#258 = EDGE_CURVE('',#259,#259,#261,.T.); +#259 = VERTEX_POINT('',#260); +#260 = CARTESIAN_POINT('',(0.,-13.85,14.5)); +#261 = SURFACE_CURVE('',#262,(#267,#274),.PCURVE_S1.); +#262 = CIRCLE('',#263,1.65); +#263 = AXIS2_PLACEMENT_3D('',#264,#265,#266); +#264 = CARTESIAN_POINT('',(0.,-15.5,14.5)); +#265 = DIRECTION('',(1.,0.,0.)); +#266 = DIRECTION('',(0.,1.,0.)); +#267 = PCURVE('',#32,#268); +#268 = DEFINITIONAL_REPRESENTATION('',(#269),#273); +#269 = CIRCLE('',#270,1.65); +#270 = AXIS2_PLACEMENT_2D('',#271,#272); +#271 = CARTESIAN_POINT('',(14.5,-5.)); +#272 = DIRECTION('',(0.,-1.)); +#273 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#274 = PCURVE('',#275,#280); +#275 = CYLINDRICAL_SURFACE('',#276,1.65); +#276 = AXIS2_PLACEMENT_3D('',#277,#278,#279); +#277 = CARTESIAN_POINT('',(0.,-15.5,14.5)); +#278 = DIRECTION('',(-1.,-0.,-0.)); +#279 = DIRECTION('',(0.,1.,0.)); +#280 = DEFINITIONAL_REPRESENTATION('',(#281),#285); +#281 = LINE('',#282,#283); +#282 = CARTESIAN_POINT('',(-0.,0.)); +#283 = VECTOR('',#284,1.); +#284 = DIRECTION('',(-1.,0.)); +#285 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#286 = FACE_BOUND('',#287,.F.); +#287 = EDGE_LOOP('',(#288)); +#288 = ORIENTED_EDGE('',*,*,#289,.F.); +#289 = EDGE_CURVE('',#290,#290,#292,.T.); +#290 = VERTEX_POINT('',#291); +#291 = CARTESIAN_POINT('',(0.,16.,30.)); +#292 = SURFACE_CURVE('',#293,(#298,#305),.PCURVE_S1.); +#293 = CIRCLE('',#294,16.); +#294 = AXIS2_PLACEMENT_3D('',#295,#296,#297); +#295 = CARTESIAN_POINT('',(0.,0.,30.)); +#296 = DIRECTION('',(1.,0.,0.)); +#297 = DIRECTION('',(0.,1.,0.)); +#298 = PCURVE('',#32,#299); +#299 = DEFINITIONAL_REPRESENTATION('',(#300),#304); +#300 = CIRCLE('',#301,16.); +#301 = AXIS2_PLACEMENT_2D('',#302,#303); +#302 = CARTESIAN_POINT('',(30.,-20.5)); +#303 = DIRECTION('',(0.,-1.)); +#304 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#305 = PCURVE('',#306,#311); +#306 = CYLINDRICAL_SURFACE('',#307,16.); +#307 = AXIS2_PLACEMENT_3D('',#308,#309,#310); +#308 = CARTESIAN_POINT('',(0.,0.,30.)); +#309 = DIRECTION('',(-1.,-0.,-0.)); +#310 = DIRECTION('',(0.,1.,0.)); +#311 = DEFINITIONAL_REPRESENTATION('',(#312),#316); +#312 = LINE('',#313,#314); +#313 = CARTESIAN_POINT('',(-0.,0.)); +#314 = VECTOR('',#315,1.); +#315 = DIRECTION('',(-1.,0.)); +#316 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#317 = FACE_BOUND('',#318,.F.); +#318 = EDGE_LOOP('',(#319)); +#319 = ORIENTED_EDGE('',*,*,#320,.F.); +#320 = EDGE_CURVE('',#321,#321,#323,.T.); +#321 = VERTEX_POINT('',#322); +#322 = CARTESIAN_POINT('',(0.,-13.85,45.5)); +#323 = SURFACE_CURVE('',#324,(#329,#336),.PCURVE_S1.); +#324 = CIRCLE('',#325,1.65); +#325 = AXIS2_PLACEMENT_3D('',#326,#327,#328); +#326 = CARTESIAN_POINT('',(0.,-15.5,45.5)); +#327 = DIRECTION('',(1.,0.,0.)); +#328 = DIRECTION('',(0.,1.,0.)); +#329 = PCURVE('',#32,#330); +#330 = DEFINITIONAL_REPRESENTATION('',(#331),#335); +#331 = CIRCLE('',#332,1.65); +#332 = AXIS2_PLACEMENT_2D('',#333,#334); +#333 = CARTESIAN_POINT('',(45.5,-5.)); +#334 = DIRECTION('',(0.,-1.)); +#335 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#336 = PCURVE('',#337,#342); +#337 = CYLINDRICAL_SURFACE('',#338,1.65); +#338 = AXIS2_PLACEMENT_3D('',#339,#340,#341); +#339 = CARTESIAN_POINT('',(0.,-15.5,45.5)); +#340 = DIRECTION('',(-1.,-0.,-0.)); +#341 = DIRECTION('',(0.,1.,0.)); +#342 = DEFINITIONAL_REPRESENTATION('',(#343),#347); +#343 = LINE('',#344,#345); +#344 = CARTESIAN_POINT('',(-0.,0.)); +#345 = VECTOR('',#346,1.); +#346 = DIRECTION('',(-1.,0.)); +#347 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#348 = ADVANCED_FACE('',(#349),#44,.F.); +#349 = FACE_BOUND('',#350,.F.); +#350 = EDGE_LOOP('',(#351,#381,#407,#408,#431,#459,#487)); +#351 = ORIENTED_EDGE('',*,*,#352,.F.); +#352 = EDGE_CURVE('',#353,#355,#357,.T.); +#353 = VERTEX_POINT('',#354); +#354 = CARTESIAN_POINT('',(3.,-20.5,-4.440892098501E-16)); +#355 = VERTEX_POINT('',#356); +#356 = CARTESIAN_POINT('',(33.,-20.5,0.)); +#357 = SURFACE_CURVE('',#358,(#362,#369),.PCURVE_S1.); +#358 = LINE('',#359,#360); +#359 = CARTESIAN_POINT('',(0.,-20.5,0.)); +#360 = VECTOR('',#361,1.); +#361 = DIRECTION('',(1.,0.,0.)); +#362 = PCURVE('',#44,#363); +#363 = DEFINITIONAL_REPRESENTATION('',(#364),#368); +#364 = LINE('',#365,#366); +#365 = CARTESIAN_POINT('',(0.,0.)); +#366 = VECTOR('',#367,1.); +#367 = DIRECTION('',(0.,1.)); +#368 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#369 = PCURVE('',#370,#375); +#370 = PLANE('',#371); +#371 = AXIS2_PLACEMENT_3D('',#372,#373,#374); +#372 = CARTESIAN_POINT('',(0.,-20.5,0.)); +#373 = DIRECTION('',(0.,0.,1.)); +#374 = DIRECTION('',(1.,0.,0.)); +#375 = DEFINITIONAL_REPRESENTATION('',(#376),#380); +#376 = LINE('',#377,#378); +#377 = CARTESIAN_POINT('',(0.,0.)); +#378 = VECTOR('',#379,1.); +#379 = DIRECTION('',(1.,0.)); +#380 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#381 = ORIENTED_EDGE('',*,*,#382,.F.); +#382 = EDGE_CURVE('',#22,#353,#383,.T.); +#383 = SURFACE_CURVE('',#384,(#389,#400),.PCURVE_S1.); +#384 = CIRCLE('',#385,3.); +#385 = AXIS2_PLACEMENT_3D('',#386,#387,#388); +#386 = CARTESIAN_POINT('',(3.,-20.5,3.)); +#387 = DIRECTION('',(-0.,-1.,0.)); +#388 = DIRECTION('',(0.,-0.,1.)); +#389 = PCURVE('',#44,#390); +#390 = DEFINITIONAL_REPRESENTATION('',(#391),#399); +#391 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#392,#393,#394,#395,#396,#397 +,#398),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2,2,2,2,1),( + -2.094395102393,0.,2.094395102393,4.188790204786,6.28318530718, +8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM( + '') ); +#392 = CARTESIAN_POINT('',(6.,3.)); +#393 = CARTESIAN_POINT('',(6.,-2.196152422707)); +#394 = CARTESIAN_POINT('',(1.5,0.401923788647)); +#395 = CARTESIAN_POINT('',(-3.,3.)); +#396 = CARTESIAN_POINT('',(1.5,5.598076211353)); +#397 = CARTESIAN_POINT('',(6.,8.196152422707)); +#398 = CARTESIAN_POINT('',(6.,3.)); +#399 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#400 = PCURVE('',#72,#401); +#401 = DEFINITIONAL_REPRESENTATION('',(#402),#406); +#402 = LINE('',#403,#404); +#403 = CARTESIAN_POINT('',(1.570796326795,-0.)); +#404 = VECTOR('',#405,1.); +#405 = DIRECTION('',(-1.,0.)); +#406 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#407 = ORIENTED_EDGE('',*,*,#21,.T.); +#408 = ORIENTED_EDGE('',*,*,#409,.T.); +#409 = EDGE_CURVE('',#24,#410,#412,.T.); +#410 = VERTEX_POINT('',#411); +#411 = CARTESIAN_POINT('',(3.,-20.5,49.)); +#412 = SURFACE_CURVE('',#413,(#417,#424),.PCURVE_S1.); +#413 = LINE('',#414,#415); +#414 = CARTESIAN_POINT('',(0.,-20.5,49.)); +#415 = VECTOR('',#416,1.); +#416 = DIRECTION('',(1.,0.,0.)); +#417 = PCURVE('',#44,#418); +#418 = DEFINITIONAL_REPRESENTATION('',(#419),#423); +#419 = LINE('',#420,#421); +#420 = CARTESIAN_POINT('',(49.,0.)); +#421 = VECTOR('',#422,1.); +#422 = DIRECTION('',(0.,1.)); +#423 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#424 = PCURVE('',#182,#425); +#425 = DEFINITIONAL_REPRESENTATION('',(#426),#430); +#426 = LINE('',#427,#428); +#427 = CARTESIAN_POINT('',(-0.,-1.414213562373)); +#428 = VECTOR('',#429,1.); +#429 = DIRECTION('',(-1.,0.)); +#430 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#431 = ORIENTED_EDGE('',*,*,#432,.F.); +#432 = EDGE_CURVE('',#433,#410,#435,.T.); +#433 = VERTEX_POINT('',#434); +#434 = CARTESIAN_POINT('',(3.,-20.5,3.)); +#435 = SURFACE_CURVE('',#436,(#440,#447),.PCURVE_S1.); +#436 = LINE('',#437,#438); +#437 = CARTESIAN_POINT('',(3.,-20.5,0.)); +#438 = VECTOR('',#439,1.); +#439 = DIRECTION('',(0.,0.,1.)); +#440 = PCURVE('',#44,#441); +#441 = DEFINITIONAL_REPRESENTATION('',(#442),#446); +#442 = LINE('',#443,#444); +#443 = CARTESIAN_POINT('',(0.,3.)); +#444 = VECTOR('',#445,1.); +#445 = DIRECTION('',(1.,0.)); +#446 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#447 = PCURVE('',#448,#453); +#448 = PLANE('',#449); +#449 = AXIS2_PLACEMENT_3D('',#450,#451,#452); +#450 = CARTESIAN_POINT('',(3.,-20.5,0.)); +#451 = DIRECTION('',(1.,0.,0.)); +#452 = DIRECTION('',(0.,0.,1.)); +#453 = DEFINITIONAL_REPRESENTATION('',(#454),#458); +#454 = LINE('',#455,#456); +#455 = CARTESIAN_POINT('',(0.,0.)); +#456 = VECTOR('',#457,1.); +#457 = DIRECTION('',(1.,0.)); +#458 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#459 = ORIENTED_EDGE('',*,*,#460,.T.); +#460 = EDGE_CURVE('',#433,#461,#463,.T.); +#461 = VERTEX_POINT('',#462); +#462 = CARTESIAN_POINT('',(33.,-20.5,3.)); +#463 = SURFACE_CURVE('',#464,(#468,#475),.PCURVE_S1.); +#464 = LINE('',#465,#466); +#465 = CARTESIAN_POINT('',(0.,-20.5,3.)); +#466 = VECTOR('',#467,1.); +#467 = DIRECTION('',(1.,0.,0.)); +#468 = PCURVE('',#44,#469); +#469 = DEFINITIONAL_REPRESENTATION('',(#470),#474); +#470 = LINE('',#471,#472); +#471 = CARTESIAN_POINT('',(3.,0.)); +#472 = VECTOR('',#473,1.); +#473 = DIRECTION('',(0.,1.)); +#474 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#475 = PCURVE('',#476,#481); +#476 = PLANE('',#477); +#477 = AXIS2_PLACEMENT_3D('',#478,#479,#480); +#478 = CARTESIAN_POINT('',(0.,-20.5,3.)); +#479 = DIRECTION('',(0.,0.,1.)); +#480 = DIRECTION('',(1.,0.,0.)); +#481 = DEFINITIONAL_REPRESENTATION('',(#482),#486); +#482 = LINE('',#483,#484); +#483 = CARTESIAN_POINT('',(0.,0.)); +#484 = VECTOR('',#485,1.); +#485 = DIRECTION('',(1.,0.)); +#486 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#487 = ORIENTED_EDGE('',*,*,#488,.F.); +#488 = EDGE_CURVE('',#355,#461,#489,.T.); +#489 = SURFACE_CURVE('',#490,(#494,#501),.PCURVE_S1.); +#490 = LINE('',#491,#492); +#491 = CARTESIAN_POINT('',(33.,-20.5,0.)); +#492 = VECTOR('',#493,1.); +#493 = DIRECTION('',(0.,0.,1.)); +#494 = PCURVE('',#44,#495); +#495 = DEFINITIONAL_REPRESENTATION('',(#496),#500); +#496 = LINE('',#497,#498); +#497 = CARTESIAN_POINT('',(0.,33.)); +#498 = VECTOR('',#499,1.); +#499 = DIRECTION('',(1.,0.)); +#500 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#501 = PCURVE('',#502,#507); +#502 = PLANE('',#503); +#503 = AXIS2_PLACEMENT_3D('',#504,#505,#506); +#504 = CARTESIAN_POINT('',(34.,-19.5,0.)); +#505 = DIRECTION('',(-0.707106781187,0.707106781187,0.)); +#506 = DIRECTION('',(0.,0.,1.)); +#507 = DEFINITIONAL_REPRESENTATION('',(#508),#512); +#508 = LINE('',#509,#510); +#509 = CARTESIAN_POINT('',(0.,-1.414213562373)); +#510 = VECTOR('',#511,1.); +#511 = DIRECTION('',(1.,0.)); +#512 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#513 = ADVANCED_FACE('',(#514),#72,.T.); +#514 = FACE_BOUND('',#515,.F.); +#515 = EDGE_LOOP('',(#516,#517,#540,#566)); +#516 = ORIENTED_EDGE('',*,*,#382,.T.); +#517 = ORIENTED_EDGE('',*,*,#518,.T.); +#518 = EDGE_CURVE('',#353,#519,#521,.T.); +#519 = VERTEX_POINT('',#520); +#520 = CARTESIAN_POINT('',(3.,20.5,-4.440892098501E-16)); +#521 = SURFACE_CURVE('',#522,(#526,#533),.PCURVE_S1.); +#522 = LINE('',#523,#524); +#523 = CARTESIAN_POINT('',(3.,-20.5,-4.440892098501E-16)); +#524 = VECTOR('',#525,1.); +#525 = DIRECTION('',(0.,1.,0.)); +#526 = PCURVE('',#72,#527); +#527 = DEFINITIONAL_REPRESENTATION('',(#528),#532); +#528 = LINE('',#529,#530); +#529 = CARTESIAN_POINT('',(-1.570796326795,0.)); +#530 = VECTOR('',#531,1.); +#531 = DIRECTION('',(-0.,1.)); +#532 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#533 = PCURVE('',#370,#534); +#534 = DEFINITIONAL_REPRESENTATION('',(#535),#539); +#535 = LINE('',#536,#537); +#536 = CARTESIAN_POINT('',(3.,0.)); +#537 = VECTOR('',#538,1.); +#538 = DIRECTION('',(0.,1.)); +#539 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#540 = ORIENTED_EDGE('',*,*,#541,.F.); +#541 = EDGE_CURVE('',#57,#519,#542,.T.); +#542 = SURFACE_CURVE('',#543,(#548,#555),.PCURVE_S1.); +#543 = CIRCLE('',#544,3.); +#544 = AXIS2_PLACEMENT_3D('',#545,#546,#547); +#545 = CARTESIAN_POINT('',(3.,20.5,3.)); +#546 = DIRECTION('',(-0.,-1.,0.)); +#547 = DIRECTION('',(0.,-0.,1.)); +#548 = PCURVE('',#72,#549); +#549 = DEFINITIONAL_REPRESENTATION('',(#550),#554); +#550 = LINE('',#551,#552); +#551 = CARTESIAN_POINT('',(1.570796326795,41.)); +#552 = VECTOR('',#553,1.); +#553 = DIRECTION('',(-1.,0.)); +#554 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#555 = PCURVE('',#100,#556); +#556 = DEFINITIONAL_REPRESENTATION('',(#557),#565); +#557 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#558,#559,#560,#561,#562,#563 +,#564),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2,2,2,2,1),( + -2.094395102393,0.,2.094395102393,4.188790204786,6.28318530718, +8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM( + '') ); +#558 = CARTESIAN_POINT('',(6.,3.)); +#559 = CARTESIAN_POINT('',(6.,-2.196152422707)); +#560 = CARTESIAN_POINT('',(1.5,0.401923788647)); +#561 = CARTESIAN_POINT('',(-3.,3.)); +#562 = CARTESIAN_POINT('',(1.5,5.598076211353)); +#563 = CARTESIAN_POINT('',(6.,8.196152422707)); +#564 = CARTESIAN_POINT('',(6.,3.)); +#565 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#566 = ORIENTED_EDGE('',*,*,#56,.F.); +#567 = ADVANCED_FACE('',(#568),#182,.F.); +#568 = FACE_BOUND('',#569,.T.); +#569 = EDGE_LOOP('',(#570,#571,#572,#595)); +#570 = ORIENTED_EDGE('',*,*,#168,.F.); +#571 = ORIENTED_EDGE('',*,*,#409,.T.); +#572 = ORIENTED_EDGE('',*,*,#573,.T.); +#573 = EDGE_CURVE('',#410,#574,#576,.T.); +#574 = VERTEX_POINT('',#575); +#575 = CARTESIAN_POINT('',(3.,-18.5,51.)); +#576 = SURFACE_CURVE('',#577,(#581,#588),.PCURVE_S1.); +#577 = LINE('',#578,#579); +#578 = CARTESIAN_POINT('',(3.,-32.25,37.25)); +#579 = VECTOR('',#580,1.); +#580 = DIRECTION('',(-0.,0.707106781187,0.707106781187)); +#581 = PCURVE('',#182,#582); +#582 = DEFINITIONAL_REPRESENTATION('',(#583),#587); +#583 = LINE('',#584,#585); +#584 = CARTESIAN_POINT('',(-3.,-18.03122292025)); +#585 = VECTOR('',#586,1.); +#586 = DIRECTION('',(-0.,1.)); +#587 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#588 = PCURVE('',#448,#589); +#589 = DEFINITIONAL_REPRESENTATION('',(#590),#594); +#590 = LINE('',#591,#592); +#591 = CARTESIAN_POINT('',(37.25,11.75)); +#592 = VECTOR('',#593,1.); +#593 = DIRECTION('',(0.707106781187,-0.707106781187)); +#594 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#595 = ORIENTED_EDGE('',*,*,#596,.F.); +#596 = EDGE_CURVE('',#141,#574,#597,.T.); +#597 = SURFACE_CURVE('',#598,(#602,#609),.PCURVE_S1.); +#598 = LINE('',#599,#600); +#599 = CARTESIAN_POINT('',(0.,-18.5,51.)); +#600 = VECTOR('',#601,1.); +#601 = DIRECTION('',(1.,0.,0.)); +#602 = PCURVE('',#182,#603); +#603 = DEFINITIONAL_REPRESENTATION('',(#604),#608); +#604 = LINE('',#605,#606); +#605 = CARTESIAN_POINT('',(-0.,1.414213562373)); +#606 = VECTOR('',#607,1.); +#607 = DIRECTION('',(-1.,0.)); +#608 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#609 = PCURVE('',#156,#610); +#610 = DEFINITIONAL_REPRESENTATION('',(#611),#615); +#611 = LINE('',#612,#613); +#612 = CARTESIAN_POINT('',(0.,2.)); +#613 = VECTOR('',#614,1.); +#614 = DIRECTION('',(1.,0.)); +#615 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#616 = ADVANCED_FACE('',(#617),#100,.T.); +#617 = FACE_BOUND('',#618,.T.); +#618 = EDGE_LOOP('',(#619,#620,#643,#666,#689,#717,#738)); +#619 = ORIENTED_EDGE('',*,*,#84,.F.); +#620 = ORIENTED_EDGE('',*,*,#621,.T.); +#621 = EDGE_CURVE('',#85,#622,#624,.T.); +#622 = VERTEX_POINT('',#623); +#623 = CARTESIAN_POINT('',(3.,20.5,49.)); +#624 = SURFACE_CURVE('',#625,(#629,#636),.PCURVE_S1.); +#625 = LINE('',#626,#627); +#626 = CARTESIAN_POINT('',(0.,20.5,49.)); +#627 = VECTOR('',#628,1.); +#628 = DIRECTION('',(1.,0.,0.)); +#629 = PCURVE('',#100,#630); +#630 = DEFINITIONAL_REPRESENTATION('',(#631),#635); +#631 = LINE('',#632,#633); +#632 = CARTESIAN_POINT('',(49.,0.)); +#633 = VECTOR('',#634,1.); +#634 = DIRECTION('',(0.,1.)); +#635 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#636 = PCURVE('',#128,#637); +#637 = DEFINITIONAL_REPRESENTATION('',(#638),#642); +#638 = LINE('',#639,#640); +#639 = CARTESIAN_POINT('',(-0.,-1.414213562373)); +#640 = VECTOR('',#641,1.); +#641 = DIRECTION('',(-1.,0.)); +#642 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#643 = ORIENTED_EDGE('',*,*,#644,.F.); +#644 = EDGE_CURVE('',#645,#622,#647,.T.); +#645 = VERTEX_POINT('',#646); +#646 = CARTESIAN_POINT('',(3.,20.5,3.)); +#647 = SURFACE_CURVE('',#648,(#652,#659),.PCURVE_S1.); +#648 = LINE('',#649,#650); +#649 = CARTESIAN_POINT('',(3.,20.5,0.)); +#650 = VECTOR('',#651,1.); +#651 = DIRECTION('',(0.,0.,1.)); +#652 = PCURVE('',#100,#653); +#653 = DEFINITIONAL_REPRESENTATION('',(#654),#658); +#654 = LINE('',#655,#656); +#655 = CARTESIAN_POINT('',(0.,3.)); +#656 = VECTOR('',#657,1.); +#657 = DIRECTION('',(1.,0.)); +#658 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#659 = PCURVE('',#448,#660); +#660 = DEFINITIONAL_REPRESENTATION('',(#661),#665); +#661 = LINE('',#662,#663); +#662 = CARTESIAN_POINT('',(0.,-41.)); +#663 = VECTOR('',#664,1.); +#664 = DIRECTION('',(1.,0.)); +#665 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#666 = ORIENTED_EDGE('',*,*,#667,.T.); +#667 = EDGE_CURVE('',#645,#668,#670,.T.); +#668 = VERTEX_POINT('',#669); +#669 = CARTESIAN_POINT('',(33.,20.5,3.)); +#670 = SURFACE_CURVE('',#671,(#675,#682),.PCURVE_S1.); +#671 = LINE('',#672,#673); +#672 = CARTESIAN_POINT('',(0.,20.5,3.)); +#673 = VECTOR('',#674,1.); +#674 = DIRECTION('',(1.,0.,0.)); +#675 = PCURVE('',#100,#676); +#676 = DEFINITIONAL_REPRESENTATION('',(#677),#681); +#677 = LINE('',#678,#679); +#678 = CARTESIAN_POINT('',(3.,0.)); +#679 = VECTOR('',#680,1.); +#680 = DIRECTION('',(0.,1.)); +#681 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#682 = PCURVE('',#476,#683); +#683 = DEFINITIONAL_REPRESENTATION('',(#684),#688); +#684 = LINE('',#685,#686); +#685 = CARTESIAN_POINT('',(0.,41.)); +#686 = VECTOR('',#687,1.); +#687 = DIRECTION('',(1.,0.)); +#688 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#689 = ORIENTED_EDGE('',*,*,#690,.F.); +#690 = EDGE_CURVE('',#691,#668,#693,.T.); +#691 = VERTEX_POINT('',#692); +#692 = CARTESIAN_POINT('',(33.,20.5,0.)); +#693 = SURFACE_CURVE('',#694,(#698,#705),.PCURVE_S1.); +#694 = LINE('',#695,#696); +#695 = CARTESIAN_POINT('',(33.,20.5,0.)); +#696 = VECTOR('',#697,1.); +#697 = DIRECTION('',(0.,0.,1.)); +#698 = PCURVE('',#100,#699); +#699 = DEFINITIONAL_REPRESENTATION('',(#700),#704); +#700 = LINE('',#701,#702); +#701 = CARTESIAN_POINT('',(0.,33.)); +#702 = VECTOR('',#703,1.); +#703 = DIRECTION('',(1.,0.)); +#704 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#705 = PCURVE('',#706,#711); +#706 = PLANE('',#707); +#707 = AXIS2_PLACEMENT_3D('',#708,#709,#710); +#708 = CARTESIAN_POINT('',(34.,19.5,0.)); +#709 = DIRECTION('',(0.707106781187,0.707106781187,0.)); +#710 = DIRECTION('',(0.,-0.,1.)); +#711 = DEFINITIONAL_REPRESENTATION('',(#712),#716); +#712 = LINE('',#713,#714); +#713 = CARTESIAN_POINT('',(0.,-1.414213562373)); +#714 = VECTOR('',#715,1.); +#715 = DIRECTION('',(1.,0.)); +#716 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#717 = ORIENTED_EDGE('',*,*,#718,.T.); +#718 = EDGE_CURVE('',#691,#519,#719,.T.); +#719 = SURFACE_CURVE('',#720,(#724,#731),.PCURVE_S1.); +#720 = LINE('',#721,#722); +#721 = CARTESIAN_POINT('',(35.,20.5,0.)); +#722 = VECTOR('',#723,1.); +#723 = DIRECTION('',(-1.,0.,0.)); +#724 = PCURVE('',#100,#725); +#725 = DEFINITIONAL_REPRESENTATION('',(#726),#730); +#726 = LINE('',#727,#728); +#727 = CARTESIAN_POINT('',(0.,35.)); +#728 = VECTOR('',#729,1.); +#729 = DIRECTION('',(0.,-1.)); +#730 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#731 = PCURVE('',#370,#732); +#732 = DEFINITIONAL_REPRESENTATION('',(#733),#737); +#733 = LINE('',#734,#735); +#734 = CARTESIAN_POINT('',(35.,41.)); +#735 = VECTOR('',#736,1.); +#736 = DIRECTION('',(-1.,0.)); +#737 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#738 = ORIENTED_EDGE('',*,*,#541,.F.); +#739 = ADVANCED_FACE('',(#740),#156,.T.); +#740 = FACE_BOUND('',#741,.T.); +#741 = EDGE_LOOP('',(#742,#743,#744,#767)); +#742 = ORIENTED_EDGE('',*,*,#140,.F.); +#743 = ORIENTED_EDGE('',*,*,#596,.T.); +#744 = ORIENTED_EDGE('',*,*,#745,.T.); +#745 = EDGE_CURVE('',#574,#746,#748,.T.); +#746 = VERTEX_POINT('',#747); +#747 = CARTESIAN_POINT('',(3.,18.5,51.)); +#748 = SURFACE_CURVE('',#749,(#753,#760),.PCURVE_S1.); +#749 = LINE('',#750,#751); +#750 = CARTESIAN_POINT('',(3.,-20.5,51.)); +#751 = VECTOR('',#752,1.); +#752 = DIRECTION('',(0.,1.,0.)); +#753 = PCURVE('',#156,#754); +#754 = DEFINITIONAL_REPRESENTATION('',(#755),#759); +#755 = LINE('',#756,#757); +#756 = CARTESIAN_POINT('',(3.,0.)); +#757 = VECTOR('',#758,1.); +#758 = DIRECTION('',(0.,1.)); +#759 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#760 = PCURVE('',#448,#761); +#761 = DEFINITIONAL_REPRESENTATION('',(#762),#766); +#762 = LINE('',#763,#764); +#763 = CARTESIAN_POINT('',(51.,0.)); +#764 = VECTOR('',#765,1.); +#765 = DIRECTION('',(0.,-1.)); +#766 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#767 = ORIENTED_EDGE('',*,*,#768,.F.); +#768 = EDGE_CURVE('',#113,#746,#769,.T.); +#769 = SURFACE_CURVE('',#770,(#774,#781),.PCURVE_S1.); +#770 = LINE('',#771,#772); +#771 = CARTESIAN_POINT('',(0.,18.5,51.)); +#772 = VECTOR('',#773,1.); +#773 = DIRECTION('',(1.,0.,0.)); +#774 = PCURVE('',#156,#775); +#775 = DEFINITIONAL_REPRESENTATION('',(#776),#780); +#776 = LINE('',#777,#778); +#777 = CARTESIAN_POINT('',(0.,39.)); +#778 = VECTOR('',#779,1.); +#779 = DIRECTION('',(1.,0.)); +#780 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#781 = PCURVE('',#128,#782); +#782 = DEFINITIONAL_REPRESENTATION('',(#783),#787); +#783 = LINE('',#784,#785); +#784 = CARTESIAN_POINT('',(-0.,1.414213562373)); +#785 = VECTOR('',#786,1.); +#786 = DIRECTION('',(-1.,0.)); +#787 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#788 = ADVANCED_FACE('',(#789),#128,.T.); +#789 = FACE_BOUND('',#790,.F.); +#790 = EDGE_LOOP('',(#791,#792,#793,#814)); +#791 = ORIENTED_EDGE('',*,*,#112,.F.); +#792 = ORIENTED_EDGE('',*,*,#621,.T.); +#793 = ORIENTED_EDGE('',*,*,#794,.T.); +#794 = EDGE_CURVE('',#622,#746,#795,.T.); +#795 = SURFACE_CURVE('',#796,(#800,#807),.PCURVE_S1.); +#796 = LINE('',#797,#798); +#797 = CARTESIAN_POINT('',(3.,22.,47.5)); +#798 = VECTOR('',#799,1.); +#799 = DIRECTION('',(0.,-0.707106781187,0.707106781187)); +#800 = PCURVE('',#128,#801); +#801 = DEFINITIONAL_REPRESENTATION('',(#802),#806); +#802 = LINE('',#803,#804); +#803 = CARTESIAN_POINT('',(-3.,-3.535533905933)); +#804 = VECTOR('',#805,1.); +#805 = DIRECTION('',(-0.,1.)); +#806 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#807 = PCURVE('',#448,#808); +#808 = DEFINITIONAL_REPRESENTATION('',(#809),#813); +#809 = LINE('',#810,#811); +#810 = CARTESIAN_POINT('',(47.5,-42.5)); +#811 = VECTOR('',#812,1.); +#812 = DIRECTION('',(0.707106781187,0.707106781187)); +#813 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#814 = ORIENTED_EDGE('',*,*,#768,.F.); +#815 = ADVANCED_FACE('',(#816),#213,.F.); +#816 = FACE_BOUND('',#817,.T.); +#817 = EDGE_LOOP('',(#818,#841,#842,#843)); +#818 = ORIENTED_EDGE('',*,*,#819,.F.); +#819 = EDGE_CURVE('',#197,#820,#822,.T.); +#820 = VERTEX_POINT('',#821); +#821 = CARTESIAN_POINT('',(3.,17.15,14.5)); +#822 = SEAM_CURVE('',#823,(#827,#834),.PCURVE_S1.); +#823 = LINE('',#824,#825); +#824 = CARTESIAN_POINT('',(0.,17.15,14.5)); +#825 = VECTOR('',#826,1.); +#826 = DIRECTION('',(1.,0.,0.)); +#827 = PCURVE('',#213,#828); +#828 = DEFINITIONAL_REPRESENTATION('',(#829),#833); +#829 = LINE('',#830,#831); +#830 = CARTESIAN_POINT('',(-6.28318530718,0.)); +#831 = VECTOR('',#832,1.); +#832 = DIRECTION('',(-0.,-1.)); +#833 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#834 = PCURVE('',#213,#835); +#835 = DEFINITIONAL_REPRESENTATION('',(#836),#840); +#836 = LINE('',#837,#838); +#837 = CARTESIAN_POINT('',(-0.,0.)); +#838 = VECTOR('',#839,1.); +#839 = DIRECTION('',(-0.,-1.)); +#840 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#841 = ORIENTED_EDGE('',*,*,#196,.F.); +#842 = ORIENTED_EDGE('',*,*,#819,.T.); +#843 = ORIENTED_EDGE('',*,*,#844,.F.); +#844 = EDGE_CURVE('',#820,#820,#845,.T.); +#845 = SURFACE_CURVE('',#846,(#851,#858),.PCURVE_S1.); +#846 = CIRCLE('',#847,1.65); +#847 = AXIS2_PLACEMENT_3D('',#848,#849,#850); +#848 = CARTESIAN_POINT('',(3.,15.5,14.5)); +#849 = DIRECTION('',(-1.,0.,0.)); +#850 = DIRECTION('',(0.,1.,0.)); +#851 = PCURVE('',#213,#852); +#852 = DEFINITIONAL_REPRESENTATION('',(#853),#857); +#853 = LINE('',#854,#855); +#854 = CARTESIAN_POINT('',(-6.28318530718,-3.)); +#855 = VECTOR('',#856,1.); +#856 = DIRECTION('',(1.,-0.)); +#857 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#858 = PCURVE('',#448,#859); +#859 = DEFINITIONAL_REPRESENTATION('',(#860),#868); +#860 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#861,#862,#863,#864,#865,#866 +,#867),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2,2,2,2,1),( + -2.094395102393,0.,2.094395102393,4.188790204786,6.28318530718, +8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM( + '') ); +#861 = CARTESIAN_POINT('',(14.5,-37.65)); +#862 = CARTESIAN_POINT('',(11.642116167511,-37.65)); +#863 = CARTESIAN_POINT('',(13.071058083756,-35.175)); +#864 = CARTESIAN_POINT('',(14.5,-32.7)); +#865 = CARTESIAN_POINT('',(15.928941916244,-35.175)); +#866 = CARTESIAN_POINT('',(17.357883832489,-37.65)); +#867 = CARTESIAN_POINT('',(14.5,-37.65)); +#868 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#869 = ADVANCED_FACE('',(#870),#244,.F.); +#870 = FACE_BOUND('',#871,.T.); +#871 = EDGE_LOOP('',(#872,#895,#896,#897)); +#872 = ORIENTED_EDGE('',*,*,#873,.F.); +#873 = EDGE_CURVE('',#228,#874,#876,.T.); +#874 = VERTEX_POINT('',#875); +#875 = CARTESIAN_POINT('',(3.,17.15,45.5)); +#876 = SEAM_CURVE('',#877,(#881,#888),.PCURVE_S1.); +#877 = LINE('',#878,#879); +#878 = CARTESIAN_POINT('',(0.,17.15,45.5)); +#879 = VECTOR('',#880,1.); +#880 = DIRECTION('',(1.,0.,0.)); +#881 = PCURVE('',#244,#882); +#882 = DEFINITIONAL_REPRESENTATION('',(#883),#887); +#883 = LINE('',#884,#885); +#884 = CARTESIAN_POINT('',(-6.28318530718,0.)); +#885 = VECTOR('',#886,1.); +#886 = DIRECTION('',(-0.,-1.)); +#887 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#888 = PCURVE('',#244,#889); +#889 = DEFINITIONAL_REPRESENTATION('',(#890),#894); +#890 = LINE('',#891,#892); +#891 = CARTESIAN_POINT('',(-0.,0.)); +#892 = VECTOR('',#893,1.); +#893 = DIRECTION('',(-0.,-1.)); +#894 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#895 = ORIENTED_EDGE('',*,*,#227,.F.); +#896 = ORIENTED_EDGE('',*,*,#873,.T.); +#897 = ORIENTED_EDGE('',*,*,#898,.F.); +#898 = EDGE_CURVE('',#874,#874,#899,.T.); +#899 = SURFACE_CURVE('',#900,(#905,#912),.PCURVE_S1.); +#900 = CIRCLE('',#901,1.65); +#901 = AXIS2_PLACEMENT_3D('',#902,#903,#904); +#902 = CARTESIAN_POINT('',(3.,15.5,45.5)); +#903 = DIRECTION('',(-1.,0.,0.)); +#904 = DIRECTION('',(0.,1.,0.)); +#905 = PCURVE('',#244,#906); +#906 = DEFINITIONAL_REPRESENTATION('',(#907),#911); +#907 = LINE('',#908,#909); +#908 = CARTESIAN_POINT('',(-6.28318530718,-3.)); +#909 = VECTOR('',#910,1.); +#910 = DIRECTION('',(1.,-0.)); +#911 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#912 = PCURVE('',#448,#913); +#913 = DEFINITIONAL_REPRESENTATION('',(#914),#922); +#914 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#915,#916,#917,#918,#919,#920 +,#921),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2,2,2,2,1),( + -2.094395102393,0.,2.094395102393,4.188790204786,6.28318530718, +8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM( + '') ); +#915 = CARTESIAN_POINT('',(45.5,-37.65)); +#916 = CARTESIAN_POINT('',(42.642116167511,-37.65)); +#917 = CARTESIAN_POINT('',(44.071058083756,-35.175)); +#918 = CARTESIAN_POINT('',(45.5,-32.7)); +#919 = CARTESIAN_POINT('',(46.928941916244,-35.175)); +#920 = CARTESIAN_POINT('',(48.357883832489,-37.65)); +#921 = CARTESIAN_POINT('',(45.5,-37.65)); +#922 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#923 = ADVANCED_FACE('',(#924),#275,.F.); +#924 = FACE_BOUND('',#925,.T.); +#925 = EDGE_LOOP('',(#926,#949,#950,#951)); +#926 = ORIENTED_EDGE('',*,*,#927,.F.); +#927 = EDGE_CURVE('',#259,#928,#930,.T.); +#928 = VERTEX_POINT('',#929); +#929 = CARTESIAN_POINT('',(3.,-13.85,14.5)); +#930 = SEAM_CURVE('',#931,(#935,#942),.PCURVE_S1.); +#931 = LINE('',#932,#933); +#932 = CARTESIAN_POINT('',(0.,-13.85,14.5)); +#933 = VECTOR('',#934,1.); +#934 = DIRECTION('',(1.,0.,0.)); +#935 = PCURVE('',#275,#936); +#936 = DEFINITIONAL_REPRESENTATION('',(#937),#941); +#937 = LINE('',#938,#939); +#938 = CARTESIAN_POINT('',(-6.28318530718,0.)); +#939 = VECTOR('',#940,1.); +#940 = DIRECTION('',(-0.,-1.)); +#941 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#942 = PCURVE('',#275,#943); +#943 = DEFINITIONAL_REPRESENTATION('',(#944),#948); +#944 = LINE('',#945,#946); +#945 = CARTESIAN_POINT('',(-0.,0.)); +#946 = VECTOR('',#947,1.); +#947 = DIRECTION('',(-0.,-1.)); +#948 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#949 = ORIENTED_EDGE('',*,*,#258,.F.); +#950 = ORIENTED_EDGE('',*,*,#927,.T.); +#951 = ORIENTED_EDGE('',*,*,#952,.F.); +#952 = EDGE_CURVE('',#928,#928,#953,.T.); +#953 = SURFACE_CURVE('',#954,(#959,#966),.PCURVE_S1.); +#954 = CIRCLE('',#955,1.65); +#955 = AXIS2_PLACEMENT_3D('',#956,#957,#958); +#956 = CARTESIAN_POINT('',(3.,-15.5,14.5)); +#957 = DIRECTION('',(-1.,0.,0.)); +#958 = DIRECTION('',(0.,1.,0.)); +#959 = PCURVE('',#275,#960); +#960 = DEFINITIONAL_REPRESENTATION('',(#961),#965); +#961 = LINE('',#962,#963); +#962 = CARTESIAN_POINT('',(-6.28318530718,-3.)); +#963 = VECTOR('',#964,1.); +#964 = DIRECTION('',(1.,-0.)); +#965 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#966 = PCURVE('',#448,#967); +#967 = DEFINITIONAL_REPRESENTATION('',(#968),#976); +#968 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#969,#970,#971,#972,#973,#974 +,#975),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2,2,2,2,1),( + -2.094395102393,0.,2.094395102393,4.188790204786,6.28318530718, +8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() +RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM( + '') ); +#969 = CARTESIAN_POINT('',(14.5,-6.65)); +#970 = CARTESIAN_POINT('',(11.642116167511,-6.65)); +#971 = CARTESIAN_POINT('',(13.071058083756,-4.175)); +#972 = CARTESIAN_POINT('',(14.5,-1.7)); +#973 = CARTESIAN_POINT('',(15.928941916244,-4.175)); +#974 = CARTESIAN_POINT('',(17.357883832489,-6.65)); +#975 = CARTESIAN_POINT('',(14.5,-6.65)); +#976 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#977 = ADVANCED_FACE('',(#978),#306,.F.); +#978 = FACE_BOUND('',#979,.T.); +#979 = EDGE_LOOP('',(#980,#1003,#1004,#1005)); +#980 = ORIENTED_EDGE('',*,*,#981,.F.); +#981 = EDGE_CURVE('',#290,#982,#984,.T.); +#982 = VERTEX_POINT('',#983); +#983 = CARTESIAN_POINT('',(3.,16.,30.)); +#984 = SEAM_CURVE('',#985,(#989,#996),.PCURVE_S1.); +#985 = LINE('',#986,#987); +#986 = CARTESIAN_POINT('',(0.,16.,30.)); +#987 = VECTOR('',#988,1.); +#988 = DIRECTION('',(1.,0.,0.)); +#989 = PCURVE('',#306,#990); +#990 = DEFINITIONAL_REPRESENTATION('',(#991),#995); +#991 = LINE('',#992,#993); +#992 = CARTESIAN_POINT('',(-6.28318530718,0.)); +#993 = VECTOR('',#994,1.); +#994 = DIRECTION('',(-0.,-1.)); +#995 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#996 = PCURVE('',#306,#997); +#997 = DEFINITIONAL_REPRESENTATION('',(#998),#1002); +#998 = LINE('',#999,#1000); +#999 = CARTESIAN_POINT('',(-0.,0.)); +#1000 = VECTOR('',#1001,1.); +#1001 = DIRECTION('',(-0.,-1.)); +#1002 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1003 = ORIENTED_EDGE('',*,*,#289,.F.); +#1004 = ORIENTED_EDGE('',*,*,#981,.T.); +#1005 = ORIENTED_EDGE('',*,*,#1006,.F.); +#1006 = EDGE_CURVE('',#982,#982,#1007,.T.); +#1007 = SURFACE_CURVE('',#1008,(#1013,#1020),.PCURVE_S1.); +#1008 = CIRCLE('',#1009,16.); +#1009 = AXIS2_PLACEMENT_3D('',#1010,#1011,#1012); +#1010 = CARTESIAN_POINT('',(3.,0.,30.)); +#1011 = DIRECTION('',(-1.,0.,0.)); +#1012 = DIRECTION('',(0.,1.,0.)); +#1013 = PCURVE('',#306,#1014); +#1014 = DEFINITIONAL_REPRESENTATION('',(#1015),#1019); +#1015 = LINE('',#1016,#1017); +#1016 = CARTESIAN_POINT('',(-6.28318530718,-3.)); +#1017 = VECTOR('',#1018,1.); +#1018 = DIRECTION('',(1.,-0.)); +#1019 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1020 = PCURVE('',#448,#1021); +#1021 = DEFINITIONAL_REPRESENTATION('',(#1022),#1030); +#1022 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1023,#1024,#1025,#1026, +#1027,#1028,#1029),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1023 = CARTESIAN_POINT('',(30.,-36.5)); +#1024 = CARTESIAN_POINT('',(2.287187078898,-36.5)); +#1025 = CARTESIAN_POINT('',(16.143593539449,-12.5)); +#1026 = CARTESIAN_POINT('',(30.,11.5)); +#1027 = CARTESIAN_POINT('',(43.856406460551,-12.5)); +#1028 = CARTESIAN_POINT('',(57.712812921102,-36.5)); +#1029 = CARTESIAN_POINT('',(30.,-36.5)); +#1030 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1031 = ADVANCED_FACE('',(#1032),#337,.F.); +#1032 = FACE_BOUND('',#1033,.T.); +#1033 = EDGE_LOOP('',(#1034,#1057,#1058,#1059)); +#1034 = ORIENTED_EDGE('',*,*,#1035,.F.); +#1035 = EDGE_CURVE('',#321,#1036,#1038,.T.); +#1036 = VERTEX_POINT('',#1037); +#1037 = CARTESIAN_POINT('',(3.,-13.85,45.5)); +#1038 = SEAM_CURVE('',#1039,(#1043,#1050),.PCURVE_S1.); +#1039 = LINE('',#1040,#1041); +#1040 = CARTESIAN_POINT('',(0.,-13.85,45.5)); +#1041 = VECTOR('',#1042,1.); +#1042 = DIRECTION('',(1.,0.,0.)); +#1043 = PCURVE('',#337,#1044); +#1044 = DEFINITIONAL_REPRESENTATION('',(#1045),#1049); +#1045 = LINE('',#1046,#1047); +#1046 = CARTESIAN_POINT('',(-6.28318530718,0.)); +#1047 = VECTOR('',#1048,1.); +#1048 = DIRECTION('',(-0.,-1.)); +#1049 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1050 = PCURVE('',#337,#1051); +#1051 = DEFINITIONAL_REPRESENTATION('',(#1052),#1056); +#1052 = LINE('',#1053,#1054); +#1053 = CARTESIAN_POINT('',(-0.,0.)); +#1054 = VECTOR('',#1055,1.); +#1055 = DIRECTION('',(-0.,-1.)); +#1056 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1057 = ORIENTED_EDGE('',*,*,#320,.F.); +#1058 = ORIENTED_EDGE('',*,*,#1035,.T.); +#1059 = ORIENTED_EDGE('',*,*,#1060,.F.); +#1060 = EDGE_CURVE('',#1036,#1036,#1061,.T.); +#1061 = SURFACE_CURVE('',#1062,(#1067,#1074),.PCURVE_S1.); +#1062 = CIRCLE('',#1063,1.65); +#1063 = AXIS2_PLACEMENT_3D('',#1064,#1065,#1066); +#1064 = CARTESIAN_POINT('',(3.,-15.5,45.5)); +#1065 = DIRECTION('',(-1.,0.,0.)); +#1066 = DIRECTION('',(0.,1.,0.)); +#1067 = PCURVE('',#337,#1068); +#1068 = DEFINITIONAL_REPRESENTATION('',(#1069),#1073); +#1069 = LINE('',#1070,#1071); +#1070 = CARTESIAN_POINT('',(-6.28318530718,-3.)); +#1071 = VECTOR('',#1072,1.); +#1072 = DIRECTION('',(1.,-0.)); +#1073 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1074 = PCURVE('',#448,#1075); +#1075 = DEFINITIONAL_REPRESENTATION('',(#1076),#1084); +#1076 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1077,#1078,#1079,#1080, +#1081,#1082,#1083),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1077 = CARTESIAN_POINT('',(45.5,-6.65)); +#1078 = CARTESIAN_POINT('',(42.642116167511,-6.65)); +#1079 = CARTESIAN_POINT('',(44.071058083756,-4.175)); +#1080 = CARTESIAN_POINT('',(45.5,-1.7)); +#1081 = CARTESIAN_POINT('',(46.928941916244,-4.175)); +#1082 = CARTESIAN_POINT('',(48.357883832489,-6.65)); +#1083 = CARTESIAN_POINT('',(45.5,-6.65)); +#1084 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1085 = ADVANCED_FACE('',(#1086,#1163,#1287,#1411,#1535,#1659,#1783), + #370,.F.); +#1086 = FACE_BOUND('',#1087,.F.); +#1087 = EDGE_LOOP('',(#1088,#1089,#1112,#1140,#1161,#1162)); +#1088 = ORIENTED_EDGE('',*,*,#352,.T.); +#1089 = ORIENTED_EDGE('',*,*,#1090,.T.); +#1090 = EDGE_CURVE('',#355,#1091,#1093,.T.); +#1091 = VERTEX_POINT('',#1092); +#1092 = CARTESIAN_POINT('',(35.,-18.5,0.)); +#1093 = SURFACE_CURVE('',#1094,(#1098,#1105),.PCURVE_S1.); +#1094 = LINE('',#1095,#1096); +#1095 = CARTESIAN_POINT('',(25.25,-28.25,0.)); +#1096 = VECTOR('',#1097,1.); +#1097 = DIRECTION('',(0.707106781187,0.707106781187,-0.)); +#1098 = PCURVE('',#370,#1099); +#1099 = DEFINITIONAL_REPRESENTATION('',(#1100),#1104); +#1100 = LINE('',#1101,#1102); +#1101 = CARTESIAN_POINT('',(25.25,-7.75)); +#1102 = VECTOR('',#1103,1.); +#1103 = DIRECTION('',(0.707106781187,0.707106781187)); +#1104 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1105 = PCURVE('',#502,#1106); +#1106 = DEFINITIONAL_REPRESENTATION('',(#1107),#1111); +#1107 = LINE('',#1108,#1109); +#1108 = CARTESIAN_POINT('',(0.,-12.37436867076)); +#1109 = VECTOR('',#1110,1.); +#1110 = DIRECTION('',(0.,1.)); +#1111 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1112 = ORIENTED_EDGE('',*,*,#1113,.T.); +#1113 = EDGE_CURVE('',#1091,#1114,#1116,.T.); +#1114 = VERTEX_POINT('',#1115); +#1115 = CARTESIAN_POINT('',(35.,18.5,0.)); +#1116 = SURFACE_CURVE('',#1117,(#1121,#1128),.PCURVE_S1.); +#1117 = LINE('',#1118,#1119); +#1118 = CARTESIAN_POINT('',(35.,-20.5,0.)); +#1119 = VECTOR('',#1120,1.); +#1120 = DIRECTION('',(0.,1.,0.)); +#1121 = PCURVE('',#370,#1122); +#1122 = DEFINITIONAL_REPRESENTATION('',(#1123),#1127); +#1123 = LINE('',#1124,#1125); +#1124 = CARTESIAN_POINT('',(35.,0.)); +#1125 = VECTOR('',#1126,1.); +#1126 = DIRECTION('',(0.,1.)); +#1127 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1128 = PCURVE('',#1129,#1134); +#1129 = PLANE('',#1130); +#1130 = AXIS2_PLACEMENT_3D('',#1131,#1132,#1133); +#1131 = CARTESIAN_POINT('',(35.,-20.5,0.)); +#1132 = DIRECTION('',(1.,0.,0.)); +#1133 = DIRECTION('',(0.,0.,1.)); +#1134 = DEFINITIONAL_REPRESENTATION('',(#1135),#1139); +#1135 = LINE('',#1136,#1137); +#1136 = CARTESIAN_POINT('',(0.,0.)); +#1137 = VECTOR('',#1138,1.); +#1138 = DIRECTION('',(0.,-1.)); +#1139 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1140 = ORIENTED_EDGE('',*,*,#1141,.F.); +#1141 = EDGE_CURVE('',#691,#1114,#1142,.T.); +#1142 = SURFACE_CURVE('',#1143,(#1147,#1154),.PCURVE_S1.); +#1143 = LINE('',#1144,#1145); +#1144 = CARTESIAN_POINT('',(35.5,18.,0.)); +#1145 = VECTOR('',#1146,1.); +#1146 = DIRECTION('',(0.707106781187,-0.707106781187,0.)); +#1147 = PCURVE('',#370,#1148); +#1148 = DEFINITIONAL_REPRESENTATION('',(#1149),#1153); +#1149 = LINE('',#1150,#1151); +#1150 = CARTESIAN_POINT('',(35.5,38.5)); +#1151 = VECTOR('',#1152,1.); +#1152 = DIRECTION('',(0.707106781187,-0.707106781187)); +#1153 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1154 = PCURVE('',#706,#1155); +#1155 = DEFINITIONAL_REPRESENTATION('',(#1156),#1160); +#1156 = LINE('',#1157,#1158); +#1157 = CARTESIAN_POINT('',(0.,2.12132034356)); +#1158 = VECTOR('',#1159,1.); +#1159 = DIRECTION('',(0.,1.)); +#1160 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1161 = ORIENTED_EDGE('',*,*,#718,.T.); +#1162 = ORIENTED_EDGE('',*,*,#518,.F.); +#1163 = FACE_BOUND('',#1164,.F.); +#1164 = EDGE_LOOP('',(#1165,#1195,#1228,#1256)); +#1165 = ORIENTED_EDGE('',*,*,#1166,.F.); +#1166 = EDGE_CURVE('',#1167,#1169,#1171,.T.); +#1167 = VERTEX_POINT('',#1168); +#1168 = CARTESIAN_POINT('',(7.75,-12.5,0.)); +#1169 = VERTEX_POINT('',#1170); +#1170 = CARTESIAN_POINT('',(7.75,-15.5,0.)); +#1171 = SURFACE_CURVE('',#1172,(#1176,#1183),.PCURVE_S1.); +#1172 = LINE('',#1173,#1174); +#1173 = CARTESIAN_POINT('',(7.75,-12.5,0.)); +#1174 = VECTOR('',#1175,1.); +#1175 = DIRECTION('',(0.,-1.,0.)); +#1176 = PCURVE('',#370,#1177); +#1177 = DEFINITIONAL_REPRESENTATION('',(#1178),#1182); +#1178 = LINE('',#1179,#1180); +#1179 = CARTESIAN_POINT('',(7.75,8.)); +#1180 = VECTOR('',#1181,1.); +#1181 = DIRECTION('',(0.,-1.)); +#1182 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1183 = PCURVE('',#1184,#1189); +#1184 = PLANE('',#1185); +#1185 = AXIS2_PLACEMENT_3D('',#1186,#1187,#1188); +#1186 = CARTESIAN_POINT('',(7.75,-12.5,0.)); +#1187 = DIRECTION('',(1.,0.,-0.)); +#1188 = DIRECTION('',(0.,-1.,0.)); +#1189 = DEFINITIONAL_REPRESENTATION('',(#1190),#1194); +#1190 = LINE('',#1191,#1192); +#1191 = CARTESIAN_POINT('',(0.,0.)); +#1192 = VECTOR('',#1193,1.); +#1193 = DIRECTION('',(1.,0.)); +#1194 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1195 = ORIENTED_EDGE('',*,*,#1196,.T.); +#1196 = EDGE_CURVE('',#1167,#1197,#1199,.T.); +#1197 = VERTEX_POINT('',#1198); +#1198 = CARTESIAN_POINT('',(12.25,-12.5,0.)); +#1199 = SURFACE_CURVE('',#1200,(#1205,#1216),.PCURVE_S1.); +#1200 = CIRCLE('',#1201,2.25); +#1201 = AXIS2_PLACEMENT_3D('',#1202,#1203,#1204); +#1202 = CARTESIAN_POINT('',(10.,-12.5,0.)); +#1203 = DIRECTION('',(-0.,-0.,-1.)); +#1204 = DIRECTION('',(0.,-1.,0.)); +#1205 = PCURVE('',#370,#1206); +#1206 = DEFINITIONAL_REPRESENTATION('',(#1207),#1215); +#1207 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1208,#1209,#1210,#1211, +#1212,#1213,#1214),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1208 = CARTESIAN_POINT('',(10.,5.75)); +#1209 = CARTESIAN_POINT('',(6.10288568297,5.75)); +#1210 = CARTESIAN_POINT('',(8.051442841485,9.125)); +#1211 = CARTESIAN_POINT('',(10.,12.5)); +#1212 = CARTESIAN_POINT('',(11.948557158515,9.125)); +#1213 = CARTESIAN_POINT('',(13.89711431703,5.75)); +#1214 = CARTESIAN_POINT('',(10.,5.75)); +#1215 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1216 = PCURVE('',#1217,#1222); +#1217 = CYLINDRICAL_SURFACE('',#1218,2.25); +#1218 = AXIS2_PLACEMENT_3D('',#1219,#1220,#1221); +#1219 = CARTESIAN_POINT('',(10.,-12.5,0.)); +#1220 = DIRECTION('',(-0.,-0.,-1.)); +#1221 = DIRECTION('',(0.,-1.,0.)); +#1222 = DEFINITIONAL_REPRESENTATION('',(#1223),#1227); +#1223 = LINE('',#1224,#1225); +#1224 = CARTESIAN_POINT('',(0.,0.)); +#1225 = VECTOR('',#1226,1.); +#1226 = DIRECTION('',(1.,0.)); +#1227 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1228 = ORIENTED_EDGE('',*,*,#1229,.F.); +#1229 = EDGE_CURVE('',#1230,#1197,#1232,.T.); +#1230 = VERTEX_POINT('',#1231); +#1231 = CARTESIAN_POINT('',(12.25,-15.5,0.)); +#1232 = SURFACE_CURVE('',#1233,(#1237,#1244),.PCURVE_S1.); +#1233 = LINE('',#1234,#1235); +#1234 = CARTESIAN_POINT('',(12.25,-15.5,0.)); +#1235 = VECTOR('',#1236,1.); +#1236 = DIRECTION('',(0.,1.,0.)); +#1237 = PCURVE('',#370,#1238); +#1238 = DEFINITIONAL_REPRESENTATION('',(#1239),#1243); +#1239 = LINE('',#1240,#1241); +#1240 = CARTESIAN_POINT('',(12.25,5.)); +#1241 = VECTOR('',#1242,1.); +#1242 = DIRECTION('',(0.,1.)); +#1243 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1244 = PCURVE('',#1245,#1250); +#1245 = PLANE('',#1246); +#1246 = AXIS2_PLACEMENT_3D('',#1247,#1248,#1249); +#1247 = CARTESIAN_POINT('',(12.25,-15.5,0.)); +#1248 = DIRECTION('',(-1.,0.,0.)); +#1249 = DIRECTION('',(0.,1.,0.)); +#1250 = DEFINITIONAL_REPRESENTATION('',(#1251),#1255); +#1251 = LINE('',#1252,#1253); +#1252 = CARTESIAN_POINT('',(0.,0.)); +#1253 = VECTOR('',#1254,1.); +#1254 = DIRECTION('',(1.,0.)); +#1255 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1256 = ORIENTED_EDGE('',*,*,#1257,.T.); +#1257 = EDGE_CURVE('',#1230,#1169,#1258,.T.); +#1258 = SURFACE_CURVE('',#1259,(#1264,#1275),.PCURVE_S1.); +#1259 = CIRCLE('',#1260,2.25); +#1260 = AXIS2_PLACEMENT_3D('',#1261,#1262,#1263); +#1261 = CARTESIAN_POINT('',(10.,-15.5,0.)); +#1262 = DIRECTION('',(0.,0.,-1.)); +#1263 = DIRECTION('',(0.,1.,0.)); +#1264 = PCURVE('',#370,#1265); +#1265 = DEFINITIONAL_REPRESENTATION('',(#1266),#1274); +#1266 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1267,#1268,#1269,#1270, +#1271,#1272,#1273),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1267 = CARTESIAN_POINT('',(10.,7.25)); +#1268 = CARTESIAN_POINT('',(13.89711431703,7.25)); +#1269 = CARTESIAN_POINT('',(11.948557158515,3.875)); +#1270 = CARTESIAN_POINT('',(10.,0.5)); +#1271 = CARTESIAN_POINT('',(8.051442841485,3.875)); +#1272 = CARTESIAN_POINT('',(6.10288568297,7.25)); +#1273 = CARTESIAN_POINT('',(10.,7.25)); +#1274 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1275 = PCURVE('',#1276,#1281); +#1276 = CYLINDRICAL_SURFACE('',#1277,2.25); +#1277 = AXIS2_PLACEMENT_3D('',#1278,#1279,#1280); +#1278 = CARTESIAN_POINT('',(10.,-15.5,0.)); +#1279 = DIRECTION('',(0.,0.,-1.)); +#1280 = DIRECTION('',(0.,1.,0.)); +#1281 = DEFINITIONAL_REPRESENTATION('',(#1282),#1286); +#1282 = LINE('',#1283,#1284); +#1283 = CARTESIAN_POINT('',(0.,0.)); +#1284 = VECTOR('',#1285,1.); +#1285 = DIRECTION('',(1.,0.)); +#1286 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1287 = FACE_BOUND('',#1288,.F.); +#1288 = EDGE_LOOP('',(#1289,#1319,#1352,#1380)); +#1289 = ORIENTED_EDGE('',*,*,#1290,.F.); +#1290 = EDGE_CURVE('',#1291,#1293,#1295,.T.); +#1291 = VERTEX_POINT('',#1292); +#1292 = CARTESIAN_POINT('',(21.5,-13.25,0.)); +#1293 = VERTEX_POINT('',#1294); +#1294 = CARTESIAN_POINT('',(18.5,-13.25,0.)); +#1295 = SURFACE_CURVE('',#1296,(#1300,#1307),.PCURVE_S1.); +#1296 = LINE('',#1297,#1298); +#1297 = CARTESIAN_POINT('',(21.5,-13.25,0.)); +#1298 = VECTOR('',#1299,1.); +#1299 = DIRECTION('',(-1.,0.,0.)); +#1300 = PCURVE('',#370,#1301); +#1301 = DEFINITIONAL_REPRESENTATION('',(#1302),#1306); +#1302 = LINE('',#1303,#1304); +#1303 = CARTESIAN_POINT('',(21.5,7.25)); +#1304 = VECTOR('',#1305,1.); +#1305 = DIRECTION('',(-1.,0.)); +#1306 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1307 = PCURVE('',#1308,#1313); +#1308 = PLANE('',#1309); +#1309 = AXIS2_PLACEMENT_3D('',#1310,#1311,#1312); +#1310 = CARTESIAN_POINT('',(21.5,-13.25,0.)); +#1311 = DIRECTION('',(0.,-1.,0.)); +#1312 = DIRECTION('',(-1.,0.,0.)); +#1313 = DEFINITIONAL_REPRESENTATION('',(#1314),#1318); +#1314 = LINE('',#1315,#1316); +#1315 = CARTESIAN_POINT('',(0.,-0.)); +#1316 = VECTOR('',#1317,1.); +#1317 = DIRECTION('',(1.,0.)); +#1318 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1319 = ORIENTED_EDGE('',*,*,#1320,.T.); +#1320 = EDGE_CURVE('',#1291,#1321,#1323,.T.); +#1321 = VERTEX_POINT('',#1322); +#1322 = CARTESIAN_POINT('',(21.5,-17.75,0.)); +#1323 = SURFACE_CURVE('',#1324,(#1329,#1340),.PCURVE_S1.); +#1324 = CIRCLE('',#1325,2.25); +#1325 = AXIS2_PLACEMENT_3D('',#1326,#1327,#1328); +#1326 = CARTESIAN_POINT('',(21.5,-15.5,0.)); +#1327 = DIRECTION('',(0.,0.,-1.)); +#1328 = DIRECTION('',(-1.,0.,0.)); +#1329 = PCURVE('',#370,#1330); +#1330 = DEFINITIONAL_REPRESENTATION('',(#1331),#1339); +#1331 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1332,#1333,#1334,#1335, +#1336,#1337,#1338),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1332 = CARTESIAN_POINT('',(19.25,5.)); +#1333 = CARTESIAN_POINT('',(19.25,8.89711431703)); +#1334 = CARTESIAN_POINT('',(22.625,6.948557158515)); +#1335 = CARTESIAN_POINT('',(26.,5.)); +#1336 = CARTESIAN_POINT('',(22.625,3.051442841485)); +#1337 = CARTESIAN_POINT('',(19.25,1.10288568297)); +#1338 = CARTESIAN_POINT('',(19.25,5.)); +#1339 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1340 = PCURVE('',#1341,#1346); +#1341 = CYLINDRICAL_SURFACE('',#1342,2.25); +#1342 = AXIS2_PLACEMENT_3D('',#1343,#1344,#1345); +#1343 = CARTESIAN_POINT('',(21.5,-15.5,0.)); +#1344 = DIRECTION('',(0.,0.,-1.)); +#1345 = DIRECTION('',(-1.,0.,0.)); +#1346 = DEFINITIONAL_REPRESENTATION('',(#1347),#1351); +#1347 = LINE('',#1348,#1349); +#1348 = CARTESIAN_POINT('',(0.,0.)); +#1349 = VECTOR('',#1350,1.); +#1350 = DIRECTION('',(1.,0.)); +#1351 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1352 = ORIENTED_EDGE('',*,*,#1353,.F.); +#1353 = EDGE_CURVE('',#1354,#1321,#1356,.T.); +#1354 = VERTEX_POINT('',#1355); +#1355 = CARTESIAN_POINT('',(18.5,-17.75,0.)); +#1356 = SURFACE_CURVE('',#1357,(#1361,#1368),.PCURVE_S1.); +#1357 = LINE('',#1358,#1359); +#1358 = CARTESIAN_POINT('',(18.5,-17.75,0.)); +#1359 = VECTOR('',#1360,1.); +#1360 = DIRECTION('',(1.,0.,0.)); +#1361 = PCURVE('',#370,#1362); +#1362 = DEFINITIONAL_REPRESENTATION('',(#1363),#1367); +#1363 = LINE('',#1364,#1365); +#1364 = CARTESIAN_POINT('',(18.5,2.75)); +#1365 = VECTOR('',#1366,1.); +#1366 = DIRECTION('',(1.,0.)); +#1367 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1368 = PCURVE('',#1369,#1374); +#1369 = PLANE('',#1370); +#1370 = AXIS2_PLACEMENT_3D('',#1371,#1372,#1373); +#1371 = CARTESIAN_POINT('',(18.5,-17.75,0.)); +#1372 = DIRECTION('',(0.,1.,0.)); +#1373 = DIRECTION('',(1.,0.,0.)); +#1374 = DEFINITIONAL_REPRESENTATION('',(#1375),#1379); +#1375 = LINE('',#1376,#1377); +#1376 = CARTESIAN_POINT('',(0.,0.)); +#1377 = VECTOR('',#1378,1.); +#1378 = DIRECTION('',(1.,0.)); +#1379 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1380 = ORIENTED_EDGE('',*,*,#1381,.T.); +#1381 = EDGE_CURVE('',#1354,#1293,#1382,.T.); +#1382 = SURFACE_CURVE('',#1383,(#1388,#1399),.PCURVE_S1.); +#1383 = CIRCLE('',#1384,2.25); +#1384 = AXIS2_PLACEMENT_3D('',#1385,#1386,#1387); +#1385 = CARTESIAN_POINT('',(18.5,-15.5,0.)); +#1386 = DIRECTION('',(0.,0.,-1.)); +#1387 = DIRECTION('',(1.,0.,0.)); +#1388 = PCURVE('',#370,#1389); +#1389 = DEFINITIONAL_REPRESENTATION('',(#1390),#1398); +#1390 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1391,#1392,#1393,#1394, +#1395,#1396,#1397),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1391 = CARTESIAN_POINT('',(20.75,5.)); +#1392 = CARTESIAN_POINT('',(20.75,1.10288568297)); +#1393 = CARTESIAN_POINT('',(17.375,3.051442841485)); +#1394 = CARTESIAN_POINT('',(14.,5.)); +#1395 = CARTESIAN_POINT('',(17.375,6.948557158515)); +#1396 = CARTESIAN_POINT('',(20.75,8.89711431703)); +#1397 = CARTESIAN_POINT('',(20.75,5.)); +#1398 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1399 = PCURVE('',#1400,#1405); +#1400 = CYLINDRICAL_SURFACE('',#1401,2.25); +#1401 = AXIS2_PLACEMENT_3D('',#1402,#1403,#1404); +#1402 = CARTESIAN_POINT('',(18.5,-15.5,0.)); +#1403 = DIRECTION('',(0.,0.,-1.)); +#1404 = DIRECTION('',(1.,0.,0.)); +#1405 = DEFINITIONAL_REPRESENTATION('',(#1406),#1410); +#1406 = LINE('',#1407,#1408); +#1407 = CARTESIAN_POINT('',(0.,0.)); +#1408 = VECTOR('',#1409,1.); +#1409 = DIRECTION('',(1.,0.)); +#1410 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1411 = FACE_BOUND('',#1412,.F.); +#1412 = EDGE_LOOP('',(#1413,#1443,#1476,#1504)); +#1413 = ORIENTED_EDGE('',*,*,#1414,.F.); +#1414 = EDGE_CURVE('',#1415,#1417,#1419,.T.); +#1415 = VERTEX_POINT('',#1416); +#1416 = CARTESIAN_POINT('',(27.75,-12.5,0.)); +#1417 = VERTEX_POINT('',#1418); +#1418 = CARTESIAN_POINT('',(27.75,-15.5,0.)); +#1419 = SURFACE_CURVE('',#1420,(#1424,#1431),.PCURVE_S1.); +#1420 = LINE('',#1421,#1422); +#1421 = CARTESIAN_POINT('',(27.75,-12.5,0.)); +#1422 = VECTOR('',#1423,1.); +#1423 = DIRECTION('',(0.,-1.,0.)); +#1424 = PCURVE('',#370,#1425); +#1425 = DEFINITIONAL_REPRESENTATION('',(#1426),#1430); +#1426 = LINE('',#1427,#1428); +#1427 = CARTESIAN_POINT('',(27.75,8.)); +#1428 = VECTOR('',#1429,1.); +#1429 = DIRECTION('',(0.,-1.)); +#1430 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1431 = PCURVE('',#1432,#1437); +#1432 = PLANE('',#1433); +#1433 = AXIS2_PLACEMENT_3D('',#1434,#1435,#1436); +#1434 = CARTESIAN_POINT('',(27.75,-12.5,0.)); +#1435 = DIRECTION('',(1.,0.,-0.)); +#1436 = DIRECTION('',(0.,-1.,0.)); +#1437 = DEFINITIONAL_REPRESENTATION('',(#1438),#1442); +#1438 = LINE('',#1439,#1440); +#1439 = CARTESIAN_POINT('',(0.,0.)); +#1440 = VECTOR('',#1441,1.); +#1441 = DIRECTION('',(1.,0.)); +#1442 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1443 = ORIENTED_EDGE('',*,*,#1444,.T.); +#1444 = EDGE_CURVE('',#1415,#1445,#1447,.T.); +#1445 = VERTEX_POINT('',#1446); +#1446 = CARTESIAN_POINT('',(32.25,-12.5,0.)); +#1447 = SURFACE_CURVE('',#1448,(#1453,#1464),.PCURVE_S1.); +#1448 = CIRCLE('',#1449,2.25); +#1449 = AXIS2_PLACEMENT_3D('',#1450,#1451,#1452); +#1450 = CARTESIAN_POINT('',(30.,-12.5,0.)); +#1451 = DIRECTION('',(-0.,-0.,-1.)); +#1452 = DIRECTION('',(0.,-1.,0.)); +#1453 = PCURVE('',#370,#1454); +#1454 = DEFINITIONAL_REPRESENTATION('',(#1455),#1463); +#1455 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1456,#1457,#1458,#1459, +#1460,#1461,#1462),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1456 = CARTESIAN_POINT('',(30.,5.75)); +#1457 = CARTESIAN_POINT('',(26.10288568297,5.75)); +#1458 = CARTESIAN_POINT('',(28.051442841485,9.125)); +#1459 = CARTESIAN_POINT('',(30.,12.5)); +#1460 = CARTESIAN_POINT('',(31.948557158515,9.125)); +#1461 = CARTESIAN_POINT('',(33.89711431703,5.75)); +#1462 = CARTESIAN_POINT('',(30.,5.75)); +#1463 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1464 = PCURVE('',#1465,#1470); +#1465 = CYLINDRICAL_SURFACE('',#1466,2.25); +#1466 = AXIS2_PLACEMENT_3D('',#1467,#1468,#1469); +#1467 = CARTESIAN_POINT('',(30.,-12.5,0.)); +#1468 = DIRECTION('',(-0.,-0.,-1.)); +#1469 = DIRECTION('',(0.,-1.,0.)); +#1470 = DEFINITIONAL_REPRESENTATION('',(#1471),#1475); +#1471 = LINE('',#1472,#1473); +#1472 = CARTESIAN_POINT('',(0.,0.)); +#1473 = VECTOR('',#1474,1.); +#1474 = DIRECTION('',(1.,0.)); +#1475 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1476 = ORIENTED_EDGE('',*,*,#1477,.F.); +#1477 = EDGE_CURVE('',#1478,#1445,#1480,.T.); +#1478 = VERTEX_POINT('',#1479); +#1479 = CARTESIAN_POINT('',(32.25,-15.5,0.)); +#1480 = SURFACE_CURVE('',#1481,(#1485,#1492),.PCURVE_S1.); +#1481 = LINE('',#1482,#1483); +#1482 = CARTESIAN_POINT('',(32.25,-15.5,0.)); +#1483 = VECTOR('',#1484,1.); +#1484 = DIRECTION('',(0.,1.,0.)); +#1485 = PCURVE('',#370,#1486); +#1486 = DEFINITIONAL_REPRESENTATION('',(#1487),#1491); +#1487 = LINE('',#1488,#1489); +#1488 = CARTESIAN_POINT('',(32.25,5.)); +#1489 = VECTOR('',#1490,1.); +#1490 = DIRECTION('',(0.,1.)); +#1491 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1492 = PCURVE('',#1493,#1498); +#1493 = PLANE('',#1494); +#1494 = AXIS2_PLACEMENT_3D('',#1495,#1496,#1497); +#1495 = CARTESIAN_POINT('',(32.25,-15.5,0.)); +#1496 = DIRECTION('',(-1.,0.,0.)); +#1497 = DIRECTION('',(0.,1.,0.)); +#1498 = DEFINITIONAL_REPRESENTATION('',(#1499),#1503); +#1499 = LINE('',#1500,#1501); +#1500 = CARTESIAN_POINT('',(0.,0.)); +#1501 = VECTOR('',#1502,1.); +#1502 = DIRECTION('',(1.,0.)); +#1503 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1504 = ORIENTED_EDGE('',*,*,#1505,.T.); +#1505 = EDGE_CURVE('',#1478,#1417,#1506,.T.); +#1506 = SURFACE_CURVE('',#1507,(#1512,#1523),.PCURVE_S1.); +#1507 = CIRCLE('',#1508,2.25); +#1508 = AXIS2_PLACEMENT_3D('',#1509,#1510,#1511); +#1509 = CARTESIAN_POINT('',(30.,-15.5,0.)); +#1510 = DIRECTION('',(0.,0.,-1.)); +#1511 = DIRECTION('',(0.,1.,0.)); +#1512 = PCURVE('',#370,#1513); +#1513 = DEFINITIONAL_REPRESENTATION('',(#1514),#1522); +#1514 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1515,#1516,#1517,#1518, +#1519,#1520,#1521),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1515 = CARTESIAN_POINT('',(30.,7.25)); +#1516 = CARTESIAN_POINT('',(33.89711431703,7.25)); +#1517 = CARTESIAN_POINT('',(31.948557158515,3.875)); +#1518 = CARTESIAN_POINT('',(30.,0.5)); +#1519 = CARTESIAN_POINT('',(28.051442841485,3.875)); +#1520 = CARTESIAN_POINT('',(26.10288568297,7.25)); +#1521 = CARTESIAN_POINT('',(30.,7.25)); +#1522 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1523 = PCURVE('',#1524,#1529); +#1524 = CYLINDRICAL_SURFACE('',#1525,2.25); +#1525 = AXIS2_PLACEMENT_3D('',#1526,#1527,#1528); +#1526 = CARTESIAN_POINT('',(30.,-15.5,0.)); +#1527 = DIRECTION('',(0.,0.,-1.)); +#1528 = DIRECTION('',(0.,1.,0.)); +#1529 = DEFINITIONAL_REPRESENTATION('',(#1530),#1534); +#1530 = LINE('',#1531,#1532); +#1531 = CARTESIAN_POINT('',(0.,0.)); +#1532 = VECTOR('',#1533,1.); +#1533 = DIRECTION('',(1.,0.)); +#1534 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1535 = FACE_BOUND('',#1536,.F.); +#1536 = EDGE_LOOP('',(#1537,#1567,#1600,#1628)); +#1537 = ORIENTED_EDGE('',*,*,#1538,.F.); +#1538 = EDGE_CURVE('',#1539,#1541,#1543,.T.); +#1539 = VERTEX_POINT('',#1540); +#1540 = CARTESIAN_POINT('',(7.75,15.5,0.)); +#1541 = VERTEX_POINT('',#1542); +#1542 = CARTESIAN_POINT('',(7.75,12.5,0.)); +#1543 = SURFACE_CURVE('',#1544,(#1548,#1555),.PCURVE_S1.); +#1544 = LINE('',#1545,#1546); +#1545 = CARTESIAN_POINT('',(7.75,15.5,0.)); +#1546 = VECTOR('',#1547,1.); +#1547 = DIRECTION('',(0.,-1.,0.)); +#1548 = PCURVE('',#370,#1549); +#1549 = DEFINITIONAL_REPRESENTATION('',(#1550),#1554); +#1550 = LINE('',#1551,#1552); +#1551 = CARTESIAN_POINT('',(7.75,36.)); +#1552 = VECTOR('',#1553,1.); +#1553 = DIRECTION('',(0.,-1.)); +#1554 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1555 = PCURVE('',#1556,#1561); +#1556 = PLANE('',#1557); +#1557 = AXIS2_PLACEMENT_3D('',#1558,#1559,#1560); +#1558 = CARTESIAN_POINT('',(7.75,15.5,0.)); +#1559 = DIRECTION('',(1.,0.,-0.)); +#1560 = DIRECTION('',(0.,-1.,0.)); +#1561 = DEFINITIONAL_REPRESENTATION('',(#1562),#1566); +#1562 = LINE('',#1563,#1564); +#1563 = CARTESIAN_POINT('',(0.,0.)); +#1564 = VECTOR('',#1565,1.); +#1565 = DIRECTION('',(1.,0.)); +#1566 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1567 = ORIENTED_EDGE('',*,*,#1568,.T.); +#1568 = EDGE_CURVE('',#1539,#1569,#1571,.T.); +#1569 = VERTEX_POINT('',#1570); +#1570 = CARTESIAN_POINT('',(12.25,15.5,0.)); +#1571 = SURFACE_CURVE('',#1572,(#1577,#1588),.PCURVE_S1.); +#1572 = CIRCLE('',#1573,2.25); +#1573 = AXIS2_PLACEMENT_3D('',#1574,#1575,#1576); +#1574 = CARTESIAN_POINT('',(10.,15.5,0.)); +#1575 = DIRECTION('',(-0.,-0.,-1.)); +#1576 = DIRECTION('',(0.,-1.,0.)); +#1577 = PCURVE('',#370,#1578); +#1578 = DEFINITIONAL_REPRESENTATION('',(#1579),#1587); +#1579 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1580,#1581,#1582,#1583, +#1584,#1585,#1586),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1580 = CARTESIAN_POINT('',(10.,33.75)); +#1581 = CARTESIAN_POINT('',(6.10288568297,33.75)); +#1582 = CARTESIAN_POINT('',(8.051442841485,37.125)); +#1583 = CARTESIAN_POINT('',(10.,40.5)); +#1584 = CARTESIAN_POINT('',(11.948557158515,37.125)); +#1585 = CARTESIAN_POINT('',(13.89711431703,33.75)); +#1586 = CARTESIAN_POINT('',(10.,33.75)); +#1587 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1588 = PCURVE('',#1589,#1594); +#1589 = CYLINDRICAL_SURFACE('',#1590,2.25); +#1590 = AXIS2_PLACEMENT_3D('',#1591,#1592,#1593); +#1591 = CARTESIAN_POINT('',(10.,15.5,0.)); +#1592 = DIRECTION('',(-0.,-0.,-1.)); +#1593 = DIRECTION('',(0.,-1.,0.)); +#1594 = DEFINITIONAL_REPRESENTATION('',(#1595),#1599); +#1595 = LINE('',#1596,#1597); +#1596 = CARTESIAN_POINT('',(0.,0.)); +#1597 = VECTOR('',#1598,1.); +#1598 = DIRECTION('',(1.,0.)); +#1599 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1600 = ORIENTED_EDGE('',*,*,#1601,.F.); +#1601 = EDGE_CURVE('',#1602,#1569,#1604,.T.); +#1602 = VERTEX_POINT('',#1603); +#1603 = CARTESIAN_POINT('',(12.25,12.5,0.)); +#1604 = SURFACE_CURVE('',#1605,(#1609,#1616),.PCURVE_S1.); +#1605 = LINE('',#1606,#1607); +#1606 = CARTESIAN_POINT('',(12.25,12.5,0.)); +#1607 = VECTOR('',#1608,1.); +#1608 = DIRECTION('',(0.,1.,0.)); +#1609 = PCURVE('',#370,#1610); +#1610 = DEFINITIONAL_REPRESENTATION('',(#1611),#1615); +#1611 = LINE('',#1612,#1613); +#1612 = CARTESIAN_POINT('',(12.25,33.)); +#1613 = VECTOR('',#1614,1.); +#1614 = DIRECTION('',(0.,1.)); +#1615 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1616 = PCURVE('',#1617,#1622); +#1617 = PLANE('',#1618); +#1618 = AXIS2_PLACEMENT_3D('',#1619,#1620,#1621); +#1619 = CARTESIAN_POINT('',(12.25,12.5,0.)); +#1620 = DIRECTION('',(-1.,0.,0.)); +#1621 = DIRECTION('',(0.,1.,0.)); +#1622 = DEFINITIONAL_REPRESENTATION('',(#1623),#1627); +#1623 = LINE('',#1624,#1625); +#1624 = CARTESIAN_POINT('',(0.,0.)); +#1625 = VECTOR('',#1626,1.); +#1626 = DIRECTION('',(1.,0.)); +#1627 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1628 = ORIENTED_EDGE('',*,*,#1629,.T.); +#1629 = EDGE_CURVE('',#1602,#1541,#1630,.T.); +#1630 = SURFACE_CURVE('',#1631,(#1636,#1647),.PCURVE_S1.); +#1631 = CIRCLE('',#1632,2.25); +#1632 = AXIS2_PLACEMENT_3D('',#1633,#1634,#1635); +#1633 = CARTESIAN_POINT('',(10.,12.5,0.)); +#1634 = DIRECTION('',(0.,0.,-1.)); +#1635 = DIRECTION('',(0.,1.,0.)); +#1636 = PCURVE('',#370,#1637); +#1637 = DEFINITIONAL_REPRESENTATION('',(#1638),#1646); +#1638 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1639,#1640,#1641,#1642, +#1643,#1644,#1645),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1639 = CARTESIAN_POINT('',(10.,35.25)); +#1640 = CARTESIAN_POINT('',(13.89711431703,35.25)); +#1641 = CARTESIAN_POINT('',(11.948557158515,31.875)); +#1642 = CARTESIAN_POINT('',(10.,28.5)); +#1643 = CARTESIAN_POINT('',(8.051442841485,31.875)); +#1644 = CARTESIAN_POINT('',(6.10288568297,35.25)); +#1645 = CARTESIAN_POINT('',(10.,35.25)); +#1646 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1647 = PCURVE('',#1648,#1653); +#1648 = CYLINDRICAL_SURFACE('',#1649,2.25); +#1649 = AXIS2_PLACEMENT_3D('',#1650,#1651,#1652); +#1650 = CARTESIAN_POINT('',(10.,12.5,0.)); +#1651 = DIRECTION('',(0.,0.,-1.)); +#1652 = DIRECTION('',(0.,1.,0.)); +#1653 = DEFINITIONAL_REPRESENTATION('',(#1654),#1658); +#1654 = LINE('',#1655,#1656); +#1655 = CARTESIAN_POINT('',(0.,0.)); +#1656 = VECTOR('',#1657,1.); +#1657 = DIRECTION('',(1.,0.)); +#1658 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1659 = FACE_BOUND('',#1660,.F.); +#1660 = EDGE_LOOP('',(#1661,#1691,#1724,#1752)); +#1661 = ORIENTED_EDGE('',*,*,#1662,.F.); +#1662 = EDGE_CURVE('',#1663,#1665,#1667,.T.); +#1663 = VERTEX_POINT('',#1664); +#1664 = CARTESIAN_POINT('',(21.5,17.75,0.)); +#1665 = VERTEX_POINT('',#1666); +#1666 = CARTESIAN_POINT('',(18.5,17.75,0.)); +#1667 = SURFACE_CURVE('',#1668,(#1672,#1679),.PCURVE_S1.); +#1668 = LINE('',#1669,#1670); +#1669 = CARTESIAN_POINT('',(21.5,17.75,0.)); +#1670 = VECTOR('',#1671,1.); +#1671 = DIRECTION('',(-1.,0.,0.)); +#1672 = PCURVE('',#370,#1673); +#1673 = DEFINITIONAL_REPRESENTATION('',(#1674),#1678); +#1674 = LINE('',#1675,#1676); +#1675 = CARTESIAN_POINT('',(21.5,38.25)); +#1676 = VECTOR('',#1677,1.); +#1677 = DIRECTION('',(-1.,0.)); +#1678 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1679 = PCURVE('',#1680,#1685); +#1680 = PLANE('',#1681); +#1681 = AXIS2_PLACEMENT_3D('',#1682,#1683,#1684); +#1682 = CARTESIAN_POINT('',(21.5,17.75,0.)); +#1683 = DIRECTION('',(0.,-1.,0.)); +#1684 = DIRECTION('',(-1.,0.,0.)); +#1685 = DEFINITIONAL_REPRESENTATION('',(#1686),#1690); +#1686 = LINE('',#1687,#1688); +#1687 = CARTESIAN_POINT('',(0.,-0.)); +#1688 = VECTOR('',#1689,1.); +#1689 = DIRECTION('',(1.,0.)); +#1690 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1691 = ORIENTED_EDGE('',*,*,#1692,.T.); +#1692 = EDGE_CURVE('',#1663,#1693,#1695,.T.); +#1693 = VERTEX_POINT('',#1694); +#1694 = CARTESIAN_POINT('',(21.5,13.25,0.)); +#1695 = SURFACE_CURVE('',#1696,(#1701,#1712),.PCURVE_S1.); +#1696 = CIRCLE('',#1697,2.25); +#1697 = AXIS2_PLACEMENT_3D('',#1698,#1699,#1700); +#1698 = CARTESIAN_POINT('',(21.5,15.5,0.)); +#1699 = DIRECTION('',(0.,0.,-1.)); +#1700 = DIRECTION('',(-1.,0.,0.)); +#1701 = PCURVE('',#370,#1702); +#1702 = DEFINITIONAL_REPRESENTATION('',(#1703),#1711); +#1703 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1704,#1705,#1706,#1707, +#1708,#1709,#1710),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1704 = CARTESIAN_POINT('',(19.25,36.)); +#1705 = CARTESIAN_POINT('',(19.25,39.89711431703)); +#1706 = CARTESIAN_POINT('',(22.625,37.948557158515)); +#1707 = CARTESIAN_POINT('',(26.,36.)); +#1708 = CARTESIAN_POINT('',(22.625,34.051442841485)); +#1709 = CARTESIAN_POINT('',(19.25,32.10288568297)); +#1710 = CARTESIAN_POINT('',(19.25,36.)); +#1711 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1712 = PCURVE('',#1713,#1718); +#1713 = CYLINDRICAL_SURFACE('',#1714,2.25); +#1714 = AXIS2_PLACEMENT_3D('',#1715,#1716,#1717); +#1715 = CARTESIAN_POINT('',(21.5,15.5,0.)); +#1716 = DIRECTION('',(0.,0.,-1.)); +#1717 = DIRECTION('',(-1.,0.,0.)); +#1718 = DEFINITIONAL_REPRESENTATION('',(#1719),#1723); +#1719 = LINE('',#1720,#1721); +#1720 = CARTESIAN_POINT('',(0.,0.)); +#1721 = VECTOR('',#1722,1.); +#1722 = DIRECTION('',(1.,0.)); +#1723 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1724 = ORIENTED_EDGE('',*,*,#1725,.F.); +#1725 = EDGE_CURVE('',#1726,#1693,#1728,.T.); +#1726 = VERTEX_POINT('',#1727); +#1727 = CARTESIAN_POINT('',(18.5,13.25,0.)); +#1728 = SURFACE_CURVE('',#1729,(#1733,#1740),.PCURVE_S1.); +#1729 = LINE('',#1730,#1731); +#1730 = CARTESIAN_POINT('',(18.5,13.25,0.)); +#1731 = VECTOR('',#1732,1.); +#1732 = DIRECTION('',(1.,0.,0.)); +#1733 = PCURVE('',#370,#1734); +#1734 = DEFINITIONAL_REPRESENTATION('',(#1735),#1739); +#1735 = LINE('',#1736,#1737); +#1736 = CARTESIAN_POINT('',(18.5,33.75)); +#1737 = VECTOR('',#1738,1.); +#1738 = DIRECTION('',(1.,0.)); +#1739 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1740 = PCURVE('',#1741,#1746); +#1741 = PLANE('',#1742); +#1742 = AXIS2_PLACEMENT_3D('',#1743,#1744,#1745); +#1743 = CARTESIAN_POINT('',(18.5,13.25,0.)); +#1744 = DIRECTION('',(0.,1.,0.)); +#1745 = DIRECTION('',(1.,0.,0.)); +#1746 = DEFINITIONAL_REPRESENTATION('',(#1747),#1751); +#1747 = LINE('',#1748,#1749); +#1748 = CARTESIAN_POINT('',(0.,0.)); +#1749 = VECTOR('',#1750,1.); +#1750 = DIRECTION('',(1.,0.)); +#1751 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1752 = ORIENTED_EDGE('',*,*,#1753,.T.); +#1753 = EDGE_CURVE('',#1726,#1665,#1754,.T.); +#1754 = SURFACE_CURVE('',#1755,(#1760,#1771),.PCURVE_S1.); +#1755 = CIRCLE('',#1756,2.25); +#1756 = AXIS2_PLACEMENT_3D('',#1757,#1758,#1759); +#1757 = CARTESIAN_POINT('',(18.5,15.5,0.)); +#1758 = DIRECTION('',(0.,0.,-1.)); +#1759 = DIRECTION('',(1.,0.,0.)); +#1760 = PCURVE('',#370,#1761); +#1761 = DEFINITIONAL_REPRESENTATION('',(#1762),#1770); +#1762 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1763,#1764,#1765,#1766, +#1767,#1768,#1769),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1763 = CARTESIAN_POINT('',(20.75,36.)); +#1764 = CARTESIAN_POINT('',(20.75,32.10288568297)); +#1765 = CARTESIAN_POINT('',(17.375,34.051442841485)); +#1766 = CARTESIAN_POINT('',(14.,36.)); +#1767 = CARTESIAN_POINT('',(17.375,37.948557158515)); +#1768 = CARTESIAN_POINT('',(20.75,39.89711431703)); +#1769 = CARTESIAN_POINT('',(20.75,36.)); +#1770 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1771 = PCURVE('',#1772,#1777); +#1772 = CYLINDRICAL_SURFACE('',#1773,2.25); +#1773 = AXIS2_PLACEMENT_3D('',#1774,#1775,#1776); +#1774 = CARTESIAN_POINT('',(18.5,15.5,0.)); +#1775 = DIRECTION('',(0.,0.,-1.)); +#1776 = DIRECTION('',(1.,0.,0.)); +#1777 = DEFINITIONAL_REPRESENTATION('',(#1778),#1782); +#1778 = LINE('',#1779,#1780); +#1779 = CARTESIAN_POINT('',(0.,0.)); +#1780 = VECTOR('',#1781,1.); +#1781 = DIRECTION('',(1.,0.)); +#1782 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1783 = FACE_BOUND('',#1784,.F.); +#1784 = EDGE_LOOP('',(#1785,#1815,#1848,#1876)); +#1785 = ORIENTED_EDGE('',*,*,#1786,.F.); +#1786 = EDGE_CURVE('',#1787,#1789,#1791,.T.); +#1787 = VERTEX_POINT('',#1788); +#1788 = CARTESIAN_POINT('',(27.75,15.5,0.)); +#1789 = VERTEX_POINT('',#1790); +#1790 = CARTESIAN_POINT('',(27.75,12.5,0.)); +#1791 = SURFACE_CURVE('',#1792,(#1796,#1803),.PCURVE_S1.); +#1792 = LINE('',#1793,#1794); +#1793 = CARTESIAN_POINT('',(27.75,15.5,0.)); +#1794 = VECTOR('',#1795,1.); +#1795 = DIRECTION('',(0.,-1.,0.)); +#1796 = PCURVE('',#370,#1797); +#1797 = DEFINITIONAL_REPRESENTATION('',(#1798),#1802); +#1798 = LINE('',#1799,#1800); +#1799 = CARTESIAN_POINT('',(27.75,36.)); +#1800 = VECTOR('',#1801,1.); +#1801 = DIRECTION('',(0.,-1.)); +#1802 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1803 = PCURVE('',#1804,#1809); +#1804 = PLANE('',#1805); +#1805 = AXIS2_PLACEMENT_3D('',#1806,#1807,#1808); +#1806 = CARTESIAN_POINT('',(27.75,15.5,0.)); +#1807 = DIRECTION('',(1.,0.,-0.)); +#1808 = DIRECTION('',(0.,-1.,0.)); +#1809 = DEFINITIONAL_REPRESENTATION('',(#1810),#1814); +#1810 = LINE('',#1811,#1812); +#1811 = CARTESIAN_POINT('',(0.,0.)); +#1812 = VECTOR('',#1813,1.); +#1813 = DIRECTION('',(1.,0.)); +#1814 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1815 = ORIENTED_EDGE('',*,*,#1816,.T.); +#1816 = EDGE_CURVE('',#1787,#1817,#1819,.T.); +#1817 = VERTEX_POINT('',#1818); +#1818 = CARTESIAN_POINT('',(32.25,15.5,0.)); +#1819 = SURFACE_CURVE('',#1820,(#1825,#1836),.PCURVE_S1.); +#1820 = CIRCLE('',#1821,2.25); +#1821 = AXIS2_PLACEMENT_3D('',#1822,#1823,#1824); +#1822 = CARTESIAN_POINT('',(30.,15.5,0.)); +#1823 = DIRECTION('',(-0.,-0.,-1.)); +#1824 = DIRECTION('',(0.,-1.,0.)); +#1825 = PCURVE('',#370,#1826); +#1826 = DEFINITIONAL_REPRESENTATION('',(#1827),#1835); +#1827 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1828,#1829,#1830,#1831, +#1832,#1833,#1834),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1828 = CARTESIAN_POINT('',(30.,33.75)); +#1829 = CARTESIAN_POINT('',(26.10288568297,33.75)); +#1830 = CARTESIAN_POINT('',(28.051442841485,37.125)); +#1831 = CARTESIAN_POINT('',(30.,40.5)); +#1832 = CARTESIAN_POINT('',(31.948557158515,37.125)); +#1833 = CARTESIAN_POINT('',(33.89711431703,33.75)); +#1834 = CARTESIAN_POINT('',(30.,33.75)); +#1835 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1836 = PCURVE('',#1837,#1842); +#1837 = CYLINDRICAL_SURFACE('',#1838,2.25); +#1838 = AXIS2_PLACEMENT_3D('',#1839,#1840,#1841); +#1839 = CARTESIAN_POINT('',(30.,15.5,0.)); +#1840 = DIRECTION('',(-0.,-0.,-1.)); +#1841 = DIRECTION('',(0.,-1.,0.)); +#1842 = DEFINITIONAL_REPRESENTATION('',(#1843),#1847); +#1843 = LINE('',#1844,#1845); +#1844 = CARTESIAN_POINT('',(0.,0.)); +#1845 = VECTOR('',#1846,1.); +#1846 = DIRECTION('',(1.,0.)); +#1847 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1848 = ORIENTED_EDGE('',*,*,#1849,.F.); +#1849 = EDGE_CURVE('',#1850,#1817,#1852,.T.); +#1850 = VERTEX_POINT('',#1851); +#1851 = CARTESIAN_POINT('',(32.25,12.5,0.)); +#1852 = SURFACE_CURVE('',#1853,(#1857,#1864),.PCURVE_S1.); +#1853 = LINE('',#1854,#1855); +#1854 = CARTESIAN_POINT('',(32.25,12.5,0.)); +#1855 = VECTOR('',#1856,1.); +#1856 = DIRECTION('',(0.,1.,0.)); +#1857 = PCURVE('',#370,#1858); +#1858 = DEFINITIONAL_REPRESENTATION('',(#1859),#1863); +#1859 = LINE('',#1860,#1861); +#1860 = CARTESIAN_POINT('',(32.25,33.)); +#1861 = VECTOR('',#1862,1.); +#1862 = DIRECTION('',(0.,1.)); +#1863 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1864 = PCURVE('',#1865,#1870); +#1865 = PLANE('',#1866); +#1866 = AXIS2_PLACEMENT_3D('',#1867,#1868,#1869); +#1867 = CARTESIAN_POINT('',(32.25,12.5,0.)); +#1868 = DIRECTION('',(-1.,0.,0.)); +#1869 = DIRECTION('',(0.,1.,0.)); +#1870 = DEFINITIONAL_REPRESENTATION('',(#1871),#1875); +#1871 = LINE('',#1872,#1873); +#1872 = CARTESIAN_POINT('',(0.,0.)); +#1873 = VECTOR('',#1874,1.); +#1874 = DIRECTION('',(1.,0.)); +#1875 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1876 = ORIENTED_EDGE('',*,*,#1877,.T.); +#1877 = EDGE_CURVE('',#1850,#1789,#1878,.T.); +#1878 = SURFACE_CURVE('',#1879,(#1884,#1895),.PCURVE_S1.); +#1879 = CIRCLE('',#1880,2.25); +#1880 = AXIS2_PLACEMENT_3D('',#1881,#1882,#1883); +#1881 = CARTESIAN_POINT('',(30.,12.5,0.)); +#1882 = DIRECTION('',(0.,0.,-1.)); +#1883 = DIRECTION('',(0.,1.,0.)); +#1884 = PCURVE('',#370,#1885); +#1885 = DEFINITIONAL_REPRESENTATION('',(#1886),#1894); +#1886 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1887,#1888,#1889,#1890, +#1891,#1892,#1893),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#1887 = CARTESIAN_POINT('',(30.,35.25)); +#1888 = CARTESIAN_POINT('',(33.89711431703,35.25)); +#1889 = CARTESIAN_POINT('',(31.948557158515,31.875)); +#1890 = CARTESIAN_POINT('',(30.,28.5)); +#1891 = CARTESIAN_POINT('',(28.051442841485,31.875)); +#1892 = CARTESIAN_POINT('',(26.10288568297,35.25)); +#1893 = CARTESIAN_POINT('',(30.,35.25)); +#1894 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1895 = PCURVE('',#1896,#1901); +#1896 = CYLINDRICAL_SURFACE('',#1897,2.25); +#1897 = AXIS2_PLACEMENT_3D('',#1898,#1899,#1900); +#1898 = CARTESIAN_POINT('',(30.,12.5,0.)); +#1899 = DIRECTION('',(0.,0.,-1.)); +#1900 = DIRECTION('',(0.,1.,0.)); +#1901 = DEFINITIONAL_REPRESENTATION('',(#1902),#1906); +#1902 = LINE('',#1903,#1904); +#1903 = CARTESIAN_POINT('',(0.,0.)); +#1904 = VECTOR('',#1905,1.); +#1905 = DIRECTION('',(1.,0.)); +#1906 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1907 = ADVANCED_FACE('',(#1908),#502,.F.); +#1908 = FACE_BOUND('',#1909,.F.); +#1909 = EDGE_LOOP('',(#1910,#1911,#1912,#1935)); +#1910 = ORIENTED_EDGE('',*,*,#1090,.F.); +#1911 = ORIENTED_EDGE('',*,*,#488,.T.); +#1912 = ORIENTED_EDGE('',*,*,#1913,.T.); +#1913 = EDGE_CURVE('',#461,#1914,#1916,.T.); +#1914 = VERTEX_POINT('',#1915); +#1915 = CARTESIAN_POINT('',(35.,-18.5,3.)); +#1916 = SURFACE_CURVE('',#1917,(#1921,#1928),.PCURVE_S1.); +#1917 = LINE('',#1918,#1919); +#1918 = CARTESIAN_POINT('',(25.25,-28.25,3.)); +#1919 = VECTOR('',#1920,1.); +#1920 = DIRECTION('',(0.707106781187,0.707106781187,-0.)); +#1921 = PCURVE('',#502,#1922); +#1922 = DEFINITIONAL_REPRESENTATION('',(#1923),#1927); +#1923 = LINE('',#1924,#1925); +#1924 = CARTESIAN_POINT('',(3.,-12.37436867076)); +#1925 = VECTOR('',#1926,1.); +#1926 = DIRECTION('',(0.,1.)); +#1927 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1928 = PCURVE('',#476,#1929); +#1929 = DEFINITIONAL_REPRESENTATION('',(#1930),#1934); +#1930 = LINE('',#1931,#1932); +#1931 = CARTESIAN_POINT('',(25.25,-7.75)); +#1932 = VECTOR('',#1933,1.); +#1933 = DIRECTION('',(0.707106781187,0.707106781187)); +#1934 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1935 = ORIENTED_EDGE('',*,*,#1936,.F.); +#1936 = EDGE_CURVE('',#1091,#1914,#1937,.T.); +#1937 = SURFACE_CURVE('',#1938,(#1942,#1949),.PCURVE_S1.); +#1938 = LINE('',#1939,#1940); +#1939 = CARTESIAN_POINT('',(35.,-18.5,0.)); +#1940 = VECTOR('',#1941,1.); +#1941 = DIRECTION('',(0.,0.,1.)); +#1942 = PCURVE('',#502,#1943); +#1943 = DEFINITIONAL_REPRESENTATION('',(#1944),#1948); +#1944 = LINE('',#1945,#1946); +#1945 = CARTESIAN_POINT('',(0.,1.414213562373)); +#1946 = VECTOR('',#1947,1.); +#1947 = DIRECTION('',(1.,0.)); +#1948 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1949 = PCURVE('',#1129,#1950); +#1950 = DEFINITIONAL_REPRESENTATION('',(#1951),#1955); +#1951 = LINE('',#1952,#1953); +#1952 = CARTESIAN_POINT('',(0.,-2.)); +#1953 = VECTOR('',#1954,1.); +#1954 = DIRECTION('',(1.,0.)); +#1955 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1956 = ADVANCED_FACE('',(#1957,#2025,#2125,#2225,#2325,#2425,#2525), + #476,.T.); +#1957 = FACE_BOUND('',#1958,.T.); +#1958 = EDGE_LOOP('',(#1959,#1960,#1979,#1980,#1981,#2004)); +#1959 = ORIENTED_EDGE('',*,*,#667,.F.); +#1960 = ORIENTED_EDGE('',*,*,#1961,.F.); +#1961 = EDGE_CURVE('',#433,#645,#1962,.T.); +#1962 = SURFACE_CURVE('',#1963,(#1967,#1973),.PCURVE_S1.); +#1963 = LINE('',#1964,#1965); +#1964 = CARTESIAN_POINT('',(3.,-20.5,3.)); +#1965 = VECTOR('',#1966,1.); +#1966 = DIRECTION('',(0.,1.,0.)); +#1967 = PCURVE('',#476,#1968); +#1968 = DEFINITIONAL_REPRESENTATION('',(#1969),#1972); +#1969 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#1970,#1971),.UNSPECIFIED.,.F., + .F.,(2,2),(0.,41.),.PIECEWISE_BEZIER_KNOTS.); +#1970 = CARTESIAN_POINT('',(3.,0.)); +#1971 = CARTESIAN_POINT('',(3.,41.)); +#1972 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1973 = PCURVE('',#448,#1974); +#1974 = DEFINITIONAL_REPRESENTATION('',(#1975),#1978); +#1975 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#1976,#1977),.UNSPECIFIED.,.F., + .F.,(2,2),(0.,41.),.PIECEWISE_BEZIER_KNOTS.); +#1976 = CARTESIAN_POINT('',(3.,0.)); +#1977 = CARTESIAN_POINT('',(3.,-41.)); +#1978 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1979 = ORIENTED_EDGE('',*,*,#460,.T.); +#1980 = ORIENTED_EDGE('',*,*,#1913,.T.); +#1981 = ORIENTED_EDGE('',*,*,#1982,.T.); +#1982 = EDGE_CURVE('',#1914,#1983,#1985,.T.); +#1983 = VERTEX_POINT('',#1984); +#1984 = CARTESIAN_POINT('',(35.,18.5,3.)); +#1985 = SURFACE_CURVE('',#1986,(#1990,#1997),.PCURVE_S1.); +#1986 = LINE('',#1987,#1988); +#1987 = CARTESIAN_POINT('',(35.,-20.5,3.)); +#1988 = VECTOR('',#1989,1.); +#1989 = DIRECTION('',(0.,1.,0.)); +#1990 = PCURVE('',#476,#1991); +#1991 = DEFINITIONAL_REPRESENTATION('',(#1992),#1996); +#1992 = LINE('',#1993,#1994); +#1993 = CARTESIAN_POINT('',(35.,0.)); +#1994 = VECTOR('',#1995,1.); +#1995 = DIRECTION('',(0.,1.)); +#1996 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#1997 = PCURVE('',#1129,#1998); +#1998 = DEFINITIONAL_REPRESENTATION('',(#1999),#2003); +#1999 = LINE('',#2000,#2001); +#2000 = CARTESIAN_POINT('',(3.,0.)); +#2001 = VECTOR('',#2002,1.); +#2002 = DIRECTION('',(0.,-1.)); +#2003 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2004 = ORIENTED_EDGE('',*,*,#2005,.F.); +#2005 = EDGE_CURVE('',#668,#1983,#2006,.T.); +#2006 = SURFACE_CURVE('',#2007,(#2011,#2018),.PCURVE_S1.); +#2007 = LINE('',#2008,#2009); +#2008 = CARTESIAN_POINT('',(35.5,18.,3.)); +#2009 = VECTOR('',#2010,1.); +#2010 = DIRECTION('',(0.707106781187,-0.707106781187,0.)); +#2011 = PCURVE('',#476,#2012); +#2012 = DEFINITIONAL_REPRESENTATION('',(#2013),#2017); +#2013 = LINE('',#2014,#2015); +#2014 = CARTESIAN_POINT('',(35.5,38.5)); +#2015 = VECTOR('',#2016,1.); +#2016 = DIRECTION('',(0.707106781187,-0.707106781187)); +#2017 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2018 = PCURVE('',#706,#2019); +#2019 = DEFINITIONAL_REPRESENTATION('',(#2020),#2024); +#2020 = LINE('',#2021,#2022); +#2021 = CARTESIAN_POINT('',(3.,2.12132034356)); +#2022 = VECTOR('',#2023,1.); +#2023 = DIRECTION('',(0.,1.)); +#2024 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2025 = FACE_BOUND('',#2026,.T.); +#2026 = EDGE_LOOP('',(#2027,#2050,#2078,#2099)); +#2027 = ORIENTED_EDGE('',*,*,#2028,.F.); +#2028 = EDGE_CURVE('',#2029,#2031,#2033,.T.); +#2029 = VERTEX_POINT('',#2030); +#2030 = CARTESIAN_POINT('',(7.75,-12.5,3.)); +#2031 = VERTEX_POINT('',#2032); +#2032 = CARTESIAN_POINT('',(7.75,-15.5,3.)); +#2033 = SURFACE_CURVE('',#2034,(#2038,#2044),.PCURVE_S1.); +#2034 = LINE('',#2035,#2036); +#2035 = CARTESIAN_POINT('',(7.75,-16.5,3.)); +#2036 = VECTOR('',#2037,1.); +#2037 = DIRECTION('',(0.,-1.,0.)); +#2038 = PCURVE('',#476,#2039); +#2039 = DEFINITIONAL_REPRESENTATION('',(#2040),#2043); +#2040 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2041,#2042),.UNSPECIFIED.,.F., + .F.,(2,2),(-4.,-1.),.PIECEWISE_BEZIER_KNOTS.); +#2041 = CARTESIAN_POINT('',(7.75,8.)); +#2042 = CARTESIAN_POINT('',(7.75,5.)); +#2043 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2044 = PCURVE('',#1184,#2045); +#2045 = DEFINITIONAL_REPRESENTATION('',(#2046),#2049); +#2046 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2047,#2048),.UNSPECIFIED.,.F., + .F.,(2,2),(-4.,-1.),.PIECEWISE_BEZIER_KNOTS.); +#2047 = CARTESIAN_POINT('',(0.,-3.)); +#2048 = CARTESIAN_POINT('',(3.,-3.)); +#2049 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2050 = ORIENTED_EDGE('',*,*,#2051,.T.); +#2051 = EDGE_CURVE('',#2029,#2052,#2054,.T.); +#2052 = VERTEX_POINT('',#2053); +#2053 = CARTESIAN_POINT('',(12.25,-12.5,3.)); +#2054 = SURFACE_CURVE('',#2055,(#2060,#2071),.PCURVE_S1.); +#2055 = CIRCLE('',#2056,2.25); +#2056 = AXIS2_PLACEMENT_3D('',#2057,#2058,#2059); +#2057 = CARTESIAN_POINT('',(10.,-12.5,3.)); +#2058 = DIRECTION('',(-0.,-0.,-1.)); +#2059 = DIRECTION('',(0.,-1.,0.)); +#2060 = PCURVE('',#476,#2061); +#2061 = DEFINITIONAL_REPRESENTATION('',(#2062),#2070); +#2062 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2063,#2064,#2065,#2066, +#2067,#2068,#2069),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2063 = CARTESIAN_POINT('',(10.,5.75)); +#2064 = CARTESIAN_POINT('',(6.10288568297,5.75)); +#2065 = CARTESIAN_POINT('',(8.051442841485,9.125)); +#2066 = CARTESIAN_POINT('',(10.,12.5)); +#2067 = CARTESIAN_POINT('',(11.948557158515,9.125)); +#2068 = CARTESIAN_POINT('',(13.89711431703,5.75)); +#2069 = CARTESIAN_POINT('',(10.,5.75)); +#2070 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2071 = PCURVE('',#1217,#2072); +#2072 = DEFINITIONAL_REPRESENTATION('',(#2073),#2077); +#2073 = LINE('',#2074,#2075); +#2074 = CARTESIAN_POINT('',(0.,-3.)); +#2075 = VECTOR('',#2076,1.); +#2076 = DIRECTION('',(1.,0.)); +#2077 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2078 = ORIENTED_EDGE('',*,*,#2079,.F.); +#2079 = EDGE_CURVE('',#2080,#2052,#2082,.T.); +#2080 = VERTEX_POINT('',#2081); +#2081 = CARTESIAN_POINT('',(12.25,-15.5,3.)); +#2082 = SURFACE_CURVE('',#2083,(#2087,#2093),.PCURVE_S1.); +#2083 = LINE('',#2084,#2085); +#2084 = CARTESIAN_POINT('',(12.25,-18.,3.)); +#2085 = VECTOR('',#2086,1.); +#2086 = DIRECTION('',(0.,1.,-0.)); +#2087 = PCURVE('',#476,#2088); +#2088 = DEFINITIONAL_REPRESENTATION('',(#2089),#2092); +#2089 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2090,#2091),.UNSPECIFIED.,.F., + .F.,(2,2),(2.5,5.5),.PIECEWISE_BEZIER_KNOTS.); +#2090 = CARTESIAN_POINT('',(12.25,5.)); +#2091 = CARTESIAN_POINT('',(12.25,8.)); +#2092 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2093 = PCURVE('',#1245,#2094); +#2094 = DEFINITIONAL_REPRESENTATION('',(#2095),#2098); +#2095 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2096,#2097),.UNSPECIFIED.,.F., + .F.,(2,2),(2.5,5.5),.PIECEWISE_BEZIER_KNOTS.); +#2096 = CARTESIAN_POINT('',(0.,-3.)); +#2097 = CARTESIAN_POINT('',(3.,-3.)); +#2098 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2099 = ORIENTED_EDGE('',*,*,#2100,.T.); +#2100 = EDGE_CURVE('',#2080,#2031,#2101,.T.); +#2101 = SURFACE_CURVE('',#2102,(#2107,#2118),.PCURVE_S1.); +#2102 = CIRCLE('',#2103,2.25); +#2103 = AXIS2_PLACEMENT_3D('',#2104,#2105,#2106); +#2104 = CARTESIAN_POINT('',(10.,-15.5,3.)); +#2105 = DIRECTION('',(0.,0.,-1.)); +#2106 = DIRECTION('',(0.,1.,0.)); +#2107 = PCURVE('',#476,#2108); +#2108 = DEFINITIONAL_REPRESENTATION('',(#2109),#2117); +#2109 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2110,#2111,#2112,#2113, +#2114,#2115,#2116),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2110 = CARTESIAN_POINT('',(10.,7.25)); +#2111 = CARTESIAN_POINT('',(13.89711431703,7.25)); +#2112 = CARTESIAN_POINT('',(11.948557158515,3.875)); +#2113 = CARTESIAN_POINT('',(10.,0.5)); +#2114 = CARTESIAN_POINT('',(8.051442841485,3.875)); +#2115 = CARTESIAN_POINT('',(6.10288568297,7.25)); +#2116 = CARTESIAN_POINT('',(10.,7.25)); +#2117 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2118 = PCURVE('',#1276,#2119); +#2119 = DEFINITIONAL_REPRESENTATION('',(#2120),#2124); +#2120 = LINE('',#2121,#2122); +#2121 = CARTESIAN_POINT('',(0.,-3.)); +#2122 = VECTOR('',#2123,1.); +#2123 = DIRECTION('',(1.,0.)); +#2124 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2125 = FACE_BOUND('',#2126,.T.); +#2126 = EDGE_LOOP('',(#2127,#2150,#2178,#2199)); +#2127 = ORIENTED_EDGE('',*,*,#2128,.F.); +#2128 = EDGE_CURVE('',#2129,#2131,#2133,.T.); +#2129 = VERTEX_POINT('',#2130); +#2130 = CARTESIAN_POINT('',(21.5,-13.25,3.)); +#2131 = VERTEX_POINT('',#2132); +#2132 = CARTESIAN_POINT('',(18.5,-13.25,3.)); +#2133 = SURFACE_CURVE('',#2134,(#2138,#2144),.PCURVE_S1.); +#2134 = LINE('',#2135,#2136); +#2135 = CARTESIAN_POINT('',(10.75,-13.25,3.)); +#2136 = VECTOR('',#2137,1.); +#2137 = DIRECTION('',(-1.,0.,0.)); +#2138 = PCURVE('',#476,#2139); +#2139 = DEFINITIONAL_REPRESENTATION('',(#2140),#2143); +#2140 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2141,#2142),.UNSPECIFIED.,.F., + .F.,(2,2),(-10.75,-7.75),.PIECEWISE_BEZIER_KNOTS.); +#2141 = CARTESIAN_POINT('',(21.5,7.25)); +#2142 = CARTESIAN_POINT('',(18.5,7.25)); +#2143 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2144 = PCURVE('',#1308,#2145); +#2145 = DEFINITIONAL_REPRESENTATION('',(#2146),#2149); +#2146 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2147,#2148),.UNSPECIFIED.,.F., + .F.,(2,2),(-10.75,-7.75),.PIECEWISE_BEZIER_KNOTS.); +#2147 = CARTESIAN_POINT('',(0.,-3.)); +#2148 = CARTESIAN_POINT('',(3.,-3.)); +#2149 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2150 = ORIENTED_EDGE('',*,*,#2151,.T.); +#2151 = EDGE_CURVE('',#2129,#2152,#2154,.T.); +#2152 = VERTEX_POINT('',#2153); +#2153 = CARTESIAN_POINT('',(21.5,-17.75,3.)); +#2154 = SURFACE_CURVE('',#2155,(#2160,#2171),.PCURVE_S1.); +#2155 = CIRCLE('',#2156,2.25); +#2156 = AXIS2_PLACEMENT_3D('',#2157,#2158,#2159); +#2157 = CARTESIAN_POINT('',(21.5,-15.5,3.)); +#2158 = DIRECTION('',(0.,0.,-1.)); +#2159 = DIRECTION('',(-1.,0.,0.)); +#2160 = PCURVE('',#476,#2161); +#2161 = DEFINITIONAL_REPRESENTATION('',(#2162),#2170); +#2162 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2163,#2164,#2165,#2166, +#2167,#2168,#2169),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2163 = CARTESIAN_POINT('',(19.25,5.)); +#2164 = CARTESIAN_POINT('',(19.25,8.89711431703)); +#2165 = CARTESIAN_POINT('',(22.625,6.948557158515)); +#2166 = CARTESIAN_POINT('',(26.,5.)); +#2167 = CARTESIAN_POINT('',(22.625,3.051442841485)); +#2168 = CARTESIAN_POINT('',(19.25,1.10288568297)); +#2169 = CARTESIAN_POINT('',(19.25,5.)); +#2170 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2171 = PCURVE('',#1341,#2172); +#2172 = DEFINITIONAL_REPRESENTATION('',(#2173),#2177); +#2173 = LINE('',#2174,#2175); +#2174 = CARTESIAN_POINT('',(0.,-3.)); +#2175 = VECTOR('',#2176,1.); +#2176 = DIRECTION('',(1.,0.)); +#2177 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2178 = ORIENTED_EDGE('',*,*,#2179,.F.); +#2179 = EDGE_CURVE('',#2180,#2152,#2182,.T.); +#2180 = VERTEX_POINT('',#2181); +#2181 = CARTESIAN_POINT('',(18.5,-17.75,3.)); +#2182 = SURFACE_CURVE('',#2183,(#2187,#2193),.PCURVE_S1.); +#2183 = LINE('',#2184,#2185); +#2184 = CARTESIAN_POINT('',(9.25,-17.75,3.)); +#2185 = VECTOR('',#2186,1.); +#2186 = DIRECTION('',(1.,0.,0.)); +#2187 = PCURVE('',#476,#2188); +#2188 = DEFINITIONAL_REPRESENTATION('',(#2189),#2192); +#2189 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2190,#2191),.UNSPECIFIED.,.F., + .F.,(2,2),(9.25,12.25),.PIECEWISE_BEZIER_KNOTS.); +#2190 = CARTESIAN_POINT('',(18.5,2.75)); +#2191 = CARTESIAN_POINT('',(21.5,2.75)); +#2192 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2193 = PCURVE('',#1369,#2194); +#2194 = DEFINITIONAL_REPRESENTATION('',(#2195),#2198); +#2195 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2196,#2197),.UNSPECIFIED.,.F., + .F.,(2,2),(9.25,12.25),.PIECEWISE_BEZIER_KNOTS.); +#2196 = CARTESIAN_POINT('',(0.,-3.)); +#2197 = CARTESIAN_POINT('',(3.,-3.)); +#2198 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2199 = ORIENTED_EDGE('',*,*,#2200,.T.); +#2200 = EDGE_CURVE('',#2180,#2131,#2201,.T.); +#2201 = SURFACE_CURVE('',#2202,(#2207,#2218),.PCURVE_S1.); +#2202 = CIRCLE('',#2203,2.25); +#2203 = AXIS2_PLACEMENT_3D('',#2204,#2205,#2206); +#2204 = CARTESIAN_POINT('',(18.5,-15.5,3.)); +#2205 = DIRECTION('',(0.,0.,-1.)); +#2206 = DIRECTION('',(1.,0.,0.)); +#2207 = PCURVE('',#476,#2208); +#2208 = DEFINITIONAL_REPRESENTATION('',(#2209),#2217); +#2209 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2210,#2211,#2212,#2213, +#2214,#2215,#2216),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2210 = CARTESIAN_POINT('',(20.75,5.)); +#2211 = CARTESIAN_POINT('',(20.75,1.10288568297)); +#2212 = CARTESIAN_POINT('',(17.375,3.051442841485)); +#2213 = CARTESIAN_POINT('',(14.,5.)); +#2214 = CARTESIAN_POINT('',(17.375,6.948557158515)); +#2215 = CARTESIAN_POINT('',(20.75,8.89711431703)); +#2216 = CARTESIAN_POINT('',(20.75,5.)); +#2217 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2218 = PCURVE('',#1400,#2219); +#2219 = DEFINITIONAL_REPRESENTATION('',(#2220),#2224); +#2220 = LINE('',#2221,#2222); +#2221 = CARTESIAN_POINT('',(0.,-3.)); +#2222 = VECTOR('',#2223,1.); +#2223 = DIRECTION('',(1.,0.)); +#2224 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2225 = FACE_BOUND('',#2226,.T.); +#2226 = EDGE_LOOP('',(#2227,#2250,#2278,#2299)); +#2227 = ORIENTED_EDGE('',*,*,#2228,.F.); +#2228 = EDGE_CURVE('',#2229,#2231,#2233,.T.); +#2229 = VERTEX_POINT('',#2230); +#2230 = CARTESIAN_POINT('',(27.75,-12.5,3.)); +#2231 = VERTEX_POINT('',#2232); +#2232 = CARTESIAN_POINT('',(27.75,-15.5,3.)); +#2233 = SURFACE_CURVE('',#2234,(#2238,#2244),.PCURVE_S1.); +#2234 = LINE('',#2235,#2236); +#2235 = CARTESIAN_POINT('',(27.75,-16.5,3.)); +#2236 = VECTOR('',#2237,1.); +#2237 = DIRECTION('',(0.,-1.,0.)); +#2238 = PCURVE('',#476,#2239); +#2239 = DEFINITIONAL_REPRESENTATION('',(#2240),#2243); +#2240 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2241,#2242),.UNSPECIFIED.,.F., + .F.,(2,2),(-4.,-1.),.PIECEWISE_BEZIER_KNOTS.); +#2241 = CARTESIAN_POINT('',(27.75,8.)); +#2242 = CARTESIAN_POINT('',(27.75,5.)); +#2243 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2244 = PCURVE('',#1432,#2245); +#2245 = DEFINITIONAL_REPRESENTATION('',(#2246),#2249); +#2246 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2247,#2248),.UNSPECIFIED.,.F., + .F.,(2,2),(-4.,-1.),.PIECEWISE_BEZIER_KNOTS.); +#2247 = CARTESIAN_POINT('',(0.,-3.)); +#2248 = CARTESIAN_POINT('',(3.,-3.)); +#2249 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2250 = ORIENTED_EDGE('',*,*,#2251,.T.); +#2251 = EDGE_CURVE('',#2229,#2252,#2254,.T.); +#2252 = VERTEX_POINT('',#2253); +#2253 = CARTESIAN_POINT('',(32.25,-12.5,3.)); +#2254 = SURFACE_CURVE('',#2255,(#2260,#2271),.PCURVE_S1.); +#2255 = CIRCLE('',#2256,2.25); +#2256 = AXIS2_PLACEMENT_3D('',#2257,#2258,#2259); +#2257 = CARTESIAN_POINT('',(30.,-12.5,3.)); +#2258 = DIRECTION('',(-0.,-0.,-1.)); +#2259 = DIRECTION('',(0.,-1.,0.)); +#2260 = PCURVE('',#476,#2261); +#2261 = DEFINITIONAL_REPRESENTATION('',(#2262),#2270); +#2262 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2263,#2264,#2265,#2266, +#2267,#2268,#2269),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2263 = CARTESIAN_POINT('',(30.,5.75)); +#2264 = CARTESIAN_POINT('',(26.10288568297,5.75)); +#2265 = CARTESIAN_POINT('',(28.051442841485,9.125)); +#2266 = CARTESIAN_POINT('',(30.,12.5)); +#2267 = CARTESIAN_POINT('',(31.948557158515,9.125)); +#2268 = CARTESIAN_POINT('',(33.89711431703,5.75)); +#2269 = CARTESIAN_POINT('',(30.,5.75)); +#2270 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2271 = PCURVE('',#1465,#2272); +#2272 = DEFINITIONAL_REPRESENTATION('',(#2273),#2277); +#2273 = LINE('',#2274,#2275); +#2274 = CARTESIAN_POINT('',(0.,-3.)); +#2275 = VECTOR('',#2276,1.); +#2276 = DIRECTION('',(1.,0.)); +#2277 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2278 = ORIENTED_EDGE('',*,*,#2279,.F.); +#2279 = EDGE_CURVE('',#2280,#2252,#2282,.T.); +#2280 = VERTEX_POINT('',#2281); +#2281 = CARTESIAN_POINT('',(32.25,-15.5,3.)); +#2282 = SURFACE_CURVE('',#2283,(#2287,#2293),.PCURVE_S1.); +#2283 = LINE('',#2284,#2285); +#2284 = CARTESIAN_POINT('',(32.25,-18.,3.)); +#2285 = VECTOR('',#2286,1.); +#2286 = DIRECTION('',(0.,1.,-0.)); +#2287 = PCURVE('',#476,#2288); +#2288 = DEFINITIONAL_REPRESENTATION('',(#2289),#2292); +#2289 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2290,#2291),.UNSPECIFIED.,.F., + .F.,(2,2),(2.5,5.5),.PIECEWISE_BEZIER_KNOTS.); +#2290 = CARTESIAN_POINT('',(32.25,5.)); +#2291 = CARTESIAN_POINT('',(32.25,8.)); +#2292 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2293 = PCURVE('',#1493,#2294); +#2294 = DEFINITIONAL_REPRESENTATION('',(#2295),#2298); +#2295 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2296,#2297),.UNSPECIFIED.,.F., + .F.,(2,2),(2.5,5.5),.PIECEWISE_BEZIER_KNOTS.); +#2296 = CARTESIAN_POINT('',(0.,-3.)); +#2297 = CARTESIAN_POINT('',(3.,-3.)); +#2298 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2299 = ORIENTED_EDGE('',*,*,#2300,.T.); +#2300 = EDGE_CURVE('',#2280,#2231,#2301,.T.); +#2301 = SURFACE_CURVE('',#2302,(#2307,#2318),.PCURVE_S1.); +#2302 = CIRCLE('',#2303,2.25); +#2303 = AXIS2_PLACEMENT_3D('',#2304,#2305,#2306); +#2304 = CARTESIAN_POINT('',(30.,-15.5,3.)); +#2305 = DIRECTION('',(0.,0.,-1.)); +#2306 = DIRECTION('',(0.,1.,0.)); +#2307 = PCURVE('',#476,#2308); +#2308 = DEFINITIONAL_REPRESENTATION('',(#2309),#2317); +#2309 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2310,#2311,#2312,#2313, +#2314,#2315,#2316),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2310 = CARTESIAN_POINT('',(30.,7.25)); +#2311 = CARTESIAN_POINT('',(33.89711431703,7.25)); +#2312 = CARTESIAN_POINT('',(31.948557158515,3.875)); +#2313 = CARTESIAN_POINT('',(30.,0.5)); +#2314 = CARTESIAN_POINT('',(28.051442841485,3.875)); +#2315 = CARTESIAN_POINT('',(26.10288568297,7.25)); +#2316 = CARTESIAN_POINT('',(30.,7.25)); +#2317 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2318 = PCURVE('',#1524,#2319); +#2319 = DEFINITIONAL_REPRESENTATION('',(#2320),#2324); +#2320 = LINE('',#2321,#2322); +#2321 = CARTESIAN_POINT('',(0.,-3.)); +#2322 = VECTOR('',#2323,1.); +#2323 = DIRECTION('',(1.,0.)); +#2324 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2325 = FACE_BOUND('',#2326,.T.); +#2326 = EDGE_LOOP('',(#2327,#2350,#2378,#2399)); +#2327 = ORIENTED_EDGE('',*,*,#2328,.F.); +#2328 = EDGE_CURVE('',#2329,#2331,#2333,.T.); +#2329 = VERTEX_POINT('',#2330); +#2330 = CARTESIAN_POINT('',(7.75,15.5,3.)); +#2331 = VERTEX_POINT('',#2332); +#2332 = CARTESIAN_POINT('',(7.75,12.5,3.)); +#2333 = SURFACE_CURVE('',#2334,(#2338,#2344),.PCURVE_S1.); +#2334 = LINE('',#2335,#2336); +#2335 = CARTESIAN_POINT('',(7.75,-2.5,3.)); +#2336 = VECTOR('',#2337,1.); +#2337 = DIRECTION('',(0.,-1.,0.)); +#2338 = PCURVE('',#476,#2339); +#2339 = DEFINITIONAL_REPRESENTATION('',(#2340),#2343); +#2340 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2341,#2342),.UNSPECIFIED.,.F., + .F.,(2,2),(-18.,-15.),.PIECEWISE_BEZIER_KNOTS.); +#2341 = CARTESIAN_POINT('',(7.75,36.)); +#2342 = CARTESIAN_POINT('',(7.75,33.)); +#2343 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2344 = PCURVE('',#1556,#2345); +#2345 = DEFINITIONAL_REPRESENTATION('',(#2346),#2349); +#2346 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2347,#2348),.UNSPECIFIED.,.F., + .F.,(2,2),(-18.,-15.),.PIECEWISE_BEZIER_KNOTS.); +#2347 = CARTESIAN_POINT('',(0.,-3.)); +#2348 = CARTESIAN_POINT('',(3.,-3.)); +#2349 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2350 = ORIENTED_EDGE('',*,*,#2351,.T.); +#2351 = EDGE_CURVE('',#2329,#2352,#2354,.T.); +#2352 = VERTEX_POINT('',#2353); +#2353 = CARTESIAN_POINT('',(12.25,15.5,3.)); +#2354 = SURFACE_CURVE('',#2355,(#2360,#2371),.PCURVE_S1.); +#2355 = CIRCLE('',#2356,2.25); +#2356 = AXIS2_PLACEMENT_3D('',#2357,#2358,#2359); +#2357 = CARTESIAN_POINT('',(10.,15.5,3.)); +#2358 = DIRECTION('',(-0.,-0.,-1.)); +#2359 = DIRECTION('',(0.,-1.,0.)); +#2360 = PCURVE('',#476,#2361); +#2361 = DEFINITIONAL_REPRESENTATION('',(#2362),#2370); +#2362 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2363,#2364,#2365,#2366, +#2367,#2368,#2369),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2363 = CARTESIAN_POINT('',(10.,33.75)); +#2364 = CARTESIAN_POINT('',(6.10288568297,33.75)); +#2365 = CARTESIAN_POINT('',(8.051442841485,37.125)); +#2366 = CARTESIAN_POINT('',(10.,40.5)); +#2367 = CARTESIAN_POINT('',(11.948557158515,37.125)); +#2368 = CARTESIAN_POINT('',(13.89711431703,33.75)); +#2369 = CARTESIAN_POINT('',(10.,33.75)); +#2370 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2371 = PCURVE('',#1589,#2372); +#2372 = DEFINITIONAL_REPRESENTATION('',(#2373),#2377); +#2373 = LINE('',#2374,#2375); +#2374 = CARTESIAN_POINT('',(0.,-3.)); +#2375 = VECTOR('',#2376,1.); +#2376 = DIRECTION('',(1.,0.)); +#2377 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2378 = ORIENTED_EDGE('',*,*,#2379,.F.); +#2379 = EDGE_CURVE('',#2380,#2352,#2382,.T.); +#2380 = VERTEX_POINT('',#2381); +#2381 = CARTESIAN_POINT('',(12.25,12.5,3.)); +#2382 = SURFACE_CURVE('',#2383,(#2387,#2393),.PCURVE_S1.); +#2383 = LINE('',#2384,#2385); +#2384 = CARTESIAN_POINT('',(12.25,-4.,3.)); +#2385 = VECTOR('',#2386,1.); +#2386 = DIRECTION('',(0.,1.,-0.)); +#2387 = PCURVE('',#476,#2388); +#2388 = DEFINITIONAL_REPRESENTATION('',(#2389),#2392); +#2389 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2390,#2391),.UNSPECIFIED.,.F., + .F.,(2,2),(16.5,19.5),.PIECEWISE_BEZIER_KNOTS.); +#2390 = CARTESIAN_POINT('',(12.25,33.)); +#2391 = CARTESIAN_POINT('',(12.25,36.)); +#2392 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2393 = PCURVE('',#1617,#2394); +#2394 = DEFINITIONAL_REPRESENTATION('',(#2395),#2398); +#2395 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2396,#2397),.UNSPECIFIED.,.F., + .F.,(2,2),(16.5,19.5),.PIECEWISE_BEZIER_KNOTS.); +#2396 = CARTESIAN_POINT('',(0.,-3.)); +#2397 = CARTESIAN_POINT('',(3.,-3.)); +#2398 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2399 = ORIENTED_EDGE('',*,*,#2400,.T.); +#2400 = EDGE_CURVE('',#2380,#2331,#2401,.T.); +#2401 = SURFACE_CURVE('',#2402,(#2407,#2418),.PCURVE_S1.); +#2402 = CIRCLE('',#2403,2.25); +#2403 = AXIS2_PLACEMENT_3D('',#2404,#2405,#2406); +#2404 = CARTESIAN_POINT('',(10.,12.5,3.)); +#2405 = DIRECTION('',(0.,0.,-1.)); +#2406 = DIRECTION('',(0.,1.,0.)); +#2407 = PCURVE('',#476,#2408); +#2408 = DEFINITIONAL_REPRESENTATION('',(#2409),#2417); +#2409 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2410,#2411,#2412,#2413, +#2414,#2415,#2416),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2410 = CARTESIAN_POINT('',(10.,35.25)); +#2411 = CARTESIAN_POINT('',(13.89711431703,35.25)); +#2412 = CARTESIAN_POINT('',(11.948557158515,31.875)); +#2413 = CARTESIAN_POINT('',(10.,28.5)); +#2414 = CARTESIAN_POINT('',(8.051442841485,31.875)); +#2415 = CARTESIAN_POINT('',(6.10288568297,35.25)); +#2416 = CARTESIAN_POINT('',(10.,35.25)); +#2417 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2418 = PCURVE('',#1648,#2419); +#2419 = DEFINITIONAL_REPRESENTATION('',(#2420),#2424); +#2420 = LINE('',#2421,#2422); +#2421 = CARTESIAN_POINT('',(0.,-3.)); +#2422 = VECTOR('',#2423,1.); +#2423 = DIRECTION('',(1.,0.)); +#2424 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2425 = FACE_BOUND('',#2426,.T.); +#2426 = EDGE_LOOP('',(#2427,#2450,#2478,#2499)); +#2427 = ORIENTED_EDGE('',*,*,#2428,.F.); +#2428 = EDGE_CURVE('',#2429,#2431,#2433,.T.); +#2429 = VERTEX_POINT('',#2430); +#2430 = CARTESIAN_POINT('',(21.5,17.75,3.)); +#2431 = VERTEX_POINT('',#2432); +#2432 = CARTESIAN_POINT('',(18.5,17.75,3.)); +#2433 = SURFACE_CURVE('',#2434,(#2438,#2444),.PCURVE_S1.); +#2434 = LINE('',#2435,#2436); +#2435 = CARTESIAN_POINT('',(10.75,17.75,3.)); +#2436 = VECTOR('',#2437,1.); +#2437 = DIRECTION('',(-1.,0.,0.)); +#2438 = PCURVE('',#476,#2439); +#2439 = DEFINITIONAL_REPRESENTATION('',(#2440),#2443); +#2440 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2441,#2442),.UNSPECIFIED.,.F., + .F.,(2,2),(-10.75,-7.75),.PIECEWISE_BEZIER_KNOTS.); +#2441 = CARTESIAN_POINT('',(21.5,38.25)); +#2442 = CARTESIAN_POINT('',(18.5,38.25)); +#2443 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2444 = PCURVE('',#1680,#2445); +#2445 = DEFINITIONAL_REPRESENTATION('',(#2446),#2449); +#2446 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2447,#2448),.UNSPECIFIED.,.F., + .F.,(2,2),(-10.75,-7.75),.PIECEWISE_BEZIER_KNOTS.); +#2447 = CARTESIAN_POINT('',(0.,-3.)); +#2448 = CARTESIAN_POINT('',(3.,-3.)); +#2449 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2450 = ORIENTED_EDGE('',*,*,#2451,.T.); +#2451 = EDGE_CURVE('',#2429,#2452,#2454,.T.); +#2452 = VERTEX_POINT('',#2453); +#2453 = CARTESIAN_POINT('',(21.5,13.25,3.)); +#2454 = SURFACE_CURVE('',#2455,(#2460,#2471),.PCURVE_S1.); +#2455 = CIRCLE('',#2456,2.25); +#2456 = AXIS2_PLACEMENT_3D('',#2457,#2458,#2459); +#2457 = CARTESIAN_POINT('',(21.5,15.5,3.)); +#2458 = DIRECTION('',(0.,0.,-1.)); +#2459 = DIRECTION('',(-1.,0.,0.)); +#2460 = PCURVE('',#476,#2461); +#2461 = DEFINITIONAL_REPRESENTATION('',(#2462),#2470); +#2462 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2463,#2464,#2465,#2466, +#2467,#2468,#2469),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2463 = CARTESIAN_POINT('',(19.25,36.)); +#2464 = CARTESIAN_POINT('',(19.25,39.89711431703)); +#2465 = CARTESIAN_POINT('',(22.625,37.948557158515)); +#2466 = CARTESIAN_POINT('',(26.,36.)); +#2467 = CARTESIAN_POINT('',(22.625,34.051442841485)); +#2468 = CARTESIAN_POINT('',(19.25,32.10288568297)); +#2469 = CARTESIAN_POINT('',(19.25,36.)); +#2470 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2471 = PCURVE('',#1713,#2472); +#2472 = DEFINITIONAL_REPRESENTATION('',(#2473),#2477); +#2473 = LINE('',#2474,#2475); +#2474 = CARTESIAN_POINT('',(0.,-3.)); +#2475 = VECTOR('',#2476,1.); +#2476 = DIRECTION('',(1.,0.)); +#2477 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2478 = ORIENTED_EDGE('',*,*,#2479,.F.); +#2479 = EDGE_CURVE('',#2480,#2452,#2482,.T.); +#2480 = VERTEX_POINT('',#2481); +#2481 = CARTESIAN_POINT('',(18.5,13.25,3.)); +#2482 = SURFACE_CURVE('',#2483,(#2487,#2493),.PCURVE_S1.); +#2483 = LINE('',#2484,#2485); +#2484 = CARTESIAN_POINT('',(9.25,13.25,3.)); +#2485 = VECTOR('',#2486,1.); +#2486 = DIRECTION('',(1.,0.,0.)); +#2487 = PCURVE('',#476,#2488); +#2488 = DEFINITIONAL_REPRESENTATION('',(#2489),#2492); +#2489 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2490,#2491),.UNSPECIFIED.,.F., + .F.,(2,2),(9.25,12.25),.PIECEWISE_BEZIER_KNOTS.); +#2490 = CARTESIAN_POINT('',(18.5,33.75)); +#2491 = CARTESIAN_POINT('',(21.5,33.75)); +#2492 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2493 = PCURVE('',#1741,#2494); +#2494 = DEFINITIONAL_REPRESENTATION('',(#2495),#2498); +#2495 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2496,#2497),.UNSPECIFIED.,.F., + .F.,(2,2),(9.25,12.25),.PIECEWISE_BEZIER_KNOTS.); +#2496 = CARTESIAN_POINT('',(0.,-3.)); +#2497 = CARTESIAN_POINT('',(3.,-3.)); +#2498 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2499 = ORIENTED_EDGE('',*,*,#2500,.T.); +#2500 = EDGE_CURVE('',#2480,#2431,#2501,.T.); +#2501 = SURFACE_CURVE('',#2502,(#2507,#2518),.PCURVE_S1.); +#2502 = CIRCLE('',#2503,2.25); +#2503 = AXIS2_PLACEMENT_3D('',#2504,#2505,#2506); +#2504 = CARTESIAN_POINT('',(18.5,15.5,3.)); +#2505 = DIRECTION('',(0.,0.,-1.)); +#2506 = DIRECTION('',(1.,0.,0.)); +#2507 = PCURVE('',#476,#2508); +#2508 = DEFINITIONAL_REPRESENTATION('',(#2509),#2517); +#2509 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2510,#2511,#2512,#2513, +#2514,#2515,#2516),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2510 = CARTESIAN_POINT('',(20.75,36.)); +#2511 = CARTESIAN_POINT('',(20.75,32.10288568297)); +#2512 = CARTESIAN_POINT('',(17.375,34.051442841485)); +#2513 = CARTESIAN_POINT('',(14.,36.)); +#2514 = CARTESIAN_POINT('',(17.375,37.948557158515)); +#2515 = CARTESIAN_POINT('',(20.75,39.89711431703)); +#2516 = CARTESIAN_POINT('',(20.75,36.)); +#2517 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2518 = PCURVE('',#1772,#2519); +#2519 = DEFINITIONAL_REPRESENTATION('',(#2520),#2524); +#2520 = LINE('',#2521,#2522); +#2521 = CARTESIAN_POINT('',(0.,-3.)); +#2522 = VECTOR('',#2523,1.); +#2523 = DIRECTION('',(1.,0.)); +#2524 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2525 = FACE_BOUND('',#2526,.T.); +#2526 = EDGE_LOOP('',(#2527,#2550,#2578,#2599)); +#2527 = ORIENTED_EDGE('',*,*,#2528,.F.); +#2528 = EDGE_CURVE('',#2529,#2531,#2533,.T.); +#2529 = VERTEX_POINT('',#2530); +#2530 = CARTESIAN_POINT('',(27.75,15.5,3.)); +#2531 = VERTEX_POINT('',#2532); +#2532 = CARTESIAN_POINT('',(27.75,12.5,3.)); +#2533 = SURFACE_CURVE('',#2534,(#2538,#2544),.PCURVE_S1.); +#2534 = LINE('',#2535,#2536); +#2535 = CARTESIAN_POINT('',(27.75,-2.5,3.)); +#2536 = VECTOR('',#2537,1.); +#2537 = DIRECTION('',(0.,-1.,0.)); +#2538 = PCURVE('',#476,#2539); +#2539 = DEFINITIONAL_REPRESENTATION('',(#2540),#2543); +#2540 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2541,#2542),.UNSPECIFIED.,.F., + .F.,(2,2),(-18.,-15.),.PIECEWISE_BEZIER_KNOTS.); +#2541 = CARTESIAN_POINT('',(27.75,36.)); +#2542 = CARTESIAN_POINT('',(27.75,33.)); +#2543 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2544 = PCURVE('',#1804,#2545); +#2545 = DEFINITIONAL_REPRESENTATION('',(#2546),#2549); +#2546 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2547,#2548),.UNSPECIFIED.,.F., + .F.,(2,2),(-18.,-15.),.PIECEWISE_BEZIER_KNOTS.); +#2547 = CARTESIAN_POINT('',(0.,-3.)); +#2548 = CARTESIAN_POINT('',(3.,-3.)); +#2549 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2550 = ORIENTED_EDGE('',*,*,#2551,.T.); +#2551 = EDGE_CURVE('',#2529,#2552,#2554,.T.); +#2552 = VERTEX_POINT('',#2553); +#2553 = CARTESIAN_POINT('',(32.25,15.5,3.)); +#2554 = SURFACE_CURVE('',#2555,(#2560,#2571),.PCURVE_S1.); +#2555 = CIRCLE('',#2556,2.25); +#2556 = AXIS2_PLACEMENT_3D('',#2557,#2558,#2559); +#2557 = CARTESIAN_POINT('',(30.,15.5,3.)); +#2558 = DIRECTION('',(-0.,-0.,-1.)); +#2559 = DIRECTION('',(0.,-1.,0.)); +#2560 = PCURVE('',#476,#2561); +#2561 = DEFINITIONAL_REPRESENTATION('',(#2562),#2570); +#2562 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2563,#2564,#2565,#2566, +#2567,#2568,#2569),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2563 = CARTESIAN_POINT('',(30.,33.75)); +#2564 = CARTESIAN_POINT('',(26.10288568297,33.75)); +#2565 = CARTESIAN_POINT('',(28.051442841485,37.125)); +#2566 = CARTESIAN_POINT('',(30.,40.5)); +#2567 = CARTESIAN_POINT('',(31.948557158515,37.125)); +#2568 = CARTESIAN_POINT('',(33.89711431703,33.75)); +#2569 = CARTESIAN_POINT('',(30.,33.75)); +#2570 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2571 = PCURVE('',#1837,#2572); +#2572 = DEFINITIONAL_REPRESENTATION('',(#2573),#2577); +#2573 = LINE('',#2574,#2575); +#2574 = CARTESIAN_POINT('',(0.,-3.)); +#2575 = VECTOR('',#2576,1.); +#2576 = DIRECTION('',(1.,0.)); +#2577 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2578 = ORIENTED_EDGE('',*,*,#2579,.F.); +#2579 = EDGE_CURVE('',#2580,#2552,#2582,.T.); +#2580 = VERTEX_POINT('',#2581); +#2581 = CARTESIAN_POINT('',(32.25,12.5,3.)); +#2582 = SURFACE_CURVE('',#2583,(#2587,#2593),.PCURVE_S1.); +#2583 = LINE('',#2584,#2585); +#2584 = CARTESIAN_POINT('',(32.25,-4.,3.)); +#2585 = VECTOR('',#2586,1.); +#2586 = DIRECTION('',(0.,1.,-0.)); +#2587 = PCURVE('',#476,#2588); +#2588 = DEFINITIONAL_REPRESENTATION('',(#2589),#2592); +#2589 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2590,#2591),.UNSPECIFIED.,.F., + .F.,(2,2),(16.5,19.5),.PIECEWISE_BEZIER_KNOTS.); +#2590 = CARTESIAN_POINT('',(32.25,33.)); +#2591 = CARTESIAN_POINT('',(32.25,36.)); +#2592 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2593 = PCURVE('',#1865,#2594); +#2594 = DEFINITIONAL_REPRESENTATION('',(#2595),#2598); +#2595 = B_SPLINE_CURVE_WITH_KNOTS('',1,(#2596,#2597),.UNSPECIFIED.,.F., + .F.,(2,2),(16.5,19.5),.PIECEWISE_BEZIER_KNOTS.); +#2596 = CARTESIAN_POINT('',(0.,-3.)); +#2597 = CARTESIAN_POINT('',(3.,-3.)); +#2598 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2599 = ORIENTED_EDGE('',*,*,#2600,.T.); +#2600 = EDGE_CURVE('',#2580,#2531,#2601,.T.); +#2601 = SURFACE_CURVE('',#2602,(#2607,#2618),.PCURVE_S1.); +#2602 = CIRCLE('',#2603,2.25); +#2603 = AXIS2_PLACEMENT_3D('',#2604,#2605,#2606); +#2604 = CARTESIAN_POINT('',(30.,12.5,3.)); +#2605 = DIRECTION('',(0.,0.,-1.)); +#2606 = DIRECTION('',(0.,1.,0.)); +#2607 = PCURVE('',#476,#2608); +#2608 = DEFINITIONAL_REPRESENTATION('',(#2609),#2617); +#2609 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#2610,#2611,#2612,#2613, +#2614,#2615,#2616),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2 + ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786, +6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() +GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5, +1.,0.5,1.)) REPRESENTATION_ITEM('') ); +#2610 = CARTESIAN_POINT('',(30.,35.25)); +#2611 = CARTESIAN_POINT('',(33.89711431703,35.25)); +#2612 = CARTESIAN_POINT('',(31.948557158515,31.875)); +#2613 = CARTESIAN_POINT('',(30.,28.5)); +#2614 = CARTESIAN_POINT('',(28.051442841485,31.875)); +#2615 = CARTESIAN_POINT('',(26.10288568297,35.25)); +#2616 = CARTESIAN_POINT('',(30.,35.25)); +#2617 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2618 = PCURVE('',#1896,#2619); +#2619 = DEFINITIONAL_REPRESENTATION('',(#2620),#2624); +#2620 = LINE('',#2621,#2622); +#2621 = CARTESIAN_POINT('',(0.,-3.)); +#2622 = VECTOR('',#2623,1.); +#2623 = DIRECTION('',(1.,0.)); +#2624 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2625 = ADVANCED_FACE('',(#2626,#2634,#2637,#2640,#2643,#2646),#448,.T. + ); +#2626 = FACE_BOUND('',#2627,.T.); +#2627 = EDGE_LOOP('',(#2628,#2629,#2630,#2631,#2632,#2633)); +#2628 = ORIENTED_EDGE('',*,*,#432,.F.); +#2629 = ORIENTED_EDGE('',*,*,#1961,.T.); +#2630 = ORIENTED_EDGE('',*,*,#644,.T.); +#2631 = ORIENTED_EDGE('',*,*,#794,.T.); +#2632 = ORIENTED_EDGE('',*,*,#745,.F.); +#2633 = ORIENTED_EDGE('',*,*,#573,.F.); +#2634 = FACE_BOUND('',#2635,.T.); +#2635 = EDGE_LOOP('',(#2636)); +#2636 = ORIENTED_EDGE('',*,*,#844,.T.); +#2637 = FACE_BOUND('',#2638,.T.); +#2638 = EDGE_LOOP('',(#2639)); +#2639 = ORIENTED_EDGE('',*,*,#898,.T.); +#2640 = FACE_BOUND('',#2641,.T.); +#2641 = EDGE_LOOP('',(#2642)); +#2642 = ORIENTED_EDGE('',*,*,#952,.T.); +#2643 = FACE_BOUND('',#2644,.T.); +#2644 = EDGE_LOOP('',(#2645)); +#2645 = ORIENTED_EDGE('',*,*,#1006,.T.); +#2646 = FACE_BOUND('',#2647,.T.); +#2647 = EDGE_LOOP('',(#2648)); +#2648 = ORIENTED_EDGE('',*,*,#1060,.T.); +#2649 = ADVANCED_FACE('',(#2650),#706,.T.); +#2650 = FACE_BOUND('',#2651,.T.); +#2651 = EDGE_LOOP('',(#2652,#2653,#2654,#2655)); +#2652 = ORIENTED_EDGE('',*,*,#1141,.F.); +#2653 = ORIENTED_EDGE('',*,*,#690,.T.); +#2654 = ORIENTED_EDGE('',*,*,#2005,.T.); +#2655 = ORIENTED_EDGE('',*,*,#2656,.F.); +#2656 = EDGE_CURVE('',#1114,#1983,#2657,.T.); +#2657 = SURFACE_CURVE('',#2658,(#2662,#2669),.PCURVE_S1.); +#2658 = LINE('',#2659,#2660); +#2659 = CARTESIAN_POINT('',(35.,18.5,0.)); +#2660 = VECTOR('',#2661,1.); +#2661 = DIRECTION('',(0.,0.,1.)); +#2662 = PCURVE('',#706,#2663); +#2663 = DEFINITIONAL_REPRESENTATION('',(#2664),#2668); +#2664 = LINE('',#2665,#2666); +#2665 = CARTESIAN_POINT('',(0.,1.414213562373)); +#2666 = VECTOR('',#2667,1.); +#2667 = DIRECTION('',(1.,0.)); +#2668 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2669 = PCURVE('',#1129,#2670); +#2670 = DEFINITIONAL_REPRESENTATION('',(#2671),#2675); +#2671 = LINE('',#2672,#2673); +#2672 = CARTESIAN_POINT('',(0.,-39.)); +#2673 = VECTOR('',#2674,1.); +#2674 = DIRECTION('',(1.,0.)); +#2675 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2676 = ADVANCED_FACE('',(#2677),#1129,.T.); +#2677 = FACE_BOUND('',#2678,.T.); +#2678 = EDGE_LOOP('',(#2679,#2680,#2681,#2682)); +#2679 = ORIENTED_EDGE('',*,*,#1982,.F.); +#2680 = ORIENTED_EDGE('',*,*,#1936,.F.); +#2681 = ORIENTED_EDGE('',*,*,#1113,.T.); +#2682 = ORIENTED_EDGE('',*,*,#2656,.T.); +#2683 = ADVANCED_FACE('',(#2684),#1184,.T.); +#2684 = FACE_BOUND('',#2685,.T.); +#2685 = EDGE_LOOP('',(#2686,#2687,#2708,#2709)); +#2686 = ORIENTED_EDGE('',*,*,#1166,.F.); +#2687 = ORIENTED_EDGE('',*,*,#2688,.T.); +#2688 = EDGE_CURVE('',#1167,#2029,#2689,.T.); +#2689 = SURFACE_CURVE('',#2690,(#2694,#2701),.PCURVE_S1.); +#2690 = LINE('',#2691,#2692); +#2691 = CARTESIAN_POINT('',(7.75,-12.5,0.)); +#2692 = VECTOR('',#2693,1.); +#2693 = DIRECTION('',(0.,0.,1.)); +#2694 = PCURVE('',#1184,#2695); +#2695 = DEFINITIONAL_REPRESENTATION('',(#2696),#2700); +#2696 = LINE('',#2697,#2698); +#2697 = CARTESIAN_POINT('',(0.,0.)); +#2698 = VECTOR('',#2699,1.); +#2699 = DIRECTION('',(0.,-1.)); +#2700 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2701 = PCURVE('',#1217,#2702); +#2702 = DEFINITIONAL_REPRESENTATION('',(#2703),#2707); +#2703 = LINE('',#2704,#2705); +#2704 = CARTESIAN_POINT('',(1.570796326795,0.)); +#2705 = VECTOR('',#2706,1.); +#2706 = DIRECTION('',(0.,-1.)); +#2707 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2708 = ORIENTED_EDGE('',*,*,#2028,.T.); +#2709 = ORIENTED_EDGE('',*,*,#2710,.F.); +#2710 = EDGE_CURVE('',#1169,#2031,#2711,.T.); +#2711 = SURFACE_CURVE('',#2712,(#2716,#2723),.PCURVE_S1.); +#2712 = LINE('',#2713,#2714); +#2713 = CARTESIAN_POINT('',(7.75,-15.5,0.)); +#2714 = VECTOR('',#2715,1.); +#2715 = DIRECTION('',(0.,0.,1.)); +#2716 = PCURVE('',#1184,#2717); +#2717 = DEFINITIONAL_REPRESENTATION('',(#2718),#2722); +#2718 = LINE('',#2719,#2720); +#2719 = CARTESIAN_POINT('',(3.,0.)); +#2720 = VECTOR('',#2721,1.); +#2721 = DIRECTION('',(0.,-1.)); +#2722 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2723 = PCURVE('',#1276,#2724); +#2724 = DEFINITIONAL_REPRESENTATION('',(#2725),#2729); +#2725 = LINE('',#2726,#2727); +#2726 = CARTESIAN_POINT('',(4.712388980385,0.)); +#2727 = VECTOR('',#2728,1.); +#2728 = DIRECTION('',(0.,-1.)); +#2729 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2730 = ADVANCED_FACE('',(#2731),#1276,.F.); +#2731 = FACE_BOUND('',#2732,.F.); +#2732 = EDGE_LOOP('',(#2733,#2734,#2755,#2756)); +#2733 = ORIENTED_EDGE('',*,*,#1257,.F.); +#2734 = ORIENTED_EDGE('',*,*,#2735,.T.); +#2735 = EDGE_CURVE('',#1230,#2080,#2736,.T.); +#2736 = SURFACE_CURVE('',#2737,(#2741,#2748),.PCURVE_S1.); +#2737 = LINE('',#2738,#2739); +#2738 = CARTESIAN_POINT('',(12.25,-15.5,0.)); +#2739 = VECTOR('',#2740,1.); +#2740 = DIRECTION('',(0.,0.,1.)); +#2741 = PCURVE('',#1276,#2742); +#2742 = DEFINITIONAL_REPRESENTATION('',(#2743),#2747); +#2743 = LINE('',#2744,#2745); +#2744 = CARTESIAN_POINT('',(1.570796326795,0.)); +#2745 = VECTOR('',#2746,1.); +#2746 = DIRECTION('',(0.,-1.)); +#2747 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2748 = PCURVE('',#1245,#2749); +#2749 = DEFINITIONAL_REPRESENTATION('',(#2750),#2754); +#2750 = LINE('',#2751,#2752); +#2751 = CARTESIAN_POINT('',(0.,0.)); +#2752 = VECTOR('',#2753,1.); +#2753 = DIRECTION('',(0.,-1.)); +#2754 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2755 = ORIENTED_EDGE('',*,*,#2100,.T.); +#2756 = ORIENTED_EDGE('',*,*,#2710,.F.); +#2757 = ADVANCED_FACE('',(#2758),#1245,.T.); +#2758 = FACE_BOUND('',#2759,.T.); +#2759 = EDGE_LOOP('',(#2760,#2761,#2762,#2763)); +#2760 = ORIENTED_EDGE('',*,*,#1229,.F.); +#2761 = ORIENTED_EDGE('',*,*,#2735,.T.); +#2762 = ORIENTED_EDGE('',*,*,#2079,.T.); +#2763 = ORIENTED_EDGE('',*,*,#2764,.F.); +#2764 = EDGE_CURVE('',#1197,#2052,#2765,.T.); +#2765 = SURFACE_CURVE('',#2766,(#2770,#2777),.PCURVE_S1.); +#2766 = LINE('',#2767,#2768); +#2767 = CARTESIAN_POINT('',(12.25,-12.5,0.)); +#2768 = VECTOR('',#2769,1.); +#2769 = DIRECTION('',(0.,0.,1.)); +#2770 = PCURVE('',#1245,#2771); +#2771 = DEFINITIONAL_REPRESENTATION('',(#2772),#2776); +#2772 = LINE('',#2773,#2774); +#2773 = CARTESIAN_POINT('',(3.,0.)); +#2774 = VECTOR('',#2775,1.); +#2775 = DIRECTION('',(0.,-1.)); +#2776 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2777 = PCURVE('',#1217,#2778); +#2778 = DEFINITIONAL_REPRESENTATION('',(#2779),#2783); +#2779 = LINE('',#2780,#2781); +#2780 = CARTESIAN_POINT('',(4.712388980385,0.)); +#2781 = VECTOR('',#2782,1.); +#2782 = DIRECTION('',(0.,-1.)); +#2783 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2784 = ADVANCED_FACE('',(#2785),#1217,.F.); +#2785 = FACE_BOUND('',#2786,.F.); +#2786 = EDGE_LOOP('',(#2787,#2788,#2789,#2790)); +#2787 = ORIENTED_EDGE('',*,*,#1196,.F.); +#2788 = ORIENTED_EDGE('',*,*,#2688,.T.); +#2789 = ORIENTED_EDGE('',*,*,#2051,.T.); +#2790 = ORIENTED_EDGE('',*,*,#2764,.F.); +#2791 = ADVANCED_FACE('',(#2792),#1308,.T.); +#2792 = FACE_BOUND('',#2793,.T.); +#2793 = EDGE_LOOP('',(#2794,#2795,#2816,#2817)); +#2794 = ORIENTED_EDGE('',*,*,#1290,.F.); +#2795 = ORIENTED_EDGE('',*,*,#2796,.T.); +#2796 = EDGE_CURVE('',#1291,#2129,#2797,.T.); +#2797 = SURFACE_CURVE('',#2798,(#2802,#2809),.PCURVE_S1.); +#2798 = LINE('',#2799,#2800); +#2799 = CARTESIAN_POINT('',(21.5,-13.25,0.)); +#2800 = VECTOR('',#2801,1.); +#2801 = DIRECTION('',(0.,0.,1.)); +#2802 = PCURVE('',#1308,#2803); +#2803 = DEFINITIONAL_REPRESENTATION('',(#2804),#2808); +#2804 = LINE('',#2805,#2806); +#2805 = CARTESIAN_POINT('',(0.,-0.)); +#2806 = VECTOR('',#2807,1.); +#2807 = DIRECTION('',(0.,-1.)); +#2808 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2809 = PCURVE('',#1341,#2810); +#2810 = DEFINITIONAL_REPRESENTATION('',(#2811),#2815); +#2811 = LINE('',#2812,#2813); +#2812 = CARTESIAN_POINT('',(1.570796326795,0.)); +#2813 = VECTOR('',#2814,1.); +#2814 = DIRECTION('',(0.,-1.)); +#2815 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2816 = ORIENTED_EDGE('',*,*,#2128,.T.); +#2817 = ORIENTED_EDGE('',*,*,#2818,.F.); +#2818 = EDGE_CURVE('',#1293,#2131,#2819,.T.); +#2819 = SURFACE_CURVE('',#2820,(#2824,#2831),.PCURVE_S1.); +#2820 = LINE('',#2821,#2822); +#2821 = CARTESIAN_POINT('',(18.5,-13.25,0.)); +#2822 = VECTOR('',#2823,1.); +#2823 = DIRECTION('',(0.,0.,1.)); +#2824 = PCURVE('',#1308,#2825); +#2825 = DEFINITIONAL_REPRESENTATION('',(#2826),#2830); +#2826 = LINE('',#2827,#2828); +#2827 = CARTESIAN_POINT('',(3.,0.)); +#2828 = VECTOR('',#2829,1.); +#2829 = DIRECTION('',(0.,-1.)); +#2830 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2831 = PCURVE('',#1400,#2832); +#2832 = DEFINITIONAL_REPRESENTATION('',(#2833),#2837); +#2833 = LINE('',#2834,#2835); +#2834 = CARTESIAN_POINT('',(4.712388980385,0.)); +#2835 = VECTOR('',#2836,1.); +#2836 = DIRECTION('',(0.,-1.)); +#2837 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2838 = ADVANCED_FACE('',(#2839),#1400,.F.); +#2839 = FACE_BOUND('',#2840,.F.); +#2840 = EDGE_LOOP('',(#2841,#2842,#2863,#2864)); +#2841 = ORIENTED_EDGE('',*,*,#1381,.F.); +#2842 = ORIENTED_EDGE('',*,*,#2843,.T.); +#2843 = EDGE_CURVE('',#1354,#2180,#2844,.T.); +#2844 = SURFACE_CURVE('',#2845,(#2849,#2856),.PCURVE_S1.); +#2845 = LINE('',#2846,#2847); +#2846 = CARTESIAN_POINT('',(18.5,-17.75,0.)); +#2847 = VECTOR('',#2848,1.); +#2848 = DIRECTION('',(0.,0.,1.)); +#2849 = PCURVE('',#1400,#2850); +#2850 = DEFINITIONAL_REPRESENTATION('',(#2851),#2855); +#2851 = LINE('',#2852,#2853); +#2852 = CARTESIAN_POINT('',(1.570796326795,0.)); +#2853 = VECTOR('',#2854,1.); +#2854 = DIRECTION('',(0.,-1.)); +#2855 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2856 = PCURVE('',#1369,#2857); +#2857 = DEFINITIONAL_REPRESENTATION('',(#2858),#2862); +#2858 = LINE('',#2859,#2860); +#2859 = CARTESIAN_POINT('',(0.,0.)); +#2860 = VECTOR('',#2861,1.); +#2861 = DIRECTION('',(0.,-1.)); +#2862 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2863 = ORIENTED_EDGE('',*,*,#2200,.T.); +#2864 = ORIENTED_EDGE('',*,*,#2818,.F.); +#2865 = ADVANCED_FACE('',(#2866),#1369,.T.); +#2866 = FACE_BOUND('',#2867,.T.); +#2867 = EDGE_LOOP('',(#2868,#2869,#2870,#2871)); +#2868 = ORIENTED_EDGE('',*,*,#1353,.F.); +#2869 = ORIENTED_EDGE('',*,*,#2843,.T.); +#2870 = ORIENTED_EDGE('',*,*,#2179,.T.); +#2871 = ORIENTED_EDGE('',*,*,#2872,.F.); +#2872 = EDGE_CURVE('',#1321,#2152,#2873,.T.); +#2873 = SURFACE_CURVE('',#2874,(#2878,#2885),.PCURVE_S1.); +#2874 = LINE('',#2875,#2876); +#2875 = CARTESIAN_POINT('',(21.5,-17.75,0.)); +#2876 = VECTOR('',#2877,1.); +#2877 = DIRECTION('',(0.,0.,1.)); +#2878 = PCURVE('',#1369,#2879); +#2879 = DEFINITIONAL_REPRESENTATION('',(#2880),#2884); +#2880 = LINE('',#2881,#2882); +#2881 = CARTESIAN_POINT('',(3.,0.)); +#2882 = VECTOR('',#2883,1.); +#2883 = DIRECTION('',(0.,-1.)); +#2884 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2885 = PCURVE('',#1341,#2886); +#2886 = DEFINITIONAL_REPRESENTATION('',(#2887),#2891); +#2887 = LINE('',#2888,#2889); +#2888 = CARTESIAN_POINT('',(4.712388980385,0.)); +#2889 = VECTOR('',#2890,1.); +#2890 = DIRECTION('',(0.,-1.)); +#2891 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2892 = ADVANCED_FACE('',(#2893),#1341,.F.); +#2893 = FACE_BOUND('',#2894,.F.); +#2894 = EDGE_LOOP('',(#2895,#2896,#2897,#2898)); +#2895 = ORIENTED_EDGE('',*,*,#1320,.F.); +#2896 = ORIENTED_EDGE('',*,*,#2796,.T.); +#2897 = ORIENTED_EDGE('',*,*,#2151,.T.); +#2898 = ORIENTED_EDGE('',*,*,#2872,.F.); +#2899 = ADVANCED_FACE('',(#2900),#1432,.T.); +#2900 = FACE_BOUND('',#2901,.T.); +#2901 = EDGE_LOOP('',(#2902,#2903,#2924,#2925)); +#2902 = ORIENTED_EDGE('',*,*,#1414,.F.); +#2903 = ORIENTED_EDGE('',*,*,#2904,.T.); +#2904 = EDGE_CURVE('',#1415,#2229,#2905,.T.); +#2905 = SURFACE_CURVE('',#2906,(#2910,#2917),.PCURVE_S1.); +#2906 = LINE('',#2907,#2908); +#2907 = CARTESIAN_POINT('',(27.75,-12.5,0.)); +#2908 = VECTOR('',#2909,1.); +#2909 = DIRECTION('',(0.,0.,1.)); +#2910 = PCURVE('',#1432,#2911); +#2911 = DEFINITIONAL_REPRESENTATION('',(#2912),#2916); +#2912 = LINE('',#2913,#2914); +#2913 = CARTESIAN_POINT('',(0.,0.)); +#2914 = VECTOR('',#2915,1.); +#2915 = DIRECTION('',(0.,-1.)); +#2916 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2917 = PCURVE('',#1465,#2918); +#2918 = DEFINITIONAL_REPRESENTATION('',(#2919),#2923); +#2919 = LINE('',#2920,#2921); +#2920 = CARTESIAN_POINT('',(1.570796326795,0.)); +#2921 = VECTOR('',#2922,1.); +#2922 = DIRECTION('',(0.,-1.)); +#2923 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2924 = ORIENTED_EDGE('',*,*,#2228,.T.); +#2925 = ORIENTED_EDGE('',*,*,#2926,.F.); +#2926 = EDGE_CURVE('',#1417,#2231,#2927,.T.); +#2927 = SURFACE_CURVE('',#2928,(#2932,#2939),.PCURVE_S1.); +#2928 = LINE('',#2929,#2930); +#2929 = CARTESIAN_POINT('',(27.75,-15.5,0.)); +#2930 = VECTOR('',#2931,1.); +#2931 = DIRECTION('',(0.,0.,1.)); +#2932 = PCURVE('',#1432,#2933); +#2933 = DEFINITIONAL_REPRESENTATION('',(#2934),#2938); +#2934 = LINE('',#2935,#2936); +#2935 = CARTESIAN_POINT('',(3.,0.)); +#2936 = VECTOR('',#2937,1.); +#2937 = DIRECTION('',(0.,-1.)); +#2938 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2939 = PCURVE('',#1524,#2940); +#2940 = DEFINITIONAL_REPRESENTATION('',(#2941),#2945); +#2941 = LINE('',#2942,#2943); +#2942 = CARTESIAN_POINT('',(4.712388980385,0.)); +#2943 = VECTOR('',#2944,1.); +#2944 = DIRECTION('',(0.,-1.)); +#2945 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2946 = ADVANCED_FACE('',(#2947),#1524,.F.); +#2947 = FACE_BOUND('',#2948,.F.); +#2948 = EDGE_LOOP('',(#2949,#2950,#2971,#2972)); +#2949 = ORIENTED_EDGE('',*,*,#1505,.F.); +#2950 = ORIENTED_EDGE('',*,*,#2951,.T.); +#2951 = EDGE_CURVE('',#1478,#2280,#2952,.T.); +#2952 = SURFACE_CURVE('',#2953,(#2957,#2964),.PCURVE_S1.); +#2953 = LINE('',#2954,#2955); +#2954 = CARTESIAN_POINT('',(32.25,-15.5,0.)); +#2955 = VECTOR('',#2956,1.); +#2956 = DIRECTION('',(0.,0.,1.)); +#2957 = PCURVE('',#1524,#2958); +#2958 = DEFINITIONAL_REPRESENTATION('',(#2959),#2963); +#2959 = LINE('',#2960,#2961); +#2960 = CARTESIAN_POINT('',(1.570796326795,0.)); +#2961 = VECTOR('',#2962,1.); +#2962 = DIRECTION('',(0.,-1.)); +#2963 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2964 = PCURVE('',#1493,#2965); +#2965 = DEFINITIONAL_REPRESENTATION('',(#2966),#2970); +#2966 = LINE('',#2967,#2968); +#2967 = CARTESIAN_POINT('',(0.,0.)); +#2968 = VECTOR('',#2969,1.); +#2969 = DIRECTION('',(0.,-1.)); +#2970 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2971 = ORIENTED_EDGE('',*,*,#2300,.T.); +#2972 = ORIENTED_EDGE('',*,*,#2926,.F.); +#2973 = ADVANCED_FACE('',(#2974),#1493,.T.); +#2974 = FACE_BOUND('',#2975,.T.); +#2975 = EDGE_LOOP('',(#2976,#2977,#2978,#2979)); +#2976 = ORIENTED_EDGE('',*,*,#1477,.F.); +#2977 = ORIENTED_EDGE('',*,*,#2951,.T.); +#2978 = ORIENTED_EDGE('',*,*,#2279,.T.); +#2979 = ORIENTED_EDGE('',*,*,#2980,.F.); +#2980 = EDGE_CURVE('',#1445,#2252,#2981,.T.); +#2981 = SURFACE_CURVE('',#2982,(#2986,#2993),.PCURVE_S1.); +#2982 = LINE('',#2983,#2984); +#2983 = CARTESIAN_POINT('',(32.25,-12.5,0.)); +#2984 = VECTOR('',#2985,1.); +#2985 = DIRECTION('',(0.,0.,1.)); +#2986 = PCURVE('',#1493,#2987); +#2987 = DEFINITIONAL_REPRESENTATION('',(#2988),#2992); +#2988 = LINE('',#2989,#2990); +#2989 = CARTESIAN_POINT('',(3.,0.)); +#2990 = VECTOR('',#2991,1.); +#2991 = DIRECTION('',(0.,-1.)); +#2992 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#2993 = PCURVE('',#1465,#2994); +#2994 = DEFINITIONAL_REPRESENTATION('',(#2995),#2999); +#2995 = LINE('',#2996,#2997); +#2996 = CARTESIAN_POINT('',(4.712388980385,0.)); +#2997 = VECTOR('',#2998,1.); +#2998 = DIRECTION('',(0.,-1.)); +#2999 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3000 = ADVANCED_FACE('',(#3001),#1465,.F.); +#3001 = FACE_BOUND('',#3002,.F.); +#3002 = EDGE_LOOP('',(#3003,#3004,#3005,#3006)); +#3003 = ORIENTED_EDGE('',*,*,#1444,.F.); +#3004 = ORIENTED_EDGE('',*,*,#2904,.T.); +#3005 = ORIENTED_EDGE('',*,*,#2251,.T.); +#3006 = ORIENTED_EDGE('',*,*,#2980,.F.); +#3007 = ADVANCED_FACE('',(#3008),#1556,.T.); +#3008 = FACE_BOUND('',#3009,.T.); +#3009 = EDGE_LOOP('',(#3010,#3011,#3032,#3033)); +#3010 = ORIENTED_EDGE('',*,*,#1538,.F.); +#3011 = ORIENTED_EDGE('',*,*,#3012,.T.); +#3012 = EDGE_CURVE('',#1539,#2329,#3013,.T.); +#3013 = SURFACE_CURVE('',#3014,(#3018,#3025),.PCURVE_S1.); +#3014 = LINE('',#3015,#3016); +#3015 = CARTESIAN_POINT('',(7.75,15.5,0.)); +#3016 = VECTOR('',#3017,1.); +#3017 = DIRECTION('',(0.,0.,1.)); +#3018 = PCURVE('',#1556,#3019); +#3019 = DEFINITIONAL_REPRESENTATION('',(#3020),#3024); +#3020 = LINE('',#3021,#3022); +#3021 = CARTESIAN_POINT('',(0.,0.)); +#3022 = VECTOR('',#3023,1.); +#3023 = DIRECTION('',(0.,-1.)); +#3024 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3025 = PCURVE('',#1589,#3026); +#3026 = DEFINITIONAL_REPRESENTATION('',(#3027),#3031); +#3027 = LINE('',#3028,#3029); +#3028 = CARTESIAN_POINT('',(1.570796326795,0.)); +#3029 = VECTOR('',#3030,1.); +#3030 = DIRECTION('',(0.,-1.)); +#3031 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3032 = ORIENTED_EDGE('',*,*,#2328,.T.); +#3033 = ORIENTED_EDGE('',*,*,#3034,.F.); +#3034 = EDGE_CURVE('',#1541,#2331,#3035,.T.); +#3035 = SURFACE_CURVE('',#3036,(#3040,#3047),.PCURVE_S1.); +#3036 = LINE('',#3037,#3038); +#3037 = CARTESIAN_POINT('',(7.75,12.5,0.)); +#3038 = VECTOR('',#3039,1.); +#3039 = DIRECTION('',(0.,0.,1.)); +#3040 = PCURVE('',#1556,#3041); +#3041 = DEFINITIONAL_REPRESENTATION('',(#3042),#3046); +#3042 = LINE('',#3043,#3044); +#3043 = CARTESIAN_POINT('',(3.,0.)); +#3044 = VECTOR('',#3045,1.); +#3045 = DIRECTION('',(0.,-1.)); +#3046 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3047 = PCURVE('',#1648,#3048); +#3048 = DEFINITIONAL_REPRESENTATION('',(#3049),#3053); +#3049 = LINE('',#3050,#3051); +#3050 = CARTESIAN_POINT('',(4.712388980385,0.)); +#3051 = VECTOR('',#3052,1.); +#3052 = DIRECTION('',(0.,-1.)); +#3053 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3054 = ADVANCED_FACE('',(#3055),#1648,.F.); +#3055 = FACE_BOUND('',#3056,.F.); +#3056 = EDGE_LOOP('',(#3057,#3058,#3079,#3080)); +#3057 = ORIENTED_EDGE('',*,*,#1629,.F.); +#3058 = ORIENTED_EDGE('',*,*,#3059,.T.); +#3059 = EDGE_CURVE('',#1602,#2380,#3060,.T.); +#3060 = SURFACE_CURVE('',#3061,(#3065,#3072),.PCURVE_S1.); +#3061 = LINE('',#3062,#3063); +#3062 = CARTESIAN_POINT('',(12.25,12.5,0.)); +#3063 = VECTOR('',#3064,1.); +#3064 = DIRECTION('',(0.,0.,1.)); +#3065 = PCURVE('',#1648,#3066); +#3066 = DEFINITIONAL_REPRESENTATION('',(#3067),#3071); +#3067 = LINE('',#3068,#3069); +#3068 = CARTESIAN_POINT('',(1.570796326795,0.)); +#3069 = VECTOR('',#3070,1.); +#3070 = DIRECTION('',(0.,-1.)); +#3071 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3072 = PCURVE('',#1617,#3073); +#3073 = DEFINITIONAL_REPRESENTATION('',(#3074),#3078); +#3074 = LINE('',#3075,#3076); +#3075 = CARTESIAN_POINT('',(0.,0.)); +#3076 = VECTOR('',#3077,1.); +#3077 = DIRECTION('',(0.,-1.)); +#3078 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3079 = ORIENTED_EDGE('',*,*,#2400,.T.); +#3080 = ORIENTED_EDGE('',*,*,#3034,.F.); +#3081 = ADVANCED_FACE('',(#3082),#1617,.T.); +#3082 = FACE_BOUND('',#3083,.T.); +#3083 = EDGE_LOOP('',(#3084,#3085,#3086,#3087)); +#3084 = ORIENTED_EDGE('',*,*,#1601,.F.); +#3085 = ORIENTED_EDGE('',*,*,#3059,.T.); +#3086 = ORIENTED_EDGE('',*,*,#2379,.T.); +#3087 = ORIENTED_EDGE('',*,*,#3088,.F.); +#3088 = EDGE_CURVE('',#1569,#2352,#3089,.T.); +#3089 = SURFACE_CURVE('',#3090,(#3094,#3101),.PCURVE_S1.); +#3090 = LINE('',#3091,#3092); +#3091 = CARTESIAN_POINT('',(12.25,15.5,0.)); +#3092 = VECTOR('',#3093,1.); +#3093 = DIRECTION('',(0.,0.,1.)); +#3094 = PCURVE('',#1617,#3095); +#3095 = DEFINITIONAL_REPRESENTATION('',(#3096),#3100); +#3096 = LINE('',#3097,#3098); +#3097 = CARTESIAN_POINT('',(3.,0.)); +#3098 = VECTOR('',#3099,1.); +#3099 = DIRECTION('',(0.,-1.)); +#3100 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3101 = PCURVE('',#1589,#3102); +#3102 = DEFINITIONAL_REPRESENTATION('',(#3103),#3107); +#3103 = LINE('',#3104,#3105); +#3104 = CARTESIAN_POINT('',(4.712388980385,0.)); +#3105 = VECTOR('',#3106,1.); +#3106 = DIRECTION('',(0.,-1.)); +#3107 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3108 = ADVANCED_FACE('',(#3109),#1589,.F.); +#3109 = FACE_BOUND('',#3110,.F.); +#3110 = EDGE_LOOP('',(#3111,#3112,#3113,#3114)); +#3111 = ORIENTED_EDGE('',*,*,#1568,.F.); +#3112 = ORIENTED_EDGE('',*,*,#3012,.T.); +#3113 = ORIENTED_EDGE('',*,*,#2351,.T.); +#3114 = ORIENTED_EDGE('',*,*,#3088,.F.); +#3115 = ADVANCED_FACE('',(#3116),#1680,.T.); +#3116 = FACE_BOUND('',#3117,.T.); +#3117 = EDGE_LOOP('',(#3118,#3119,#3140,#3141)); +#3118 = ORIENTED_EDGE('',*,*,#1662,.F.); +#3119 = ORIENTED_EDGE('',*,*,#3120,.T.); +#3120 = EDGE_CURVE('',#1663,#2429,#3121,.T.); +#3121 = SURFACE_CURVE('',#3122,(#3126,#3133),.PCURVE_S1.); +#3122 = LINE('',#3123,#3124); +#3123 = CARTESIAN_POINT('',(21.5,17.75,0.)); +#3124 = VECTOR('',#3125,1.); +#3125 = DIRECTION('',(0.,0.,1.)); +#3126 = PCURVE('',#1680,#3127); +#3127 = DEFINITIONAL_REPRESENTATION('',(#3128),#3132); +#3128 = LINE('',#3129,#3130); +#3129 = CARTESIAN_POINT('',(0.,-0.)); +#3130 = VECTOR('',#3131,1.); +#3131 = DIRECTION('',(0.,-1.)); +#3132 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3133 = PCURVE('',#1713,#3134); +#3134 = DEFINITIONAL_REPRESENTATION('',(#3135),#3139); +#3135 = LINE('',#3136,#3137); +#3136 = CARTESIAN_POINT('',(1.570796326795,0.)); +#3137 = VECTOR('',#3138,1.); +#3138 = DIRECTION('',(0.,-1.)); +#3139 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3140 = ORIENTED_EDGE('',*,*,#2428,.T.); +#3141 = ORIENTED_EDGE('',*,*,#3142,.F.); +#3142 = EDGE_CURVE('',#1665,#2431,#3143,.T.); +#3143 = SURFACE_CURVE('',#3144,(#3148,#3155),.PCURVE_S1.); +#3144 = LINE('',#3145,#3146); +#3145 = CARTESIAN_POINT('',(18.5,17.75,0.)); +#3146 = VECTOR('',#3147,1.); +#3147 = DIRECTION('',(0.,0.,1.)); +#3148 = PCURVE('',#1680,#3149); +#3149 = DEFINITIONAL_REPRESENTATION('',(#3150),#3154); +#3150 = LINE('',#3151,#3152); +#3151 = CARTESIAN_POINT('',(3.,0.)); +#3152 = VECTOR('',#3153,1.); +#3153 = DIRECTION('',(0.,-1.)); +#3154 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3155 = PCURVE('',#1772,#3156); +#3156 = DEFINITIONAL_REPRESENTATION('',(#3157),#3161); +#3157 = LINE('',#3158,#3159); +#3158 = CARTESIAN_POINT('',(4.712388980385,0.)); +#3159 = VECTOR('',#3160,1.); +#3160 = DIRECTION('',(0.,-1.)); +#3161 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3162 = ADVANCED_FACE('',(#3163),#1772,.F.); +#3163 = FACE_BOUND('',#3164,.F.); +#3164 = EDGE_LOOP('',(#3165,#3166,#3187,#3188)); +#3165 = ORIENTED_EDGE('',*,*,#1753,.F.); +#3166 = ORIENTED_EDGE('',*,*,#3167,.T.); +#3167 = EDGE_CURVE('',#1726,#2480,#3168,.T.); +#3168 = SURFACE_CURVE('',#3169,(#3173,#3180),.PCURVE_S1.); +#3169 = LINE('',#3170,#3171); +#3170 = CARTESIAN_POINT('',(18.5,13.25,0.)); +#3171 = VECTOR('',#3172,1.); +#3172 = DIRECTION('',(0.,0.,1.)); +#3173 = PCURVE('',#1772,#3174); +#3174 = DEFINITIONAL_REPRESENTATION('',(#3175),#3179); +#3175 = LINE('',#3176,#3177); +#3176 = CARTESIAN_POINT('',(1.570796326795,0.)); +#3177 = VECTOR('',#3178,1.); +#3178 = DIRECTION('',(0.,-1.)); +#3179 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3180 = PCURVE('',#1741,#3181); +#3181 = DEFINITIONAL_REPRESENTATION('',(#3182),#3186); +#3182 = LINE('',#3183,#3184); +#3183 = CARTESIAN_POINT('',(0.,0.)); +#3184 = VECTOR('',#3185,1.); +#3185 = DIRECTION('',(0.,-1.)); +#3186 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3187 = ORIENTED_EDGE('',*,*,#2500,.T.); +#3188 = ORIENTED_EDGE('',*,*,#3142,.F.); +#3189 = ADVANCED_FACE('',(#3190),#1741,.T.); +#3190 = FACE_BOUND('',#3191,.T.); +#3191 = EDGE_LOOP('',(#3192,#3193,#3194,#3195)); +#3192 = ORIENTED_EDGE('',*,*,#1725,.F.); +#3193 = ORIENTED_EDGE('',*,*,#3167,.T.); +#3194 = ORIENTED_EDGE('',*,*,#2479,.T.); +#3195 = ORIENTED_EDGE('',*,*,#3196,.F.); +#3196 = EDGE_CURVE('',#1693,#2452,#3197,.T.); +#3197 = SURFACE_CURVE('',#3198,(#3202,#3209),.PCURVE_S1.); +#3198 = LINE('',#3199,#3200); +#3199 = CARTESIAN_POINT('',(21.5,13.25,0.)); +#3200 = VECTOR('',#3201,1.); +#3201 = DIRECTION('',(0.,0.,1.)); +#3202 = PCURVE('',#1741,#3203); +#3203 = DEFINITIONAL_REPRESENTATION('',(#3204),#3208); +#3204 = LINE('',#3205,#3206); +#3205 = CARTESIAN_POINT('',(3.,0.)); +#3206 = VECTOR('',#3207,1.); +#3207 = DIRECTION('',(0.,-1.)); +#3208 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3209 = PCURVE('',#1713,#3210); +#3210 = DEFINITIONAL_REPRESENTATION('',(#3211),#3215); +#3211 = LINE('',#3212,#3213); +#3212 = CARTESIAN_POINT('',(4.712388980385,0.)); +#3213 = VECTOR('',#3214,1.); +#3214 = DIRECTION('',(0.,-1.)); +#3215 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3216 = ADVANCED_FACE('',(#3217),#1713,.F.); +#3217 = FACE_BOUND('',#3218,.F.); +#3218 = EDGE_LOOP('',(#3219,#3220,#3221,#3222)); +#3219 = ORIENTED_EDGE('',*,*,#1692,.F.); +#3220 = ORIENTED_EDGE('',*,*,#3120,.T.); +#3221 = ORIENTED_EDGE('',*,*,#2451,.T.); +#3222 = ORIENTED_EDGE('',*,*,#3196,.F.); +#3223 = ADVANCED_FACE('',(#3224),#1804,.T.); +#3224 = FACE_BOUND('',#3225,.T.); +#3225 = EDGE_LOOP('',(#3226,#3227,#3248,#3249)); +#3226 = ORIENTED_EDGE('',*,*,#1786,.F.); +#3227 = ORIENTED_EDGE('',*,*,#3228,.T.); +#3228 = EDGE_CURVE('',#1787,#2529,#3229,.T.); +#3229 = SURFACE_CURVE('',#3230,(#3234,#3241),.PCURVE_S1.); +#3230 = LINE('',#3231,#3232); +#3231 = CARTESIAN_POINT('',(27.75,15.5,0.)); +#3232 = VECTOR('',#3233,1.); +#3233 = DIRECTION('',(0.,0.,1.)); +#3234 = PCURVE('',#1804,#3235); +#3235 = DEFINITIONAL_REPRESENTATION('',(#3236),#3240); +#3236 = LINE('',#3237,#3238); +#3237 = CARTESIAN_POINT('',(0.,0.)); +#3238 = VECTOR('',#3239,1.); +#3239 = DIRECTION('',(0.,-1.)); +#3240 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3241 = PCURVE('',#1837,#3242); +#3242 = DEFINITIONAL_REPRESENTATION('',(#3243),#3247); +#3243 = LINE('',#3244,#3245); +#3244 = CARTESIAN_POINT('',(1.570796326795,0.)); +#3245 = VECTOR('',#3246,1.); +#3246 = DIRECTION('',(0.,-1.)); +#3247 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3248 = ORIENTED_EDGE('',*,*,#2528,.T.); +#3249 = ORIENTED_EDGE('',*,*,#3250,.F.); +#3250 = EDGE_CURVE('',#1789,#2531,#3251,.T.); +#3251 = SURFACE_CURVE('',#3252,(#3256,#3263),.PCURVE_S1.); +#3252 = LINE('',#3253,#3254); +#3253 = CARTESIAN_POINT('',(27.75,12.5,0.)); +#3254 = VECTOR('',#3255,1.); +#3255 = DIRECTION('',(0.,0.,1.)); +#3256 = PCURVE('',#1804,#3257); +#3257 = DEFINITIONAL_REPRESENTATION('',(#3258),#3262); +#3258 = LINE('',#3259,#3260); +#3259 = CARTESIAN_POINT('',(3.,0.)); +#3260 = VECTOR('',#3261,1.); +#3261 = DIRECTION('',(0.,-1.)); +#3262 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3263 = PCURVE('',#1896,#3264); +#3264 = DEFINITIONAL_REPRESENTATION('',(#3265),#3269); +#3265 = LINE('',#3266,#3267); +#3266 = CARTESIAN_POINT('',(4.712388980385,0.)); +#3267 = VECTOR('',#3268,1.); +#3268 = DIRECTION('',(0.,-1.)); +#3269 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3270 = ADVANCED_FACE('',(#3271),#1896,.F.); +#3271 = FACE_BOUND('',#3272,.F.); +#3272 = EDGE_LOOP('',(#3273,#3274,#3295,#3296)); +#3273 = ORIENTED_EDGE('',*,*,#1877,.F.); +#3274 = ORIENTED_EDGE('',*,*,#3275,.T.); +#3275 = EDGE_CURVE('',#1850,#2580,#3276,.T.); +#3276 = SURFACE_CURVE('',#3277,(#3281,#3288),.PCURVE_S1.); +#3277 = LINE('',#3278,#3279); +#3278 = CARTESIAN_POINT('',(32.25,12.5,0.)); +#3279 = VECTOR('',#3280,1.); +#3280 = DIRECTION('',(0.,0.,1.)); +#3281 = PCURVE('',#1896,#3282); +#3282 = DEFINITIONAL_REPRESENTATION('',(#3283),#3287); +#3283 = LINE('',#3284,#3285); +#3284 = CARTESIAN_POINT('',(1.570796326795,0.)); +#3285 = VECTOR('',#3286,1.); +#3286 = DIRECTION('',(0.,-1.)); +#3287 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3288 = PCURVE('',#1865,#3289); +#3289 = DEFINITIONAL_REPRESENTATION('',(#3290),#3294); +#3290 = LINE('',#3291,#3292); +#3291 = CARTESIAN_POINT('',(0.,0.)); +#3292 = VECTOR('',#3293,1.); +#3293 = DIRECTION('',(0.,-1.)); +#3294 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3295 = ORIENTED_EDGE('',*,*,#2600,.T.); +#3296 = ORIENTED_EDGE('',*,*,#3250,.F.); +#3297 = ADVANCED_FACE('',(#3298),#1865,.T.); +#3298 = FACE_BOUND('',#3299,.T.); +#3299 = EDGE_LOOP('',(#3300,#3301,#3302,#3303)); +#3300 = ORIENTED_EDGE('',*,*,#1849,.F.); +#3301 = ORIENTED_EDGE('',*,*,#3275,.T.); +#3302 = ORIENTED_EDGE('',*,*,#2579,.T.); +#3303 = ORIENTED_EDGE('',*,*,#3304,.F.); +#3304 = EDGE_CURVE('',#1817,#2552,#3305,.T.); +#3305 = SURFACE_CURVE('',#3306,(#3310,#3317),.PCURVE_S1.); +#3306 = LINE('',#3307,#3308); +#3307 = CARTESIAN_POINT('',(32.25,15.5,0.)); +#3308 = VECTOR('',#3309,1.); +#3309 = DIRECTION('',(0.,0.,1.)); +#3310 = PCURVE('',#1865,#3311); +#3311 = DEFINITIONAL_REPRESENTATION('',(#3312),#3316); +#3312 = LINE('',#3313,#3314); +#3313 = CARTESIAN_POINT('',(3.,0.)); +#3314 = VECTOR('',#3315,1.); +#3315 = DIRECTION('',(0.,-1.)); +#3316 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3317 = PCURVE('',#1837,#3318); +#3318 = DEFINITIONAL_REPRESENTATION('',(#3319),#3323); +#3319 = LINE('',#3320,#3321); +#3320 = CARTESIAN_POINT('',(4.712388980385,0.)); +#3321 = VECTOR('',#3322,1.); +#3322 = DIRECTION('',(0.,-1.)); +#3323 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) +PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE','' + ) ); +#3324 = ADVANCED_FACE('',(#3325),#1837,.F.); +#3325 = FACE_BOUND('',#3326,.F.); +#3326 = EDGE_LOOP('',(#3327,#3328,#3329,#3330)); +#3327 = ORIENTED_EDGE('',*,*,#1816,.F.); +#3328 = ORIENTED_EDGE('',*,*,#3228,.T.); +#3329 = ORIENTED_EDGE('',*,*,#2551,.T.); +#3330 = ORIENTED_EDGE('',*,*,#3304,.F.); +#3331 = ( GEOMETRIC_REPRESENTATION_CONTEXT(3) +GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#3335)) +GLOBAL_UNIT_ASSIGNED_CONTEXT((#3332,#3333,#3334)) REPRESENTATION_CONTEXT +('Context #1','3D Context with UNIT and UNCERTAINTY') ); +#3332 = ( LENGTH_UNIT() NAMED_UNIT(*) SI_UNIT(.MILLI.,.METRE.) ); +#3333 = ( NAMED_UNIT(*) PLANE_ANGLE_UNIT() SI_UNIT($,.RADIAN.) ); +#3334 = ( NAMED_UNIT(*) SI_UNIT($,.STERADIAN.) SOLID_ANGLE_UNIT() ); +#3335 = UNCERTAINTY_MEASURE_WITH_UNIT(LENGTH_MEASURE(1.E-07),#3332, + 'distance_accuracy_value','confusion accuracy'); +#3336 = PRODUCT_RELATED_PRODUCT_CATEGORY('part',$,(#7)); +#3337 = MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION('',( + #3338),#3331); +#3338 = STYLED_ITEM('color',(#3339),#15); +#3339 = PRESENTATION_STYLE_ASSIGNMENT((#3340)); +#3340 = SURFACE_STYLE_USAGE(.BOTH.,#3341); +#3341 = SURFACE_SIDE_STYLE('',(#3342)); +#3342 = SURFACE_STYLE_FILL_AREA(#3343); +#3343 = FILL_AREA_STYLE('',(#3344)); +#3344 = FILL_AREA_STYLE_COLOUR('',#3345); +#3345 = DRAUGHTING_PRE_DEFINED_COLOUR('black'); +ENDSEC; +END-ISO-10303-21; From 82d0af35e7f7ea8cee11e9a3ce6086609d9746d2 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 30 Jun 2025 23:11:39 -0400 Subject: [PATCH 348/518] Resolve #1019 and other spelling --- docs/examples_1.rst | 14 +++++++------- docs/joints.rst | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/examples_1.rst b/docs/examples_1.rst index 364c2fb..7da07de 100644 --- a/docs/examples_1.rst +++ b/docs/examples_1.rst @@ -549,7 +549,7 @@ Stud Wall .. image:: assets/examples/stud_wall.png :align: center -This example demonstrates creatings custom `Part` objects and putting them into +This example demonstrates creating custom `Part` objects and putting them into assemblies. The custom object is a `Stud` used in the building industry while the assembly is a `StudWall` created from copies of `Stud` objects for efficiency. Both the `Stud` and `StudWall` objects use `RigidJoints` to define snap points which @@ -603,7 +603,7 @@ Toy Truck --------- .. image:: assets/examples/toy_truck.png :align: center - + .. image:: assets/examples/toy_truck_picture.jpg :align: center @@ -613,11 +613,11 @@ Toy Truck :start-after: [Code] :end-before: [End] -This example demonstrates how to design a toy truck using BuildPart and -BuildSketch in Builder mode. The model includes a detailed body, cab, grill, -and bumper, showcasing techniques like sketch reuse, symmetry, tapered -extrusions, selective filleting, and the use of joints for part assembly. -Ideal for learning complex part construction and hierarchical modeling in +This example demonstrates how to design a toy truck using BuildPart and +BuildSketch in Builder mode. The model includes a detailed body, cab, grill, +and bumper, showcasing techniques like sketch reuse, symmetry, tapered +extrusions, selective filleting, and the use of joints for part assembly. +Ideal for learning complex part construction and hierarchical modeling in build123d. .. _vase: diff --git a/docs/joints.rst b/docs/joints.rst index e6a7e7c..07cc623 100644 --- a/docs/joints.rst +++ b/docs/joints.rst @@ -25,7 +25,7 @@ in pairs - a :class:`~topology.Joint` can only be connected to another :class:`~ Objects may have many joints bound to them each with an identifying label. All :class:`~topology.Joint` objects have a ``symbol`` property that can be displayed to help visualize -their position and orientation (the `ocp-vscode `_ viewer +their position and orientation (the `ocp-vscode `_ viewer has built-in support for displaying joints). .. note:: @@ -41,16 +41,16 @@ The following sections provide more detail on the available joints and describes Rigid Joint *********** -A rigid joint positions two components relative to each another with no freedom of movement. When a +A rigid joint positions two components relative to each another with no freedom of movement. When a :class:`~joints.RigidJoint` is instantiated it's assigned a ``label``, a part to bind to (``to_part``), -and a ``joint_location`` which defines both the position and orientation of the joint (see +and a ``joint_location`` which defines both the position and orientation of the joint (see :class:`~geometry.Location`) - as follows: .. code-block:: python RigidJoint(label="outlet", to_part=pipe, joint_location=path.location_at(1)) -Once a joint is bound to a part this way, the :meth:`~topology.Joint.connect_to` method can be used to +Once a joint is bound to a part this way, the :meth:`~topology.Joint.connect_to` method can be used to repositioning another part relative to ``self`` which stay fixed - as follows: .. code-block:: python @@ -74,7 +74,7 @@ flanges are attached to the ends of a curved pipe: Note how the locations of the joints are determined by the :meth:`~topology.Mixin1D.location_at` method and how the ``-`` negate operator is used to reverse the direction of the location without changing its -poosition. Also note that the ``WeldNeckFlange`` class predefines two joints, one at the pipe end and +position. Also note that the ``WeldNeckFlange`` class predefines two joints, one at the pipe end and one at the face end - both of which are shown in the above image (generated by ocp-vscode with the ``render_joints=True`` flag set in the ``show`` function). @@ -105,7 +105,7 @@ Revolute Joint Component rotates around axis like a hinge. The :ref:`joint_tutorial` covers Revolute Joints in detail. -During instantiation of a :class:`~joints.RevoluteJoint` there are three parameters not present with +During instantiation of a :class:`~joints.RevoluteJoint` there are three parameters not present with Rigid Joints: ``axis``, ``angle_reference``, and ``range`` that allow the circular motion to be fully defined. @@ -114,7 +114,7 @@ which allows one to change the relative position of joined parts by changing a s .. autoclass:: RevoluteJoint -.. +.. :exclude-members: connect_to .. method:: connect_to(other: RigidJoint, *, angle: float = None) @@ -151,7 +151,7 @@ of the limits will raise an exception. .. autoclass:: LinearJoint -.. +.. :exclude-members: connect_to .. method:: connect_to(other: RevoluteJoint, *, position: float = None, angle: float = None) @@ -164,10 +164,10 @@ of the limits will raise an exception. Cylindrical Joint ***************** -A :class:`~joints.CylindricalJoint` allows a component to rotate around and moves along a single axis -like a screw combining the functionality of a :class:`~joints.LinearJoint` and a -:class:`~joints.RevoluteJoint` joint. The ``connect_to`` for these joints have both ``position`` and -``angle`` parameters as shown below extracted from the joint tutorial. +A :class:`~joints.CylindricalJoint` allows a component to rotate around and moves along a single axis +like a screw combining the functionality of a :class:`~joints.LinearJoint` and a +:class:`~joints.RevoluteJoint` joint. The ``connect_to`` for these joints have both ``position`` and +``angle`` parameters as shown below extracted from the joint tutorial. .. code-block::python @@ -176,7 +176,7 @@ like a screw combining the functionality of a :class:`~joints.LinearJoint` and a .. autoclass:: CylindricalJoint -.. +.. :exclude-members: connect_to .. method:: connect_to(other: RigidJoint, *, position: float = None, angle: float = None) @@ -195,13 +195,13 @@ is found within a rod end as shown here: .. literalinclude:: rod_end.py :emphasize-lines: 40-44,51,53 -Note how limits are defined during the instantiation of the ball joint when ensures that the pin or bolt +Note how limits are defined during the instantiation of the ball joint when ensures that the pin or bolt within the rod end does not interfere with the rod end itself. The ``connect_to`` sets the three angles (only two are significant in this example). .. autoclass:: BallJoint -.. +.. :exclude-members: connect_to .. method:: connect_to(other: RigidJoint, *, angles: RotationLike = None) From 7dcee5225b447c91c4daedc70650fbbdb40c869d Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 30 Jun 2025 23:40:30 -0400 Subject: [PATCH 349/518] Add tangent objects to Resolve #974 --- docs/cheat_sheet.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index ebec505..4b88edb 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -15,6 +15,8 @@ Cheat Sheet .. grid-item-card:: 1D - BuildLine + | :class:`~objects_curve.ArcArcTangentArc` + | :class:`~objects_curve.ArcArcTangentLine` | :class:`~objects_curve.Bezier` | :class:`~objects_curve.CenterArc` | :class:`~objects_curve.DoubleTangentArc` @@ -24,6 +26,8 @@ Cheat Sheet | :class:`~objects_curve.IntersectingLine` | :class:`~objects_curve.JernArc` | :class:`~objects_curve.Line` + | :class:`~objects_curve.PointArcTangentArc` + | :class:`~objects_curve.PointArcTangentLine` | :class:`~objects_curve.PolarLine` | :class:`~objects_curve.Polyline` | :class:`~objects_curve.RadiusArc` From 4f2649f0af45bfdbec40f5fd38023b53b8fa15c2 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 1 Jul 2025 10:23:57 -0400 Subject: [PATCH 350/518] Reducing thread size to avoid OCCT fuse issue --- docs/rod_end.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/rod_end.py b/docs/rod_end.py index e0a4364..335743f 100644 --- a/docs/rod_end.py +++ b/docs/rod_end.py @@ -3,9 +3,7 @@ from bd_warehouse.thread import IsoThread from ocp_vscode import * # Create the thread so the min radius is available below -thread = IsoThread( - major_diameter=8, pitch=1.25, length=20, end_finishes=("fade", "raw") -) +thread = IsoThread(major_diameter=6, pitch=1, length=20, end_finishes=("fade", "raw")) inner_radius = 15.89 / 2 inner_gap = 0.2 @@ -52,4 +50,4 @@ with BuildPart() as ball: rod_end.part.joints["socket"].connect_to(ball.part.joints["ball"], angles=(5, 10, 0)) -show(rod_end.part, ball.part) +show(rod_end.part, ball.part, s2) From 228769005a2b3575a488203c99b53ed8c1ee1790 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 3 Jul 2025 09:29:51 -0400 Subject: [PATCH 351/518] Ensuring Polygon takes an iterable --- src/build123d/objects_sketch.py | 2 +- tests/test_build_sketch.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index a630e29..eed5b59 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -206,7 +206,7 @@ class Polygon(BaseSketchObject): self.pts = flattened_pts self.align = tuplify(align, 2) - poly_pts = [Vector(p) for p in pts] + poly_pts = [Vector(p) for p in self.pts] face = Face(Wire.make_polygon(poly_pts)) super().__init__(face, rotation, self.align, mode) diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 443d441..c00a504 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -222,6 +222,11 @@ class TestBuildSketchObjects(unittest.TestCase): self.assertAlmostEqual(test.sketch.area, 0.5, 5) self.assertEqual(p.faces()[0].normal_at(), Vector(0, 0, 1)) + # test iterable input + points_nervure = [(0.0, 0.0), (10.0, 0.0), (0.0, 5.0)] + riri = Polygon(points_nervure, align=Align.NONE) + self.assertEqual(len(riri.vertices()), 3) + def test_rectangle(self): with BuildSketch() as test: r = Rectangle(20, 10) From 551cd3bdd40f700e29f87c05b79155c8e4d48866 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 15 Jul 2025 16:33:07 -0500 Subject: [PATCH 352/518] deglob.py -> add requested / discussed changes --- tools/deglob.py | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/tools/deglob.py b/tools/deglob.py index dd44aa4..37e1063 100755 --- a/tools/deglob.py +++ b/tools/deglob.py @@ -20,7 +20,20 @@ desc: python deglob.py my_build123d_script.py python deglob.py -h - After parsing my_build123d_script.py, the script prints a line such as: + Usage: + deglob.py [-h] [--write] [--verbose] build123d_file + Find all the build123d symbols in module. + + positional arguments: + build123d_file Path to the build123d file + + options: + -h, --help show this help message and exit + --write Overwrite glob import in input file, defaults to read-only and + printed to stdout + --verbose Increase verbosity when write is enabled, defaults to silent + + After parsing my_build123d_script.py, the script optionally prints a line such as: from build123d import Workplane, Solid Which you can then paste back into the file to replace the glob import. @@ -79,6 +92,11 @@ def parse_args(): help="Overwrite glob import in input file, defaults to read-only and printed to stdout", action="store_true", ) + parser.add_argument( + "--verbose", + help="Increase verbosity when write is enabled, defaults to silent", + action="store_true", + ) args = parser.parse_args() @@ -147,7 +165,8 @@ def main(): 4. Collect all referenced symbol names from the file's abstract syntax tree. 5. Intersect these names with those found in build123d.__all__ to identify which build123d symbols are actually used. - 6. Print an import statement that explicitly imports only the used symbols. + 6A. Optionally print an import statement that explicitly imports only the used symbols. + 6B. Or optionally write the glob import replacement back to file Behavior: - If no 'from build123d import *' import is found, the script prints @@ -191,17 +210,22 @@ def main(): import_line = f"from build123d import {', '.join(actual_imports)}" if args.write: - # Replace only the first instance, warn if more are found + # Replace only the first instance updated_code = re.sub(r"from build123d import\s*\*", import_line, code, count=1) - # Write code back to target file - with open(args.build123d_file, "w", encoding="utf-8") as f: - f.write(updated_code) + # Try to write code back to target file + try: + with open(args.build123d_file, "w", encoding="utf-8") as f: + f.write(updated_code) + except (PermissionError, OSError) as e: + print(f"Error: Unable to write to file '{args.build123d_file}'. {e}") + sys.exit(1) - if glob_count: + if glob_count and args.verbose: print(f"Replaced build123d glob import with '{import_line}'") if glob_count > 1: + # NOTE: always prints warning if more than one glob import is found print( "Warning: more than one instance of glob import was detected " f"(count: {glob_count}), only the first instance was replaced" From 4795bf79ffff4ed7fdfdd1d7fd120e7447782f6b Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 16 Jul 2025 11:41:55 -0400 Subject: [PATCH 353/518] Added continuity to topo_explore_connected_edges --- src/build123d/build_enums.py | 24 ++++++++- src/build123d/topology/one_d.py | 47 ++++++++++++++++-- tests/test_topo_explore.py | 88 ++++++++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 6 deletions(-) diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index 62babad..8cca982 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -28,7 +28,7 @@ license: from __future__ import annotations -from enum import Enum, auto +from enum import Enum, auto, IntEnum, unique from typing import Union from typing import TypeAlias @@ -89,6 +89,28 @@ class CenterOf(Enum): return f"<{self.__class__.__name__}.{self.name}>" +@unique +class ContinuityLevel(IntEnum): + """ + Continuity level for evaluating geometric connections. + + Used to determine how smoothly adjacent geometry joins together, + such as at shared vertices between edges or shared edges between faces. + + Levels: + + - C0 (G0): Positional continuity—elements meet at a point but may have sharp angles. + - C1 (G1): Tangent continuity—elements have the same tangent direction at the junction. + - C2 (G2): Curvature continuity—elements have matching curvature at the junction. + + These levels correspond to common CAD definitions and are compatible with OCCT's GeomAbs_Shape. + """ + + C0 = 0 + C1 = 1 + C2 = 2 + + class Extrinsic(Enum): """Order to apply extrinsic rotations by axis""" diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index e7b02e4..a17ff24 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -84,6 +84,7 @@ from OCP.BRepExtrema import BRepExtrema_DistShapeShape from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepLib import BRepLib, BRepLib_FindSurface +from OCP.BRepLProp import BRepLProp_CLProps, BRepLProp from OCP.BRepOffset import BRepOffset_MakeOffset from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace @@ -103,6 +104,7 @@ from OCP.Geom import ( ) from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve +from OCP.GeomAbs import GeomAbs_C0, GeomAbs_G1, GeomAbs_C1, GeomAbs_G2, GeomAbs_C2 from OCP.GeomAPI import ( GeomAPI_IntCS, GeomAPI_Interpolate, @@ -165,6 +167,7 @@ from OCP.gp import ( ) from build123d.build_enums import ( AngularDirection, + ContinuityLevel, CenterOf, FrameMethod, GeomType, @@ -3213,10 +3216,28 @@ def offset_topods_face(face: TopoDS_Face, amount: float) -> TopoDS_Shape: def topo_explore_connected_edges( - edge: Edge, parent: Shape | None = None + edge: Edge, + parent: Shape | None = None, + continuity: ContinuityLevel = ContinuityLevel.C0, ) -> ShapeList[Edge]: - """Given an edge extracted from a Shape, return the edges connected to it""" + """ + Find edges connected to the given edge with at least the requested continuity. + Args: + edge: The reference edge to explore from. + parent: Optional parent Shape. If None, uses edge.topo_parent. + continuity: Minimum required continuity (C0/G0, C1/G1, C2/G2). + + Returns: + ShapeList[Edge]: Connected edges meeting the continuity requirement. + """ + continuity_map = { + GeomAbs_C0: ContinuityLevel.C0, + GeomAbs_G1: ContinuityLevel.C1, + GeomAbs_C1: ContinuityLevel.C1, + GeomAbs_G2: ContinuityLevel.C2, + GeomAbs_C2: ContinuityLevel.C2, + } parent = parent if parent is not None else edge.topo_parent if parent is None: raise ValueError("edge has no valid parent") @@ -3233,8 +3254,26 @@ def topo_explore_connected_edges( if given_topods_edge.IsSame(topods_edge): continue # If the edge shares a vertex with the given edge they are connected - if topo_explore_common_vertex(given_topods_edge, topods_edge) is not None: - connected_edges.add(topods_edge) + common_topods_vertex: Vertex | None = topo_explore_common_vertex( + given_topods_edge, topods_edge + ) + if common_topods_vertex is not None: + # shared_vertex is the TopoDS_Vertex common to edge1 and edge2 + u1 = BRep_Tool.Parameter_s(common_topods_vertex.wrapped, given_topods_edge) + u2 = BRep_Tool.Parameter_s(common_topods_vertex.wrapped, topods_edge) + + # Build adaptors so OCCT can work on the curves + curve1 = BRepAdaptor_Curve(given_topods_edge) + curve2 = BRepAdaptor_Curve(topods_edge) + + # Get the GeomAbs_Shape enum continuity at the vertex + actual_continuity = BRepLProp.Continuity_s( + curve1, curve2, u1, u2, TOLERANCE, TOLERANCE + ) + actual_level = continuity_map.get(actual_continuity, ContinuityLevel.C2) + + if actual_level >= continuity: + connected_edges.add(topods_edge) return ShapeList(Edge(e) for e in connected_edges) diff --git a/tests/test_topo_explore.py b/tests/test_topo_explore.py index 5c686df..76e7e0c 100644 --- a/tests/test_topo_explore.py +++ b/tests/test_topo_explore.py @@ -6,7 +6,7 @@ from OCP.GProp import GProp_GProps from OCP.BRepGProp import BRepGProp from OCP.gp import gp_Pnt, gp_Pln from OCP.TopoDS import TopoDS_Face, TopoDS_Shape -from build123d.build_enums import SortBy +from build123d.build_enums import ContinuityLevel, GeomType, SortBy from build123d.objects_part import Box from build123d.geometry import ( @@ -17,6 +17,7 @@ from build123d.geometry import ( from build123d.topology import ( Edge, Face, + ShapeList, Shell, Wire, offset_topods_face, @@ -48,6 +49,9 @@ class DirectApiTestCase(unittest.TestCase): self.assertAlmostEqual(first.Z, second_vector.Z, places, msg=msg) +from ocp_vscode import show, show_all + + class TestTopoExplore(DirectApiTestCase): def test_topo_explore_connected_edges(self): @@ -97,6 +101,88 @@ class TestTopoExplore(DirectApiTestCase): with self.assertRaises(ValueError): topo_explore_connected_edges(null_edge) + def test_topo_explore_connected_edges_continuity(self): + # Create a 3-edge wire: straight line + smooth spline + sharp corner + + # First edge: straight line + e1 = Edge.make_line((0, 0), (1, 0)) + + # Second edge: spline tangent-aligned to e1 (G1 continuous) + e2 = Edge.make_spline([e1 @ 1, (1, 1)], tangents=[(1, 0), (-1, 0)]) + + # Third edge: sharp corner from e2 (no G1 continuity) + e3 = Edge.make_line(e2 @ 1, e1 @ 0) + + face = Face(Wire([e1, e2, e3])) + + extracted_e1 = face.edges().sort_by(Axis.Y)[0] + extracted_e2 = face.edges().filter_by(GeomType.LINE, reverse=True)[0] + + # Test C0: Should find both e2 and e3 connected to e1 and e2 respectively + connected_c0 = topo_explore_connected_edges( + extracted_e1, continuity=ContinuityLevel.C0 + ) + show_all() + self.assertEqual(len(connected_c0), 2) + self.assertTrue( + connected_c0.filter_by(GeomType.LINE, reverse=True)[0].is_same(extracted_e2) + ) + + # Test C1: Should still find e2 connected to e1 (they're tangent aligned) + connected_c1 = topo_explore_connected_edges( + extracted_e1, continuity=ContinuityLevel.C1 + ) + self.assertEqual(len(connected_c1), 1) + self.assertTrue(connected_c1[0].is_same(extracted_e2)) + + # Test C2: No edges are curvature continuous at the junctions + connected_c2 = topo_explore_connected_edges( + extracted_e1, continuity=ContinuityLevel.C2 + ) + self.assertEqual(len(connected_c2), 0) + + # Also test e2 to e3 continuity + connected_e2_c0 = topo_explore_connected_edges( + extracted_e2, continuity=ContinuityLevel.C0 + ) + self.assertEqual(len(connected_e2_c0), 2) # e1 and e3 connected by vertex + + connected_e2_c1 = topo_explore_connected_edges( + extracted_e2, continuity=ContinuityLevel.C1 + ) + # e3 should be excluded due to sharp corner + self.assertEqual(len(connected_e2_c1), 1) + self.assertTrue(connected_e2_c1[0].is_same(extracted_e1)) + + connected_e2_c2 = topo_explore_connected_edges( + extracted_e2, continuity=ContinuityLevel.C2 + ) + self.assertEqual(len(connected_e2_c2), 0) + + def test_topo_explore_connected_edges_continuity_loop(self): + # Perfect circle: all edges G2 continuous at their junctions + + circle = Edge.make_circle(1) + edges = ShapeList([circle.edge().trim(0, 0.5), circle.edge().trim(0.5, 1.0)]) + circle = Face(Wire(edges)) + edges = circle.edges() + + for e in edges: + connected_c2 = topo_explore_connected_edges( + e, parent=circle, continuity=ContinuityLevel.C2 + ) + self.assertEqual(len(connected_c2), 1) + + connected_c1 = topo_explore_connected_edges( + e, parent=circle, continuity=ContinuityLevel.C1 + ) + self.assertEqual(len(connected_c1), 1) + + connected_c0 = topo_explore_connected_edges( + e, parent=circle, continuity=ContinuityLevel.C0 + ) + self.assertEqual(len(connected_c0), 1) + def test_topo_explore_common_vertex(self): triangle = Face( Wire( From 108c1be3f2779236f6e691b9a866673b3b2c9b3a Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 17 Jul 2025 08:50:03 -0400 Subject: [PATCH 354/518] Adding missing ContinuityLevel --- src/build123d/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index 209c248..b3e4449 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -45,6 +45,7 @@ __all__ = [ "ApproxOption", "AngularDirection", "CenterOf", + "ContinuityLevel", "Extrinsic", "FontStyle", "FrameMethod", From 29cf8959a5de581f2aa972b1d524dd9e65175020 Mon Sep 17 00:00:00 2001 From: Daniele D'Orazio Date: Sun, 20 Jul 2025 16:38:29 +0200 Subject: [PATCH 355/518] fix PolarLine with angles that make the length negative --- src/build123d/objects_curve.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index a883ac9..e4ac2a8 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -779,9 +779,9 @@ class PolarLine(BaseEdgeObject): if length_mode == LengthMode.DIAGONAL: length_vector = direction_localized * length elif length_mode == LengthMode.HORIZONTAL: - length_vector = direction_localized * (length / cos(radians(angle))) + length_vector = direction_localized * abs(length / cos(radians(angle))) elif length_mode == LengthMode.VERTICAL: - length_vector = direction_localized * (length / sin(radians(angle))) + length_vector = direction_localized * abs(length / sin(radians(angle))) new_edge = Edge.make_line(start, start + length_vector) From 93e9b22eb5ac5ef5e7838ba2e98ff0c7f0cbc686 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 21 Jul 2025 15:12:35 -0500 Subject: [PATCH 356/518] add a surface modeling method with support for edge/face, edge, and point constraints --- src/build123d/topology/two_d.py | 42 +++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 1a1e9dc..44b9363 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -82,7 +82,7 @@ from OCP.BRepPrimAPI import BRepPrimAPI_MakeRevol from OCP.BRepTools import BRepTools, BRepTools_ReShape from OCP.gce import gce_MakeLin from OCP.Geom import Geom_BezierSurface, Geom_RectangularTrimmedSurface, Geom_Surface -from OCP.GeomAbs import GeomAbs_C0 +from OCP.GeomAbs import GeomAbs_C0, GeomAbs_G1, GeomAbs_G2 from OCP.GeomAPI import ( GeomAPI_ExtremaCurveCurve, GeomAPI_PointsToBSplineSurface, @@ -106,7 +106,14 @@ from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_S from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape from typing_extensions import Self -from build123d.build_enums import CenterOf, GeomType, Keep, SortBy, Transition +from build123d.build_enums import ( + CenterOf, + ContinuityLevel, + GeomType, + Keep, + SortBy, + Transition, +) from build123d.geometry import ( DEG2RAD, TOLERANCE, @@ -1159,6 +1166,37 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return_value = cls.cast(BRepFill.Face_s(curve1.wrapped, curve2.wrapped)) return return_value + @classmethod + def make_surface_patch( + cls, + constraints: Iterable[tuple[Edge, Face, ContinuityLevel] | Edge | VectorLike], + ) -> Face: + continuity_dict = { + ContinuityLevel.C0: GeomAbs_C0, + ContinuityLevel.C1: GeomAbs_G1, + ContinuityLevel.C2: GeomAbs_G2, + } + patch = BRepOffsetAPI_MakeFilling() + for constraint in constraints: + if isinstance(constraint, (Vector, Sequence)) and not isinstance( + constraint, tuple + ): + patch.Add(gp_Pnt(*constraint)) + elif isinstance(constraint, Edge): + patch.Add(constraint.wrapped, continuity_dict[ContinuityLevel.C0]) + elif len(constraint) == 3: + patch.Add( + constraint[0].wrapped, + constraint[1].wrapped, + continuity_dict[constraint[2]], + ) + else: + raise ValueError(f"Provided {constraint} is not an allowed constraint") + patch.Build() + result = patch.Shape() + + return cls(result) + @classmethod def revolve( cls, From 5612100e6037d733e7c6fe563181505c06560f54 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 21 Jul 2025 16:47:17 -0500 Subject: [PATCH 357/518] change interface for better type checking, add a few basic tests --- src/build123d/topology/two_d.py | 27 ++++++++------ tests/test_direct_api/test_face.py | 59 +++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 44b9363..9bb851d 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1169,7 +1169,11 @@ class Face(Mixin2D, Shape[TopoDS_Face]): @classmethod def make_surface_patch( cls, - constraints: Iterable[tuple[Edge, Face, ContinuityLevel] | Edge | VectorLike], + edge_face_constraints: ( + Iterable[tuple[Edge, Face, ContinuityLevel]] | None + ) = None, + edge_constraints: Iterable[Edge] | None = None, + point_constraints: Iterable[VectorLike] | None = None, ) -> Face: continuity_dict = { ContinuityLevel.C0: GeomAbs_C0, @@ -1177,21 +1181,22 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ContinuityLevel.C2: GeomAbs_G2, } patch = BRepOffsetAPI_MakeFilling() - for constraint in constraints: - if isinstance(constraint, (Vector, Sequence)) and not isinstance( - constraint, tuple - ): - patch.Add(gp_Pnt(*constraint)) - elif isinstance(constraint, Edge): - patch.Add(constraint.wrapped, continuity_dict[ContinuityLevel.C0]) - elif len(constraint) == 3: + + if edge_face_constraints: + for constraint in edge_face_constraints: patch.Add( constraint[0].wrapped, constraint[1].wrapped, continuity_dict[constraint[2]], ) - else: - raise ValueError(f"Provided {constraint} is not an allowed constraint") + if edge_constraints: + for edge in edge_constraints: + patch.Add(edge.wrapped, continuity_dict[ContinuityLevel.C0]) + + if point_constraints: + for point in point_constraints: + patch.Add(gp_Pnt(*point)) + patch.Build() result = patch.Shape() diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 7bf2f5f..2074750 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -35,7 +35,7 @@ import unittest from unittest.mock import patch, PropertyMock from OCP.Geom import Geom_RectangularTrimmedSurface from build123d.build_common import Locations, PolarLocations -from build123d.build_enums import Align, CenterOf, GeomType +from build123d.build_enums import Align, CenterOf, ContinuityLevel, GeomType from build123d.build_line import BuildLine from build123d.build_part import BuildPart from build123d.build_sketch import BuildSketch @@ -430,6 +430,63 @@ class TestFace(unittest.TestCase): with self.assertRaises(ValueError): Face.sweep(edge, Polyline((0, 0), (0.1, 0), (0.2, 0.1))) + def test_make_surface_patch(self): + m1 = Spline((0, 0), (1, 0), (10, 0, -10)) + m2 = Spline((0, 0), (0, 1), (0, 10, -10)) + m3 = Spline(m1 @ 1, (7, 7, -10), m2 @ 1) + + patch = Face.make_surface_patch( + edge_constraints=[ + m1.edge(), + m2.edge(), + m3.edge(), + ] + ) + self.assertAlmostEqual(patch.area, 157.186, 3) + + f1 = Face.extrude(m1.edge(), (0, -1, 0)) + f2 = Face.extrude(m2.edge(), (-1, 0, 0)) + f3 = Face.extrude(m3.edge(), (0, 0, -1)) + + patch2 = Face.make_surface_patch( + edge_face_constraints=[ + (m1.edge(), f1, ContinuityLevel.C1), + (m2.edge(), f2, ContinuityLevel.C1), + (m3.edge(), f3, ContinuityLevel.C1), + ] + ) + + self.assertAlmostEqual(patch2.area, 152.670, 3) + + mid_edge = Spline(m1 @ 0.5, (5, 5, -3), m2 @ 0.5) + + patch3 = -Face.make_surface_patch( + edge_face_constraints=[ + (m1.edge(), f1, ContinuityLevel.C1), + (m2.edge(), f2, ContinuityLevel.C1), + (m3.edge(), f3, ContinuityLevel.C1), + ], + edge_constraints=[ + mid_edge.edge(), + ], + ) + + self.assertAlmostEqual(patch3.area, 152.643, 3) + + point = patch.position_at(0.5, 0.5) + (0.5, 0.5) + patch4 = -Face.make_surface_patch( + edge_constraints=[ + m1.edge(), + m2.edge(), + m3.edge(), + ], + point_constraints=[ + point, + ], + ) + + self.assertAlmostEqual(patch4.area, 164.618, 3) + # def test_to_arcs(self): # with BuildSketch() as bs: # with BuildLine() as bl: From 6d16d56586725d1864f5c2ec4bbc9b3034311f3e Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 25 Jul 2025 11:32:40 -0500 Subject: [PATCH 358/518] two_d.py -> Face.make_surface_patch: add docstring and additional error handling --- src/build123d/topology/two_d.py | 42 ++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 9bb851d..91cbc65 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1175,6 +1175,28 @@ class Face(Mixin2D, Shape[TopoDS_Face]): edge_constraints: Iterable[Edge] | None = None, point_constraints: Iterable[VectorLike] | None = None, ) -> Face: + """make_surface_patch + + Create a potentially non-planar face patch bounded by exterior edges which can + be optionally refined using support faces to ensure e.g. tangent surface + continuity. Also can optionally refine the surface using surface points. + + Args: + edge_face_constraints (list[tuple[Edge, Face, ContinuityLevel]], optional): + Edges defining perimeter of face with adjacent support faces subject to + ContinuityLevel. Defaults to None. + edge_constraints (list[Edge], optional): Edges defining perimeter of face + without adjacent support faces. Defaults to None. + point_constraints (list[VectorLike], optional): Points on the surface that + refine the shape. Defaults to None. + + Raises: + RuntimeError: Error building non-planar face with provided constraints + RuntimeError: Generated face is invalid + + Returns: + Face: Potentially non-planar face + """ continuity_dict = { ContinuityLevel.C0: GeomAbs_C0, ContinuityLevel.C1: GeomAbs_G1, @@ -1197,10 +1219,24 @@ class Face(Mixin2D, Shape[TopoDS_Face]): for point in point_constraints: patch.Add(gp_Pnt(*point)) - patch.Build() - result = patch.Shape() + try: + patch.Build() + result = cls(patch.Shape()) + except ( + Standard_Failure, + StdFail_NotDone, + Standard_NoSuchObject, + Standard_ConstructionError, + ) as err: + raise RuntimeError( + "Error building non-planar face with provided constraints" + ) from err - return cls(result) + result = result.fix() + if not result.is_valid or result.wrapped is None: + raise RuntimeError("Non planar face is invalid") + + return result @classmethod def revolve( From ca823c4c1e107cadf1761e62d5c2edb877aff5e9 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 25 Jul 2025 11:56:49 -0500 Subject: [PATCH 359/518] test_face.py -> add error checking tests --- tests/test_direct_api/test_face.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 2074750..353c20c 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -487,6 +487,13 @@ class TestFace(unittest.TestCase): self.assertAlmostEqual(patch4.area, 164.618, 3) + def test_make_surface_patch_error_checking(self): + with self.assertRaises(RuntimeError): + Face.make_surface_patch(edge_constraints=[Edge.make_line((0, 0), (1, 0))]) + + with self.assertRaises(RuntimeError): + Face.make_surface_patch(edge_constraints=[]) + # def test_to_arcs(self): # with BuildSketch() as bs: # with BuildLine() as bl: From c2bfb74784f1b7412f20818d6dd71c034d8d27fb Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Fri, 25 Jul 2025 13:30:17 -0500 Subject: [PATCH 360/518] test_face.py -> add new test for missing coverage line --- tests/test_direct_api/test_face.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 353c20c..82460c0 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -494,6 +494,14 @@ class TestFace(unittest.TestCase): with self.assertRaises(RuntimeError): Face.make_surface_patch(edge_constraints=[]) + with self.assertRaises(RuntimeError): + Face.make_surface_patch( + edge_constraints=[ + Edge.make_line((0, 0), (1, 0)), + Edge.make_line((0, 0), (0, 1)), + ] + ) + # def test_to_arcs(self): # with BuildSketch() as bs: # with BuildLine() as bl: From 5c7ab703e11b8995a90e105de7cbea305a179a18 Mon Sep 17 00:00:00 2001 From: Yeicor <4929005+yeicor@users.noreply.github.com> Date: Sat, 26 Jul 2025 20:31:16 +0200 Subject: [PATCH 361/518] Update external tools to add OCP.wasm and update Yet Another CAD Viewer --- docs/external.rst | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/docs/external.rst b/docs/external.rst index f1b9480..cdadde8 100644 --- a/docs/external.rst +++ b/docs/external.rst @@ -31,15 +31,16 @@ GUI editor based on PyQT. This fork has changes from jdegenstein to allow easier See: `jdegenstein's fork of cq-editor `_ -yet-another-cad-viewer +Yet Another CAD Viewer ====================== -A CAD viewer capable of displaying OCP models (CadQuery/Build123d) in a -web browser. Mainly intended for deployment of finished models as a static -website. It also works for developing models with hot reloading, though -this feature may not be as mature as in ocp-vscode. +A web-based CAD viewer for OCP models (CadQuery/build123d) that runs in any modern browser and supports +static site deployment. Features include interactive inspection of faces, edges, and vertices, +measurement tools, per-model clipping planes, transparency control, and hot reloading via ``yacv-server``. +It also has a build123d playground for editing and sharing models directly in the browser +(`demo `_). -See: `yet-another-cad-viewer `_ +See: `Yet Another CAD Viewer `_ PartCAD VS Code extension ========================= @@ -153,3 +154,13 @@ Library that helps perform `topology optimization `_-based CAD models (`CadQuery `_/`Build123d `_/...) using the `dl4to `_ library. + +See: `dl4to4ocp `_ + +OCP.wasm +======== + +This project ports the low-level dependencies required for build123d to run in a browser. +For a fully featured frontend, check out ``Yet Another CAD Viewer`` (see above). + +See: `OCP.wasm `_ From 986aa30be5c490e480b0fdb616a7040c18f10940 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 28 Jul 2025 12:12:12 -0400 Subject: [PATCH 362/518] Add new method `available_fonts` for listing available font names and styles to resolve #364 --- src/build123d/__init__.py | 2 ++ src/build123d/objects_sketch.py | 4 ++- src/build123d/utils.py | 57 +++++++++++++++++++++++++++++++++ tests/test_utils.py | 36 +++++++++++++++++++++ 4 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/build123d/utils.py create mode 100644 tests/test_utils.py diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index 209c248..7d85f5b 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -21,6 +21,7 @@ from build123d.topology import * from build123d.drafting import * from build123d.persistence import modify_copyreg from build123d.exporters3d import * +from build123d.utils import available_fonts from .version import version as __version__ @@ -183,6 +184,7 @@ __all__ = [ "new_edges", "pack", "polar", + "available_fonts", # Context aware selectors "solids", "faces", diff --git a/src/build123d/objects_sketch.py b/src/build123d/objects_sketch.py index eed5b59..f301c0e 100644 --- a/src/build123d/objects_sketch.py +++ b/src/build123d/objects_sketch.py @@ -549,7 +549,9 @@ class Text(BaseSketchObject): subfamilies not in FontStyle should be specified with the subfamily name, e.g. "Arial Black". Alternatively, a specific font file can be specified with font_path. - Note: Windows 10+ users must "Install for all users" for fonts to be found by name. + Use `available_fonts()` to list available font names for `font` and FontStyles. + Note: on Windows, fonts must be installed with "Install for all users" to be found + by name. Not all fonts have every FontStyle available, however ITALIC and BOLDITALIC will still italicize the font if the respective font file is not available. diff --git a/src/build123d/utils.py b/src/build123d/utils.py new file mode 100644 index 0000000..7c43093 --- /dev/null +++ b/src/build123d/utils.py @@ -0,0 +1,57 @@ +""" +Helper Utilities + +name: utils.py +by: jwagenet +date: July 28th 2025 + +desc: + This python module contains helper utilities not related to object creation. + +""" + +from dataclasses import dataclass + +from build123d.build_enums import FontStyle +from OCP.Font import ( + Font_FA_Bold, + Font_FA_BoldItalic, + Font_FA_Italic, + Font_FA_Regular, + Font_FontMgr, +) + + +@dataclass(frozen=True) +class FontInfo: + name: str + styles: tuple[FontStyle, ...] + + def __repr__(self) -> str: + style_names = tuple(s.name for s in self.styles) + return f"Font(name={self.name!r}, styles={style_names})" + + +def available_fonts() -> list[FontInfo]: + """Get list of available fonts by name and available styles (also called aspects). + Note: on Windows, fonts must be installed with "Install for all users" to be found. + """ + + font_aspects = { + "REGULAR": Font_FA_Regular, + "BOLD": Font_FA_Bold, + "BOLDITALIC": Font_FA_BoldItalic, + "ITALIC": Font_FA_Italic, + } + + manager = Font_FontMgr.GetInstance_s() + font_list = [] + for f in manager.GetAvailableFonts(): + avail_aspects = tuple( + FontStyle[n] for n, a in font_aspects.items() if f.HasFontAspect(a) + ) + font_list.append(FontInfo(f.FontName().ToCString(), avail_aspects)) + + font_list.sort(key=lambda x: x.name) + + return font_list \ No newline at end of file diff --git a/tests/test_utils.py b/tests/test_utils.py new file mode 100644 index 0000000..eef3ab8 --- /dev/null +++ b/tests/test_utils.py @@ -0,0 +1,36 @@ +""" +build123d Helper Utilities tests + +name: test_utils.py +by: jwagenet +date: July 28th 2025 + +desc: Unit tests for the build123d helper utilities module +""" + +import unittest + +from build123d import * +from build123d.utils import FontInfo + + +class TestFontHelpers(unittest.TestCase): + """Tests for font helpers.""" + + def test_available_fonts(self): + """Test expected output for available fonts.""" + fonts = available_fonts() + self.assertIsInstance(fonts, list) + for font in fonts: + self.assertIsInstance(font, FontInfo) + self.assertIsInstance(font.name, str) + self.assertIsInstance(font.styles, tuple) + for style in font.styles: + self.assertIsInstance(style, FontStyle) + + names = [font.name for font in fonts] + self.assertEqual(names, sorted(names)) + + +if __name__ == "__main__": + unittest.main() From 06d2d9a8170d20cc211bfbd07ae5b99782300883 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 29 Jul 2025 10:38:05 -0400 Subject: [PATCH 363/518] Add FontInfo test --- tests/test_utils.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/test_utils.py b/tests/test_utils.py index eef3ab8..9d5ba9c 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -17,6 +17,16 @@ from build123d.utils import FontInfo class TestFontHelpers(unittest.TestCase): """Tests for font helpers.""" + def test_font_info(self): + """Test expected FontInfo repr.""" + name = "Arial" + styles = tuple(member for member in FontStyle) + font = FontInfo(name, styles) + + self.assertEqual( + repr(font), f"Font(name={name!r}, styles={tuple(s.name for s in styles)})" + ) + def test_available_fonts(self): """Test expected output for available fonts.""" fonts = available_fonts() From 9f51515c63bad51ee50ac987760c930e5c993e7b Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 30 Jul 2025 13:53:05 -0400 Subject: [PATCH 364/518] Enhancing loft to support a single hole --- src/build123d/operations_part.py | 94 +++++++++++++++++++++----------- tests/test_build_part.py | 26 ++++++++- 2 files changed, 86 insertions(+), 34 deletions(-) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 7a196f7..1e3cdbf 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -262,54 +262,82 @@ def loft( clean (bool, optional): Remove extraneous internal structure. Defaults to True. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ + + def normalize_list_of_lists(lst): + lengths = {len(sub) for sub in lst} + if lengths <= {0}: + return [] + if lengths == {1}: + return [sub[0] for sub in lst] + if len(lengths) > 1: + raise ValueError("The number of holes in the sections must be the same") + if max(lengths) > 1: + raise ValueError( + f"loft supports a maximum of 1 hole per section but one or more section " + f"has {max(lengths)} hole - loft the perimeter and holes separately and " + f"subtract the holes" + ) + context: BuildPart | None = BuildPart._get_context("loft") section_list = flatten_sequence(sections) validate_inputs(context, "loft", section_list) - if all([s is None for s in section_list]): - if context is None or (context is not None and not context.pending_faces): + # If no explicit sections provided, use pending_faces from context + if all(s is None for s in section_list): + if context is None or not context.pending_faces: raise ValueError("No sections provided") - loft_wires = [face.outer_wire() for face in context.pending_faces] + input_sections = context.pending_faces context.pending_faces = [] context.pending_face_planes = [] else: - if not any(isinstance(s, Vertex) for s in section_list): - loft_wires = [ - face.outer_wire() - for section in section_list - for face in section.faces() - ] - elif any(isinstance(s, Vertex) for s in section_list) and any( - isinstance(s, (Face, Sketch)) for s in section_list + input_sections = section_list + + # Validate Vertex placement + if any(isinstance(s, Vertex) for s in input_sections): + if not isinstance(input_sections[0], Vertex) and not isinstance( + input_sections[-1], Vertex ): - if any(isinstance(s, Vertex) for s in section_list[1:-1]): - raise ValueError( - "Vertices must be the first, last, or first and last elements" - ) - loft_wires = [] - for s in section_list: - if isinstance(s, Vertex): - loft_wires.append(s) - elif isinstance(s, Face): - loft_wires.append(s.outer_wire()) - elif isinstance(s, Sketch): - loft_wires.extend([f.outer_wire() for f in s.faces()]) - elif all(isinstance(s, Vertex) for s in section_list): raise ValueError( - "At least one face/sketch is required if vertices are the first, last, " - "or first and last elements" + "Vertices must be the first, last, or first and last elements" + ) + if any(isinstance(s, Vertex) for s in input_sections[1:-1]): + raise ValueError( + "Vertices must be the first, last, or first and last elements" ) - new_solid = Solid.make_loft(loft_wires, ruled) + # Normalize all input into loft_sections: each is either a Vertex or a Wire + loft_sections = [] + hole_candidates = [] + for s in input_sections: + if isinstance(s, Vertex): + loft_sections.append(s) + else: + for face in s.faces(): + loft_sections.append(face.outer_wire()) + hole_candidates.append(face.inner_wires()) - # Try to recover an invalid loft + holes = normalize_list_of_lists(hole_candidates) + + # Perform lofts + new_solid = Solid.make_loft(loft_sections, ruled) + if holes: + # Since the holes are interior a Solid will be generated here + new_solid = cast(Solid, new_solid.cut(Solid.make_loft(holes, ruled))) + + # Try to recover an invalid loft - untestable code if not new_solid.is_valid: - new_solid = Solid(Shell(new_solid.faces() + section_list)) - if clean: - new_solid = new_solid.clean() - if not new_solid.is_valid: - raise RuntimeError("Failed to create valid loft") + try: + recovery_faces = new_solid.faces() + [ + s for s in loft_sections if isinstance(s, Face) + ] + new_solid = Solid(Shell(recovery_faces)) + if clean: + new_solid = new_solid.clean() + if not new_solid.is_valid: + raise ValueError("Recovery failed") + except Exception as e: + raise RuntimeError("Failed to create valid loft") from e if context is not None: context._add_to_context(new_solid, clean=clean, mode=mode) diff --git a/tests/test_build_part.py b/tests/test_build_part.py index d6fb66a..0f6331a 100644 --- a/tests/test_build_part.py +++ b/tests/test_build_part.py @@ -28,7 +28,7 @@ license: import unittest from math import pi, sin -from unittest.mock import MagicMock, patch +from unittest.mock import MagicMock, patch, PropertyMock from build123d import * from build123d import LocationList, WorkplaneList @@ -411,6 +411,12 @@ class TestLoft(unittest.TestCase): test = loft(sections=[r.face(), v1], ruled=True) self.assertAlmostEqual(test.volume, 1, 5) + def test_loft_invalid_vertex(self): + lower_section = Face.make_rect(10, 10) - Face.make_rect(8, 8) + upper_section = Pos(Z=5) * lower_section + with self.assertRaises(ValueError): + loft([lower_section, Vertex(0, 0, 2.5), upper_section]) + def test_loft_no_sections_assert(self): with BuildPart() as test: with self.assertRaises(ValueError): @@ -432,6 +438,24 @@ class TestLoft(unittest.TestCase): with self.assertRaises(ValueError): loft(sections=[v1, v2, s.sketch]) + def test_loft_with_hole(self): + lower_section = Face.make_rect(10, 10) - Face.make_rect(8, 8) + upper_section = Pos(Z=5) * lower_section + loft_with_hole = loft([lower_section, upper_section]) + self.assertAlmostEqual(loft_with_hole.volume, 10 * 10 * 5 - 8 * 8 * 5, 5) + + def test_loft_with_two_holes(self): + lower_section = Text("B", font_size=10) + upper_section = Pos(Z=5) * lower_section + with self.assertRaises(ValueError): + loft([lower_section, upper_section]) + + def test_loft_with_inconsistent_holes(self): + lower_section = Text("B", font_size=10) + upper_section = Pos(Z=5) * Face.make_rect(10, 10) + with self.assertRaises(ValueError): + loft([lower_section, upper_section]) + class TestRevolve(unittest.TestCase): def test_simple_revolve(self): From 59bc6268bc153f8cddc79cea6290b0af31018142 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 30 Jul 2025 14:04:15 -0400 Subject: [PATCH 365/518] AATA: correct tangent check to use full start circle if start arc is a segment --- src/build123d/objects_curve.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index e4ac2a8..7cb1253 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1478,8 +1478,9 @@ class ArcArcTangentArc(BaseEdgeObject): arc = RadiusArc(intersect[0], intersect[1], radius=radius) # Check and flip arc if not tangent - _, _, point = start_arc.distance_to_with_closest_points(arc) - if start_arc.tangent_at(point).cross(arc.tangent_at(point)).length > TOLERANCE: + start_circle = CenterArc(start_arc.arc_center, start_arc.radius, 0, 360) + _, _, point = start_circle.distance_to_with_closest_points(arc) + if start_circle.tangent_at(point).cross(arc.tangent_at(point)).length > TOLERANCE: arc = RadiusArc(intersect[0], intersect[1], radius=-radius) super().__init__(arc, mode) From 7dde642f04cfb965daa6485e305a04ca2ec5b485 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 30 Jul 2025 14:56:51 -0400 Subject: [PATCH 366/518] AATA: support internal arc placement in addition to external --- src/build123d/objects_curve.py | 45 +++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 7cb1253..76c2465 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -45,7 +45,7 @@ from build123d.build_enums import ( ) from build123d.build_line import BuildLine from build123d.geometry import Axis, Plane, Vector, VectorLike, TOLERANCE -from build123d.topology import Edge, Face, Wire, Curve +from build123d.topology import Edge, Face, Wire, Curve, tuplify from build123d.topology.shape_core import ShapeList @@ -1394,9 +1394,10 @@ class ArcArcTangentArc(BaseEdgeObject): end_arc: Curve | Edge | Wire, radius: float, side: Side = Side.LEFT, - keep: Keep = Keep.INSIDE, + keep: Keep | tuple[Keep, Keep] = (Keep.INSIDE, Keep.OUTSIDE), mode: Mode = Mode.ADD, ): + keep_type, keep_placement = tuplify(keep, 2) context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) @@ -1418,7 +1419,7 @@ class ArcArcTangentArc(BaseEdgeObject): workplane = copy_module.copy(WorkplaneList._get_context().workplanes[0]) side_sign = 1 if side == Side.LEFT else -1 - keep_sign = 1 if keep == Keep.INSIDE else -1 + keep_sign = 1 if keep_type == Keep.INSIDE else -1 arcs = [start_arc, end_arc] points = [arc.arc_center for arc in arcs] radii = [arc.radius for arc in arcs] @@ -1436,7 +1437,13 @@ class ArcArcTangentArc(BaseEdgeObject): # The range midline.length / 2 < tangent radius < math.inf should be valid # Sometimes fails if min_radius == radius, so using >= min_radius = (midline.length - keep_sign * (radii[0] + radii[1])) / 2 - if min_radius >= radius: + if keep_placement == Keep.OUTSIDE and min_radius >= radius: + raise ValueError( + f"The arc radius is too small. Should be greater than {min_radius}." + ) + + min_radius = (midline.length + keep_sign * (radii[0] - radii[1])) / 2 + if keep_placement == Keep.INSIDE and min_radius >= radius: raise ValueError( f"The arc radius is too small. Should be greater than {min_radius}." ) @@ -1450,12 +1457,23 @@ class ArcArcTangentArc(BaseEdgeObject): # - then it's a matter of finding the points where the connecting lines # intersect the point circles local = [workplane.to_local_coords(p) for p in points] - ref_circles = [ - sympy.Circle( - sympy.Point(local[i].X, local[i].Y), keep_sign * radii[i] + radius - ) - for i in range(len(arcs)) - ] + if keep_placement == Keep.OUTSIDE: + ref_circles = [ + sympy.Circle( + sympy.Point(local[i].X, local[i].Y), keep_sign * radii[i] + radius + ) + for i in range(len(arcs)) + ] + else: + ref_circles = [ + sympy.Circle( + sympy.Point(local[0].X, local[0].Y), abs(radii[0] - keep_sign * radius) + ), + sympy.Circle( + sympy.Point(local[1].X, local[1].Y), abs(radii[1] + keep_sign * radius) + ) + ] + ref_intersections = ShapeList( [ workplane.from_local_coords( @@ -1466,9 +1484,14 @@ class ArcArcTangentArc(BaseEdgeObject): ) arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] + if keep_placement == Keep.OUTSIDE: + factor = [keep_sign, keep_sign] + else: + factor = [-1, 1] if keep_type == Keep.INSIDE else [1, -1] + intersect = [ points[i] - + keep_sign * radii[i] * (Vector(arc_center) - points[i]).normalized() + + factor[i] * radii[i] * (Vector(arc_center) - points[i]).normalized() for i in range(len(arcs)) ] From da5b1fb96182f1541c6fa299db12fa15d6d69a44 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 31 Jul 2025 14:52:57 -0400 Subject: [PATCH 367/518] AATA: support overlapping cases --- src/build123d/objects_curve.py | 146 ++++++++++++++++++++++++--------- 1 file changed, 107 insertions(+), 39 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 76c2465..3a4b3c2 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1375,14 +1375,19 @@ class ArcArcTangentArc(BaseEdgeObject): Create an arc tangent to two arcs and a radius. + keep specifies tangent arc position with a Keep pair: (placement, type) + placement: start_arc is tangent INSIDE or OUTSIDE the tangent arc + BOTH is a special case for overlapping arcs with type INSIDE + type: tangent arc is INSIDE or OUTSIDE start_arc and end_arc + Args: start_arc (Curve | Edge | Wire): starting arc, must be GeomType.CIRCLE end_arc (Curve | Edge | Wire): ending arc, must be GeomType.CIRCLE radius (float): radius of tangent arc side (Side): side of arcs to place tangent arc center, LEFT or RIGHT. Defaults to Side.LEFT - keep (Keep): which tangent arc to keep, INSIDE or OUTSIDE. - Defaults to Keep.INSIDE + keep (Keep | tuple[Keep, Keep]): which tangent arc to keep, INSIDE or OUTSIDE. + Defaults to (Keep.INSIDE, Keep.INSIDE) mode (Mode, optional): combination mode. Defaults to Mode.ADD """ @@ -1394,17 +1399,22 @@ class ArcArcTangentArc(BaseEdgeObject): end_arc: Curve | Edge | Wire, radius: float, side: Side = Side.LEFT, - keep: Keep | tuple[Keep, Keep] = (Keep.INSIDE, Keep.OUTSIDE), + keep: Keep | tuple[Keep, Keep] = (Keep.INSIDE, Keep.INSIDE), mode: Mode = Mode.ADD, ): - keep_type, keep_placement = tuplify(keep, 2) + keep_placement, keep_type = tuplify(keep, 2) context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - if start_arc.geom_type != GeomType.CIRCLE: + if keep_placement == Keep.BOTH and keep_type != Keep.INSIDE: raise ValueError("Start arc must have GeomType.CIRCLE.") + if start_arc.geom_type != GeomType.CIRCLE: + raise ValueError( + "Keep.BOTH can only be used in configuration: (Keep.BOTH, Keep.INSIDE)" + ) + if end_arc.geom_type != GeomType.CIRCLE: raise ValueError("End arc must have GeomType.CIRCLE.") @@ -1419,7 +1429,7 @@ class ArcArcTangentArc(BaseEdgeObject): workplane = copy_module.copy(WorkplaneList._get_context().workplanes[0]) side_sign = 1 if side == Side.LEFT else -1 - keep_sign = 1 if keep_type == Keep.INSIDE else -1 + keep_sign = 1 if keep_placement == Keep.OUTSIDE else -1 arcs = [start_arc, end_arc] points = [arc.arc_center for arc in arcs] radii = [arc.radius for arc in arcs] @@ -1431,48 +1441,108 @@ class ArcArcTangentArc(BaseEdgeObject): if midline.length == 0: raise ValueError("Cannot find tangent for concentric arcs.") - if midline.length <= abs(radii[1] - radii[0]): - raise NotImplementedError("Arc inside arc not yet implemented.") + if midline.length == sum(radii) and keep_type == Keep.INSIDE: + raise ValueError( + "Cannot find tangent type Keep.INSIDE for non-overlapping arcs already tangent." + ) - # The range midline.length / 2 < tangent radius < math.inf should be valid - # Sometimes fails if min_radius == radius, so using >= - min_radius = (midline.length - keep_sign * (radii[0] + radii[1])) / 2 - if keep_placement == Keep.OUTSIDE and min_radius >= radius: + if midline.length == abs(radii[0] - radii[1]) and keep_placement == Keep.INSIDE: + raise ValueError( + "Cannot find tangent placement Keep.INSIDE for completely overlapping arcs already tangent." + ) + + min_radius = 0 + max_radius = None + r_sign = 1 if radii[0] < radii[1] else -1 + x_sign = [1, 1] + pick_index = 0 + if midline.length > abs(radii[0] - radii[1]) and keep_type == Keep.OUTSIDE: + # No full overlap, placed externally + ref_radii = [keep_sign * radii[0] + radius, keep_sign * radii[1] + radius] + x_sign = [keep_sign, keep_sign] + min_radius = (midline.length - keep_sign * (radii[0] + radii[1])) / 2 + min_radius = 0 if min_radius < 0 else min_radius + + elif midline.length > radii[0] + radii[1] and keep_type == Keep.INSIDE: + # No overlap, placed inside + ref_radii = [ + abs(radii[0] + keep_sign * radius), + abs(radii[1] - keep_sign * radius), + ] + x_sign = [1, -1] if keep_placement == Keep.OUTSIDE else [-1, 1] + min_radius = (midline.length - keep_sign * (radii[0] - radii[1])) / 2 + + elif midline.length <= abs(radii[0] - radii[1]): + # Full Overlap + pick_index = -1 + if keep_placement == Keep.OUTSIDE: + print(1) + # External tangent to start + ref_radii = [radii[0] + r_sign * radius, radii[1] - r_sign * radius] + min_radius = ( + -midline.length - r_sign * radii[0] + r_sign * radii[1] + ) / 2 + max_radius = ( + midline.length - r_sign * radii[0] + r_sign * radii[1] + ) / 2 + + elif keep_placement == Keep.INSIDE: + print(2) + # Internal tangent to start + ref_radii = [abs(radii[0] - radius), abs(radii[1] - radius)] + min_radius = (-midline.length + radii[0] + radii[1]) / 2 + max_radius = (midline.length + radii[0] + radii[1]) / 2 + if radii[0] < radii[1]: + x_sign = [-1, 1] + else: + x_sign = [1, -1] + else: + # Partial Overlap + pick_index = -1 + if keep_placement == Keep.BOTH: + # Internal tangent to both + ref_radii = [abs(radii[0] - radius), abs(radii[1] - radius)] + max_radius = (-midline.length + radii[0] + radii[1]) / 2 + + elif keep_placement == Keep.OUTSIDE: + # External tangent to start + ref_radii = [radii[0] + r_sign * radius, radii[1] - r_sign * radius] + max_radius = ( + midline.length - r_sign * radii[0] + r_sign * radii[1] + ) / 2 + + elif keep_placement == Keep.INSIDE: + # Internal tangent to start + ref_radii = [radii[0] - r_sign * radius, radii[1] + r_sign * radius] + max_radius = ( + midline.length + r_sign * radii[0] - r_sign * radii[1] + ) / 2 + + if min_radius >= radius: raise ValueError( f"The arc radius is too small. Should be greater than {min_radius}." ) - min_radius = (midline.length + keep_sign * (radii[0] - radii[1])) / 2 - if keep_placement == Keep.INSIDE and min_radius >= radius: + if max_radius is not None and max_radius <= radius: raise ValueError( - f"The arc radius is too small. Should be greater than {min_radius}." + f"The arc radius is too large. Should be less than {max_radius}." ) # Method: # https://www.youtube.com/watch?v=-STj2SSv6TU + # For (*, OUTSIDE) Not completely overlapping # - the centerpoint of the inner arc is found by the intersection of the # arcs made by adding the inner radius to the point radii # - the centerpoint of the outer arc is found by the intersection of the # arcs made by subtracting the outer radius from the point radii # - then it's a matter of finding the points where the connecting lines # intersect the point circles + # Other placements and types vary construction radii local = [workplane.to_local_coords(p) for p in points] - if keep_placement == Keep.OUTSIDE: - ref_circles = [ - sympy.Circle( - sympy.Point(local[i].X, local[i].Y), keep_sign * radii[i] + radius - ) - for i in range(len(arcs)) - ] - else: - ref_circles = [ - sympy.Circle( - sympy.Point(local[0].X, local[0].Y), abs(radii[0] - keep_sign * radius) - ), - sympy.Circle( - sympy.Point(local[1].X, local[1].Y), abs(radii[1] + keep_sign * radius) - ) - ] + ref_circles = [ + sympy.Circle(sympy.Point(local[i].X, local[i].Y), ref_radii[i]) + for i in range(len(arcs)) + ] ref_intersections = ShapeList( [ @@ -1482,16 +1552,11 @@ class ArcArcTangentArc(BaseEdgeObject): for p in sympy.intersection(*ref_circles) ] ) - arc_center = ref_intersections.sort_by(Axis(points[0], normal))[0] - - if keep_placement == Keep.OUTSIDE: - factor = [keep_sign, keep_sign] - else: - factor = [-1, 1] if keep_type == Keep.INSIDE else [1, -1] + arc_center = ref_intersections.sort_by(Axis(points[0], normal))[pick_index] intersect = [ points[i] - + factor[i] * radii[i] * (Vector(arc_center) - points[i]).normalized() + + x_sign[i] * radii[i] * (Vector(arc_center) - points[i]).normalized() for i in range(len(arcs)) ] @@ -1503,7 +1568,10 @@ class ArcArcTangentArc(BaseEdgeObject): # Check and flip arc if not tangent start_circle = CenterArc(start_arc.arc_center, start_arc.radius, 0, 360) _, _, point = start_circle.distance_to_with_closest_points(arc) - if start_circle.tangent_at(point).cross(arc.tangent_at(point)).length > TOLERANCE: + if ( + start_circle.tangent_at(point).cross(arc.tangent_at(point)).length + > TOLERANCE + ): arc = RadiusArc(intersect[0], intersect[1], radius=-radius) super().__init__(arc, mode) From 5e4f4dbcb4f51d2418eebd2dfd06d16bbf253444 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 31 Jul 2025 16:51:23 -0400 Subject: [PATCH 368/518] AATA: add short_sag option --- src/build123d/objects_curve.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 3a4b3c2..c3d6d1c 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1376,9 +1376,9 @@ class ArcArcTangentArc(BaseEdgeObject): Create an arc tangent to two arcs and a radius. keep specifies tangent arc position with a Keep pair: (placement, type) - placement: start_arc is tangent INSIDE or OUTSIDE the tangent arc - BOTH is a special case for overlapping arcs with type INSIDE - type: tangent arc is INSIDE or OUTSIDE start_arc and end_arc + + - placement: start_arc is tangent INSIDE or OUTSIDE the tangent arc. BOTH is a special case for overlapping arcs with type INSIDE + - type: tangent arc is INSIDE or OUTSIDE start_arc and end_arc Args: start_arc (Curve | Edge | Wire): starting arc, must be GeomType.CIRCLE @@ -1388,6 +1388,8 @@ class ArcArcTangentArc(BaseEdgeObject): Defaults to Side.LEFT keep (Keep | tuple[Keep, Keep]): which tangent arc to keep, INSIDE or OUTSIDE. Defaults to (Keep.INSIDE, Keep.INSIDE) + short_sagitta (bool): If True selects the short sagitta (height of arc from + chord), else the long sagitta crossing the center. Defaults to True mode (Mode, optional): combination mode. Defaults to Mode.ADD """ @@ -1400,6 +1402,7 @@ class ArcArcTangentArc(BaseEdgeObject): radius: float, side: Side = Side.LEFT, keep: Keep | tuple[Keep, Keep] = (Keep.INSIDE, Keep.INSIDE), + short_sagitta: bool = True, mode: Mode = Mode.ADD, ): keep_placement, keep_type = tuplify(keep, 2) @@ -1476,7 +1479,6 @@ class ArcArcTangentArc(BaseEdgeObject): # Full Overlap pick_index = -1 if keep_placement == Keep.OUTSIDE: - print(1) # External tangent to start ref_radii = [radii[0] + r_sign * radius, radii[1] - r_sign * radius] min_radius = ( @@ -1487,7 +1489,6 @@ class ArcArcTangentArc(BaseEdgeObject): ) / 2 elif keep_placement == Keep.INSIDE: - print(2) # Internal tangent to start ref_radii = [abs(radii[0] - radius), abs(radii[1] - radius)] min_radius = (-midline.length + radii[0] + radii[1]) / 2 @@ -1563,7 +1564,9 @@ class ArcArcTangentArc(BaseEdgeObject): if side == Side.LEFT: intersect.reverse() - arc = RadiusArc(intersect[0], intersect[1], radius=radius) + arc = RadiusArc( + intersect[0], intersect[1], radius=radius, short_sagitta=short_sagitta + ) # Check and flip arc if not tangent start_circle = CenterArc(start_arc.arc_center, start_arc.radius, 0, 360) @@ -1572,6 +1575,8 @@ class ArcArcTangentArc(BaseEdgeObject): start_circle.tangent_at(point).cross(arc.tangent_at(point)).length > TOLERANCE ): - arc = RadiusArc(intersect[0], intersect[1], radius=-radius) + arc = RadiusArc( + intersect[0], intersect[1], radius=-radius, short_sagitta=short_sagitta + ) super().__init__(arc, mode) From eb488afcd3170b589bd287681e88e4ad52ecec71 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 31 Jul 2025 16:51:42 -0400 Subject: [PATCH 369/518] Add AATA keep table --- .../objects/arcarctangentarc_keep_table.png | Bin 0 -> 41045 bytes docs/objects.rst | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 docs/assets/objects/arcarctangentarc_keep_table.png diff --git a/docs/assets/objects/arcarctangentarc_keep_table.png b/docs/assets/objects/arcarctangentarc_keep_table.png new file mode 100644 index 0000000000000000000000000000000000000000..c659e69652c2f402d1a2872fbeadc4f984b37598 GIT binary patch literal 41045 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 z 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 UbIuDgFfcH9y85}Sb4q9e0IYttu>b%7 literal 0 HcmV?d00001 diff --git a/docs/objects.rst b/docs/objects.rst index 186ae18..5769b37 100644 --- a/docs/objects.rst +++ b/docs/objects.rst @@ -239,6 +239,10 @@ Reference .. autoclass:: ThreePointArc .. autoclass:: ArcArcTangentLine .. autoclass:: ArcArcTangentArc +.. image:: assets/objects/arcarctangentarc_keep_table.png + :alt: ArcArcTangentArc keep table + :align: center + .. autoclass:: PointArcTangentLine .. autoclass:: PointArcTangentArc From cd0763791ba6a903c1d35eea8652a6a3305edb95 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 31 Jul 2025 22:14:05 -0400 Subject: [PATCH 370/518] Fix pylint and mypy errors --- src/build123d/objects_curve.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index c3d6d1c..35a9f08 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -45,7 +45,7 @@ from build123d.build_enums import ( ) from build123d.build_line import BuildLine from build123d.geometry import Axis, Plane, Vector, VectorLike, TOLERANCE -from build123d.topology import Edge, Face, Wire, Curve, tuplify +from build123d.topology import Edge, Face, Wire, Curve from build123d.topology.shape_core import ShapeList @@ -1377,7 +1377,8 @@ class ArcArcTangentArc(BaseEdgeObject): keep specifies tangent arc position with a Keep pair: (placement, type) - - placement: start_arc is tangent INSIDE or OUTSIDE the tangent arc. BOTH is a special case for overlapping arcs with type INSIDE + - placement: start_arc is tangent INSIDE or OUTSIDE the tangent arc. BOTH is a + special case for overlapping arcs with type INSIDE - type: tangent arc is INSIDE or OUTSIDE start_arc and end_arc Args: @@ -1405,7 +1406,7 @@ class ArcArcTangentArc(BaseEdgeObject): short_sagitta: bool = True, mode: Mode = Mode.ADD, ): - keep_placement, keep_type = tuplify(keep, 2) + keep_placement, keep_type = (keep, keep) if isinstance(keep, Keep) else keep context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) @@ -1446,15 +1447,17 @@ class ArcArcTangentArc(BaseEdgeObject): if midline.length == sum(radii) and keep_type == Keep.INSIDE: raise ValueError( - "Cannot find tangent type Keep.INSIDE for non-overlapping arcs already tangent." + "Cannot find tangent type Keep.INSIDE for non-overlapping arcs " \ + "already tangent." ) if midline.length == abs(radii[0] - radii[1]) and keep_placement == Keep.INSIDE: raise ValueError( - "Cannot find tangent placement Keep.INSIDE for completely overlapping arcs already tangent." + "Cannot find tangent placement Keep.INSIDE for completely " \ + "overlapping arcs already tangent." ) - min_radius = 0 + min_radius = 0. max_radius = None r_sign = 1 if radii[0] < radii[1] else -1 x_sign = [1, 1] From 6d6084ce15c1f27e65d16cf014bea24f81ab89c1 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 31 Jul 2025 23:11:20 -0400 Subject: [PATCH 371/518] Update AATA svg creation --- docs/objects_1d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/objects_1d.py b/docs/objects_1d.py index f927aae..1d72359 100644 --- a/docs/objects_1d.py +++ b/docs/objects_1d.py @@ -303,7 +303,7 @@ with BuildLine() as arc_arc_tangent_arc: l1 = CenterArc((7, 3), 3, 0, 360) l2 = CenterArc((0, 8), 2, -90, 180) radius = 12 - l3 = ArcArcTangentArc(l1, l2, radius, Side.LEFT, Keep.OUTSIDE) + l3 = ArcArcTangentArc(l1, l2, radius, Side.LEFT, (Keep.INSIDE, Keep.OUTSIDE)) s = 100 / max(*arc_arc_tangent_arc.line.bounding_box().size) svg = ExportSVG(scale=s) svg.add_layer("dashed", line_type=LineType.ISO_DASH_SPACE) From ab6eaff52b1712412b298d6b0fe241ef4bd5890c Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 31 Jul 2025 23:18:18 -0400 Subject: [PATCH 372/518] AATA: Fix tests and addsome new. Likely incomplete --- src/build123d/objects_curve.py | 6 ++--- tests/test_build_line.py | 42 +++++++++++++++++++++++----------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 35a9f08..9ac3f69 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1412,13 +1412,13 @@ class ArcArcTangentArc(BaseEdgeObject): validate_inputs(context, self) if keep_placement == Keep.BOTH and keep_type != Keep.INSIDE: - raise ValueError("Start arc must have GeomType.CIRCLE.") - - if start_arc.geom_type != GeomType.CIRCLE: raise ValueError( "Keep.BOTH can only be used in configuration: (Keep.BOTH, Keep.INSIDE)" ) + if start_arc.geom_type != GeomType.CIRCLE: + raise ValueError("Start arc must have GeomType.CIRCLE.") + if end_arc.geom_type != GeomType.CIRCLE: raise ValueError("End arc must have GeomType.CIRCLE.") diff --git a/tests/test_build_line.py b/tests/test_build_line.py index d6c939b..a68d7ef 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -646,12 +646,10 @@ class BuildLineTests(unittest.TestCase): Considerations: - Should produce a GeomType.CIRCLE located on and tangent to arcs - Tangent arcs that share a side have arc centers on the same side of the midline - - LEFT arcs have centers to right of midline - - INSIDE lines should always have equal length as long as arcs are same distance - - OUTSIDE lines should always have equal length as long as arcs are same distance + - LEFT arcs have centers to left of midline (for (INSIDE, *) case, non overlapping)) + - Mirrored arcs should always have equal length as long as arcs are same distance - Tangent should be GeomType.CIRCLE - Arcs must be coplanar - - Cannot make tangent for radius under certain size - Cannot make tangent for concentric arcs """ # Test line properties in algebra mode @@ -665,7 +663,8 @@ class BuildLineTests(unittest.TestCase): end_arc = CenterArc(end_point, end_r, 0, 360) radius = 15 lines = [] - for keep in [Keep.INSIDE, Keep.OUTSIDE]: + for keep_placement in [Keep.INSIDE, Keep.OUTSIDE]: + keep = (keep_placement, Keep.OUTSIDE) for side in [Side.LEFT, Side.RIGHT]: l1 = ArcArcTangentArc(start_arc, end_arc, radius, side=side, keep=keep) self.assertEqual(l1.geom_type, GeomType.CIRCLE) @@ -699,18 +698,18 @@ class BuildLineTests(unittest.TestCase): start_arc = CenterArc(point_arc @ (point / 16), start_r, 0, 360) mid_vector = end_center - start_center mid_perp = mid_vector.cross(workplane.z_dir) - for keep in [Keep.INSIDE, Keep.OUTSIDE]: + for keep_placement in [Keep.INSIDE, Keep.OUTSIDE]: + keep = (keep_placement, Keep.OUTSIDE) for side in [Side.LEFT, Side.RIGHT]: l2 = ArcArcTangentArc( start_arc, end_arc, radius, side=side, keep=keep ) - # Check length against algebraic length - if keep == Keep.INSIDE: - self.assertAlmostEqual(lines[0].length, l2.length, 5) - side_sign = 1 - elif keep == Keep.OUTSIDE: + if keep_placement == Keep.OUTSIDE: self.assertAlmostEqual(lines[2].length, l2.length, 5) + side_sign = 1 + elif keep_placement == Keep.INSIDE: + self.assertAlmostEqual(lines[0].length, l2.length, 5) side_sign = -1 # Check side of midline @@ -720,7 +719,6 @@ class BuildLineTests(unittest.TestCase): if side == Side.LEFT: self.assertLess(side_sign * coincident_dir, 0) self.assertLess(center_dir, 0) - elif side == Side.RIGHT: self.assertGreater(side_sign * coincident_dir, 0) self.assertGreater(center_dir, 0) @@ -728,7 +726,8 @@ class BuildLineTests(unittest.TestCase): # Verify arc is tangent for a reversed start arc c1 = CenterArc((0, 80), 40, 0, -180) c2 = CenterArc((80, 0), 40, 90, 180) - arc = ArcArcTangentArc(c1, c2, 25, side=Side.RIGHT) + keep = (Keep.OUTSIDE, Keep.OUTSIDE) + arc = ArcArcTangentArc(c1, c2, 25, side=Side.RIGHT, keep=keep) _, _, point = c1.distance_to_with_closest_points(arc) self.assertAlmostEqual( c1.tangent_at(point).cross(arc.tangent_at(point)).length, 0, 5 @@ -737,6 +736,7 @@ class BuildLineTests(unittest.TestCase): ## Error Handling start_arc = CenterArc(start_point, start_r, 0, 360) end_arc = CenterArc(end_point, end_r, 0, 360) + # GeomType bad_type = Line((0, 0), (0, 10)) with self.assertRaises(ValueError): @@ -745,10 +745,26 @@ class BuildLineTests(unittest.TestCase): with self.assertRaises(ValueError): ArcArcTangentArc(bad_type, end_arc, radius) + # Keep.BOTH + with self.assertRaises(ValueError): + ArcArcTangentArc(bad_type, end_arc, radius, keep=(Keep.BOTH, Keep.OUTSIDE)) + # Coplanar with self.assertRaises(ValueError): ArcArcTangentArc(CenterArc((0, 0, 1), 5, 0, 360), end_arc, radius) + # Coincidence (already tangent) + with self.assertRaises(ValueError): + ArcArcTangentArc(start_arc, CenterArc((0, 2 * start_r), start_r, 0, 360), 3) + + with self.assertRaises(ValueError): + ArcArcTangentArc(start_arc, CenterArc(start_point, start_r, 0, 360), 3) + + with self.assertRaises(ValueError): + ArcArcTangentArc( + start_arc, CenterArc((0, end_r - start_r), end_r, 0, 360), 3 + ) + # Radius size with self.assertRaises(ValueError): r = (separation - (start_r + end_r)) / 2 - 1 From 6dd89cf004aba5332bfee9f5d79a128c7cfa0368 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 1 Aug 2025 15:49:26 -0400 Subject: [PATCH 373/518] AATA: Add test matrix to spot check min/max limits, tangency for each condition --- src/build123d/objects_curve.py | 18 ++++---- tests/test_build_line.py | 82 ++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 12 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 9ac3f69..dde1928 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1377,7 +1377,7 @@ class ArcArcTangentArc(BaseEdgeObject): keep specifies tangent arc position with a Keep pair: (placement, type) - - placement: start_arc is tangent INSIDE or OUTSIDE the tangent arc. BOTH is a + - placement: start_arc is tangent INSIDE or OUTSIDE the tangent arc. BOTH is a special case for overlapping arcs with type INSIDE - type: tangent arc is INSIDE or OUTSIDE start_arc and end_arc @@ -1432,13 +1432,14 @@ class ArcArcTangentArc(BaseEdgeObject): else: workplane = copy_module.copy(WorkplaneList._get_context().workplanes[0]) - side_sign = 1 if side == Side.LEFT else -1 - keep_sign = 1 if keep_placement == Keep.OUTSIDE else -1 arcs = [start_arc, end_arc] points = [arc.arc_center for arc in arcs] radii = [arc.radius for arc in arcs] + side_sign = 1 if side == Side.LEFT else -1 + keep_sign = 1 if keep_placement == Keep.OUTSIDE else -1 + r_sign = 1 if radii[0] < radii[1] else -1 - # make a normal vector for sorting intersections + # Make a normal vector for sorting intersections midline = points[1] - points[0] normal = side_sign * midline.cross(workplane.z_dir) @@ -1447,19 +1448,19 @@ class ArcArcTangentArc(BaseEdgeObject): if midline.length == sum(radii) and keep_type == Keep.INSIDE: raise ValueError( - "Cannot find tangent type Keep.INSIDE for non-overlapping arcs " \ + "Cannot find tangent type Keep.INSIDE for non-overlapping arcs " "already tangent." ) if midline.length == abs(radii[0] - radii[1]) and keep_placement == Keep.INSIDE: raise ValueError( - "Cannot find tangent placement Keep.INSIDE for completely " \ + "Cannot find tangent placement Keep.INSIDE for completely " "overlapping arcs already tangent." ) - min_radius = 0. + # Set following parameters based on overlap condition and keep configuration + min_radius = 0.0 max_radius = None - r_sign = 1 if radii[0] < radii[1] else -1 x_sign = [1, 1] pick_index = 0 if midline.length > abs(radii[0] - radii[1]) and keep_type == Keep.OUTSIDE: @@ -1558,6 +1559,7 @@ class ArcArcTangentArc(BaseEdgeObject): ) arc_center = ref_intersections.sort_by(Axis(points[0], normal))[pick_index] + # x_sign determines if tangent is near side or far side of circle intersect = [ points[i] + x_sign[i] * radii[i] * (Vector(arc_center) - points[i]).normalized() diff --git a/tests/test_build_line.py b/tests/test_build_line.py index a68d7ef..01c2fbe 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -652,6 +652,7 @@ class BuildLineTests(unittest.TestCase): - Arcs must be coplanar - Cannot make tangent for concentric arcs """ + # Test line properties in algebra mode start_r = 2 end_r = 5 @@ -765,10 +766,83 @@ class BuildLineTests(unittest.TestCase): start_arc, CenterArc((0, end_r - start_r), end_r, 0, 360), 3 ) - # Radius size - with self.assertRaises(ValueError): - r = (separation - (start_r + end_r)) / 2 - 1 - ArcArcTangentArc(CenterArc((0, 0, 1), 5, 0, 360), end_arc, r) + ## Spot check all conditions + r1, r2 = 3, 8 + start_center = (0, 0) + start_arc = CenterArc(start_center, r1, 0, 360) + + end_y = { + "no_overlap": (r1 + r2) * 1.1, + "partial_overlap": (r1 + r2) / 2, + "full_overlap": (r2 - r1) * 0.9, + } + + # Test matrix: + # (separation, keep pair, [min_limit, max_limit]) + # actual limit will be (separation + min_limit) / 2 + cases = [ + (end_y["no_overlap"], (Keep.INSIDE, Keep.INSIDE), [r1 - r2, None]), + (end_y["no_overlap"], (Keep.OUTSIDE, Keep.INSIDE), [-r1 + r2, None]), + (end_y["no_overlap"], (Keep.INSIDE, Keep.OUTSIDE), [r1 + r2, None]), + (end_y["no_overlap"], (Keep.OUTSIDE, Keep.OUTSIDE), [-r1 - r2, None]), + (end_y["partial_overlap"], (Keep.INSIDE, Keep.INSIDE), [None, r1 - r2]), + (end_y["partial_overlap"], (Keep.OUTSIDE, Keep.INSIDE), [None, -r1 + r2]), + (end_y["partial_overlap"], (Keep.BOTH, Keep.INSIDE), [None, r1 + r2]), + (end_y["partial_overlap"], (Keep.INSIDE, Keep.OUTSIDE), [r1 + r2, None]), + (end_y["partial_overlap"], (Keep.OUTSIDE, Keep.OUTSIDE), [None, None]), + (end_y["full_overlap"], (Keep.INSIDE, Keep.INSIDE), [r1 + r2, r1 + r2]), + (end_y["full_overlap"], (Keep.OUTSIDE, Keep.INSIDE), [-r1 + r2, -r1 + r2]), + ] + + # Check min and max radii, tangency + for case in cases: + end_center = (0, case[0]) + end_arc = CenterArc(end_center, r2, 0, 360) + + flip_max = -1 if case[1] == (Keep.BOTH, Keep.INSIDE) else 1 + flip_min = -1 if case[0] == end_y["full_overlap"] else 1 + + min_r = 0 if case[2][0] is None else (flip_min * case[0] + case[2][0]) / 2 + max_r = 1e6 if case[2][1] is None else (flip_max * case[0] + case[2][1]) / 2 + + print(case[1], min_r, max_r, case[0]) + print(min_r + 0.01, min_r * 0.99, max_r - 0.01, max_r + 0.01) + print((case[0] - 1 * (r1 + r2)) / 2) + + # Greater than min + l1 = ArcArcTangentArc(start_arc, end_arc, min_r + 0.01, keep=case[1]) + _, p1, p2 = start_arc.distance_to_with_closest_points(l1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + start_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + _, p1, p2 = end_arc.distance_to_with_closest_points(l1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + end_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + + # Less than max + l1 = ArcArcTangentArc(start_arc, end_arc, max_r - 0.01, keep=case[1]) + _, p1, p2 = start_arc.distance_to_with_closest_points(l1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + start_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + _, p1, p2 = end_arc.distance_to_with_closest_points(l1) + self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) + self.assertAlmostEqual( + end_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 + ) + + # Less than min + with self.assertRaises(ValueError): + ArcArcTangentArc(start_arc, end_arc, min_r * 0.99, keep=case[1]) + + # Greater than max + if max_r != 1e6: + with self.assertRaises(ValueError): + ArcArcTangentArc(start_arc, end_arc, max_r + 0.01, keep=case[1]) def test_line_with_list(self): """Test line with a list of points""" From e766ba96cc73a1372482259ff64e601e7538493e Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 1 Aug 2025 17:10:03 -0400 Subject: [PATCH 374/518] Make BaseEdgeObject additions private to avoid adding to context. --- src/build123d/objects_curve.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index dde1928..e71e871 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1570,18 +1570,28 @@ class ArcArcTangentArc(BaseEdgeObject): intersect.reverse() arc = RadiusArc( - intersect[0], intersect[1], radius=radius, short_sagitta=short_sagitta + intersect[0], + intersect[1], + radius=radius, + short_sagitta=short_sagitta, + mode=Mode.PRIVATE, ) # Check and flip arc if not tangent - start_circle = CenterArc(start_arc.arc_center, start_arc.radius, 0, 360) + start_circle = CenterArc( + start_arc.arc_center, start_arc.radius, 0, 360, mode=Mode.PRIVATE + ) _, _, point = start_circle.distance_to_with_closest_points(arc) if ( start_circle.tangent_at(point).cross(arc.tangent_at(point)).length > TOLERANCE ): arc = RadiusArc( - intersect[0], intersect[1], radius=-radius, short_sagitta=short_sagitta + intersect[0], + intersect[1], + radius=-radius, + short_sagitta=short_sagitta, + mode=Mode.PRIVATE, ) super().__init__(arc, mode) From 815f30abbfb345b3119d5e7bf7d2d813458c5c89 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 1 Aug 2025 18:21:43 -0400 Subject: [PATCH 375/518] Check TOLERANCE instead of strict equality --- src/build123d/objects_curve.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index e71e871..3ea3adf 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1443,16 +1443,19 @@ class ArcArcTangentArc(BaseEdgeObject): midline = points[1] - points[0] normal = side_sign * midline.cross(workplane.z_dir) - if midline.length == 0: + if midline.length < TOLERANCE: raise ValueError("Cannot find tangent for concentric arcs.") - if midline.length == sum(radii) and keep_type == Keep.INSIDE: + if abs(midline.length - sum(radii)) < TOLERANCE and keep_type == Keep.INSIDE: raise ValueError( "Cannot find tangent type Keep.INSIDE for non-overlapping arcs " "already tangent." ) - if midline.length == abs(radii[0] - radii[1]) and keep_placement == Keep.INSIDE: + if ( + abs(midline.length - abs(radii[0] - radii[1])) < TOLERANCE + and keep_placement == Keep.INSIDE + ): raise ValueError( "Cannot find tangent placement Keep.INSIDE for completely " "overlapping arcs already tangent." From 13dd4da6a060b3c91bd8d6c954b7a0904859b4a9 Mon Sep 17 00:00:00 2001 From: Manuel Tancoigne Date: Mon, 4 Aug 2025 22:24:37 +0200 Subject: [PATCH 376/518] Add link to bd_beams_and_bars to external tools --- docs/external.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/external.rst b/docs/external.rst index cdadde8..ac13250 100644 --- a/docs/external.rst +++ b/docs/external.rst @@ -72,6 +72,13 @@ Parts available include: See: `bd_warehouse `_ +bd_beams_and_bars +================= + +2D sections and 3D beams generation (UPN, IPN, UPE, flat bars, ...) + +See: `bd_beams_and_bars _` + Superellipses & Superellipsoids =============================== From fd40c91227beacecb29b678235788e99eed85674 Mon Sep 17 00:00:00 2001 From: Manuel Tancoigne Date: Tue, 5 Aug 2025 20:34:38 +0200 Subject: [PATCH 377/518] Fix link format in external tools docs --- docs/external.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/external.rst b/docs/external.rst index ac13250..85f7723 100644 --- a/docs/external.rst +++ b/docs/external.rst @@ -77,7 +77,7 @@ bd_beams_and_bars 2D sections and 3D beams generation (UPN, IPN, UPE, flat bars, ...) -See: `bd_beams_and_bars _` +See: `bd_beams_and_bars `_ Superellipses & Superellipsoids =============================== From e32799dd6f52ae340d717d102c72f18c617638dd Mon Sep 17 00:00:00 2001 From: Elle Kaplan Date: Wed, 6 Aug 2025 02:07:24 -0400 Subject: [PATCH 378/518] add ability to do perspective projection --- src/build123d/topology/one_d.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index a17ff24..ff75d64 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -920,6 +920,7 @@ class Mixin1D(Shape): viewport_origin: VectorLike, viewport_up: VectorLike = (0, 0, 1), look_at: VectorLike | None = None, + focus: float | None = None, ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: """project_to_viewport @@ -931,6 +932,8 @@ class Mixin1D(Shape): Defaults to (0, 0, 1). look_at (VectorLike, optional): point to look at. Defaults to None (center of shape). + focus (float, optional): the focal length for perspective projection + Defaults to None (orthographic projection) Returns: tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges @@ -963,7 +966,11 @@ class Mixin1D(Shape): gp_Ax1(viewport_origin.to_pnt(), projection_dir.to_dir()) ) camera_coordinate_system.SetYDirection(viewport_up.to_dir()) - projector = HLRAlgo_Projector(camera_coordinate_system) + projector = ( + HLRAlgo_Projector(camera_coordinate_system, focus) + if focus + else HLRAlgo_Projector(camera_coordinate_system) + ) hidden_line_removal.Projector(projector) hidden_line_removal.Update() From d0284abbb3aa3e25d1aaba663f31c546e60b91c1 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 11 Aug 2025 11:18:02 -0500 Subject: [PATCH 379/518] operations_part.py -> reset `pending_edges` for `make_brake_formed` --- src/build123d/operations_part.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index 7a196f7..1ac1043 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -423,6 +423,7 @@ def make_brake_formed( if context is not None: context._add_to_context(new_solid, clean=clean, mode=mode) + context.pending_edges = ShapeList() elif clean: new_solid = new_solid.clean() From 377ec3a40bbb7a50f2766bec8b2c9db876c90ad5 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 11 Aug 2025 20:43:10 -0400 Subject: [PATCH 380/518] Add ColorLike and update Color overloads accordingly - add css3 color support through webcolors - replace color_tuple - restructure input branching --- pyproject.toml | 1 + src/build123d/geometry.py | 213 ++++++++++++++++++---------- tests/test_direct_api/test_color.py | 86 +++++++++-- 3 files changed, 213 insertions(+), 87 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f0aca33..0a2c87a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,7 @@ dependencies = [ "trianglesolver", "sympy", "scipy", + "webcolors ~= 24.8.0", ] [project.urls] diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 81f4075..29494d8 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -44,6 +44,7 @@ from math import degrees, isclose, log10, pi, radians from typing import TYPE_CHECKING, Any, TypeAlias, overload import numpy as np +import webcolors # type: ignore from OCP.Bnd import Bnd_Box, Bnd_OBB from OCP.BRep import BRep_Tool from OCP.BRepBndLib import BRepBndLib @@ -1146,22 +1147,33 @@ class Color: """ @overload - def __init__(self, q_color: Quantity_ColorRGBA): - """Color from OCCT color object + def __init__(self, color_like: ColorLike): + """Color from ColorLike Args: - name (Quantity_ColorRGBA): q_color + color_like (ColorLike): + name, ex: "red", + name + alpha, ex: ("red", 0.5), + rgb, ex: (1., 0., 0.), + rgb + alpha, ex: (1., 0., 0., 0.5), + hex, ex: 0xff0000, + hex + alpha, ex: (0xff0000, 0x80), + Quantity_ColorRGBA """ @overload def __init__(self, name: str, alpha: float = 1.0): """Color from name + `CSS3 Color Names + ` + `OCCT Color Names `_ Args: name (str): color, e.g. "blue" + alpha (float, optional): 0.0 <= alpha <= 1.0. Defaults to 1.0 """ @overload @@ -1172,15 +1184,7 @@ class Color: red (float): 0.0 <= red <= 1.0 green (float): 0.0 <= green <= 1.0 blue (float): 0.0 <= blue <= 1.0 - alpha (float, optional): 0.0 <= alpha <= 1.0. Defaults to 0.0. - """ - - @overload - def __init__(self, color_tuple: tuple[float]): - """Color from a 3 or 4 tuple of float values - - Args: - color_tuple (tuple[float]): _description_ + alpha (float, optional): 0.0 <= alpha <= 1.0. Defaults to 1.0 """ @overload @@ -1193,68 +1197,77 @@ class Color: """ def __init__(self, *args, **kwargs): - # pylint: disable=too-many-branches - red, green, blue, alpha, color_tuple, name, color_code, q_color = ( - 1.0, - 1.0, - 1.0, - 1.0, - None, - None, - None, - None, - ) - if len(args) == 1 and isinstance(args[0], tuple): - red, green, blue, alpha = args[0] + (1.0,) * (4 - len(args[0])) - elif len(args) == 1 or len(args) == 2: - if isinstance(args[0], Quantity_ColorRGBA): - q_color = args[0] - elif isinstance(args[0], int): - color_code = args[0] - alpha = args[1] if len(args) == 2 else 0xFF - elif isinstance(args[0], str): - name = args[0] - if len(args) == 2: - alpha = args[1] - elif len(args) >= 3: - red, green, blue = args[0:3] # pylint: disable=unbalanced-tuple-unpacking - if len(args) == 4: - alpha = args[3] - - color_code = kwargs.get("color_code", color_code) - red = kwargs.get("red", red) - green = kwargs.get("green", green) - blue = kwargs.get("blue", blue) - color_tuple = kwargs.get("color_tuple", color_tuple) - - if color_code is None: - alpha = kwargs.get("alpha", alpha) - else: - alpha = kwargs.get("alpha", alpha) - alpha = alpha / 255 - - if color_code is not None and isinstance(color_code, int): - red, remainder = divmod(color_code, 256**2) - green, blue = divmod(remainder, 256) - red = red / 255 - green = green / 255 - blue = blue / 255 - - if color_tuple is not None: - red, green, blue, alpha = color_tuple + (1.0,) * (4 - len(color_tuple)) - - if q_color is not None: - self.wrapped = q_color - elif name: - self.wrapped = Quantity_ColorRGBA() - exists = Quantity_ColorRGBA.ColorFromName_s(args[0], self.wrapped) - if not exists: - raise ValueError(f"Unknown color name: {name}") - self.wrapped.SetAlpha(alpha) - else: - self.wrapped = Quantity_ColorRGBA(red, green, blue, alpha) - + self.wrapped = None self.iter_index = 0 + red, green, blue, alpha, name, color_code = (1.0, 1.0, 1.0, 1.0, None, None) + default_rgb = (red, green, blue, alpha) + + # Conform inputs to complete color_like tuples + # color_like does not use other kwargs or args, but benefits from conformity + color_like = kwargs.get("color_like", None) + if color_like is not None: + args = (color_like,) + + if args: + args = args[0] if isinstance(args[0], tuple) else args + + # Fills missing defaults from b if a is short + def fill_defaults(a, b): + return tuple(a[i] if i < len(a) else b[i] for i in range(len(b))) + + if args: + if len(args) >= 3: + red, green, blue, alpha = fill_defaults(args, default_rgb) + else: + match args[0]: + case Quantity_ColorRGBA(): + # Nothing else to do here + self.wrapped = args[0] + return + case str(): + name, alpha = fill_defaults(args, (name, alpha)) + case int(): + color_code, alpha = fill_defaults(args, (color_code, alpha)) + case float(): + red, green, blue, alpha = fill_defaults(args, default_rgb) + case _: + raise TypeError(f"Unsupported color definition: {args}") + + # Replace positional values with kwargs unless from color_like + if color_like is None: + name = kwargs.get("name", name) + color_code = kwargs.get("color_code", color_code) + red = kwargs.get("red", red) + green = kwargs.get("green", green) + blue = kwargs.get("blue", blue) + alpha = kwargs.get("alpha", alpha) + + if name: + color_format = (name, alpha) + elif color_code: + color_format = (color_code, alpha) + else: + color_format = (red, green, blue, alpha) + + # Convert color_format to rgb + match color_format: + case (name, a) if isinstance(name, str) and isinstance(a, (float, int)): + red, green, blue = Color._rgb_from_str(name) + alpha = a + case (hexa, a) if isinstance(hexa, int) and isinstance(a, (float, int)): + red, green, blue = Color._rgb_from_int(hexa) + if a != 1: + # alpha == 1 is special case as default, don't divide + alpha = a / 0xFF + case (red, green, blue, alpha) if all( + isinstance(c, (int, float)) for c in (red, green, blue, alpha) + ): + pass + case _: + raise TypeError(f"Unsupported color definition: {color_format}") + + if not self.wrapped: + self.wrapped = Quantity_ColorRGBA(red, green, blue, alpha) def __iter__(self): """Initialize to beginning""" @@ -1292,14 +1305,60 @@ class Color: def __str__(self) -> str: """Generate string""" - quantity_color_enum = self.wrapped.GetRGB().Name() - quantity_color_str = Quantity_Color.StringName_s(quantity_color_enum) - return f"Color: {str(tuple(self))} ~ {quantity_color_str}" + rgb = self.wrapped.GetRGB() + rgb = (rgb.Red(), rgb.Green(), rgb.Blue()) + try: + name = webcolors.rgb_to_name([int(c * 255) for c in rgb]) + qualifier = "is" + except ValueError: + # This still uses OCCT X11 colors instead of css3 + quantity_color_enum = self.wrapped.GetRGB().Name() + name = Quantity_Color.StringName_s(quantity_color_enum) + qualifier = "near" + return f"Color: {str(tuple(self))} {qualifier} {name.upper()!r}" def __repr__(self) -> str: """Color repr""" return f"Color{str(tuple(self))}" + @staticmethod + def _rgb_from_int(triplet: int) -> tuple[float, float, float]: + red, remainder = divmod(triplet, 256**2) + green, blue = divmod(remainder, 256) + return red / 255, green / 255, blue / 255 + + @staticmethod + def _rgb_from_str(name: str) -> tuple: + if "#" not in name: + try: + # Use css3 color names by default + triplet = webcolors.name_to_rgb(name) + except ValueError as exc: + # Fall back to OCCT/X11 color names + color = Quantity_Color() + exists = Quantity_Color.ColorFromName_s(name, color) + if not exists: + raise ValueError( + f"{name!r} is not defined as a named color in CSS3 or OCCT/X11" + ) from exc + return (color.Red(), color.Green(), color.Blue()) + else: + triplet = webcolors.hex_to_rgb(name) + return tuple(i / 255 for i in tuple(triplet)) + + +ColorLike: TypeAlias = ( + str # name, ex: "red" + | tuple[str, float | int] # name + alpha, ex: ("red", 0.5) + | tuple[float | int, float | int, float | int] # rgb, ex: (1, 0, 0) + | tuple[ + float | int, float | int, float | int, float | int + ] # rgb + alpha, ex: (1, 0, 0, 0.5) + | int # hex, ex: 0xff0000 + | tuple[int, int] # hex + alpha, ex: (0xff0000, 0x80) + | Quantity_ColorRGBA # OCP color +) + class GeomEncoder(json.JSONEncoder): """ @@ -1346,7 +1405,7 @@ class GeomEncoder(json.JSONEncoder): return {"Color": tuple(o)} if isinstance(o, Location): tup = tuple(o) - return {f"Location": (tuple(tup[0]), tuple(tup[1]))} + return {"Location": (tuple(tup[0]), tuple(tup[1]))} if isinstance(o, Plane): return {"Plane": (tuple(o.origin), tuple(o.x_dir), tuple(o.z_dir))} if isinstance(o, Vector): diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py index 6bd6b8f..cc9e328 100644 --- a/tests/test_direct_api/test_color.py +++ b/tests/test_direct_api/test_color.py @@ -31,9 +31,11 @@ import unittest import numpy as np from build123d.geometry import Color +from OCP.Quantity import Quantity_ColorRGBA class TestColor(unittest.TestCase): + # name + alpha overload def test_name1(self): c = Color("blue") np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) @@ -46,6 +48,7 @@ class TestColor(unittest.TestCase): c = Color("blue", 0.5) np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) + # red + green + blue + alpha overload def test_rgb0(self): c = Color(0.0, 1.0, 0.0) np.testing.assert_allclose(tuple(c), (0, 1, 0, 1), 1e-5) @@ -65,14 +68,7 @@ class TestColor(unittest.TestCase): c = Color(red=0.1, green=0.2, blue=0.3, alpha=0.5) np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.5), 1e-5) - def test_bad_color_name(self): - with self.assertRaises(ValueError): - Color("build123d") - - def test_to_tuple(self): - c = Color("blue", alpha=0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) - + # hex (int) + alpha overload def test_hex(self): c = Color(0x996692) np.testing.assert_allclose( @@ -98,6 +94,11 @@ class TestColor(unittest.TestCase): c = Color(0, 0, 1, 1) np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) + # Methods + def test_to_tuple(self): + c = Color("blue", alpha=0.5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) + def test_copy(self): c = Color(0.1, 0.2, 0.3, alpha=0.4) c_copy = copy.copy(c) @@ -105,9 +106,13 @@ class TestColor(unittest.TestCase): def test_str_repr(self): c = Color(1, 0, 0) - self.assertEqual(str(c), "Color: (1.0, 0.0, 0.0, 1.0) ~ RED") + self.assertEqual(str(c), "Color: (1.0, 0.0, 0.0, 1.0) is 'RED'") self.assertEqual(repr(c), "Color(1.0, 0.0, 0.0, 1.0)") + c = Color(1, .5, 0) + self.assertEqual(str(c), "Color: (1.0, 0.5, 0.0, 1.0) near 'DARKGOLDENROD1'") + self.assertEqual(repr(c), "Color(1.0, 0.5, 0.0, 1.0)") + def test_tuple(self): c = Color((0.1,)) np.testing.assert_allclose(tuple(c), (0.1, 1.0, 1.0, 1.0), 1e-5) @@ -117,9 +122,70 @@ class TestColor(unittest.TestCase): np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 1.0), 1e-5) c = Color((0.1, 0.2, 0.3, 0.4)) np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) - c = Color(color_tuple=(0.1, 0.2, 0.3, 0.4)) + c = Color(color_like=(0.1, 0.2, 0.3, 0.4)) np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) + # color_like overload + def test_color_like(self): + red_color_likes = [ + Quantity_ColorRGBA(1, 0, 0, 1), + "red", + ("red",), + ("red", 1), + "#ff0000", + ("#ff0000",), + ("#ff0000", 1), + 0xff0000, + (0xff0000), + (0xff0000, 0xff), + (1, 0, 0), + (1, 0, 0, 1), + (1., 0., 0.), + (1., 0., 0., 1.) + ] + expected = (1, 0, 0, 1) + for cl in red_color_likes: + np.testing.assert_allclose(tuple(Color(cl)), expected, 1e-5) + np.testing.assert_allclose(tuple(Color(color_like=cl)), expected, 1e-5) + + incomplete_color_likes = [ + (1., (1, 1, 1, 1)), + ((1.,), (1, 1, 1, 1)), + ((1., 0.), (1, 0, 1, 1)), + ] + for cl, expected in incomplete_color_likes: + np.testing.assert_allclose(tuple(Color(cl)), expected, 1e-5) + np.testing.assert_allclose(tuple(Color(color_like=cl)), expected, 1e-5) + + alpha_color_likes = [ + Quantity_ColorRGBA(1, 0, 0, 0.6), + ("red", 0.6), + ("#ff0000", 0.6), + (0xff0000, 153), + (1., 0., 0., 0.6) + ] + expected = (1, 0, 0, 0.6) + for cl in alpha_color_likes: + np.testing.assert_allclose(tuple(Color(cl)), expected, 1e-5) + np.testing.assert_allclose(tuple(Color(color_like=cl)), expected, 1e-5) + + # Exceptions + def test_bad_color_name(self): + with self.assertRaises(ValueError): + Color("build123d") + + def test_bad_color_type(self): + with self.assertRaises(TypeError): + Color(dict({"name": "red", "alpha": 1})) + + with self.assertRaises(TypeError): + Color("red", "blue") + + with self.assertRaises(TypeError): + Color(1., "blue") + + with self.assertRaises(TypeError): + Color(1, "blue") if __name__ == "__main__": unittest.main() From 847f4f5f7c1f661cace340ee8d1b6f3c89ad8c00 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 11 Aug 2025 21:17:37 -0400 Subject: [PATCH 381/518] Add Color to ColorLike --- src/build123d/geometry.py | 6 +++++- tests/test_direct_api/test_color.py | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 29494d8..960f4ae 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1158,6 +1158,7 @@ class Color: rgb + alpha, ex: (1., 0., 0., 0.5), hex, ex: 0xff0000, hex + alpha, ex: (0xff0000, 0x80), + Color, Quantity_ColorRGBA """ @@ -1220,8 +1221,10 @@ class Color: red, green, blue, alpha = fill_defaults(args, default_rgb) else: match args[0]: + case Color(): + self.wrapped = args[0].wrapped + return case Quantity_ColorRGBA(): - # Nothing else to do here self.wrapped = args[0] return case str(): @@ -1356,6 +1359,7 @@ ColorLike: TypeAlias = ( ] # rgb + alpha, ex: (1, 0, 0, 0.5) | int # hex, ex: 0xff0000 | tuple[int, int] # hex + alpha, ex: (0xff0000, 0x80) + | Color | Quantity_ColorRGBA # OCP color ) diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py index cc9e328..cced7e5 100644 --- a/tests/test_direct_api/test_color.py +++ b/tests/test_direct_api/test_color.py @@ -149,6 +149,7 @@ class TestColor(unittest.TestCase): np.testing.assert_allclose(tuple(Color(color_like=cl)), expected, 1e-5) incomplete_color_likes = [ + (Color(), (1, 1, 1, 1)), (1., (1, 1, 1, 1)), ((1.,), (1, 1, 1, 1)), ((1., 0.), (1, 0, 1, 1)), From 4341d8a399ab1b21dfb711114ec5dba716f7547b Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 11 Aug 2025 21:43:51 -0400 Subject: [PATCH 382/518] Add ColorLike to Shape.color handling --- src/build123d/topology/shape_core.py | 11 +++++++---- tests/test_direct_api/test_shape.py | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index a7abb07..69d0e44 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -137,6 +137,7 @@ from build123d.geometry import ( Axis, BoundBox, Color, + ColorLike, Location, Matrix, OrientedBoundBox, @@ -249,6 +250,8 @@ class Shape(NodeMixin, Generic[TOPODS]): Transition.RIGHT: BRepBuilderAPI_RightCorner, } + _color: Color | None + class _DisplayNode(NodeMixin): """Used to create anytree structures from TopoDS_Shapes""" @@ -281,7 +284,7 @@ class Shape(NodeMixin, Generic[TOPODS]): self, obj: TopoDS_Shape | None = None, label: str = "", - color: Color | None = None, + color: Color | ColorLike | None = None, parent: Compound | None = None, ): self.wrapped: TOPODS | None = ( @@ -289,7 +292,7 @@ class Shape(NodeMixin, Generic[TOPODS]): ) self.for_construction = False self.label = label - self._color = color + self.color = color # parent must be set following children as post install accesses children self.parent = parent @@ -336,9 +339,9 @@ class Shape(NodeMixin, Generic[TOPODS]): return node_color @color.setter - def color(self, value): + def color(self, value: Color | ColorLike | None) -> None: """Set the shape's color""" - self._color = value + self._color = Color(value) if value is not None else None @property def geom_type(self) -> GeomType: diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 715680b..ae74227 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -450,11 +450,13 @@ class TestShape(unittest.TestCase): b = Box(1, 1, 1).locate(Pos(2, 2, 0)) b.color = Color("blue") # Blue c = Cylinder(1, 1).locate(Pos(-2, 2, 0)) + c.color = "red" a = Compound(children=[b, c]) a.color = Color(0, 1, 0) - # Check that assigned colors stay and iheritance works + # Check that assigned colors stay and inheritance works np.testing.assert_allclose(tuple(a.color), (0, 1, 0, 1), 1e-5) np.testing.assert_allclose(tuple(b.color), (0, 0, 1, 1), 1e-5) + np.testing.assert_allclose(tuple(c.color), (1, 0, 0, 1), 1e-5) def test_ocp_section(self): # Vertex From 16abcafa6dbf24c98f2dbc2a9517ac090f06b5e2 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 12 Aug 2025 23:23:05 -0400 Subject: [PATCH 383/518] Fix color setter in step import which could receive None in tests (despite the lack of None typing). Other color setters more explicitly return rgba so should be safe. --- src/build123d/importers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/importers.py b/src/build123d/importers.py index 73be5a7..55d1d42 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -201,7 +201,7 @@ def import_step(filename: PathLike | str | bytes) -> Compound: else: sub_shape = topods_lut[type(sub_topo_shape)](sub_topo_shape) - sub_shape.color = Color(get_color(sub_topo_shape)) + sub_shape.color = get_color(sub_topo_shape) sub_shape.label = get_name(ref_tdf_label) sub_shape.move(Location(shape_tool.GetLocation_s(sub_tdf_label))) From e6cc2c6c0eaf5b87a60a7c4715c2f566053796cd Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 13 Aug 2025 12:34:08 -0400 Subject: [PATCH 384/518] Color: Strip string input and remove redundant Color | ColorLike typing --- src/build123d/geometry.py | 1 + src/build123d/topology/shape_core.py | 6 +++--- tests/test_direct_api/test_color.py | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 950c97c..02725c8 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1332,6 +1332,7 @@ class Color: @staticmethod def _rgb_from_str(name: str) -> tuple: + name = name.strip() if "#" not in name: try: # Use css3 color names by default diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 67d0ec3..61c200a 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -172,7 +172,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Args: obj (TopoDS_Shape, optional): OCCT object. Defaults to None. label (str, optional): Defaults to ''. - color (Color, optional): Defaults to None. + color (ColorLike, optional): Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. Attributes: @@ -284,7 +284,7 @@ class Shape(NodeMixin, Generic[TOPODS]): self, obj: TopoDS_Shape | None = None, label: str = "", - color: Color | ColorLike | None = None, + color: ColorLike | None = None, parent: Compound | None = None, ): self.wrapped: TOPODS | None = ( @@ -339,7 +339,7 @@ class Shape(NodeMixin, Generic[TOPODS]): return node_color @color.setter - def color(self, value: Color | ColorLike | None) -> None: + def color(self, value: ColorLike | None) -> None: """Set the shape's color""" self._color = Color(value) if value is not None else None diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py index cced7e5..62c26bf 100644 --- a/tests/test_direct_api/test_color.py +++ b/tests/test_direct_api/test_color.py @@ -130,9 +130,11 @@ class TestColor(unittest.TestCase): red_color_likes = [ Quantity_ColorRGBA(1, 0, 0, 1), "red", + "red ", ("red",), ("red", 1), "#ff0000", + " #ff0000 ", ("#ff0000",), ("#ff0000", 1), 0xff0000, From 2efa2a3a093b096cb74246f6175cfee95e10977d Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 16 Aug 2025 17:49:33 -0400 Subject: [PATCH 385/518] Most functionality working --- src/build123d/objects_curve.py | 2 +- src/build123d/topology/one_d.py | 221 ++++++++++++++++++++++++-------- tests/test_build_line.py | 5 + 3 files changed, 172 insertions(+), 56 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 3ea3adf..8a6cc46 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1272,7 +1272,7 @@ class PointArcTangentArc(BaseEdgeObject): # Confirm new tangent point is colinear with point tangent on arc arc_dir = arc.tangent_at(tangent_point) - if tangent_dir.cross(arc_dir).length > TOLERANCE: + if tangent_dir.cross(arc_dir).length > TOLERANCE * 10: raise RuntimeError("No tangent arc found, found tangent out of tolerance.") arc = TangentArc(arc_point, tangent_point, tangent=arc_tangent) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index ff75d64..2520d53 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -484,6 +484,52 @@ class Mixin1D(Shape): return result + def derivative_at( + self, + position: float | VectorLike, + order: int = 2, + position_mode: PositionMode = PositionMode.PARAMETER, + ) -> Vector: + """Derivative At + + Generate a derivative along the underlying curve. + + Args: + position (float | VectorLike): distance, parameter value or point + order (int): derivative order. Defaults to 2 + position_mode (PositionMode, optional): position calculation mode. Defaults to + PositionMode.PARAMETER. + + Raises: + ValueError: position must be a float or a point + + Returns: + Vector: position on the underlying curve + """ + if isinstance(position, (float, int)): + comp_curve, occt_param = self._occt_param_at(position, position_mode) + else: + try: + point_on_curve = Vector(position) + except Exception as exc: + raise ValueError("position must be a float or a point") from exc + if isinstance(self, Wire): + closest_edge = min( + self.edges(), key=lambda e: e.distance_to(point_on_curve) + ) + else: + closest_edge = self + u_value = closest_edge.param_at_point(point_on_curve) + comp_curve, occt_param = closest_edge._occt_param_at(u_value) + + derivative_gp_vec = comp_curve.DN(occt_param, order) + if derivative_gp_vec.Magnitude() == 0: + return Vector(0, 0, 0) + + if self.is_forward: + return Vector(derivative_gp_vec) + return Vector(derivative_gp_vec) * -1 + def edge(self) -> Edge | None: """Return the Edge""" return Shape.get_single_shape(self, "Edge") @@ -822,11 +868,11 @@ class Mixin1D(Shape): return line def position_at( - self, distance: float, position_mode: PositionMode = PositionMode.PARAMETER + self, position: float, position_mode: PositionMode = PositionMode.PARAMETER ) -> Vector: """Position At - Generate a position along the underlying curve. + Generate a position along the underlying Wire. Args: distance (float): distance or parameter value @@ -836,18 +882,12 @@ class Mixin1D(Shape): Returns: Vector: position on the underlying curve """ - curve = self.geom_adaptor() + # Find the TopoDS_Edge and parameter on that edge at given position + edge_curve_adaptor, occt_edge_param = self._occt_param_at( + position, position_mode + ) - if position_mode == PositionMode.PARAMETER: - if not self.is_forward: - distance = 1 - distance - param = self.param_at(distance) - else: - if not self.is_forward: - distance = self.length - distance - param = self.param_at(distance / self.length) - - return Vector(curve.Value(param)) + return Vector(edge_curve_adaptor.Value(occt_edge_param)) def positions( self, @@ -1191,51 +1231,10 @@ class Mixin1D(Shape): position_mode (PositionMode, optional): position calculation mode. Defaults to PositionMode.PARAMETER. - Raises: - ValueError: invalid position - Returns: Vector: tangent value """ - - if isinstance(position, (float, int)): - if not self.is_forward: - if position_mode == PositionMode.PARAMETER: - position = 1 - position - else: - position = self.length - position - - curve = self.geom_adaptor() - if position_mode == PositionMode.PARAMETER: - parameter = self.param_at(position) - else: - parameter = self.param_at(position / self.length) - else: - try: - pnt = Vector(position) - except Exception as exc: - raise ValueError("position must be a float or a point") from exc - # GeomAPI_ProjectPointOnCurve only works with Edges so find - # the closest Edge if the shape has multiple Edges. - my_edges: list[Edge] = self.edges() - distances = [(e.distance_to(pnt), i) for i, e in enumerate(my_edges)] - sorted_distances = sorted(distances, key=lambda x: x[0]) - closest_edge = my_edges[sorted_distances[0][1]] - # Get the extreme of the parameter values for this Edge - first: float = closest_edge.param_at(0) - last: float = closest_edge.param_at(1) - # Extract the Geom_Curve from the Shape - curve = BRep_Tool.Curve_s(closest_edge.wrapped, first, last) - projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) - parameter = projector.LowerDistanceParameter() - - tmp = gp_Pnt() - res = gp_Vec() - curve.D1(parameter, tmp, res) - - if self.is_forward: - return Vector(gp_Dir(res)) - return Vector(gp_Dir(res)) * -1 + return self.derivative_at(position, 1, position_mode).normalized() def vertex(self) -> Vertex | None: """Return the Vertex""" @@ -1789,6 +1788,36 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return return_value + # def derivative_at( + # self, + # position: float, + # order: int = 2, + # position_mode: PositionMode = PositionMode.PARAMETER, + # ) -> Vector: + # """Derivative At + + # Generate a derivative along the underlying curve. + + # Args: + # position (float): distance or parameter value + # order (int): derivative order. Defaults to 2 + # position_mode (PositionMode, optional): position calculation mode. Defaults to + # PositionMode.PARAMETER. + + # Returns: + # Vector: position on the underlying curve + # """ + # comp_curve, occt_param = self._occt_param_at(position, position_mode) + # derivative_gp_vec = comp_curve.DN(occt_param, order) + # if derivative_gp_vec.Magnitude() == 0: + # return Vector(0, 0, 0) + # else: + # gp_dir = gp_Dir(derivative_gp_vec) + + # if self.is_forward: + # return Vector(gp_dir) + # return Vector(gp_dir) * -1 + def distribute_locations( self: Wire | Edge, count: int, @@ -2092,6 +2121,26 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return ShapeList(common_vertices + common_edges) return None + def _occt_param_at( + self, position: float, position_mode: PositionMode = PositionMode.PARAMETER + ) -> tuple[BRepAdaptor_CompCurve, float]: + comp_curve = self.geom_adaptor() + length = GCPnts_AbscissaPoint.Length_s(comp_curve) + + if position_mode == PositionMode.PARAMETER: + if not self.is_forward: + position = 1 - position + value = position + else: + if not self.is_forward: + position = self.length - position + value = position / self.length + + occt_param = GCPnts_AbscissaPoint( + comp_curve, length * value, comp_curve.FirstParameter() + ).Parameter() + return comp_curve, occt_param + def param_at_point(self, point: VectorLike) -> float: """param_at_point @@ -2163,6 +2212,24 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): raise RuntimeError("Unable to find parameter, Edge is too complex") + # def position_at( + # self, position: float, position_mode: PositionMode = PositionMode.PARAMETER + # ) -> Vector: + # """Position At + + # Generate a position along the underlying curve. + + # Args: + # position (float): distance or parameter value + # position_mode (PositionMode, optional): position calculation mode. Defaults to + # PositionMode.PARAMETER. + + # Returns: + # Vector: position on the underlying curve + # """ + # comp_curve, occt_param = self._occt_param_at(position, position_mode) + # return Vector(comp_curve.Value(occt_param)) + def project_to_shape( self, target_object: Shape, @@ -3000,6 +3067,50 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return distance / wire_length + def _occt_param_at( + self, position: float, position_mode: PositionMode = PositionMode.PARAMETER + ) -> tuple[BRepAdaptor_CompCurve, float]: + wire_curve_adaptor = self.geom_adaptor() + + if position_mode == PositionMode.PARAMETER: + if not self.is_forward: + position = 1 - position + occt_wire_param = self.param_at(position) + else: + if not self.is_forward: + position = self.length - position + occt_wire_param = self.param_at(position / self.length) + + topods_edge_at_position = TopoDS_Edge() + occt_edge_params = wire_curve_adaptor.Edge( + occt_wire_param, topods_edge_at_position + ) + edge_curve_adaptor = BRepAdaptor_Curve(topods_edge_at_position) + + return edge_curve_adaptor, occt_edge_params[0] + + # def position_at( + # self, position: float, position_mode: PositionMode = PositionMode.PARAMETER + # ) -> Vector: + # """Position At + + # Generate a position along the underlying Wire. + + # Args: + # distance (float): distance or parameter value + # position_mode (PositionMode, optional): position calculation mode. Defaults to + # PositionMode.PARAMETER. + + # Returns: + # Vector: position on the underlying curve + # """ + # # Find the TopoDS_Edge and parameter on that edge at given position + # edge_curve_adaptor, occt_edge_param = self._occt_param_at( + # position, position_mode + # ) + + # return Vector(edge_curve_adaptor.Value(occt_edge_param)) + def project_to_shape( self, target_object: Shape, diff --git a/tests/test_build_line.py b/tests/test_build_line.py index 01c2fbe..145d43f 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -30,6 +30,8 @@ import unittest from math import sqrt, pi from build123d import * +from ocp_vscode import show + def _assertTupleAlmostEquals(self, expected, actual, places, msg=None): """Check Tuples""" @@ -673,6 +675,9 @@ class BuildLineTests(unittest.TestCase): # Check coincidence, tangency with each arc _, p1, p2 = start_arc.distance_to_with_closest_points(l1) + a1 = Axis(p1, start_arc.tangent_at(p1)) + a2 = Axis(p2, l1.tangent_at(p2)) + show(start_arc, l1, p1, p2, a1, a2) self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) self.assertAlmostEqual( start_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 From 57208734416ca2bdbe85137ac361a4bdcf0970a3 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 18 Aug 2025 14:08:32 -0400 Subject: [PATCH 386/518] All tests pass --- src/build123d/objects_curve.py | 2 +- src/build123d/topology/one_d.py | 178 +++++++++++++++++++++++--------- 2 files changed, 133 insertions(+), 47 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 8a6cc46..3ea3adf 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -1272,7 +1272,7 @@ class PointArcTangentArc(BaseEdgeObject): # Confirm new tangent point is colinear with point tangent on arc arc_dir = arc.tangent_at(tangent_point) - if tangent_dir.cross(arc_dir).length > TOLERANCE * 10: + if tangent_dir.cross(arc_dir).length > TOLERANCE: raise RuntimeError("No tangent arc found, found tangent out of tolerance.") arc = TangentArc(arc_point, tangent_point, tangent=arc_tangent) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 2520d53..735afa1 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -113,6 +113,7 @@ from OCP.GeomAPI import ( ) from OCP.GeomAbs import GeomAbs_JoinType from OCP.GeomAdaptor import GeomAdaptor_Curve +from OCP.GeomConvert import GeomConvert_CompCurveToBSplineCurve from OCP.GeomFill import ( GeomFill_CorrectedFrenet, GeomFill_Frenet, @@ -2144,6 +2145,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def param_at_point(self, point: VectorLike) -> float: """param_at_point + Returns a normalized u value (between 0.0 and 1.0) representing + the position on the Edge that is closest to the given point. + Args: point (VectorLike): point on Edge @@ -2152,27 +2156,47 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): RuntimeError: failed to find parameter Returns: - float: parameter value at point on edge + float: normalized u value at point on edge """ - # Note that this search algorithm would ideally be replaced with - # an OCP based solution, something like that which is shown below. - # However, there are known issues with the OCP methods for some - # curves which may return negative values or incorrect values at - # end points. Also note that this search takes about 1.3ms on a - # complex curve while the OCP methods take about 0.4ms. - # - # curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) - # param_min, param_max = BRep_Tool.Range_s(self.wrapped) - # projector = GeomAPI_ProjectPointOnCurve(point.to_pnt(), curve) - # param_value = projector.LowerDistanceParameter() - # u_value = (param_value - param_min) / (param_max - param_min) + pnt = Vector(point) + # Extract the edge's end parameters + param_min, param_max = BRep_Tool.Range_s(self.wrapped) + param_range = param_max - param_min - point = Vector(point) + # Method 1: the point is a Vertex - separation = self.distance_to(point) + # Check to see if the point is a Vertex of the Edge + # Note: on a closed edge a single point is ambiguous so the result + # is undefined with respect to matching the "start" or "end". + nearest_vertex = min(self.vertices(), key=lambda v: (Vector(v) - pnt).length) + if (Vector(nearest_vertex) - pnt).length <= TOLERANCE: + param = BRep_Tool.Parameter_s(nearest_vertex.wrapped, self.wrapped) + return (param - param_min) / param_range + + separation = self.distance_to(pnt) if not isclose_b(separation, 0, abs_tol=TOLERANCE): - raise ValueError(f"point ({point}) is {separation} from edge") + raise ValueError(f"point ({pnt}) is {separation} from edge") + + # Method 2: project the point onto the edge + # There are known issues with the OCP methods for some + # curves which may return negative values or incorrect values at + # end points. + + # Extract the normalized parameter using OCCT GeomAPI_ProjectPointOnCurve + curve = BRep_Tool.Curve_s(self.wrapped, float(), float()) + projector = GeomAPI_ProjectPointOnCurve(pnt.to_pnt(), curve) + param = projector.LowerDistanceParameter() + # Note that for some periodic curves the LowerDistanceParameter might + # be outside the given range + u_value = ((param - param_min) % param_range) / param_range + # Validate that GeomAPI_ProjectPointOnCurve worked correctly + if (self.position_at(u_value) - pnt).length < TOLERANCE: + return u_value + + # Method 3: search the edge for the point + # Note that this search takes about 1.3ms on a complex curve while the + # OCP methods take about 0.4ms. # This algorithm finds the normalized [0, 1] parameter of a point on an edge # by minimizing the 3D distance between the edge and the given point. @@ -2195,7 +2219,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): lo, hi = i * step, (i + 1) * step result = minimize_scalar( - lambda u: (self.position_at(u) - point).length, + lambda u: (self.position_at(u) - pnt).length, bounds=(lo, hi), method="bounded", options={"xatol": TOLERANCE / 2}, @@ -3028,44 +3052,68 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): def param_at_point(self, point: VectorLike) -> float: """Parameter at point on Wire""" + # return self._to_bspline().param_at_point(point) + # OCP doesn't support this so this algorithm finds the edge that contains the # point, finds the u value/fractional distance of the point on that edge and # sums up the length of the edges from the start to the edge with the point. - wire_length = self.length - edge_list = self.edges() - target = self.position_at(0) # To start, find the edge at the beginning - distance = 0.0 # distance along wire - found = False + point_on_curve = Vector(point) + closest_edge = min(self.edges(), key=lambda e: e.distance_to(point_on_curve)) + print(f"{closest_edge.is_forward=}") + distance_along_wire = ( + closest_edge.param_at_point(point_on_curve) * closest_edge.length + ) + wire_explorer = BRepTools_WireExplorer(self.wrapped) - while edge_list: - # Find the edge closest to the target - edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - edge_list.pop(edge_list.index(edge)) + while wire_explorer.More(): + topods_edge = wire_explorer.Current() + # Skip degenerate edges + if BRep_Tool.Degenerated_s(topods_edge): + wire_explorer.Next() + continue - # The edge might be flipped requiring the u value to be reversed - edge_p0 = edge.position_at(0) - edge_p1 = edge.position_at(1) - flipped = (target - edge_p0).length > (target - edge_p1).length - - # Set the next start to "end" of the current edge - target = edge_p0 if flipped else edge_p1 - - # If this edge contain the point, get a fractional distance - otherwise the whole - if edge.distance_to(point) <= TOLERANCE: - found = True - u_value = edge.param_at_point(point) - if flipped: - distance += (1 - u_value) * edge.length - else: - distance += u_value * edge.length + if topods_edge.IsEqual(closest_edge.wrapped): break - distance += edge.length + distance_along_wire += GCPnts_AbscissaPoint.Length_s( + BRepAdaptor_Curve(topods_edge) + ) + wire_explorer.Next() - if not found: - raise ValueError(f"{point} not on wire") + return distance_along_wire / self.length + # edge_list = self.edges() + # target = self.position_at(0) # To start, find the edge at the beginning + # distance = 0.0 # distance along wire + # found = False - return distance / wire_length + # while edge_list: + # # Find the edge closest to the target + # edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] + # edge_list.pop(edge_list.index(edge)) + + # # The edge might be flipped requiring the u value to be reversed + # edge_p0 = edge.position_at(0) + # edge_p1 = edge.position_at(1) + # flipped = (target - edge_p0).length > (target - edge_p1).length + + # # Set the next start to "end" of the current edge + # target = edge_p0 if flipped else edge_p1 + + # # If this edge contain the point, get a fractional distance - otherwise the whole + # if edge.distance_to(point) <= TOLERANCE: + # found = True + # u_value = edge.param_at_point(point) + # if flipped: + # distance += (1 - u_value) * edge.length + # else: + # distance += u_value * edge.length + # break + # distance += edge.length + + # if not found: + # raise ValueError(f"{point} not on wire") + + # return distance / wire_length def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER @@ -3235,6 +3283,44 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return self.__class__.cast(wire_builder.Wire()) + def _to_bspline(self) -> Edge: + """Build a single bspline Edge from the wire. + + Note that the result may contain knots (i.e. corners with only C0 continuity) + that aren't vertices. + + Raises: + RuntimeError: failed to build bspline + + Returns: + Edge: of type GeomType.BSPLINE + """ + # Build a single Geom_BSplineCurve from the wire, in *topological order* + builder = GeomConvert_CompCurveToBSplineCurve() + wire_explorer = BRepTools_WireExplorer(self.wrapped) + + while wire_explorer.More(): + topods_edge = wire_explorer.Current() + # Skip degenerate edges + if BRep_Tool.Degenerated_s(topods_edge): + wire_explorer.Next() + continue + param_min, param_max = BRep_Tool.Range_s(topods_edge) + new_curve = BRep_Tool.Curve_s(topods_edge, float(), float()) + trimmed_curve = Geom_TrimmedCurve(new_curve, param_min, param_max) + + # Append this edge's trimmed curve into the composite spline. + ok = builder.Add(trimmed_curve, TOLERANCE) + if not ok: + raise RuntimeError("Failed to build bspline.") + wire_explorer.Next() + + edge_builder = BRepBuilderAPI_MakeEdge(builder.BSplineCurve()) + if not edge_builder.IsDone(): + raise RuntimeError("Failed to build bspline.") + + return Edge(edge_builder.Edge()) + def to_wire(self) -> Wire: """Return Wire - used as a pair with Edge.to_wire when self is Wire | Edge""" warnings.warn( From 93331313c15ae5bd3cd90c830663a32ba2d165fa Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 19 Aug 2025 11:56:56 -0400 Subject: [PATCH 387/518] Improving docstrings and tests --- src/build123d/topology/one_d.py | 256 +++++++++++++++++------------ tests/test_direct_api/test_edge.py | 65 ++++++++ 2 files changed, 219 insertions(+), 102 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 735afa1..4f5eea1 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -825,22 +825,40 @@ class Mixin1D(Shape): offset_edges = offset_wire.edges() return offset_edges[0] if len(offset_edges) == 1 else offset_wire - def param_at(self, distance: float) -> float: - """Parameter along a curve + def param_at(self, position: float) -> float: + """ + Map a normalized arc-length position to the underlying OCCT parameter. - Compute parameter value at the specified normalized distance. + The meaning of the returned parameter depends on the type of self: + + - **Edge**: Returns the native OCCT curve parameter corresponding to the + given normalized `position` (0.0 → start, 1.0 → end). For closed/periodic + edges, OCCT may return a value **outside** the edge's nominal parameter + range `[param_min, param_max]` (e.g., by adding/subtracting multiples of + the period). If you require a value folded into the edge's range, apply a + modulo with the parameter span. + + - **Wire**: Returns a *composite* parameter encoding both the edge index + and the position within that edge: the **integer part** is the zero-based + count of fully traversed edges, and the **fractional part** is the + normalized position in `[0.0, 1.0]` along the current edge. Args: - d (float): normalized distance (0.0 >= d >= 1.0) + position (float): Normalized arc-length position along the shape, + where `0.0` is the start and `1.0` is the end. Values outside + `[0.0, 1.0]` are not validated and yield OCCT-dependent results. Returns: - float: parameter value + float: OCCT parameter (for edges) **or** composite “edgeIndex + fraction” + parameter (for wires), as described above. + """ + curve = self.geom_adaptor() length = GCPnts_AbscissaPoint.Length_s(curve) return GCPnts_AbscissaPoint( - curve, length * distance, curve.FirstParameter() + curve, length * position, curve.FirstParameter() ).Parameter() def perpendicular_line( @@ -876,7 +894,7 @@ class Mixin1D(Shape): Generate a position along the underlying Wire. Args: - distance (float): distance or parameter value + position (float): distance or parameter value position_mode (PositionMode, optional): position calculation mode. Defaults to PositionMode.PARAMETER. @@ -2125,6 +2143,29 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER ) -> tuple[BRepAdaptor_CompCurve, float]: + """ + Map a position on this edge to its underlying OCCT parameter. + + This returns the OCCT `BRepAdaptor_CompCurve` for the edge together with + the corresponding (non-normalized) curve parameter at the given position. + The interpretation of `position` depends on `position_mode`: + + - ``PositionMode.PARAMETER``: `position` is a normalized curve parameter in [0, 1]. + - ``PositionMode.DISTANCE``: `position` is an arc length distance along the edge. + + Edge orientation (`is_forward`) is taken into account so that positions are + measured consistently along the geometric curve. + + Args: + position (float): Position along the edge, either a normalized parameter + (0-1) or a distance, depending on `position_mode`. + position_mode (PositionMode, optional): How to interpret `position`. + Defaults to ``PositionMode.PARAMETER``. + + Returns: + tuple[BRepAdaptor_CompCurve, float]: The curve adaptor for this edge and + the corresponding OCCT curve parameter. + """ comp_curve = self.geom_adaptor() length = GCPnts_AbscissaPoint.Length_s(comp_curve) @@ -2143,22 +2184,45 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return comp_curve, occt_param def param_at_point(self, point: VectorLike) -> float: - """param_at_point + """ + Return the normalized parameter (∈ [0.0, 1.0]) of the location on this edge + closest to `point`. - Returns a normalized u value (between 0.0 and 1.0) representing - the position on the Edge that is closest to the given point. + This method always returns a **normalized** parameter across the edge's full + OCCT parameter range, even though the underlying OCP/OCCT queries work in + native (non-normalized) parameters. It is robust to several OCCT quirks: + + 1) Vertex snap (fast path) + If `point` coincides (within tolerance) with one of the edge's vertices, + that vertex's OCCT parameter is used and normalized to [0, 1]. + Note: for a closed edge, a vertex may represent both start and end; the + mapping is therefore ambiguous and either end may be chosen. + + 2) Projection via GeomAPI_ProjectPointOnCurve + The OCCT projector's `LowerDistanceParameter()` can legitimately return a + value **outside** the edge's [param_min, param_max] (e.g., periodic curves + or implementation behavior). The result is wrapped back into range using a + modulo by the parameter span and then normalized to [0, 1]. The projected + answer is accepted only if re-evaluating the 3D point at that normalized + parameter is within tolerance of the input `point`. + + 3) Fallback numeric search (robust path) + If the projector fails the validation, a bounded 1D search is performed + over [0, 1] using progressive subdivision and local minimization of the + 3D distance ‖edge(u) - point‖. The first minimum found under geometric + resolution is returned. Args: - point (VectorLike): point on Edge + point (VectorLike): A point expected to lie on this edge (within tolerance). Raises: - ValueError: point not on edge - RuntimeError: failed to find parameter - + ValueError: If `point` is not on the edge within tolerance. + RuntimeError: If no parameter can be found (e.g., extremely pathological + curves or numerical failure). Returns: - float: normalized u value at point on edge + float: Normalized parameter in [0.0, 1.0] corresponding to the point's + closest location on the edge. """ - pnt = Vector(point) # Extract the edge's end parameters param_min, param_max = BRep_Tool.Range_s(self.wrapped) @@ -2236,24 +2300,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): raise RuntimeError("Unable to find parameter, Edge is too complex") - # def position_at( - # self, position: float, position_mode: PositionMode = PositionMode.PARAMETER - # ) -> Vector: - # """Position At - - # Generate a position along the underlying curve. - - # Args: - # position (float): distance or parameter value - # position_mode (PositionMode, optional): position calculation mode. Defaults to - # PositionMode.PARAMETER. - - # Returns: - # Vector: position on the underlying curve - # """ - # comp_curve, occt_param = self._occt_param_at(position, position_mode) - # return Vector(comp_curve.Value(occt_param)) - def project_to_shape( self, target_object: Shape, @@ -3050,74 +3096,83 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return ordered_edges def param_at_point(self, point: VectorLike) -> float: - """Parameter at point on Wire""" + """ + Return the normalized wire parameter for the point closest to this wire. - # return self._to_bspline().param_at_point(point) + This method projects the given point onto the wire, finds the nearest edge, + and accumulates arc lengths to determine the fractional position along the + entire wire. The result is normalized to the interval [0.0, 1.0], where: - # OCP doesn't support this so this algorithm finds the edge that contains the - # point, finds the u value/fractional distance of the point on that edge and - # sums up the length of the edges from the start to the edge with the point. + - 0.0 corresponds to the start of the wire + - 1.0 corresponds to the end of the wire + Unlike the edge version of this method, the returned value is **not** + an OCCT curve parameter, but a normalized parameter across the wire as a whole. + + Args: + point (VectorLike): The point to project onto the wire. + + Returns: + float: Normalized parameter in [0.0, 1.0] representing the relative + position of the projected point along the wire. + """ point_on_curve = Vector(point) closest_edge = min(self.edges(), key=lambda e: e.distance_to(point_on_curve)) - print(f"{closest_edge.is_forward=}") distance_along_wire = ( closest_edge.param_at_point(point_on_curve) * closest_edge.length ) - wire_explorer = BRepTools_WireExplorer(self.wrapped) + # Compensate for different directionss + # if closest_edge.is_forward ^ self.is_forward: # opposite directions + # distance_along_wire = closest_edge.length - distance_along_wire + # Find all of the edges prior to the closest edge + wire_explorer = BRepTools_WireExplorer(self.wrapped) while wire_explorer.More(): topods_edge = wire_explorer.Current() # Skip degenerate edges if BRep_Tool.Degenerated_s(topods_edge): wire_explorer.Next() continue - + # Stop when we find the closest edge if topods_edge.IsEqual(closest_edge.wrapped): break + # Add the length of the current edge to the running total distance_along_wire += GCPnts_AbscissaPoint.Length_s( BRepAdaptor_Curve(topods_edge) ) wire_explorer.Next() return distance_along_wire / self.length - # edge_list = self.edges() - # target = self.position_at(0) # To start, find the edge at the beginning - # distance = 0.0 # distance along wire - # found = False - - # while edge_list: - # # Find the edge closest to the target - # edge = sorted(edge_list, key=lambda e: e.distance_to(target))[0] - # edge_list.pop(edge_list.index(edge)) - - # # The edge might be flipped requiring the u value to be reversed - # edge_p0 = edge.position_at(0) - # edge_p1 = edge.position_at(1) - # flipped = (target - edge_p0).length > (target - edge_p1).length - - # # Set the next start to "end" of the current edge - # target = edge_p0 if flipped else edge_p1 - - # # If this edge contain the point, get a fractional distance - otherwise the whole - # if edge.distance_to(point) <= TOLERANCE: - # found = True - # u_value = edge.param_at_point(point) - # if flipped: - # distance += (1 - u_value) * edge.length - # else: - # distance += u_value * edge.length - # break - # distance += edge.length - - # if not found: - # raise ValueError(f"{point} not on wire") - - # return distance / wire_length def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER ) -> tuple[BRepAdaptor_CompCurve, float]: + """ + Map a position along this wire to the underlying OCCT edge and curve parameter. + + Unlike the edge version, this method determines which constituent edge of the + wire contains the requested position, then returns a curve adaptor for that + edge together with the corresponding OCCT parameter. + + The interpretation of `position` depends on `position_mode`: + + - ``PositionMode.PARAMETER``: `position` is a normalized parameter in [0, 1] + across the entire wire. + - ``PositionMode.DISTANCE``: `position` is an arc length distance along the wire. + + Edge and wire orientation (`is_forward`) is respected so that positions are + measured consistently along the wire. + + Args: + position (float): Position along the wire, either a normalized parameter + (0-1) or a distance, depending on `position_mode`. + position_mode (PositionMode, optional): How to interpret `position`. + Defaults to ``PositionMode.PARAMETER``. + + Returns: + tuple[BRepAdaptor_Curve, float]: The curve adaptor for the specific edge + at the given position, and the corresponding OCCT parameter on that edge. + """ wire_curve_adaptor = self.geom_adaptor() if position_mode == PositionMode.PARAMETER: @@ -3137,28 +3192,6 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return edge_curve_adaptor, occt_edge_params[0] - # def position_at( - # self, position: float, position_mode: PositionMode = PositionMode.PARAMETER - # ) -> Vector: - # """Position At - - # Generate a position along the underlying Wire. - - # Args: - # distance (float): distance or parameter value - # position_mode (PositionMode, optional): position calculation mode. Defaults to - # PositionMode.PARAMETER. - - # Returns: - # Vector: position on the underlying curve - # """ - # # Find the TopoDS_Edge and parameter on that edge at given position - # edge_curve_adaptor, occt_edge_param = self._occt_param_at( - # position, position_mode - # ) - - # return Vector(edge_curve_adaptor.Value(occt_edge_param)) - def project_to_shape( self, target_object: Shape, @@ -3284,16 +3317,35 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return self.__class__.cast(wire_builder.Wire()) def _to_bspline(self) -> Edge: - """Build a single bspline Edge from the wire. + """ + Collapse this wire into a single BSpline edge (internal use). - Note that the result may contain knots (i.e. corners with only C0 continuity) - that aren't vertices. + Concatenates the wire's constituent edges—**in topological order**—into one + `Geom_BSplineCurve` using OCP/OCCT's `GeomConvert_CompCurveToBSplineCurve`. + Degenerate edges are skipped. The resulting topology is a **single Edge**; + former junctions between original edges become **internal spline knots** + (C0 corners) but **not vertices**. + + ⚠️ Not intended for general user workflows. The loss of vertex boundaries + can make downstream operations (e.g., splitting at vertices, continuity checks, + feature recognition) surprising. This is primarily useful for internal tasks + that benefit from a single-curve representation (e.g., length/abscissa queries + or parameter mapping along the entire wire). + + Behavior & caveats: + - Orientation and section order follow the wire's topological sequence. + - Junctions with only C0 continuity are preserved as spline knots, not as + topological vertices. + - The returned edge's parameterization is that of the composite BSpline + (not a normalized [0,1] wire parameter). + - Failure to append any segment or to build the final edge raises an error. Raises: - RuntimeError: failed to build bspline + RuntimeError: If any segment cannot be appended to the composite spline + or the final BSpline edge cannot be built. Returns: - Edge: of type GeomType.BSPLINE + Edge: A single edge whose geometry is `GeomType.BSPLINE`. """ # Build a single Geom_BSplineCurve from the wire, in *topological order* builder = GeomConvert_CompCurveToBSplineCurve() diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 8599c44..068bbb8 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -32,6 +32,7 @@ import unittest from unittest.mock import patch, PropertyMock +from build123d.topology.shape_core import TOLERANCE from build123d.build_enums import AngularDirection, GeomType, PositionMode, Transition from build123d.geometry import Axis, Plane, Vector from build123d.objects_curve import CenterArc, EllipticalCenterArc @@ -395,5 +396,69 @@ class TestEdge(unittest.TestCase): spline._extend_spline(True, geom_surface) +class TestWireToBSpline(unittest.TestCase): + def setUp(self): + # A simple rectilinear, multi-segment wire: + # p0 ── p1 + # │ + # p2 ── p3 + self.p0 = Vector(0, 0, 0) + self.p1 = Vector(20, 0, 0) + self.p2 = Vector(20, 10, 0) + self.p3 = Vector(35, 10, 0) + + e01 = Edge.make_line(self.p0, self.p1) + e12 = Edge.make_line(self.p1, self.p2) + e23 = Edge.make_line(self.p2, self.p3) + + self.wire = Wire([e01, e12, e23]) + + def test_to_bspline_basic_properties(self): + bs = self.wire._to_bspline() + + # 1) Type/geom check + self.assertIsInstance(bs, Edge) + self.assertEqual(bs.geom_type, GeomType.BSPLINE) + + # 2) Endpoint preservation + self.assertLess((Vector(bs.vertices()[0]) - self.p0).length, TOLERANCE) + self.assertLess((Vector(bs.vertices()[-1]) - self.p3).length, TOLERANCE) + + # 3) Length preservation (within numerical tolerance) + self.assertAlmostEqual(bs.length, self.wire.length, delta=1e-6) + + # 4) Topology collapse: single edge has only 2 vertices (start/end) + self.assertEqual(len(bs.vertices()), 2) + + # 5) The composite BSpline should pass through former junctions + for junction in (self.p1, self.p2): + self.assertLess(bs.distance_to(junction), 1e-6) + + # 6) Normalized parameter increases along former junctions + u_p1 = bs.param_at_point(self.p1) + u_p2 = bs.param_at_point(self.p2) + self.assertGreater(u_p1, 0.0) + self.assertLess(u_p2, 1.0) + self.assertLess(u_p1, u_p2) + + # 7) Re-evaluating at those parameters should be close to the junctions + self.assertLess((bs.position_at(u_p1) - self.p1).length, 1e-6) + self.assertLess((bs.position_at(u_p2) - self.p2).length, 1e-6) + + def test_to_bspline_orientation(self): + # Ensure the BSpline follows the wire's topological order + bs = self.wire._to_bspline() + + # Start ~ p0, end ~ p3 + self.assertLess((bs.position_at(0.0) - self.p0).length, 1e-6) + self.assertLess((bs.position_at(1.0) - self.p3).length, 1e-6) + + # Parameters at interior points should sit between 0 and 1 + u0 = bs.param_at_point(self.p1) + u1 = bs.param_at_point(self.p2) + self.assertTrue(0.0 < u0 < 1.0) + self.assertTrue(0.0 < u1 < 1.0) + + if __name__ == "__main__": unittest.main() From 232c283efc91788701839cef5750790d46ef8913 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 21 Aug 2025 13:23:20 -0400 Subject: [PATCH 388/518] Working on coverage --- src/build123d/geometry.py | 4 +- src/build123d/topology/one_d.py | 272 ++++++++++++++++--------- tests/test_direct_api/test_edge.py | 14 ++ tests/test_direct_api/test_mixin1_d.py | 55 ++++- 4 files changed, 245 insertions(+), 100 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 0404ca4..60acae1 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -690,7 +690,7 @@ class Axis(metaclass=AxisMeta): self.wrapped: gp_Ax1 = gp_ax1 # type: ignore[annotation-unchecked] @property - def position(self): + def position(self) -> Vector: """The position or origin of the Axis""" return Vector(self.wrapped.Location()) @@ -700,7 +700,7 @@ class Axis(metaclass=AxisMeta): self.wrapped.SetLocation(Vector(position).to_pnt()) @property - def direction(self): + def direction(self) -> Vector: """The normalized direction of the Axis""" return Vector(self.wrapped.Direction()) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 4f5eea1..3c765d9 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -57,10 +57,10 @@ import warnings from collections.abc import Iterable from itertools import combinations from math import radians, inf, pi, cos, copysign, ceil, floor +from typing import cast as tcast from typing import Literal, overload, TYPE_CHECKING from typing_extensions import Self -from numpy import ndarray -from scipy.optimize import minimize, minimize_scalar +from scipy.optimize import minimize_scalar from scipy.spatial import ConvexHull import OCP.TopAbs as ta @@ -84,7 +84,7 @@ from OCP.BRepExtrema import BRepExtrema_DistShapeShape from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepLProp import BRepLProp_CLProps, BRepLProp +from OCP.BRepLProp import BRepLProp from OCP.BRepOffset import BRepOffset_MakeOffset from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace @@ -95,6 +95,7 @@ from OCP.GCPnts import GCPnts_AbscissaPoint from OCP.GProp import GProp_GProps from OCP.Geom import ( Geom_BezierCurve, + Geom_BSplineCurve, Geom_ConicalSurface, Geom_CylindricalSurface, Geom_Plane, @@ -333,9 +334,9 @@ class Mixin1D(Shape): # Convert `other` to list of base topods objects and filter out None values if other is None: - summands = [] + topods_summands = [] else: - summands = [ + topods_summands = [ shape # for o in (other if isinstance(other, (list, tuple)) else [other]) for o in ([other] if isinstance(other, Shape) else other) @@ -343,26 +344,29 @@ class Mixin1D(Shape): for shape in get_top_level_topods_shapes(o.wrapped) ] # If there is nothing to add return the original object - if not summands: + if not topods_summands: return self - if not all(topods_dim(summand) == 1 for summand in summands): + if not all(topods_dim(summand) == 1 for summand in topods_summands): raise ValueError("Only shapes with the same dimension can be added") # Convert back to Edge/Wire objects now that it's safe to do so - summands = [Mixin1D.cast(s) for s in summands] + summands = ShapeList( + [tcast(Edge | Wire, Mixin1D.cast(s)) for s in topods_summands] + ) summand_edges = [e for summand in summands for e in summand.edges()] if self.wrapped is None: # an empty object if len(summands) == 1: - sum_shape = summands[0] + sum_shape: Edge | Wire | ShapeList[Edge] = summands[0] else: try: sum_shape = Wire(summand_edges) except Exception: + # pylint: disable=[no-member] sum_shape = summands[0].fuse(*summands[1:]) if type(self).order == 4: - sum_shape = type(self)(sum_shape) + sum_shape = type(self)(sum_shape) # type: ignore else: try: sum_shape = Wire(self.edges() + ShapeList(summand_edges)) @@ -373,7 +377,7 @@ class Mixin1D(Shape): sum_shape = sum_shape.clean() # If there is only one Edge, return that - sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape + sum_shape = sum_shape.edge() if len(sum_shape.edges()) == 1 else sum_shape # type: ignore return sum_shape @@ -400,13 +404,16 @@ class Mixin1D(Shape): Returns: Vector: center """ + if self.wrapped is None: + raise ValueError("Can't find center of empty edge/wire") + if center_of == CenterOf.GEOMETRY: middle = self.position_at(0.5) elif center_of == CenterOf.MASS: properties = GProp_GProps() BRepGProp.LinearProperties_s(self.wrapped, properties) middle = Vector(properties.CentreOfMass()) - elif center_of == CenterOf.BOUNDING_BOX: + else: # center_of == CenterOf.BOUNDING_BOX: middle = self.bounding_box().center() return middle @@ -537,7 +544,7 @@ class Mixin1D(Shape): def edges(self) -> ShapeList[Edge]: """edges - all the edges in this Shape""" - if isinstance(self, Wire): + if isinstance(self, Wire) and self.wrapped is not None: # The WireExplorer is a tool to explore the edges of a wire in a connection order. explorer = BRepTools_WireExplorer(self.wrapped) @@ -550,11 +557,11 @@ class Mixin1D(Shape): edge_list.append(next_edge) explorer.Next() return edge_list - else: - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) + + edge_list = Shape.get_shape_list(self, "Edge") + return edge_list.filter_by( + lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True + ) def end_point(self) -> Vector: """The end point of this edge. @@ -644,12 +651,12 @@ class Mixin1D(Shape): transformation.SetTransformation( gp_Ax3(pnt, gp_Dir(tangent.XYZ()), Vector(x_dir).to_dir()), gp_Ax3() ) - except Standard_ConstructionError: + except Standard_ConstructionError as exc: raise ValueError( f"Unable to create location with given x_dir {x_dir}. " f"x_dir must be perpendicular to shape's tangent " f"{tuple(Vector(tangent))}." - ) + ) from exc else: transformation.SetTransformation( @@ -707,6 +714,9 @@ class Mixin1D(Shape): Returns: """ + if self.wrapped is None: + raise ValueError("Can't find normal of empty edge/wire") + curve = self.geom_adaptor() gtype = self.geom_type @@ -763,10 +773,12 @@ class Mixin1D(Shape): # Avoiding a bug when the wire contains a single Edge if len(line.edges()) == 1: edge = line.edges()[0] + # pylint: disable=[no-member] edges = [edge.trim(0.0, 0.5), edge.trim(0.5, 1.0)] topods_wire = Wire(edges).wrapped else: topods_wire = line.wrapped + assert topods_wire is not None offset_builder = BRepOffsetAPI_MakeOffset() offset_builder.Init(kind_dict[kind]) @@ -785,7 +797,7 @@ class Mixin1D(Shape): if side != Side.BOTH: # Find and remove the end arcs offset_edges = offset_wire.edges() - edges_to_keep: list[list[int]] = [[], [], []] + edges_to_keep: list[list[Edge]] = [[], [], []] i = 0 for edge in offset_edges: if edge.geom_type == GeomType.CIRCLE and ( @@ -940,8 +952,8 @@ class Mixin1D(Shape): Returns: """ - if self.wrapped is None: - raise ValueError("Can't project an empty Edge or Wire") + if self.wrapped is None or face.wrapped is None: + raise ValueError("Can't project an empty Edge or Wire onto empty Face") bldr = BRepProj_Projection( self.wrapped, face.wrapped, Vector(direction).to_dir() @@ -1012,6 +1024,9 @@ class Mixin1D(Shape): return edges + if self.wrapped is None: + raise ValueError("Can't project empty edge/wire") + # Setup the projector hidden_line_removal = HLRBRep_Algo() hidden_line_removal.Add(self.wrapped) @@ -1112,12 +1127,15 @@ class Mixin1D(Shape): - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is either a `Self` or `list[Self]`, or `None` if no corresponding part is found. """ + if self.wrapped is None or tool.wrapped is None: + raise ValueError("Can't split an empty edge/wire/tool") + shape_list = TopTools_ListOfShape() shape_list.Append(self.wrapped) # Define the splitting tool trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # Plane to Face + BRepBuilderAPI_MakeFace(tool.wrapped).Face() # gp_Pln to Face if isinstance(tool, Plane) else tool.wrapped ) @@ -1150,27 +1168,30 @@ class Mixin1D(Shape): if not isinstance(tool, Plane): # Get a TopoDS_Face to work with from the tool if isinstance(trim_tool, TopoDS_Shell): - faceExplorer = TopExp_Explorer(trim_tool, ta.TopAbs_FACE) - tool_face = TopoDS.Face_s(faceExplorer.Current()) + face_explorer = TopExp_Explorer(trim_tool, ta.TopAbs_FACE) + tool_face = TopoDS.Face_s(face_explorer.Current()) else: tool_face = trim_tool # Create a reference point off the +ve side of the tool - surface_point = gp_Pnt() + surface_gppnt = gp_Pnt() surface_normal = gp_Vec() u_min, u_max, v_min, v_max = BRepTools.UVBounds_s(tool_face) BRepGProp_Face(tool_face).Normal( - (u_min + u_max) / 2, (v_min + v_max) / 2, surface_point, surface_normal + (u_min + u_max) / 2, (v_min + v_max) / 2, surface_gppnt, surface_normal ) normalized_surface_normal = Vector( surface_normal.X(), surface_normal.Y(), surface_normal.Z() ).normalized() - surface_point = Vector(surface_point) + surface_point = Vector(surface_gppnt) ref_point = surface_point + normalized_surface_normal # Create a HalfSpace - Solidish object to determine top/bottom - halfSpaceMaker = BRepPrimAPI_MakeHalfSpace(trim_tool, ref_point.to_pnt()) - tool_solid = halfSpaceMaker.Solid() + # Note: BRepPrimAPI_MakeHalfSpace takes either a TopoDS_Shell or TopoDS_Face but the + # mypy expects only a TopoDS_Shell here + half_space_maker = BRepPrimAPI_MakeHalfSpace(trim_tool, ref_point.to_pnt()) + # type: ignore + tool_solid = half_space_maker.Solid() tops: list[Shape] = [] bottoms: list[Shape] = [] @@ -1353,6 +1374,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Returns: Edge: extruded shape """ + if obj.wrapped is None: + raise ValueError("Can't extrude empty vertex") return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) @classmethod @@ -1807,36 +1830,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return return_value - # def derivative_at( - # self, - # position: float, - # order: int = 2, - # position_mode: PositionMode = PositionMode.PARAMETER, - # ) -> Vector: - # """Derivative At - - # Generate a derivative along the underlying curve. - - # Args: - # position (float): distance or parameter value - # order (int): derivative order. Defaults to 2 - # position_mode (PositionMode, optional): position calculation mode. Defaults to - # PositionMode.PARAMETER. - - # Returns: - # Vector: position on the underlying curve - # """ - # comp_curve, occt_param = self._occt_param_at(position, position_mode) - # derivative_gp_vec = comp_curve.DN(occt_param, order) - # if derivative_gp_vec.Magnitude() == 0: - # return Vector(0, 0, 0) - # else: - # gp_dir = gp_Dir(derivative_gp_vec) - - # if self.is_forward: - # return Vector(gp_dir) - # return Vector(gp_dir) * -1 - def distribute_locations( self: Wire | Edge, count: int, @@ -1881,13 +1874,17 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): extension_factor: float = 0.1, ): """Helper method to slightly extend an edge that is bound to a surface""" + if self.wrapped is None: + raise ValueError("Can't extend empty spline") if self.geom_type != GeomType.BSPLINE: raise TypeError("_extend_spline only works with splines") u_start: float = self.param_at(0) u_end: float = self.param_at(1) - curve_original = BRep_Tool.Curve_s(self.wrapped, u_start, u_end) + curve_original = tcast( + Geom_BSplineCurve, BRep_Tool.Curve_s(self.wrapped, u_start, u_end) + ) n_poles = curve_original.NbPoles() poles = [curve_original.Pole(i + 1) for i in range(n_poles)] # Find position and tangent past end of spline to extend it @@ -1902,6 +1899,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): pnts: list[VectorLike] = [Vector(p) for p in poles] extended_edge = Edge.make_spline(pnts, tangents=tangents) + assert extended_edge.wrapped is not None geom_curve = BRep_Tool.Curve_s( extended_edge.wrapped, extended_edge.param_at(0), extended_edge.param_at(1) @@ -1927,17 +1925,22 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tolerance (float, optional): the precision of computing the intersection points. Defaults to TOLERANCE. + Raises: + ValueError: empty edge + Returns: ShapeList[Vector]: list of intersection points """ + if self.wrapped is None: + raise ValueError("Can't find intersections of empty edge") + # Convert an Axis into an edge at least as large as self and Axis start point if isinstance(other, Axis): - self_bbox_w_edge = self.bounding_box().add( - Vertex(other.position).bounding_box() - ) + pos = tcast(Vector, other.position) + self_bbox_w_edge = self.bounding_box().add(Vertex(pos).bounding_box()) other = Edge.make_line( - other.position + other.direction * (-1 * self_bbox_w_edge.diagonal), - other.position + other.direction * self_bbox_w_edge.diagonal, + pos + other.direction * (-1 * self_bbox_w_edge.diagonal), + pos + other.direction * self_bbox_w_edge.diagonal, ) # To determine the 2D plane to work on plane = self.common_plane(other) @@ -1954,7 +1957,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): self.param_at(0), self.param_at(1), ) - if other is not None: + if other is not None and other.wrapped is not None: edge_2d_curve: Geom2d_Curve = BRep_Tool.CurveOnPlane_s( other.wrapped, edge_surface, @@ -2056,6 +2059,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def geom_adaptor(self) -> BRepAdaptor_Curve: """Return the Geom Curve from this Edge""" + if self.wrapped is None: + raise ValueError("Can't find adaptor for empty edge") return BRepAdaptor_Curve(self.wrapped) def intersect( @@ -2098,6 +2103,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): # Find any edge / plane intersection points & edges for edge, plane in itertools.product([self] + edges, planes): + if edge.wrapped is None: + continue # Find point intersections geom_line = BRep_Tool.Curve_s( edge.wrapped, edge.param_at(0), edge.param_at(1) @@ -2142,7 +2149,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> tuple[BRepAdaptor_CompCurve, float]: + ) -> tuple[BRepAdaptor_Curve, float]: """ Map a position on this edge to its underlying OCCT parameter. @@ -2217,12 +2224,16 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Raises: ValueError: If `point` is not on the edge within tolerance. + ValueError: Can't find param on empty edge RuntimeError: If no parameter can be found (e.g., extremely pathological curves or numerical failure). Returns: float: Normalized parameter in [0.0, 1.0] corresponding to the point's closest location on the edge. """ + if self.wrapped is None: + raise ValueError("Can't find param on empty edge") + pnt = Vector(point) # Extract the edge's end parameters param_min, param_max = BRep_Tool.Range_s(self.wrapped) @@ -2234,7 +2245,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): # Note: on a closed edge a single point is ambiguous so the result # is undefined with respect to matching the "start" or "end". nearest_vertex = min(self.vertices(), key=lambda v: (Vector(v) - pnt).length) - if (Vector(nearest_vertex) - pnt).length <= TOLERANCE: + if ( + Vector(nearest_vertex) - pnt + ).length <= TOLERANCE and nearest_vertex.wrapped is not None: param = BRep_Tool.Parameter_s(nearest_vertex.wrapped, self.wrapped) return (param - param_min) / param_range @@ -2401,6 +2414,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Raises: ValueError: start >= end + ValueError: can't trim empty edge Returns: Edge: trimmed edge @@ -2408,8 +2422,14 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): if start >= end: raise ValueError(f"start ({start}) must be less than end ({end})") + if self.wrapped is None: + raise ValueError("Can't trim empty edge") + + self_copy = copy.deepcopy(self) + assert self_copy.wrapped is not None + new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) + self_copy.wrapped, self.param_at(0), self.param_at(1) ) parm_start = self.param_at(start) parm_end = self.param_at(end) @@ -2431,11 +2451,20 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): start (float): 0.0 <= start < 1.0 length (float): target length + Raise: + ValueError: can't trim empty edge + Returns: Edge: trimmed edge """ + if self.wrapped is None: + raise ValueError("Can't trim empty edge") + + self_copy = copy.deepcopy(self) + assert self_copy.wrapped is not None + new_curve = BRep_Tool.Curve_s( - copy.deepcopy(self).wrapped, self.param_at(0), self.param_at(1) + self_copy.wrapped, self.param_at(0), self.param_at(1) ) # Create an adaptor for the curve @@ -2673,7 +2702,8 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): wire_builder = BRepBuilderAPI_MakeWire() combined_edges = TopTools_ListOfShape() for edge in edges: - combined_edges.Append(edge.wrapped) + if edge.wrapped is not None: + combined_edges.Append(edge.wrapped) wire_builder.Add(combined_edges) wire_builder.Build() @@ -2710,13 +2740,14 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): wires_out = TopTools_HSequenceOfShape() for edge in [e for w in wires for e in w.edges()]: - edges_in.Append(edge.wrapped) + if edge.wrapped is not None: + edges_in.Append(edge.wrapped) ShapeAnalysis_FreeBounds.ConnectEdgesToWires_s(edges_in, tol, False, wires_out) wires = ShapeList() for i in range(wires_out.Length()): - wires.append(Wire(downcast(wires_out.Value(i + 1)))) + wires.append(Wire(tcast(TopoDS_Wire, downcast(wires_out.Value(i + 1))))) return wires @@ -2989,6 +3020,9 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: Wire: chamfered wire """ + if self.wrapped is None: + raise ValueError("Can't chamfer empty wire") + reference_edge = edge # Create a face to chamfer @@ -3001,20 +3035,25 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): ) for v in vertices: + if v.wrapped is None: + continue edge_list = vertex_edge_map.FindFromKey(v.wrapped) # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) + edges = ( + Edge(tcast(TopoDS_Edge, downcast(edge_list.First()))), + Edge(tcast(TopoDS_Edge, downcast(edge_list.Last()))), + ) edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) - - chamfer_builder.AddChamfer( - TopoDS.Edge_s(edge1.wrapped), - TopoDS.Edge_s(edge2.wrapped), - distance, - distance2, - ) + if edge1.wrapped is not None and edge2.wrapped is not None: + chamfer_builder.AddChamfer( + TopoDS.Edge_s(edge1.wrapped), + TopoDS.Edge_s(edge2.wrapped), + distance, + distance2, + ) chamfer_builder.Build() chamfered_face = chamfer_builder.Shape() @@ -3022,6 +3061,8 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): shape_fix = ShapeFix_Shape(chamfered_face) shape_fix.Perform() chamfered_face = downcast(shape_fix.Shape()) + if not isinstance(chamfered_face, TopoDS_Face): + raise RuntimeError("An internal error occured creating the chamfer") # Return the outer wire return Wire(BRepTools.OuterWire_s(chamfered_face)) @@ -3044,17 +3085,27 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): radius (float): vertices (Iterable[Vertex]): vertices to fillet + Raises: + RuntimeError: Internal error + ValueError: empty wire + Returns: Wire: filleted wire """ + if self.wrapped is None: + raise ValueError("Can't fillet an empty wire") + # Create a face to fillet unfilleted_face = _make_topods_face_from_wires(self.wrapped) # Fillet the face fillet_builder = BRepFilletAPI_MakeFillet2d(unfilleted_face) for vertex in vertices: - fillet_builder.AddFillet(vertex.wrapped, radius) + if vertex.wrapped is not None: + fillet_builder.AddFillet(vertex.wrapped, radius) fillet_builder.Build() filleted_face = downcast(fillet_builder.Shape()) + if not isinstance(filleted_face, TopoDS_Face): + raise RuntimeError("An internal error occured creating the fillet") # Return the outer wire return Wire(BRepTools.OuterWire_s(filleted_face)) @@ -3069,15 +3120,21 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: Wire: fixed wire """ + if self.wrapped is None: + raise ValueError("Can't fix an empty edge") + sf_w = ShapeFix_Wireframe(self.wrapped) sf_w.SetPrecision(precision) sf_w.SetMaxTolerance(1e-6) sf_w.FixSmallEdges() sf_w.FixWireGaps() - return Wire(downcast(sf_w.Shape())) + return Wire(tcast(TopoDS_Wire, downcast(sf_w.Shape()))) def geom_adaptor(self) -> BRepAdaptor_CompCurve: """Return the Geom Comp Curve for this Wire""" + if self.wrapped is None: + raise ValueError("Can't get geom adaptor of empty wire") + return BRepAdaptor_CompCurve(self.wrapped) def order_edges(self) -> ShapeList[Edge]: @@ -3112,12 +3169,19 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Args: point (VectorLike): The point to project onto the wire. + Raises: + ValueError: Can't find point on empty wire + Returns: float: Normalized parameter in [0.0, 1.0] representing the relative position of the projected point along the wire. """ + if self.wrapped is None: + raise ValueError("Can't find point on empty wire") + point_on_curve = Vector(point) closest_edge = min(self.edges(), key=lambda e: e.distance_to(point_on_curve)) + assert closest_edge.wrapped is not None distance_along_wire = ( closest_edge.param_at_point(point_on_curve) * closest_edge.length ) @@ -3146,7 +3210,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> tuple[BRepAdaptor_CompCurve, float]: + ) -> tuple[BRepAdaptor_Curve, float]: """ Map a position along this wire to the underlying OCCT edge and curve parameter. @@ -3227,14 +3291,14 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): if self.wrapped is None or target_object.wrapped is None: raise ValueError("Can't project empty Wires or to empty Shapes") - if not (direction is None) ^ (center is None): - raise ValueError("One of either direction or center must be provided") - if direction is not None: + if direction is not None and center is None: direction_vector = Vector(direction).normalized() center_point = Vector() # for typing, never used - else: + elif center is not None and direction is None: direction_vector = None center_point = Vector(center) + else: + raise ValueError("Provide exactly one of direction or center") # Project the wire on the target object if direction_vector is not None: @@ -3258,7 +3322,9 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): if target_orientation == projected_wire.Orientation(): output_wires.append(Wire(projected_wire)) else: - output_wires.append(Wire(projected_wire.Reversed())) + output_wires.append( + Wire(tcast(TopoDS_Wire, downcast(projected_wire.Reversed()))) + ) projection_object.Next() logger.debug("wire generated %d projected wires", len(output_wires)) @@ -3300,14 +3366,19 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return output_wires def stitch(self, other: Wire) -> Wire: - """Attempt to stich wires + """Attempt to stitch wires Args: - other: Wire: + other (Wire): wire to combine + + Raises: + ValueError: Can't stitch empty wires Returns: - + Wire: stitched wires """ + if self.wrapped is None or other.wrapped is None: + raise ValueError("Can't stitch empty wires") wire_builder = BRepBuilderAPI_MakeWire() wire_builder.Add(TopoDS.Wire_s(self.wrapped)) @@ -3343,12 +3414,15 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Raises: RuntimeError: If any segment cannot be appended to the composite spline or the final BSpline edge cannot be built. + ValueError: Empty Wire Returns: Edge: A single edge whose geometry is `GeomType.BSPLINE`. """ # Build a single Geom_BSplineCurve from the wire, in *topological order* builder = GeomConvert_CompCurveToBSplineCurve() + if self.wrapped is None: + raise ValueError("Can't convert an empty wire") wire_explorer = BRepTools_WireExplorer(self.wrapped) while wire_explorer.More(): @@ -3513,7 +3587,10 @@ def topo_explore_connected_edges( common_topods_vertex: Vertex | None = topo_explore_common_vertex( given_topods_edge, topods_edge ) - if common_topods_vertex is not None: + if ( + common_topods_vertex is not None + and common_topods_vertex.wrapped is not None + ): # shared_vertex is the TopoDS_Vertex common to edge1 and edge2 u1 = BRep_Tool.Parameter_s(common_topods_vertex.wrapped, given_topods_edge) u2 = BRep_Tool.Parameter_s(common_topods_vertex.wrapped, topods_edge) @@ -3539,8 +3616,11 @@ def topo_explore_connected_faces( ) -> list[TopoDS_Face]: """Given an edge extracted from a Shape, return the topods_faces connected to it""" + if edge.wrapped is None: + raise ValueError("Can't explore from an empty edge") + parent = parent if parent is not None else edge.topo_parent - if parent is None: + if parent is None or parent.wrapped is None: raise ValueError("edge has no valid parent") # make a edge --> faces mapping diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 068bbb8..9ebe011 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -162,6 +162,10 @@ class TestEdge(unittest.TestCase): with self.assertRaises(ValueError): line.find_intersection_points(Plane.YZ) + circle.wrapped = None + with self.assertRaises(ValueError): + circle.find_intersection_points(line) + # def test_intersections_tolerance(self): # Multiple operands not currently supported @@ -387,6 +391,10 @@ class TestEdge(unittest.TestCase): geom_surface = Face.make_rect(4, 4).geom_adaptor() with self.assertRaises(TypeError): Edge.make_line((0, 0), (1, 0))._extend_spline(True, geom_surface) + spline = Edge.make_spline([(0, 0), (1,), (2, 0)]) + spline.wrapped = None + with self.assertRaises(ValueError): + spline._extend_spline(True, geom_surface) @patch.object(GeomProjLib, "Project_s", return_value=None) def test_extend_spline_failed_snap(self, mock_is_valid): @@ -395,6 +403,12 @@ class TestEdge(unittest.TestCase): with self.assertRaises(RuntimeError): spline._extend_spline(True, geom_surface) + def test_geom_adaptor(self): + line = Edge.make_line((0, 0), (1, 0)) + line.wrapped = None + with self.assertRaises(ValueError): + line.geom_adaptor() + class TestWireToBSpline(unittest.TestCase): def setUp(self): diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index df8f2d4..69cdc84 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -42,7 +42,7 @@ from build123d.objects_curve import Polyline from build123d.objects_part import Box, Cylinder from build123d.operations_part import extrude from build123d.operations_generic import fillet -from build123d.topology import Compound, Edge, Face, Solid, Wire +from build123d.topology import Compound, Edge, Face, Solid, Vertex, Wire class TestMixin1D(unittest.TestCase): @@ -183,8 +183,12 @@ class TestMixin1D(unittest.TestCase): (0, 0, 1), 5, ) + line = Edge.make_line((0, 0, 0), (1, 1, 1)) with self.assertRaises(ValueError): - Edge.make_line((0, 0, 0), (1, 1, 1)).normal() + line.normal() + line.wrapped = None + with self.assertRaises(ValueError): + line.normal() def test_center(self): c = Edge.make_circle(1, start_angle=0, end_angle=180) @@ -195,6 +199,9 @@ class TestMixin1D(unittest.TestCase): 5, ) self.assertAlmostEqual(c.center(CenterOf.BOUNDING_BOX), (0, 0.5, 0), 5) + c.wrapped = None + with self.assertRaises(ValueError): + c.center() def test_location_at(self): loc = Edge.make_circle(1).location_at(0.25) @@ -268,6 +275,9 @@ class TestMixin1D(unittest.TestCase): bbox = ellipse.bounding_box() self.assertAlmostEqual(bbox.min, (-1, -1, -1), 5) self.assertAlmostEqual(bbox.max, (1, 1, 1), 5) + circle.wrapped = None + with self.assertRaises(ValueError): + circle.project(target, (0, 0, -1)) def test_project2(self): target = Cylinder(1, 10).faces().filter_by(GeomType.PLANE, reverse=True)[0] @@ -282,6 +292,10 @@ class TestMixin1D(unittest.TestCase): hole_edges = plate.edges().filter_by(GeomType.CIRCLE) self.assertTrue(hole_edges.sort_by(Axis.Z)[-1].is_forward) self.assertFalse(hole_edges.sort_by(Axis.Z)[0].is_forward) + e = Edge.make_line((0, 0), (1, 0)) + e.wrapped = None + with self.assertRaises(ValueError): + e.is_forward def test_offset_2d(self): base_wire = Wire.make_polygon([(0, 0), (1, 0), (1, 1)], close=False) @@ -385,6 +399,43 @@ class TestMixin1D(unittest.TestCase): phone_case_ff = fillet(perimeter, 1) self.assertLess(phone_case_ff.volume, phone_case_f.volume) + def test_is_closed(self): + self.assertTrue(Edge.make_circle(1).is_closed) + self.assertTrue(Face.make_rect(1, 1).outer_wire().is_closed) + self.assertFalse(Edge.make_line((0, 0), (1, 0)).is_closed) + e = Edge.make_circle(1) + e.wrapped = None + with self.assertRaises(ValueError): + e.is_closed + + def test_add(self): + e = Edge.make_line((0, 0), (1, 0)) + e_plus = e + None + self.assertTrue(e.is_same(e_plus)) + + def test_derivative_at(self): + self.assertAlmostEqual( + Edge.make_line((0, 0), (1, 0)).derivative_at((0, 0), 2), (0, 0, 0), 5 + ) + + def test_project_to_viewport(self): + line = Edge.make_line((0, 0), (1, 0)) + line.wrapped = None + with self.assertRaises(ValueError): + line.project_to_viewport((0, 0, 0)) + + def test_split(self): + line = Edge.make_line((0, 0), (1, 0)) + line.wrapped = None + with self.assertRaises(ValueError): + line.split(Plane.XZ.offset(0.5)) + + def test_extrude(self): + pnt = Vertex(1, 0, 0) + pnt.wrapped = None + with self.assertRaises(ValueError): + Edge.extrude(pnt, (0, 0, 1)) + if __name__ == "__main__": unittest.main() From 335f82d740fa43c11794d2171b452279b212f5de Mon Sep 17 00:00:00 2001 From: Paul Korzhyk Date: Thu, 28 Aug 2025 20:19:06 +0300 Subject: [PATCH 389/518] Add Mixin1D.discretize --- src/build123d/topology/one_d.py | 32 +++++++++++++++++++++++++- tests/test_direct_api/test_mixin1_d.py | 5 ++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index ff75d64..5df771a 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -91,7 +91,11 @@ from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace from OCP.BRepProj import BRepProj_Projection from OCP.BRepTools import BRepTools, BRepTools_WireExplorer from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse -from OCP.GCPnts import GCPnts_AbscissaPoint +from OCP.GCPnts import ( + GCPnts_AbscissaPoint, + GCPnts_QuasiUniformDeflection, + GCPnts_UniformDeflection, +) from OCP.GProp import GProp_GProps from OCP.Geom import ( Geom_BezierCurve, @@ -484,6 +488,32 @@ class Mixin1D(Shape): return result + def discretize(self, deflection: float = 0.1, quasi=True) -> list[Vector]: + """Discretize the shape into a list of points""" + if self.wrapped is None: + raise ValueError("Cannot discretize an empty shape") + curve = self.geom_adaptor() + if quasi: + discretizer = GCPnts_QuasiUniformDeflection() + else: + discretizer = GCPnts_UniformDeflection() + discretizer.Initialize( + curve, + deflection, + curve.FirstParameter(), + curve.LastParameter(), + ) + + assert discretizer.IsDone() + + return [ + Vector(v.X(), v.Y(), v.Z()) + for v in ( + curve.Value(discretizer.Parameter(i)) + for i in range(1, discretizer.NbPoints() + 1) + ) + ] + def edge(self) -> Edge | None: """Return the Edge""" return Shape.get_single_shape(self, "Edge") diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index df8f2d4..8e3c61e 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -354,6 +354,11 @@ class TestMixin1D(unittest.TestCase): self.assertAlmostEqual(common.z_dir.Y, 0, 5) self.assertAlmostEqual(common.z_dir.Z, 0, 5) + def test_discretize(self): + edge = Edge.make_circle(2, start_angle=0, end_angle=180) + points = edge.discretize(0.1) + self.assertEqual(len(points), 6) + def test_edge_volume(self): edge = Edge.make_line((0, 0), (1, 1)) self.assertAlmostEqual(edge.volume, 0, 5) From 735f4ffb4d867e4d11554e3797f9c6eb143fa814 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 30 Aug 2025 10:16:39 -0400 Subject: [PATCH 390/518] Wire.param_at_point improved --- src/build123d/topology/one_d.py | 56 +++++++++++++++++++++++------ tests/test_build_line.py | 5 --- tests/test_direct_api/test_shape.py | 2 -- tests/test_topo_explore.py | 4 --- 4 files changed, 46 insertions(+), 21 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 3c765d9..3c74577 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -80,7 +80,7 @@ from OCP.BRepBuilderAPI import ( BRepBuilderAPI_MakeWire, BRepBuilderAPI_NonManifoldWire, ) -from OCP.BRepExtrema import BRepExtrema_DistShapeShape +from OCP.BRepExtrema import BRepExtrema_DistShapeShape, BRepExtrema_SupportType from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepLib import BRepLib, BRepLib_FindSurface @@ -2266,7 +2266,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): param = projector.LowerDistanceParameter() # Note that for some periodic curves the LowerDistanceParameter might # be outside the given range - u_value = ((param - param_min) % param_range) / param_range + curve_adaptor = BRepAdaptor_Curve(self.wrapped) + if curve_adaptor.IsPeriodic(): + u_value = ((param - param_min) % curve_adaptor.Period()) / param_range + else: + u_value = (param - param_min) / param_range # Validate that GeomAPI_ProjectPointOnCurve worked correctly if (self.position_at(u_value) - pnt).length < TOLERANCE: return u_value @@ -3180,14 +3184,46 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): raise ValueError("Can't find point on empty wire") point_on_curve = Vector(point) - closest_edge = min(self.edges(), key=lambda e: e.distance_to(point_on_curve)) - assert closest_edge.wrapped is not None - distance_along_wire = ( - closest_edge.param_at_point(point_on_curve) * closest_edge.length + + separation = self.distance_to(point) + if not isclose_b(separation, 0, abs_tol=TOLERANCE): + raise ValueError(f"point ({point}) is {separation} from wire") + + extrema = BRepExtrema_DistShapeShape( + Vertex(point_on_curve).wrapped, self.wrapped ) - # Compensate for different directionss - # if closest_edge.is_forward ^ self.is_forward: # opposite directions - # distance_along_wire = closest_edge.length - distance_along_wire + extrema.Perform() + if not extrema.IsDone() or extrema.NbSolution() == 0: + raise ValueError("point is not on Wire") + + supp_type = extrema.SupportTypeShape2(1) + + if supp_type == BRepExtrema_SupportType.BRepExtrema_IsOnEdge: + closest_topods_edge = downcast(extrema.SupportOnShape2(1)) + closest_topods_edge_param = extrema.ParOnEdgeS2(1)[0] + elif supp_type == BRepExtrema_SupportType.BRepExtrema_IsVertex: + v_hit = downcast(extrema.SupportOnShape2(1)) + vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() + TopExp.MapShapesAndAncestors_s( + self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map + ) + closest_topods_edge = downcast(vertex_edge_map.FindFromKey(v_hit).First()) + closest_topods_edge_param = BRep_Tool.Parameter_s( + v_hit, closest_topods_edge + ) + + curve_adaptor = BRepAdaptor_Curve(closest_topods_edge) + param_min, param_max = BRep_Tool.Range_s(closest_topods_edge) + if curve_adaptor.IsPeriodic(): + closest_topods_edge_param = ( + (closest_topods_edge_param - param_min) % curve_adaptor.Period() + ) + param_min + param_pair = ( + (param_min, closest_topods_edge_param) + if closest_topods_edge.Orientation() == TopAbs_Orientation.TopAbs_FORWARD + else (closest_topods_edge_param, param_max) + ) + distance_along_wire = GCPnts_AbscissaPoint.Length_s(curve_adaptor, *param_pair) # Find all of the edges prior to the closest edge wire_explorer = BRepTools_WireExplorer(self.wrapped) @@ -3198,7 +3234,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): wire_explorer.Next() continue # Stop when we find the closest edge - if topods_edge.IsEqual(closest_edge.wrapped): + if topods_edge.IsEqual(closest_topods_edge): break # Add the length of the current edge to the running total distance_along_wire += GCPnts_AbscissaPoint.Length_s( diff --git a/tests/test_build_line.py b/tests/test_build_line.py index 145d43f..01c2fbe 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -30,8 +30,6 @@ import unittest from math import sqrt, pi from build123d import * -from ocp_vscode import show - def _assertTupleAlmostEquals(self, expected, actual, places, msg=None): """Check Tuples""" @@ -675,9 +673,6 @@ class BuildLineTests(unittest.TestCase): # Check coincidence, tangency with each arc _, p1, p2 = start_arc.distance_to_with_closest_points(l1) - a1 = Axis(p1, start_arc.tangent_at(p1)) - a2 = Axis(p2, l1.tangent_at(p2)) - show(start_arc, l1, p1, p2, a1, a2) self.assertTupleAlmostEquals(tuple(p1), tuple(p2), 5) self.assertAlmostEqual( start_arc.tangent_at(p1).cross(l1.tangent_at(p2)).length, 0, 5 diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index fc0c2e6..02f9de0 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -680,7 +680,5 @@ class TestGlobalLocation(unittest.TestCase): ) -from ocp_vscode import show - if __name__ == "__main__": unittest.main() diff --git a/tests/test_topo_explore.py b/tests/test_topo_explore.py index 76e7e0c..add8721 100644 --- a/tests/test_topo_explore.py +++ b/tests/test_topo_explore.py @@ -49,9 +49,6 @@ class DirectApiTestCase(unittest.TestCase): self.assertAlmostEqual(first.Z, second_vector.Z, places, msg=msg) -from ocp_vscode import show, show_all - - class TestTopoExplore(DirectApiTestCase): def test_topo_explore_connected_edges(self): @@ -122,7 +119,6 @@ class TestTopoExplore(DirectApiTestCase): connected_c0 = topo_explore_connected_edges( extracted_e1, continuity=ContinuityLevel.C0 ) - show_all() self.assertEqual(len(connected_c0), 2) self.assertTrue( connected_c0.filter_by(GeomType.LINE, reverse=True)[0].is_same(extracted_e2) From dc763aa6b7cdd431d3a63b7ae5a66566cfa8ece4 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 30 Aug 2025 10:46:30 -0400 Subject: [PATCH 391/518] Adding reversed edges in wire param_at_point test --- tests/test_direct_api/test_wire.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py index 51e398e..a64ca45 100644 --- a/tests/test_direct_api/test_wire.py +++ b/tests/test_direct_api/test_wire.py @@ -32,9 +32,11 @@ import unittest import numpy as np from build123d.build_enums import Side -from build123d.geometry import Axis, Color, Location -from build123d.objects_curve import Polyline, Spline +from build123d.build_line import BuildLine +from build123d.geometry import Axis, Color, Location, Plane, Vector +from build123d.objects_curve import Line, PolarLine, Polyline, Spline from build123d.objects_sketch import Circle, Rectangle, RegularPolygon +from build123d.operations_generic import fillet from build123d.topology import Edge, Face, Wire @@ -173,6 +175,20 @@ class TestWire(unittest.TestCase): with self.assertRaises(ValueError): w1.param_at_point((20, 20, 20)) + def test_param_at_point_reversed_edges(self): + with BuildLine(Plane.YZ) as wing_line: + l1 = Line((0, 65), (80 / 2 + 1.526 * 4, 65)) + PolarLine( + l1 @ 1, 20.371288916, direction=Vector(0, 1, 0).rotate(Axis.X, -75) + ) + fillet(wing_line.vertices(), 7) + + w = wing_line.wire() + params = [w.param_at_point(w @ (i / 20)) for i in range(21)] + self.assertTrue(params == sorted(params)) + for i, param in enumerate(params): + self.assertAlmostEqual(param, i / 20, 6) + def test_order_edges(self): w1 = Wire( [ From 16396571e1b8af1b9b2d56901ea925e3a94ba8dc Mon Sep 17 00:00:00 2001 From: Paul Korzhyk Date: Sat, 30 Aug 2025 21:01:33 +0300 Subject: [PATCH 392/518] call arcs arcs --- docs/objects.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/objects.rst b/docs/objects.rst index 5769b37..8513b2a 100644 --- a/docs/objects.rst +++ b/docs/objects.rst @@ -158,14 +158,14 @@ The following objects all can be used in BuildLine contexts. Note that .. image:: assets/radius_arc_example.svg +++ - Arc define by two points and a radius + Arc defined by two points and a radius .. grid-item-card:: :class:`~objects_curve.SagittaArc` .. image:: assets/sagitta_arc_example.svg +++ - Arc define by two points and a sagitta + Arc defined by two points and a sagitta .. grid-item-card:: :class:`~objects_curve.Spline` @@ -179,14 +179,14 @@ The following objects all can be used in BuildLine contexts. Note that .. image:: assets/tangent_arc_example.svg +++ - Curve define by two points and a tangent + Arc defined by two points and a tangent .. grid-item-card:: :class:`~objects_curve.ThreePointArc` .. image:: assets/three_point_arc_example.svg +++ - Curve define by three points + Arc defined by three points .. grid-item-card:: :class:`~objects_curve.ArcArcTangentLine` From 9d019ea436fbf526d26d812d037816edcfbb2441 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 31 Aug 2025 10:35:28 -0400 Subject: [PATCH 393/518] Improved offset2d side selection --- src/build123d/topology/one_d.py | 37 +++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 3c74577..d7e7564 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -796,20 +796,31 @@ class Mixin1D(Shape): if side != Side.BOTH: # Find and remove the end arcs - offset_edges = offset_wire.edges() - edges_to_keep: list[list[Edge]] = [[], [], []] - i = 0 - for edge in offset_edges: - if edge.geom_type == GeomType.CIRCLE and ( - edge.arc_center == line.position_at(0) - or edge.arc_center == line.position_at(1) - ): - i += 1 - else: - edges_to_keep[i].append(edge) - edges_to_keep[0] += edges_to_keep[2] - wires = [Wire(edges) for edges in edges_to_keep[0:2]] + # offset_edges = offset_wire.edges() + # edges_to_keep: list[list[Edge]] = [[], [], []] + # i = 0 + # for edge in offset_edges: + # if edge.geom_type == GeomType.CIRCLE and ( + # edge.arc_center == line.position_at(0) + # or edge.arc_center == line.position_at(1) + # ): + # i += 1 + # else: + # edges_to_keep[i].append(edge) + # edges_to_keep[0] += edges_to_keep[2] + # wires = [Wire(edges) for edges in edges_to_keep[0:2]] + endpoints = (line.position_at(0), line.position_at(1)) + offset_edges = offset_wire.edges().filter_by( + lambda e: ( + e.geom_type == GeomType.CIRCLE + and any((e.arc_center - pt).length < TOLERANCE for pt in endpoints) + ), + reverse=True, + ) + wires = edges_to_wires(offset_edges) centers = [w.position_at(0.5) for w in wires] + tangent = line.tangent_at(0) + start = line.position_at(0) angles = [ line.tangent_at(0).get_signed_angle(c - line.position_at(0)) for c in centers From 3074f18d0178e96bd0e64d96cd64a46b7558dd3a Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 31 Aug 2025 13:38:39 -0400 Subject: [PATCH 394/518] Fixed Wire.derivative_at with reversed edges --- src/build123d/topology/one_d.py | 45 ++++++++++++++++++------------ tests/test_direct_api/test_wire.py | 14 ++++++++++ 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index d7e7564..bb10e1a 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -515,28 +515,32 @@ class Mixin1D(Shape): Vector: position on the underlying curve """ if isinstance(position, (float, int)): - comp_curve, occt_param = self._occt_param_at(position, position_mode) + comp_curve, occt_param, closest_forward = self._occt_param_at( + position, position_mode + ) else: try: point_on_curve = Vector(position) except Exception as exc: raise ValueError("position must be a float or a point") from exc if isinstance(self, Wire): - closest_edge = min( - self.edges(), key=lambda e: e.distance_to(point_on_curve) - ) + closest = min(self.edges(), key=lambda e: e.distance_to(point_on_curve)) else: - closest_edge = self - u_value = closest_edge.param_at_point(point_on_curve) - comp_curve, occt_param = closest_edge._occt_param_at(u_value) + closest = self + u_value = closest.param_at_point(point_on_curve) + comp_curve, occt_param, closest_forward = closest._occt_param_at(u_value) derivative_gp_vec = comp_curve.DN(occt_param, order) if derivative_gp_vec.Magnitude() == 0: return Vector(0, 0, 0) - if self.is_forward: - return Vector(derivative_gp_vec) - return Vector(derivative_gp_vec) * -1 + edge_same_as_wire = closest_forward == self.is_forward + derivative = ( + -Vector(derivative_gp_vec) + if (not edge_same_as_wire) and (order % 2 == 1) + else Vector(derivative_gp_vec) + ) + return derivative def edge(self) -> Edge | None: """Return the Edge""" @@ -925,7 +929,7 @@ class Mixin1D(Shape): Vector: position on the underlying curve """ # Find the TopoDS_Edge and parameter on that edge at given position - edge_curve_adaptor, occt_edge_param = self._occt_param_at( + edge_curve_adaptor, occt_edge_param, _ = self._occt_param_at( position, position_mode ) @@ -2160,7 +2164,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> tuple[BRepAdaptor_Curve, float]: + ) -> tuple[BRepAdaptor_Curve, float, bool]: """ Map a position on this edge to its underlying OCCT parameter. @@ -2181,8 +2185,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Defaults to ``PositionMode.PARAMETER``. Returns: - tuple[BRepAdaptor_CompCurve, float]: The curve adaptor for this edge and - the corresponding OCCT curve parameter. + tuple[BRepAdaptor_CompCurve, float, bool]: The curve adaptor for this edge, + the corresponding OCCT curve parameter and is_forward. """ comp_curve = self.geom_adaptor() length = GCPnts_AbscissaPoint.Length_s(comp_curve) @@ -2199,7 +2203,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): occt_param = GCPnts_AbscissaPoint( comp_curve, length * value, comp_curve.FirstParameter() ).Parameter() - return comp_curve, occt_param + return comp_curve, occt_param, self.is_forward def param_at_point(self, point: VectorLike) -> float: """ @@ -3257,7 +3261,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER - ) -> tuple[BRepAdaptor_Curve, float]: + ) -> tuple[BRepAdaptor_Curve, float, bool]: """ Map a position along this wire to the underlying OCCT edge and curve parameter. @@ -3282,7 +3286,8 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: tuple[BRepAdaptor_Curve, float]: The curve adaptor for the specific edge - at the given position, and the corresponding OCCT parameter on that edge. + at the given position, the corresponding OCCT parameter on that edge and + if edge is_forward. """ wire_curve_adaptor = self.geom_adaptor() @@ -3301,7 +3306,11 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): ) edge_curve_adaptor = BRepAdaptor_Curve(topods_edge_at_position) - return edge_curve_adaptor, occt_edge_params[0] + return ( + edge_curve_adaptor, + occt_edge_params[0], + topods_edge_at_position.Orientation() == TopAbs_Orientation.TopAbs_FORWARD, + ) def project_to_shape( self, diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py index a64ca45..f4cf622 100644 --- a/tests/test_direct_api/test_wire.py +++ b/tests/test_direct_api/test_wire.py @@ -189,6 +189,20 @@ class TestWire(unittest.TestCase): for i, param in enumerate(params): self.assertAlmostEqual(param, i / 20, 6) + def test_tangent_at_reversed_edges(self): + with BuildLine(Plane.YZ) as wing_line: + l1 = Line((0, 65), (80 / 2 + 1.526 * 4, 65)) + PolarLine( + l1 @ 1, 20.371288916, direction=Vector(0, 1, 0).rotate(Axis.X, -75) + ) + fillet(wing_line.vertices(), 7) + + w = wing_line.wire() + self.assertAlmostEqual( + w.tangent_at(0), (0, -0.2588190451025, 0.9659258262891), 6 + ) + self.assertAlmostEqual(w.tangent_at(1), (0, -1, 0), 6) + def test_order_edges(self): w1 = Wire( [ From 6755a721d82152dc18553cc0042bff57c6b1a0fe Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 31 Aug 2025 14:16:00 -0400 Subject: [PATCH 395/518] All tests pass --- src/build123d/topology/one_d.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index bb10e1a..c10b037 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -534,12 +534,15 @@ class Mixin1D(Shape): if derivative_gp_vec.Magnitude() == 0: return Vector(0, 0, 0) - edge_same_as_wire = closest_forward == self.is_forward - derivative = ( - -Vector(derivative_gp_vec) - if (not edge_same_as_wire) and (order % 2 == 1) - else Vector(derivative_gp_vec) - ) + derivative = Vector(derivative_gp_vec) + # Potentially flip the direction of the derivative + if order % 2 == 1: + if isinstance(self, Wire): + edge_same_as_wire = closest_forward == self.is_forward + derivative = derivative if edge_same_as_wire else -derivative + else: + derivative = derivative if self.is_forward else -derivative + return derivative def edge(self) -> Edge | None: From a52f112375766719452c6e2b9cbfea3777e1eba3 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 31 Aug 2025 20:11:58 -0400 Subject: [PATCH 396/518] Improving test coverage --- src/build123d/topology/one_d.py | 33 +++------ tests/test_direct_api/test_edge.py | 81 ++++---------------- tests/test_direct_api/test_wire.py | 114 ++++++++++++++++++++++++++++- 3 files changed, 138 insertions(+), 90 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index c10b037..286c311 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -152,6 +152,7 @@ from OCP.TopoDS import ( TopoDS_Face, TopoDS_Shape, TopoDS_Shell, + TopoDS_Vertex, TopoDS_Wire, ) from OCP.gp import ( @@ -803,19 +804,6 @@ class Mixin1D(Shape): if side != Side.BOTH: # Find and remove the end arcs - # offset_edges = offset_wire.edges() - # edges_to_keep: list[list[Edge]] = [[], [], []] - # i = 0 - # for edge in offset_edges: - # if edge.geom_type == GeomType.CIRCLE and ( - # edge.arc_center == line.position_at(0) - # or edge.arc_center == line.position_at(1) - # ): - # i += 1 - # else: - # edges_to_keep[i].append(edge) - # edges_to_keep[0] += edges_to_keep[2] - # wires = [Wire(edges) for edges in edges_to_keep[0:2]] endpoints = (line.position_at(0), line.position_at(1)) offset_edges = offset_wire.edges().filter_by( lambda e: ( @@ -826,8 +814,6 @@ class Mixin1D(Shape): ) wires = edges_to_wires(offset_edges) centers = [w.position_at(0.5) for w in wires] - tangent = line.tangent_at(0) - start = line.position_at(0) angles = [ line.tangent_at(0).get_signed_angle(c - line.position_at(0)) for c in centers @@ -2619,7 +2605,6 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): edge, label, color, parent = args[:4] + (None,) * (4 - l_a) elif isinstance(args[0], Wire): wire, label, color, parent = args[:4] + (None,) * (4 - l_a) - # elif isinstance(args[0], Curve): elif ( hasattr(args[0], "wrapped") and isinstance(args[0].wrapped, TopoDS_Compound) @@ -3202,14 +3187,14 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): raise ValueError("Can't find point on empty wire") point_on_curve = Vector(point) + vertex_on_curve = Vertex(point_on_curve) + assert vertex_on_curve.wrapped is not None separation = self.distance_to(point) if not isclose_b(separation, 0, abs_tol=TOLERANCE): raise ValueError(f"point ({point}) is {separation} from wire") - extrema = BRepExtrema_DistShapeShape( - Vertex(point_on_curve).wrapped, self.wrapped - ) + extrema = BRepExtrema_DistShapeShape(vertex_on_curve.wrapped, self.wrapped) extrema.Perform() if not extrema.IsDone() or extrema.NbSolution() == 0: raise ValueError("point is not on Wire") @@ -3217,15 +3202,19 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): supp_type = extrema.SupportTypeShape2(1) if supp_type == BRepExtrema_SupportType.BRepExtrema_IsOnEdge: - closest_topods_edge = downcast(extrema.SupportOnShape2(1)) + closest_topods_edge = tcast( + TopoDS_Edge, downcast(extrema.SupportOnShape2(1)) + ) closest_topods_edge_param = extrema.ParOnEdgeS2(1)[0] elif supp_type == BRepExtrema_SupportType.BRepExtrema_IsVertex: - v_hit = downcast(extrema.SupportOnShape2(1)) + v_hit = tcast(TopoDS_Vertex, downcast(extrema.SupportOnShape2(1))) vertex_edge_map = TopTools_IndexedDataMapOfShapeListOfShape() TopExp.MapShapesAndAncestors_s( self.wrapped, ta.TopAbs_VERTEX, ta.TopAbs_EDGE, vertex_edge_map ) - closest_topods_edge = downcast(vertex_edge_map.FindFromKey(v_hit).First()) + closest_topods_edge = tcast( + TopoDS_Edge, downcast(vertex_edge_map.FindFromKey(v_hit).First()) + ) closest_topods_edge_param = BRep_Tool.Parameter_s( v_hit, closest_topods_edge ) diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index 9ebe011..fb60a7d 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -32,7 +32,6 @@ import unittest from unittest.mock import patch, PropertyMock -from build123d.topology.shape_core import TOLERANCE from build123d.build_enums import AngularDirection, GeomType, PositionMode, Transition from build123d.geometry import Axis, Plane, Vector from build123d.objects_curve import CenterArc, EllipticalCenterArc @@ -187,6 +186,10 @@ class TestEdge(unittest.TestCase): with self.assertRaises(ValueError): line.trim(0.75, 0.25) + line.wrapped = None + with self.assertRaises(ValueError): + line.trim(0.1, 0.9) + def test_trim_to_length(self): e1 = Edge.make_line((0, 0), (10, 10)) @@ -210,6 +213,10 @@ class TestEdge(unittest.TestCase): e4_trim = Edge(a4).trim_to_length(0.5, 2) self.assertAlmostEqual(e4_trim.length, 2, 5) + e1.wrapped = None + with self.assertRaises(ValueError): + e1.trim_to_length(0.1, 2) + def test_bezier(self): with self.assertRaises(ValueError): Edge.make_bezier((1, 1)) @@ -278,6 +285,10 @@ class TestEdge(unittest.TestCase): with self.assertRaises(ValueError): edge.param_at_point((-1, 1)) + ea.wrapped = None + with self.assertRaises(ValueError): + ea.param_at_point((15, 5)) + def test_param_at_point_bspline(self): # Define a complex spline with inflections and non-monotonic behavior curve = Edge.make_spline( @@ -315,6 +326,10 @@ class TestEdge(unittest.TestCase): e2r = e2.reversed(reconstruct=True) self.assertAlmostEqual((e2 @ 0.1).X, -(e2r @ 0.1).X, 5) + e2.wrapped = None + with self.assertRaises(ValueError): + e2.reversed() + def test_init(self): with self.assertRaises(TypeError): Edge(direction=(1, 0, 0)) @@ -410,69 +425,5 @@ class TestEdge(unittest.TestCase): line.geom_adaptor() -class TestWireToBSpline(unittest.TestCase): - def setUp(self): - # A simple rectilinear, multi-segment wire: - # p0 ── p1 - # │ - # p2 ── p3 - self.p0 = Vector(0, 0, 0) - self.p1 = Vector(20, 0, 0) - self.p2 = Vector(20, 10, 0) - self.p3 = Vector(35, 10, 0) - - e01 = Edge.make_line(self.p0, self.p1) - e12 = Edge.make_line(self.p1, self.p2) - e23 = Edge.make_line(self.p2, self.p3) - - self.wire = Wire([e01, e12, e23]) - - def test_to_bspline_basic_properties(self): - bs = self.wire._to_bspline() - - # 1) Type/geom check - self.assertIsInstance(bs, Edge) - self.assertEqual(bs.geom_type, GeomType.BSPLINE) - - # 2) Endpoint preservation - self.assertLess((Vector(bs.vertices()[0]) - self.p0).length, TOLERANCE) - self.assertLess((Vector(bs.vertices()[-1]) - self.p3).length, TOLERANCE) - - # 3) Length preservation (within numerical tolerance) - self.assertAlmostEqual(bs.length, self.wire.length, delta=1e-6) - - # 4) Topology collapse: single edge has only 2 vertices (start/end) - self.assertEqual(len(bs.vertices()), 2) - - # 5) The composite BSpline should pass through former junctions - for junction in (self.p1, self.p2): - self.assertLess(bs.distance_to(junction), 1e-6) - - # 6) Normalized parameter increases along former junctions - u_p1 = bs.param_at_point(self.p1) - u_p2 = bs.param_at_point(self.p2) - self.assertGreater(u_p1, 0.0) - self.assertLess(u_p2, 1.0) - self.assertLess(u_p1, u_p2) - - # 7) Re-evaluating at those parameters should be close to the junctions - self.assertLess((bs.position_at(u_p1) - self.p1).length, 1e-6) - self.assertLess((bs.position_at(u_p2) - self.p2).length, 1e-6) - - def test_to_bspline_orientation(self): - # Ensure the BSpline follows the wire's topological order - bs = self.wire._to_bspline() - - # Start ~ p0, end ~ p3 - self.assertLess((bs.position_at(0.0) - self.p0).length, 1e-6) - self.assertLess((bs.position_at(1.0) - self.p3).length, 1e-6) - - # Parameters at interior points should sit between 0 and 1 - u0 = bs.param_at_point(self.p1) - u1 = bs.param_at_point(self.p2) - self.assertTrue(0.0 < u0 < 1.0) - self.assertTrue(0.0 < u1 < 1.0) - - if __name__ == "__main__": unittest.main() diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py index f4cf622..cbb9449 100644 --- a/tests/test_direct_api/test_wire.py +++ b/tests/test_direct_api/test_wire.py @@ -31,13 +31,16 @@ import random import unittest import numpy as np -from build123d.build_enums import Side +from build123d.topology.shape_core import TOLERANCE + +from build123d.build_enums import GeomType, Side from build123d.build_line import BuildLine from build123d.geometry import Axis, Color, Location, Plane, Vector -from build123d.objects_curve import Line, PolarLine, Polyline, Spline +from build123d.objects_curve import Curve, Line, PolarLine, Polyline, Spline from build123d.objects_sketch import Circle, Rectangle, RegularPolygon from build123d.operations_generic import fillet from build123d.topology import Edge, Face, Wire +from OCP.BRepAdaptor import BRepAdaptor_CompCurve class TestWire(unittest.TestCase): @@ -64,6 +67,9 @@ class TestWire(unittest.TestCase): self.assertAlmostEqual( squaroid.length, 4 * (1 - 2 * 0.1) + 2 * math.pi * 0.1, 5 ) + square.wrapped = None + with self.assertRaises(ValueError): + square.fillet_2d(0.1, square.vertices()) def test_chamfer_2d(self): square = Wire.make_rect(1, 1) @@ -71,6 +77,18 @@ class TestWire(unittest.TestCase): self.assertAlmostEqual( squaroid.length, 4 * (1 - 2 * 0.1 + 0.1 * math.sqrt(2)), 5 ) + verts = square.vertices() + verts[0].wrapped = None + three_corners = square.chamfer_2d(0.1, 0.1, verts) + self.assertEqual(len(three_corners.edges()), 7) + + square.wrapped = None + with self.assertRaises(ValueError): + square.chamfer_2d(0.1, 0.1, square.vertices()) + + def test_close(self): + t = Polyline((0, 0), (1, 0), (0, 1), close=True) + self.assertIs(t, t.close()) def test_chamfer_2d_edge(self): square = Wire.make_rect(1, 1) @@ -98,7 +116,15 @@ class TestWire(unittest.TestCase): hull_wire = Wire.make_convex_hull(adjoining_edges) self.assertAlmostEqual(Face(hull_wire).area, 319.9612, 4) - # def test_fix_degenerate_edges(self): + def test_fix_degenerate_edges(self): + e0 = Edge.make_line((0, 0), (1, 0)) + e1 = Edge.make_line((2, 0), (1, 0)) + + w = Wire([e0, e1]) + w.wrapped = None + with self.assertRaises(ValueError): + w.fix_degenerate_edges(0.1) + # # Can't find a way to create one # edge0 = Edge.make_line((0, 0, 0), (1, 0, 0)) # edge1 = Edge.make_line(edge0 @ 0, edge0 @ 0 + Vector(0, 1, 0)) @@ -175,6 +201,10 @@ class TestWire(unittest.TestCase): with self.assertRaises(ValueError): w1.param_at_point((20, 20, 20)) + w1.wrapped = None + with self.assertRaises(ValueError): + w1.param_at_point((0, 0)) + def test_param_at_point_reversed_edges(self): with BuildLine(Plane.YZ) as wing_line: l1 = Line((0, 65), (80 / 2 + 1.526 * 4, 65)) @@ -216,6 +246,13 @@ class TestWire(unittest.TestCase): self.assertAlmostEqual(ordered_edges[1] @ 0, (1, 0, 0), 5) self.assertAlmostEqual(ordered_edges[2] @ 0, (1, 1, 0), 5) + def test_geom_adaptor(self): + w = Polyline((0, 0), (1, 0), (1, 1)) + self.assertTrue(isinstance(w.geom_adaptor(), BRepAdaptor_CompCurve)) + w.wrapped = None + with self.assertRaises(ValueError): + w.geom_adaptor() + def test_constructor(self): e0 = Edge.make_line((0, 0), (1, 0)) e1 = Edge.make_line((1, 0), (1, 1)) @@ -241,9 +278,80 @@ class TestWire(unittest.TestCase): c0 = Polyline((0, 0), (1, 0), (1, 1)) w8 = Wire(c0) self.assertTrue(w8.is_valid) + w9 = Wire(Curve([e0, e1])) + self.assertTrue(w9.is_valid) with self.assertRaises(ValueError): Wire(bob="fred") +class TestWireToBSpline(unittest.TestCase): + def setUp(self): + # A simple rectilinear, multi-segment wire: + # p0 ── p1 + # │ + # p2 ── p3 + self.p0 = Vector(0, 0, 0) + self.p1 = Vector(20, 0, 0) + self.p2 = Vector(20, 10, 0) + self.p3 = Vector(35, 10, 0) + + e01 = Edge.make_line(self.p0, self.p1) + e12 = Edge.make_line(self.p1, self.p2) + e23 = Edge.make_line(self.p2, self.p3) + + self.wire = Wire([e01, e12, e23]) + + def test_to_bspline_basic_properties(self): + bs = self.wire._to_bspline() + + # 1) Type/geom check + self.assertIsInstance(bs, Edge) + self.assertEqual(bs.geom_type, GeomType.BSPLINE) + + # 2) Endpoint preservation + self.assertLess((Vector(bs.vertices()[0]) - self.p0).length, TOLERANCE) + self.assertLess((Vector(bs.vertices()[-1]) - self.p3).length, TOLERANCE) + + # 3) Length preservation (within numerical tolerance) + self.assertAlmostEqual(bs.length, self.wire.length, delta=1e-6) + + # 4) Topology collapse: single edge has only 2 vertices (start/end) + self.assertEqual(len(bs.vertices()), 2) + + # 5) The composite BSpline should pass through former junctions + for junction in (self.p1, self.p2): + self.assertLess(bs.distance_to(junction), 1e-6) + + # 6) Normalized parameter increases along former junctions + u_p1 = bs.param_at_point(self.p1) + u_p2 = bs.param_at_point(self.p2) + self.assertGreater(u_p1, 0.0) + self.assertLess(u_p2, 1.0) + self.assertLess(u_p1, u_p2) + + # 7) Re-evaluating at those parameters should be close to the junctions + self.assertLess((bs.position_at(u_p1) - self.p1).length, 1e-6) + self.assertLess((bs.position_at(u_p2) - self.p2).length, 1e-6) + + w = self.wire + w.wrapped = None + with self.assertRaises(ValueError): + w._to_bspline() + + def test_to_bspline_orientation(self): + # Ensure the BSpline follows the wire's topological order + bs = self.wire._to_bspline() + + # Start ~ p0, end ~ p3 + self.assertLess((bs.position_at(0.0) - self.p0).length, 1e-6) + self.assertLess((bs.position_at(1.0) - self.p3).length, 1e-6) + + # Parameters at interior points should sit between 0 and 1 + u0 = bs.param_at_point(self.p1) + u1 = bs.param_at_point(self.p2) + self.assertTrue(0.0 < u0 < 1.0) + self.assertTrue(0.0 < u1 < 1.0) + + if __name__ == "__main__": unittest.main() From cc7b3ffa8228a3dc19ed6fc7a8da7e551f9eb7e9 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 1 Sep 2025 13:45:50 -0400 Subject: [PATCH 397/518] Fixed Edge.filter_by not respecting location Issue #1083 --- src/build123d/topology/shape_core.py | 5 ++++- tests/test_direct_api/test_shape_list.py | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 61c200a..6f8d673 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2531,9 +2531,9 @@ class ShapeList(list[T]): def plane_parallel_predicate(plane: Plane, tolerance: float): plane_axis = Axis(plane.origin, plane.z_dir) - plane_xyz = plane.z_dir.wrapped.XYZ() def pred(shape: Shape): + if shape.is_planar_face: assert shape.wrapped is not None and isinstance( shape.wrapped, TopoDS_Face @@ -2550,6 +2550,9 @@ class ShapeList(list[T]): if isinstance(shape.wrapped, TopoDS_Wire): return all(pred(e) for e in shape.edges()) if isinstance(shape.wrapped, TopoDS_Edge): + plane_xyz = ( + plane * Location(shape.location).inverse() + ).z_dir.wrapped.XYZ() for curve in shape.wrapped.TShape().Curves(): if curve.IsCurve3D(): return ShapeAnalysis_Curve.IsPlanar_s( diff --git a/tests/test_direct_api/test_shape_list.py b/tests/test_direct_api/test_shape_list.py index 535e034..24091b7 100644 --- a/tests/test_direct_api/test_shape_list.py +++ b/tests/test_direct_api/test_shape_list.py @@ -118,6 +118,24 @@ class TestShapeList(unittest.TestCase): self.assertEqual(len(box.edges().filter_by(Axis.X)), 4) self.assertEqual(len(box.vertices().filter_by(Axis.X)), 0) + def test_filter_by_plane(self): + c1 = Cylinder(1, 3) + c2 = Cylinder(1, 3, rotation=(90, 0, 0)) + + sel1 = c1.faces().filter_by(Plane.XY) + sel2 = c1.edges().filter_by(Plane.XY) + sel3 = c2.faces().filter_by(Plane.XZ) + sel4 = c2.edges().filter_by(Plane.XZ) + sel5 = c1.wires().filter_by(Plane.XY) + sel6 = c2.wires().filter_by(Plane.XZ) + + self.assertEqual(len(sel1), 2) + self.assertEqual(len(sel2), 2) + self.assertEqual(len(sel3), 2) + self.assertEqual(len(sel4), 2) + self.assertEqual(len(sel5), 2) + self.assertEqual(len(sel6), 2) + def test_filter_by_callable_predicate(self): boxes = [Solid.make_box(1, 1, 1) for _ in range(3)] boxes[0].label = "A" From 033ad04b70ff520f354ef0877067d03e3dfeee22 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 1 Sep 2025 14:06:08 -0400 Subject: [PATCH 398/518] Improving shape_core.py typing --- src/build123d/topology/shape_core.py | 33 +++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 6f8d673..ec9e2ae 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -72,7 +72,7 @@ from anytree import NodeMixin, RenderTree from IPython.lib.pretty import RepresentationPrinter, pretty from OCP.Bnd import Bnd_Box, Bnd_OBB from OCP.BOPAlgo import BOPAlgo_GlueEnum -from OCP.BRep import BRep_Tool +from OCP.BRep import BRep_TEdge, BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Surface from OCP.BRepAlgoAPI import ( BRepAlgoAPI_BooleanOperation, @@ -105,7 +105,7 @@ from OCP.gce import gce_MakeLin from OCP.Geom import Geom_Line from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf from OCP.GeomLib import GeomLib_IsPlanarSurface -from OCP.gp import gp_Ax1, gp_Ax2, gp_Ax3, gp_Dir, gp_Pnt, gp_Trsf, gp_Vec +from OCP.gp import gp_Ax1, gp_Ax2, gp_Ax3, gp_Dir, gp_Pnt, gp_Trsf, gp_Vec, gp_XYZ from OCP.GProp import GProp_GProps from OCP.ShapeAnalysis import ShapeAnalysis_Curve from OCP.ShapeCustom import ShapeCustom, ShapeCustom_RestrictionParameters @@ -518,6 +518,8 @@ class Shape(NodeMixin, Generic[TOPODS]): - It is commonly used in structural analysis, mechanical simulations, and physics-based motion calculations. """ + if self.wrapped is None: + raise ValueError("Can't calculate matrix for empty shape") properties = GProp_GProps() BRepGProp.VolumeProperties_s(self.wrapped, properties) inertia_matrix = properties.MatrixOfInertia() @@ -573,6 +575,9 @@ class Shape(NodeMixin, Generic[TOPODS]): (Vector(0, 1, 0), 1000.0), (Vector(0, 0, 1), 300.0)] """ + if self.wrapped is None: + raise ValueError("Can't calculate properties for empty shape") + properties = GProp_GProps() BRepGProp.VolumeProperties_s(self.wrapped, properties) principal_props = properties.PrincipalProperties() @@ -610,6 +615,9 @@ class Shape(NodeMixin, Generic[TOPODS]): (150.0, 200.0, 50.0) """ + if self.wrapped is None: + raise ValueError("Can't calculate moments for empty shape") + properties = GProp_GProps() BRepGProp.VolumeProperties_s(self.wrapped, properties) return properties.StaticMoments() @@ -1633,6 +1641,9 @@ class Shape(NodeMixin, Generic[TOPODS]): - The radius of gyration is computed based on the shape’s mass properties. - It is useful for evaluating structural stability and rotational behavior. """ + if self.wrapped is None: + raise ValueError("Can't calculate radius of gyration for empty shape") + properties = GProp_GProps() BRepGProp.VolumeProperties_s(self.wrapped, properties) return properties.RadiusOfGyration(axis.wrapped) @@ -1852,12 +1863,16 @@ class Shape(NodeMixin, Generic[TOPODS]): raise ValueError("perimeter must be a closed Wire or Edge") perimeter_edges = TopTools_SequenceOfShape() for perimeter_edge in perimeter.edges(): + if perimeter_edge.wrapped is None: + continue perimeter_edges.Append(perimeter_edge.wrapped) # Split the shells by the perimeter edges lefts: list[Shell] = [] rights: list[Shell] = [] for target_shell in self.shells(): + if target_shell.wrapped is None: + continue constructor = BRepFeat_SplitShape(target_shell.wrapped) constructor.Add(perimeter_edges) constructor.Build() @@ -2550,10 +2565,16 @@ class ShapeList(list[T]): if isinstance(shape.wrapped, TopoDS_Wire): return all(pred(e) for e in shape.edges()) if isinstance(shape.wrapped, TopoDS_Edge): - plane_xyz = ( - plane * Location(shape.location).inverse() - ).z_dir.wrapped.XYZ() - for curve in shape.wrapped.TShape().Curves(): + if shape.location is None: + return False + plane_xyz = tcast( + gp_XYZ, + ( + tcast(Plane, plane * Location(shape.location).inverse()) + ).z_dir.wrapped.XYZ(), + ) + t_edge = tcast(BRep_TEdge, shape.wrapped.TShape()) + for curve in t_edge.Curves(): if curve.IsCurve3D(): return ShapeAnalysis_Curve.IsPlanar_s( curve.Curve3D(), plane_xyz, tolerance From 6028b14aa068f9235c41a74f837fecc898330764 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 2 Sep 2025 14:21:59 -0400 Subject: [PATCH 399/518] Adding BlendCurve Issue #1054 --- docs/cheat_sheet.rst | 1 + src/build123d/__init__.py | 1 + src/build123d/objects_curve.py | 168 ++++++++++++++++++++++++++++++++- tests/test_blendcurve.py | 144 ++++++++++++++++++++++++++++ 4 files changed, 313 insertions(+), 1 deletion(-) create mode 100644 tests/test_blendcurve.py diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index 4b88edb..d46ccf8 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -18,6 +18,7 @@ Cheat Sheet | :class:`~objects_curve.ArcArcTangentArc` | :class:`~objects_curve.ArcArcTangentLine` | :class:`~objects_curve.Bezier` + | :class:`~objects_curve.BlendCurve` | :class:`~objects_curve.CenterArc` | :class:`~objects_curve.DoubleTangentArc` | :class:`~objects_curve.EllipticalCenterArc` diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index dc25ee1..a2ccbfc 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -80,6 +80,7 @@ __all__ = [ # 1D Curve Objects "BaseLineObject", "Bezier", + "BlendCurve", "CenterArc", "DoubleTangentArc", "EllipticalCenterArc", diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 3ea3adf..e697145 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -30,6 +30,7 @@ from __future__ import annotations import copy as copy_module from collections.abc import Iterable +from itertools import product from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize import sympy # type: ignore @@ -37,6 +38,7 @@ import sympy # type: ignore from build123d.build_common import WorkplaneList, flatten_sequence, validate_inputs from build123d.build_enums import ( AngularDirection, + ContinuityLevel, GeomType, LengthMode, Keep, @@ -78,7 +80,8 @@ class BaseLineObject(Wire): def __init__(self, curve: Wire, mode: Mode = Mode.ADD): # Use the helper function to handle adding the curve to the context _add_curve_to_context(curve, mode) - super().__init__(curve.wrapped) + if curve.wrapped is not None: + super().__init__(curve.wrapped) class BaseEdgeObject(Edge): @@ -128,6 +131,169 @@ class Bezier(BaseEdgeObject): super().__init__(curve, mode=mode) +class BlendCurve(BaseEdgeObject): + """Line Object: BlendCurve + + Create a smooth Bézier-based transition curve between two existing edges. + + The blend is constructed as a cubic (C1) or quintic (C2) Bézier curve + whose control points are determined from the position, first derivative, + and (for C2) second derivative of the input curves at the chosen endpoints. + Optional scalar multipliers can be applied to the endpoint tangents to + control the "tension" of the blend. + + Args: + curve0 (Edge): First curve to blend from. + curve1 (Edge): Second curve to blend to. + continuity (ContinuityLevel, optional): + Desired geometric continuity at the join: + - ContinuityLevel.C0: position match only (straight line) + - ContinuityLevel.C1: match position and tangent direction (cubic Bézier) + - ContinuityLevel.C2: match position, tangent, and curvature (quintic Bézier) + Defaults to ContinuityLevel.C2. + end_points (tuple[VectorLike, VectorLike] | None, optional): + Pair of points specifying the connection points on `curve0` and `curve1`. + Each must coincide (within TOLERANCE) with the start or end of the + respective curve. If None, the closest pair of endpoints is chosen. + Defaults to None. + tangent_scalars (tuple[float, float] | None, optional): + Scalar multipliers applied to the first derivatives at the start + of `curve0` and the end of `curve1` before computing control points. + Useful for adjusting the pull/tension of the blend without altering + the base curves. Defaults to (1.0, 1.0). + mode (Mode, optional): Boolean operation mode when used in a + BuildLine context. Defaults to Mode.ADD. + + Raises: + ValueError: `tangent_scalars` must be a pair of float values. + ValueError: If specified `end_points` are not coincident with the start + or end of their respective curves. + + Example: + >>> blend = BlendCurve(curve_a, curve_b, ContinuityLevel.C1, tangent_scalars=(1.2, 0.8)) + >>> show(blend) + """ + + def __init__( + self, + curve0: Edge, + curve1: Edge, + continuity: ContinuityLevel = ContinuityLevel.C2, + end_points: tuple[VectorLike, VectorLike] | None = None, + tangent_scalars: tuple[float, float] | None = None, + mode: Mode = Mode.ADD, + ): + # + # Process the inputs + + tan_scalars = (1.0, 1.0) if tangent_scalars is None else tangent_scalars + if len(tan_scalars) != 2: + raise ValueError("tangent_scalars must be a (start, end) pair") + + # Find the vertices that will be connected using closest if None + end_pnts = ( + min( + product(curve0.vertices(), curve1.vertices()), + key=lambda pair: pair[0].distance_to(pair[1]), + ) + if end_points is None + else end_points + ) + + # Find the Edge parameter that matches the end points + curves: tuple[Edge, Edge] = (curve0, curve1) + end_params = [0, 0] + for i, end_pnt in enumerate(end_pnts): + curve_start_pnt = curves[i].position_at(0) + curve_end_pnt = curves[i].position_at(1) + given_end_pnt = Vector(end_pnt) + if (given_end_pnt - curve_start_pnt).length < TOLERANCE: + end_params[i] = 0 + elif (given_end_pnt - curve_end_pnt).length < TOLERANCE: + end_params[i] = 1 + else: + raise ValueError( + "end_points must be at either the start or end of a curve" + ) + + # + # Bézier endpoint derivative constraints (degree n=5 case) + # + # For a degree-n Bézier curve: + # B(t) = Σ_{i=0}^n binom(n,i) (1-t)^(n-i) t^i P_i + # B'(t) = n(P_1 - P_0) at t=0 + # n(P_n - P_{n-1}) at t=1 + # B''(t) = n(n-1)(P_2 - 2P_1 + P_0) at t=0 + # n(n-1)(P_{n-2} - 2P_{n-1} + P_n) at t=1 + # + # Matching a desired start derivative D0 and curvature vector K0: + # P1 = P0 + (1/n) * D0 + # P2 = P0 + (2/n) * D0 + (1/(n*(n-1))) * K0 + # + # Matching a desired end derivative D1 and curvature vector K1: + # P_{n-1} = P_n - (1/n) * D1 + # P_{n-2} = P_n - (2/n) * D1 + (1/(n*(n-1))) * K1 + # + # For n=5 specifically: + # P1 = P0 + D0 / 5 + # P2 = P0 + (2*D0)/5 + K0/20 + # P4 = P5 - D1 / 5 + # P3 = P5 - (2*D1)/5 + K1/20 + # + # D0, D1 are first derivatives at endpoints (can be scaled for tension). + # K0, K1 are second derivatives at endpoints (for C² continuity). + # Works in any dimension; P_i are vectors in ℝ² or ℝ³. + + # + # | Math symbol | Meaning in code | Python name | + # | ----------- | -------------------------- | ------------ | + # | P_0 | start position | start_pos | + # | P_1 | 1st control pt after start | ctrl_pnt1 | + # | P_2 | 2nd control pt after start | ctrl_pnt2 | + # | P_{n-2} | 2nd control pt before end | ctrl_pnt3 | + # | P_{n-1} | 1st control pt before end | ctrl_pnt4 | + # | P_n | end position | end_pos | + # | D_0 | derivative at start | start_deriv | + # | D_1 | derivative at end | end_deriv | + # | K_0 | curvature vec at start | start_curv | + # | K_1 | curvature vec at end | end_curv | + + start_pos = curve0.position_at(end_params[0]) + end_pos = curve1.position_at(end_params[1]) + + # Note: derivative_at(..,1) is being used instead of tangent_at as + # derivate_at isn't normalized which allows for a natural "speed" to be used + # if no scalar is provided. + start_deriv = curve0.derivative_at(end_params[0], 1) * tan_scalars[0] + end_deriv = curve1.derivative_at(end_params[1], 1) * tan_scalars[1] + + if continuity == ContinuityLevel.C0: + joining_curve = Line(start_pos, end_pos) + elif continuity == ContinuityLevel.C1: + cntl_pnt1 = start_pos + start_deriv / 3 + cntl_pnt4 = end_pos - end_deriv / 3 + cntl_pnts = [start_pos, cntl_pnt1, cntl_pnt4, end_pos] # degree-3 Bézier + joining_curve = Bezier(*cntl_pnts) + else: # C2 + start_curv = curve0.derivative_at(end_params[0], 2) + end_curv = curve1.derivative_at(end_params[1], 2) + cntl_pnt1 = start_pos + start_deriv / 5 + cntl_pnt2 = start_pos + (2 * start_deriv) / 5 + start_curv / 20 + cntl_pnt4 = end_pos - end_deriv / 5 + cntl_pnt3 = end_pos - (2 * end_deriv) / 5 + end_curv / 20 + cntl_pnts = [ + start_pos, + cntl_pnt1, + cntl_pnt2, + cntl_pnt3, + cntl_pnt4, + end_pos, + ] # degree-5 Bézier + joining_curve = Bezier(*cntl_pnts) + + super().__init__(joining_curve, mode=mode) + + class CenterArc(BaseEdgeObject): """Line Object: Center Arc diff --git a/tests/test_blendcurve.py b/tests/test_blendcurve.py new file mode 100644 index 0000000..c3abafc --- /dev/null +++ b/tests/test_blendcurve.py @@ -0,0 +1,144 @@ +""" +build123d tests + +name: test_blendcurve.py +by: Gumyr +date: September 2, 2025 + +desc: + This python module contains pytests for the build123d BlendCurve object. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import pytest + +from build123d.objects_curve import BlendCurve, CenterArc, Spline, Line +from build123d.geometry import Vector, Pos, TOLERANCE +from build123d.build_enums import ContinuityLevel, GeomType + + +def _vclose(a: Vector, b: Vector, tol: float = TOLERANCE) -> bool: + return (a - b).length <= tol + + +def _either_close(p: Vector, a: Vector, b: Vector, tol: float = TOLERANCE) -> bool: + return _vclose(p, a, tol) or _vclose(p, b, tol) + + +def make_edges(): + """ + Arc + spline pair similar to the user demo: + - arc radius 5, moved left a bit, reversed so the join uses the arc's 'end' + - symmetric spline with a dip + """ + m1 = Pos(-10, 3) * CenterArc((0, 0), 5, -10, 200).reversed() + m2 = Pos(5, -13) * Spline((-3, 9), (0, 0), (3, 9)) + return m1, m2 + + +def test_c0_positions_match_endpoints(): + m1, m2 = make_edges() + + # No end_points passed -> should auto-pick closest pair of vertices. + bc = BlendCurve(m1, m2, continuity=ContinuityLevel.C0) + + # Start of connector must be one of m1's endpoints; end must be one of m2's endpoints. + m1_p0, m1_p1 = m1.position_at(0), m1.position_at(1) + m2_p0, m2_p1 = m2.position_at(0), m2.position_at(1) + + assert _either_close(bc.position_at(0), m1_p0, m1_p1) + assert _either_close(bc.position_at(1), m2_p0, m2_p1) + + # Geometry type should be a line for C0. + assert bc.geom_type == GeomType.LINE + + +@pytest.mark.parametrize("continuity", [ContinuityLevel.C1, ContinuityLevel.C2]) +def test_c1_c2_tangent_matches_with_scalars(continuity): + m1, m2 = make_edges() + + # Force a specific endpoint pairing to avoid ambiguity + start_pt = m1.position_at(1) # arc end + end_pt = m2.position_at(0) # spline start + s0, s1 = 1.7, 0.8 + + bc = BlendCurve( + m1, + m2, + continuity=continuity, + end_points=(start_pt, end_pt), + tangent_scalars=(s0, s1), + ) + + # Positions must match exactly at the ends + assert _vclose(bc.position_at(0), start_pt) + assert _vclose(bc.position_at(1), end_pt) + + # First-derivative (tangent) must match inputs * scalars + exp_d1_start = m1.derivative_at(1, 1) * s0 + exp_d1_end = m2.derivative_at(0, 1) * s1 + + got_d1_start = bc.derivative_at(0, 1) + got_d1_end = bc.derivative_at(1, 1) + + assert _vclose(got_d1_start, exp_d1_start) + assert _vclose(got_d1_end, exp_d1_end) + + # C1/C2 connectors are Bezier curves + assert bc.geom_type == GeomType.BEZIER + + if continuity == ContinuityLevel.C2: + # Second derivative must also match at both ends + exp_d2_start = m1.derivative_at(1, 2) + exp_d2_end = m2.derivative_at(0, 2) + + got_d2_start = bc.derivative_at(0, 2) + got_d2_end = bc.derivative_at(1, 2) + + assert _vclose(got_d2_start, exp_d2_start) + assert _vclose(got_d2_end, exp_d2_end) + + +def test_auto_select_closest_endpoints_simple_lines(): + # Construct two simple lines with an unambiguous closest-endpoint pair + a = Line((0, 0), (1, 0)) + b = Line((2, 0), (2, 1)) + + bc = BlendCurve(a, b, continuity=ContinuityLevel.C0) + + assert _vclose(bc.position_at(0), a.position_at(1)) # (1,0) + assert _vclose(bc.position_at(1), b.position_at(0)) # (2,0) + + +def test_invalid_tangent_scalars_raises(): + m1, m2 = make_edges() + with pytest.raises(ValueError): + BlendCurve(m1, m2, tangent_scalars=(1.0,), continuity=ContinuityLevel.C1) + + +def test_invalid_end_points_raises(): + m1, m2 = make_edges() + bad_point = m1.position_at(0.5) # not an endpoint + with pytest.raises(ValueError): + BlendCurve( + m1, + m2, + continuity=ContinuityLevel.C1, + end_points=(bad_point, m2.position_at(0)), + ) From 5681bfb905f6a5e482f6449a34fdebebfbce84fb Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 3 Sep 2025 11:01:05 -0400 Subject: [PATCH 400/518] Adding BlendCurve to the docs --- docs/assets/example_blend_curve.svg | 12 ++++++++++++ docs/objects.rst | 8 ++++++++ docs/objects_1d_blend_curve.py | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 docs/assets/example_blend_curve.svg create mode 100644 docs/objects_1d_blend_curve.py diff --git a/docs/assets/example_blend_curve.svg b/docs/assets/example_blend_curve.svg new file mode 100644 index 0000000..d5e0ce6 --- /dev/null +++ b/docs/assets/example_blend_curve.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/objects.rst b/docs/objects.rst index 8513b2a..0cff926 100644 --- a/docs/objects.rst +++ b/docs/objects.rst @@ -83,6 +83,13 @@ The following objects all can be used in BuildLine contexts. Note that +++ Curve defined by control points and weights + .. grid-item-card:: :class:`~objects_curve.BlendCurve` + + .. image:: assets/example_blend_curve.svg + + +++ + Curve blending curvature of two curves + .. grid-item-card:: :class:`~objects_curve.CenterArc` .. image:: assets/center_arc_example.svg @@ -222,6 +229,7 @@ Reference .. autoclass:: BaseLineObject .. autoclass:: Bezier +.. autoclass:: BlendCurve .. autoclass:: CenterArc .. autoclass:: DoubleTangentArc .. autoclass:: EllipticalCenterArc diff --git a/docs/objects_1d_blend_curve.py b/docs/objects_1d_blend_curve.py new file mode 100644 index 0000000..e7ea991 --- /dev/null +++ b/docs/objects_1d_blend_curve.py @@ -0,0 +1,18 @@ +from build123d import * + +# from ocp_vscode import show_all, set_defaults, Camera + +# set_defaults(reset_camera=Camera.KEEP) + +with BuildLine() as blend_curve: + l1 = CenterArc((0, 0), 5, 135, -135) + l2 = Spline((0, -5), (-3, -8), (0, -11)) + l3 = BlendCurve(l1, l2, tangent_scalars=(2, 5)) +s = 100 / max(*blend_curve.line.bounding_box().size) +svg = ExportSVG(scale=s) +svg.add_layer("dashed", line_type=LineType.ISO_DASH_SPACE) +svg.add_shape(l1, "dashed") +svg.add_shape(l2, "dashed") +svg.add_shape(l3) +svg.write("assets/example_blend_curve.svg") +# show_all() From 790f0eacedcf056cfd46ab9c3945a5a405e6e2e7 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 3 Sep 2025 19:29:46 -0400 Subject: [PATCH 401/518] Adding Mixin1D.curvature_comb --- src/build123d/topology/one_d.py | 86 +++++++++++++++++++++++++- tests/test_direct_api/test_mixin1_d.py | 64 ++++++++++++++++++- 2 files changed, 147 insertions(+), 3 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 286c311..e019df7 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -53,10 +53,11 @@ from __future__ import annotations import copy import itertools +import numpy as np import warnings from collections.abc import Iterable from itertools import combinations -from math import radians, inf, pi, cos, copysign, ceil, floor +from math import radians, inf, pi, cos, copysign, ceil, floor, isclose from typing import cast as tcast from typing import Literal, overload, TYPE_CHECKING from typing_extensions import Self @@ -493,6 +494,89 @@ class Mixin1D(Shape): return result + def curvature_comb( + self, count: int = 100, max_tooth_size: float | None = None + ) -> ShapeList[Edge]: + """ + Build a *curvature comb* for a planar (XY) 1D curve. + + A curvature comb is a set of short line segments (“teeth”) erected + perpendicular to the curve that visualize the signed curvature κ(u). + Tooth length is proportional to |κ| and the direction encodes the sign + (left normal for κ>0, right normal for κ<0). This is useful for inspecting + fairness and continuity (C0/C1/C2) of edges and wires. + + Args: + count (int, optional): Number of uniformly spaced samples over the normalized + parameter. Increase for a denser comb. Defaults to 100. + max_tooth_size (float | None, optional): Maximum tooth height in model units. + If None, set to 10% maximum curve dimension. Defaults to None. + + Raises: + ValueError: Empty curve. + ValueError: If the curve is not planar on `Plane.XY`. + + Returns: + ShapeList[Edge]: A list of short `Edge` objects (lines) anchored on the curve + and oriented along the left normal `n̂ = normalize(t) × +Z`. + + Notes: + - On circles, κ = 1/R so tooth length is constant. + - On straight segments, κ = 0 so no teeth are drawn. + - At inflection points κ→0 and the tooth flips direction. + - At C0 corners the tangent is discontinuous; nearby teeth may jump. + C1 yields continuous direction; C2 yields continuous magnitude as well. + + Example: + >>> comb = my_wire.curvature_comb(count=200, max_tooth_size=2.0) + >>> show(my_wire, Curve(comb)) + + """ + if self.wrapped is None: + raise ValueError("Can't create curvature_comb for empty curve") + pln = self.common_plane() + if pln is None or not isclose(abs(pln.z_dir.Z), 1.0, abs_tol=TOLERANCE): + raise ValueError("curvature_comb only works for curves on Plane.XY") + + # If periodic the first and last tooth would be the same so skip them + u_values = np.linspace(0, 1, count, endpoint=not self.is_closed) + + # first pass: gather kappas for scaling + kappas = [] + tangents, curvatures = [], [] + for u in u_values: + tangent = self.derivative_at(u, 1) + curvature = self.derivative_at(u, 2) + tangents.append(tangent) + curvatures.append(curvature) + cross = tangent.cross(curvature) + kappa = cross.length / (tangent.length**3 + TOLERANCE) + # signed for XY: + sign = 1.0 if cross.Z >= 0 else -1.0 + kappas.append(sign * kappa) + + # choose a scale so the tallest tooth is max_tooth_size + max_kappa_size = max(TOLERANCE, max(abs(k) for k in kappas)) + curve_size = max(self.bounding_box().size) + max_tooth_size = ( + max_tooth_size if max_tooth_size is not None else curve_size / 10 + ) + scale = max_tooth_size / max_kappa_size + + comb_edges = ShapeList[Edge]() + for u, kappa, tangent in zip(u_values, kappas, tangents): + # Avoid tiny teeth + if abs(length := scale * kappa) < TOLERANCE: + continue + pnt_on_curve = self @ u + # left normal in XY (principal normal direction for a planar curve) + kappa_dir = tangent.normalized().cross(Vector(0, 0, 1)) + comb_edges.append( + Edge.make_line(pnt_on_curve, pnt_on_curve + length * kappa_dir) + ) + + return comb_edges + def derivative_at( self, position: float | VectorLike, diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index 69cdc84..1d7791b 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -37,8 +37,8 @@ from build123d.build_enums import ( Side, SortBy, ) -from build123d.geometry import Axis, Location, Plane, Vector -from build123d.objects_curve import Polyline +from build123d.geometry import Axis, Location, Plane, Rot, Vector, TOLERANCE +from build123d.objects_curve import CenterArc, Line, Polyline from build123d.objects_part import Box, Cylinder from build123d.operations_part import extrude from build123d.operations_generic import fillet @@ -437,5 +437,65 @@ class TestMixin1D(unittest.TestCase): Edge.extrude(pnt, (0, 0, 1)) +class TestCurvatureComb(unittest.TestCase): + def test_raises_if_not_on_XY(self): + line_xz = Polyline((0, 0, 0), (1, 0, 0), (0, 0, 1)) + with self.assertRaises(ValueError): + _ = line_xz.curvature_comb() + + def test_empty_curve(self): + c = CenterArc((0, 0), 1, 0, 360) + c.wrapped = None + with self.assertRaises(ValueError): + c.curvature_comb() + + def test_circle_constant_height_and_count(self): + radius = 5.0 + count = 64 + max_tooth = 2.0 + + # A closed circle in the XY plane + c = CenterArc((0, 0), radius, 0, 360) + comb = c.curvature_comb(count=count, max_tooth_size=max_tooth) + + # For a closed curve, endpoint is excluded but the method still returns `count` samples. + self.assertEqual(len(comb), count) + + # On a circle, kappa = 1/R => all teeth should have the same length = max_tooth + lengths = [edge.length for edge in comb] + self.assertTrue(all(abs(L - max_tooth) <= TOLERANCE for L in lengths)) + + # Direction check: teeth should be radial (perpendicular to tangent), + # i.e., aligned with (start_point - center). For Circle(...) center is (0,0,0). + center = Vector(0, 0, 0) + for edge in comb[:: max(1, len(comb) // 8)]: # sample a few + p0 = edge.position_at(0.0) + p1 = edge.position_at(1.0) + tooth_dir = (p1 - p0).normalized() + radial = (p0 - center).normalized() + # allow either direction (outward/inward), check colinearity + cross_len = tooth_dir.cross(radial).length + self.assertLessEqual(cross_len, 1e-3) + + def test_line_near_zero_teeth_and_count(self): + # Straight segment in XY => curvature = 0 everywhere + line = Line((0, 0), (10, 0)) + + count = 25 + comb = line.curvature_comb(count=count, max_tooth_size=3.0) + + self.assertEqual(len(comb), 0) # They are 0 length so skipped + + def test_open_arc_count_and_variation(self): + # Open arc: teeth count == requested count; lengths not constant in general + arc = CenterArc((0, 0), 5, 0, 180) # open, CCW half-circle + count = 40 + comb = arc.curvature_comb(count=count, max_tooth_size=1.0) + self.assertEqual(len(comb), count) + # For a circular arc, curvature is constant, so lengths should still be constant + lengths = [e.length for e in comb] + self.assertLessEqual(max(lengths) - min(lengths), 1e-6) + + if __name__ == "__main__": unittest.main() From bfd7968b8097ba079494a9ee36c74c3e1215d3d5 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 6 Sep 2025 19:30:11 -0400 Subject: [PATCH 402/518] Initial constrained tangent code --- src/build123d/__init__.py | 2 + src/build123d/build_enums.py | 33 ++- src/build123d/topology/one_d.py | 352 ++++++++++++++++++++++++++++---- 3 files changed, 346 insertions(+), 41 deletions(-) diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index a2ccbfc..a7aa36c 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -55,11 +55,13 @@ __all__ = [ "Intrinsic", "Keep", "Kind", + "LengthConstraint", "LengthMode", "MeshType", "Mode", "NumberDisplay", "PageSize", + "PositionConstraint", "PositionMode", "PrecisionMode", "Select", diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index 8cca982..a912381 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -29,9 +29,15 @@ license: from __future__ import annotations from enum import Enum, auto, IntEnum, unique -from typing import Union +from typing import TypeAlias, Union -from typing import TypeAlias +from OCP.GccEnt import ( + GccEnt_unqualified, + GccEnt_enclosing, + GccEnt_enclosed, + GccEnt_outside, + GccEnt_noqualifier, +) class Align(Enum): @@ -248,6 +254,17 @@ class FontStyle(Enum): return f"<{self.__class__.__name__}.{self.name}>" +class LengthConstraint(Enum): + """Length Constraint for sagatti selection""" + + SHORT = 0 + LONG = -1 + BOTH = 1 + + def __repr__(self): + return f"<{self.__class__.__name__}.{self.name}>" + + class LengthMode(Enum): """Method of specifying length along PolarLine""" @@ -303,6 +320,18 @@ class PageSize(Enum): return f"<{self.__class__.__name__}.{self.name}>" +class PositionConstraint(Enum): + """Position Constraint for edge selection""" + + UNQUALIFIED = GccEnt_unqualified + ENCLOSING = GccEnt_enclosing + ENCLOSED = GccEnt_enclosed + OUTSIDE = GccEnt_outside + + def __repr__(self): + return f"<{self.__class__.__name__}.{self.name}>" + + class PositionMode(Enum): """Position along curve mode""" diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index e019df7..1ed4a7e 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -53,17 +53,15 @@ from __future__ import annotations import copy import itertools -import numpy as np import warnings from collections.abc import Iterable from itertools import combinations -from math import radians, inf, pi, cos, copysign, ceil, floor, isclose +from math import ceil, copysign, cos, floor, inf, isclose, pi, radians +from typing import TYPE_CHECKING, Literal from typing import cast as tcast -from typing import Literal, overload, TYPE_CHECKING -from typing_extensions import Self -from scipy.optimize import minimize_scalar -from scipy.spatial import ConvexHull +from typing import overload +import numpy as np import OCP.TopAbs as ta from OCP.BRep import BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_CompCurve, BRepAdaptor_Curve @@ -76,6 +74,7 @@ from OCP.BRepBuilderAPI import ( BRepBuilderAPI_DisconnectedWire, BRepBuilderAPI_EmptyWire, BRepBuilderAPI_MakeEdge, + BRepBuilderAPI_MakeEdge2d, BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakePolygon, BRepBuilderAPI_MakeWire, @@ -92,29 +91,45 @@ from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace from OCP.BRepProj import BRepProj_Projection from OCP.BRepTools import BRepTools, BRepTools_WireExplorer from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse +from OCP.GccEnt import GccEnt_unqualified, GccEnt_Position from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.GProp import GProp_GProps from OCP.Geom import ( Geom_BezierCurve, Geom_BSplineCurve, Geom_ConicalSurface, Geom_CylindricalSurface, + Geom_Line, Geom_Plane, Geom_Surface, Geom_TrimmedCurve, - Geom_Line, ) -from OCP.Geom2d import Geom2d_Curve, Geom2d_Line, Geom2d_TrimmedCurve +from OCP.Geom2d import ( + Geom2d_CartesianPoint, + Geom2d_Circle, + Geom2d_Curve, + Geom2d_Line, + Geom2d_Point, + Geom2d_TrimmedCurve, +) +from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_G1, GeomAbs_C1, GeomAbs_G2, GeomAbs_C2 +from OCP.Geom2dGcc import Geom2dGcc_Circ2d2TanRad, Geom2dGcc_QualifiedCurve +from OCP.GeomAbs import ( + GeomAbs_C0, + GeomAbs_C1, + GeomAbs_C2, + GeomAbs_G1, + GeomAbs_G2, + GeomAbs_JoinType, +) +from OCP.GeomAdaptor import GeomAdaptor_Curve from OCP.GeomAPI import ( + GeomAPI, GeomAPI_IntCS, GeomAPI_Interpolate, GeomAPI_PointsToBSpline, GeomAPI_ProjectPointOnCurve, ) -from OCP.GeomAbs import GeomAbs_JoinType -from OCP.GeomAdaptor import GeomAdaptor_Curve from OCP.GeomConvert import GeomConvert_CompCurveToBSplineCurve from OCP.GeomFill import ( GeomFill_CorrectedFrenet, @@ -122,30 +137,40 @@ from OCP.GeomFill import ( GeomFill_TrihedronLaw, ) from OCP.GeomProjLib import GeomProjLib +from OCP.gp import ( + gp_Ax1, + gp_Ax2, + gp_Ax3, + gp_Circ, + gp_Circ2d, + gp_Dir, + gp_Dir2d, + gp_Elips, + gp_Pln, + gp_Pnt, + gp_Pnt2d, + gp_Trsf, + gp_Vec, +) +from OCP.GProp import GProp_GProps from OCP.HLRAlgo import HLRAlgo_Projector from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds from OCP.ShapeFix import ShapeFix_Shape, ShapeFix_Wireframe from OCP.Standard import ( + Standard_ConstructionError, Standard_Failure, Standard_NoSuchObject, - Standard_ConstructionError, ) +from OCP.TColgp import TColgp_Array1OfPnt, TColgp_Array1OfVec, TColgp_HArray1OfPnt from OCP.TColStd import ( TColStd_Array1OfReal, TColStd_HArray1OfBoolean, TColStd_HArray1OfReal, ) -from OCP.TColgp import TColgp_Array1OfPnt, TColgp_Array1OfVec, TColgp_HArray1OfPnt from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum from OCP.TopExp import TopExp, TopExp_Explorer from OCP.TopLoc import TopLoc_Location -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_IndexedMapOfShape, - TopTools_ListOfShape, -) from OCP.TopoDS import ( TopoDS, TopoDS_Compound, @@ -156,34 +181,33 @@ from OCP.TopoDS import ( TopoDS_Vertex, TopoDS_Wire, ) -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, +from OCP.TopTools import ( + TopTools_HSequenceOfShape, + TopTools_IndexedDataMapOfShapeListOfShape, + TopTools_IndexedMapOfShape, + TopTools_ListOfShape, ) +from scipy.optimize import minimize_scalar +from scipy.spatial import ConvexHull +from typing_extensions import Self + from build123d.build_enums import ( AngularDirection, - ContinuityLevel, CenterOf, + ContinuityLevel, FrameMethod, GeomType, Keep, Kind, + LengthConstraint, + PositionConstraint, PositionMode, Side, ) from build123d.geometry import ( DEG2RAD, - TOLERANCE, TOL_DIGITS, + TOLERANCE, Axis, Color, Location, @@ -206,17 +230,16 @@ from .shape_core import ( ) from .utils import ( _extrude_topods_shape, - isclose_b, _make_topods_face_from_wires, _topods_bool_op, + isclose_b, ) -from .zero_d import topo_explore_common_vertex, Vertex - +from .zero_d import Vertex, topo_explore_common_vertex if TYPE_CHECKING: # pragma: no cover - from .two_d import Face, Shell # pylint: disable=R0801 + from .composite import Compound, Curve, Part, Sketch # pylint: disable=R0801 from .three_d import Solid # pylint: disable=R0801 - from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 + from .two_d import Face, Shell # pylint: disable=R0801 class Mixin1D(Shape): @@ -1885,6 +1908,257 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) + @classmethod + # def make_tangent_arcs( + # cls, + # object_one: tuple[Edge,PositionConstraint] | Vertex | VectorLike, + # object_two: tuple[Edge,PositionConstraint] | Vertex | VectorLike, + # radius: float, + # sagitta_constraint: LengthConstraint = LengthConstraint.SHORT + # ) -> ShapeList[Edge]: + + def make_tangent_arcs( + cls, + object_one: Edge | Vertex | VectorLike, + object_two: Edge | Vertex | VectorLike, + radius: float, + constaints: tuple[PositionConstraint, PositionConstraint, LengthConstraint] = ( + PositionConstraint.UNQUALIFIED, + PositionConstraint.UNQUALIFIED, + LengthConstraint.SHORT, + ), + ) -> ShapeList[Edge]: + """ + Create all planar circular arcs of a given radius that are tangent/contacting + the two provided objects on the XY plane. + + Inputs must be coplanar with ``Plane.XY``. Non-coplanar edges are not supported. + + Args: + object_one (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched + by the circle(s) + object_two (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched + by the circle(s) + radius (float): Circle radius for all candidate solutions. + + Raises: + ValueError: Invalid input + ValueError: Invalid curve + RuntimeError: no valid circle solutions found + + Returns: + ShapeList[Edge]: A list of planar circular edges (on XY) representing both + the minor and major arcs between the two tangency points for every valid + circle solution. + + """ + # Reuse a single XY plane for 3D->2D projection and for 2D-edge building + _pln_xy = gp_Pln(gp_Ax3(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(0.0, 0.0, 1.0))) + _surf_xy = Geom_Plane(_pln_xy) + + # --------------------------- + # Normalization utilities + # --------------------------- + def _norm_on_period(u: float, first: float, per: float) -> float: + """Map parameter u into [first, first+per).""" + if per <= 0.0: + return u + k = floor((u - first) / per) + return u - k * per + + def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: + """ + Forward (positive) delta from u1 to u2 on a periodic domain anchored at + 'first'. + """ + u1n = _norm_on_period(u1, first, period) + u2n = _norm_on_period(u2, first, period) + delta = u2n - u1n + if delta < 0.0: + delta += period + return delta + + # --------------------------- + # Core helpers + # --------------------------- + def _edge_to_qualified_2d( + edge: TopoDS_Edge, position_constaint: PositionConstraint + ) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float]: + """Convert a TopoDS_Edge into 2d curve & extract properties""" + + # 1) Underlying curve + range (also retrieve location to be safe) + loc = edge.Location() + hcurve3d = BRep_Tool.Curve_s(edge, float(), float()) + first, last = BRep_Tool.Range_s(edge) + + if hcurve3d is None: + raise ValueError("Edge has no underlying 3D curve.") + + # 2) Apply location if the edge is positioned by a TopLoc_Location + if not loc.IsIdentity(): + trsf = loc.Transformation() + hcurve3d = hcurve3d.Transformed(trsf) + + # 3) Convert to 2D on Plane.XY (Z-up frame at origin) + hcurve2d = GeomAPI.To2d_s(hcurve3d, _pln_xy) # -> Handle_Geom2d_Curve + + # 4) Wrap in an adaptor using the same parametric range + adapt2d = Geom2dAdaptor_Curve(hcurve2d, first, last) + + # 5) Create the qualified curve (unqualified is fine here) + qcurve = Geom2dGcc_QualifiedCurve(adapt2d, position_constaint.value) + return qcurve, hcurve2d, first, last + + def _edge_from_circle( + h2d_circle: Geom2d_Circle, u1: float, u2: float + ) -> TopoDS_Edge: + """Build a 3D edge on XY from a trimmed 2D circle segment [u1, u2].""" + arc2d = Geom2d_TrimmedCurve(h2d_circle, u1, u2, True) # sense=True + return BRepBuilderAPI_MakeEdge(arc2d, _surf_xy).Edge() + + def _param_in_trim( + u: float, first: float, last: float, h2d: Geom2d_Curve + ) -> bool: + """Normalize (if periodic) then test [first, last] with tolerance.""" + u = _norm_on_period(u, first, h2d.Period()) if h2d.IsPeriodic() else u + return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) + + def _as_gcc_arg( + obj: Edge | Vertex | VectorLike, constaint: PositionConstraint + ) -> tuple[ + Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, + Geom2d_Curve | None, + float | None, + float | None, + bool, + ]: + """ + Normalize input to a GCC argument. + Returns: (q_obj, h2d, first, last, is_edge) + - Edge -> (QualifiedCurve, h2d, first, last, True) + - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) + """ + if isinstance(obj, Edge): + return _edge_to_qualified_2d(obj.wrapped, constaint) + (True,) + + loc_xyz = obj.position if isinstance(obj, Vertex) else Vector() + try: + base = Vector(obj) + except (TypeError, ValueError) as exc: + raise ValueError("Expected Edge | Vertex | VectorLike") from exc + + gp_pnt = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) + return Geom2d_CartesianPoint(gp_pnt), None, None, None, False + + def _two_arc_edges_from_params( + circ: gp_Circ2d, u1: float, u2: float + ) -> ShapeList[Edge]: + """ + Given two parameters on a circle, return both the forward (minor) + and complementary (major) arcs as TopoDS_Edge(s). + Uses centralized normalization utilities. + """ + h2d_circle = Geom2d_Circle(circ) + per = h2d_circle.Period() # usually 2*pi + + # Minor (forward) span + d = _forward_delta(u1, u2, 0.0, per) # anchor at 0 for circle convenience + u1n = _norm_on_period(u1, 0.0, per) + u2n = _norm_on_period(u2, 0.0, per) + + # Guard degeneracy + if d <= TOLERANCE or abs(per - d) <= TOLERANCE: + return ShapeList() + + minor = _edge_from_circle(h2d_circle, u1n, u1n + d) + major = _edge_from_circle(h2d_circle, u2n, u2n + (per - d)) + return ShapeList([Edge(minor), Edge(major)]) + + def _qstr(q) -> str: + # Works with OCP's GccEnt enum values + try: + from OCP.GccEnt import ( + GccEnt_enclosed, + GccEnt_enclosing, + GccEnt_outside, + ) + + try: + from OCP.GccEnt import GccEnt_unqualified + except ImportError: + # Some OCCT versions name this 'noqualifier' + from OCP.GccEnt import GccEnt_noqualifier as GccEnt_unqualified + mapping = { + GccEnt_enclosed: "enclosed", + GccEnt_enclosing: "enclosing", + GccEnt_outside: "outside", + GccEnt_unqualified: "unqualified", + } + return mapping.get(q, f"unknown({int(q)})") + except Exception: + # Fallback if enums aren't importable for any reason + return str(int(q)) + + # --------------------------- + # Build inputs and GCC + # --------------------------- + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, constaints[0]) + q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg(object_two, constaints[1]) + + # Put the Edge arg first when exactly one is an Edge (improves robustness) + if is_edge1 ^ is_edge2: + q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) + + gcc = Geom2dGcc_Circ2d2TanRad(q_o1, q_o2, radius, TOLERANCE) + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find a tangent arc") + + def _valid_on_arg1(u: float) -> bool: + return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) + + def _valid_on_arg2(u: float) -> bool: + return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) + + # --------------------------- + # Solutions + # --------------------------- + solutions: list[Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + circ = gcc.ThisSolution(i) # gp_Circ2d + + # Tangency on curve 1 + p1 = gp_Pnt2d() + u_circ1, u_arg1 = gcc.Tangency1(i, p1) + if not _valid_on_arg1(u_arg1): + continue + + # Tangency on curve 2 + p2 = gp_Pnt2d() + u_circ2, u_arg2 = gcc.Tangency2(i, p2) + if not _valid_on_arg2(u_arg2): + continue + + qual1 = GccEnt_Position(int()) + qual2 = GccEnt_Position(int()) + gcc.WhichQualifier(i, qual1, qual2) # returns two GccEnt_Position values + print( + f"Solution {i}: " + f"arg1={_qstr(qual1)}, arg2={_qstr(qual2)} | " + f"u_circ=({u_circ1:.6g}, {u_circ2:.6g}) " + f"u_arg=({u_arg1:.6g}, {u_arg2:.6g})" + ) + + # Build BOTH sagitta arcs and select by LengthConstraint + if constaints[2].value == LengthConstraint.BOTH: + solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) + else: + solutions.append( + _two_arc_edges_from_params(circ, u_circ1, u_circ2).sort_by( + Edge.length + )[constaints[2].value] + ) + return ShapeList(solutions) + @classmethod def make_three_point_arc( cls, point1: VectorLike, point2: VectorLike, point3: VectorLike From f489854425e70ca756ce7216a1bf2730ef716127 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 7 Sep 2025 11:49:16 -0400 Subject: [PATCH 403/518] Restructuring to utils --- src/build123d/topology/one_d.py | 40 +- src/build123d/topology/utils.py | 757 +++++++++++++++++--------------- 2 files changed, 425 insertions(+), 372 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 1ed4a7e..3eea653 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1909,24 +1909,12 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) @classmethod - # def make_tangent_arcs( - # cls, - # object_one: tuple[Edge,PositionConstraint] | Vertex | VectorLike, - # object_two: tuple[Edge,PositionConstraint] | Vertex | VectorLike, - # radius: float, - # sagitta_constraint: LengthConstraint = LengthConstraint.SHORT - # ) -> ShapeList[Edge]: - def make_tangent_arcs( cls, - object_one: Edge | Vertex | VectorLike, - object_two: Edge | Vertex | VectorLike, + object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, radius: float, - constaints: tuple[PositionConstraint, PositionConstraint, LengthConstraint] = ( - PositionConstraint.UNQUALIFIED, - PositionConstraint.UNQUALIFIED, - LengthConstraint.SHORT, - ), + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, ) -> ShapeList[Edge]: """ Create all planar circular arcs of a given radius that are tangent/contacting @@ -1952,6 +1940,16 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): circle solution. """ + + if isinstance(object_1, tuple): + object_one, object_one_constraint = object_1 + else: + object_one = object_1 + if isinstance(object_2, tuple): + object_two, object_two_constraint = object_2 + else: + object_two = object_2 + # Reuse a single XY plane for 3D->2D projection and for 2D-edge building _pln_xy = gp_Pln(gp_Ax3(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(0.0, 0.0, 1.0))) _surf_xy = Geom_Plane(_pln_xy) @@ -2102,8 +2100,12 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): # --------------------------- # Build inputs and GCC # --------------------------- - q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, constaints[0]) - q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg(object_two, constaints[1]) + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( + object_one, object_one_constraint + ) + q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( + object_two, object_two_constraint + ) # Put the Edge arg first when exactly one is an Edge (improves robustness) if is_edge1 ^ is_edge2: @@ -2149,13 +2151,13 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): ) # Build BOTH sagitta arcs and select by LengthConstraint - if constaints[2].value == LengthConstraint.BOTH: + if sagitta_constraint == LengthConstraint.BOTH: solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) else: solutions.append( _two_arc_edges_from_params(circ, u_circ1, u_circ2).sort_by( Edge.length - )[constaints[2].value] + )[sagitta_constraint.value] ) return ShapeList(solutions) diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index c1bbb1e..6fd50c5 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -3,35 +3,11 @@ build123d topology name: utils.py by: Gumyr -date: January 07, 2025 +date: September 07, 2025 desc: -This module provides utility functions and helper classes for the build123d CAD library, enabling -advanced geometric operations and facilitating the use of the OpenCascade CAD kernel. It complements -the core library by offering reusable and modular tools for manipulating shapes, performing Boolean -operations, and validating geometry. - -Key Features: -- **Geometric Utilities**: - - `polar`: Converts polar coordinates to Cartesian. - - `tuplify`: Normalizes inputs into consistent tuples. - - `find_max_dimension`: Computes the maximum bounding dimension of shapes. - -- **Shape Creation**: - - `_make_loft`: Creates lofted shapes from wires and vertices. - - `_make_topods_compound_from_shapes`: Constructs compounds from multiple shapes. - - `_make_topods_face_from_wires`: Generates planar faces with optional holes. - -- **Boolean Operations**: - - `_topods_bool_op`: Generic Boolean operations for TopoDS_Shapes. - - `new_edges`: Identifies newly created edges from combined shapes. - -- **Enhanced Math**: - - `isclose_b`: Overrides `math.isclose` with a stricter absolute tolerance. - -This module is a critical component of build123d, supporting complex CAD workflows and geometric -transformations while maintaining a clean, extensible API. +This module houses utilities used within the topology modules. license: @@ -53,378 +29,453 @@ license: from __future__ import annotations -from math import radians, sin, cos, isclose -from typing import Any, TYPE_CHECKING - +import copy +import itertools +import warnings from collections.abc import Iterable +from itertools import combinations +from math import ceil, copysign, cos, floor, inf, isclose, pi, radians +from typing import Callable, TypeVar, TYPE_CHECKING, Literal +from typing import cast as tcast +from typing import overload +import numpy as np +import OCP.TopAbs as ta from OCP.BRep import BRep_Tool +from OCP.BRepAdaptor import BRepAdaptor_CompCurve, BRepAdaptor_Curve from OCP.BRepAlgoAPI import ( - BRepAlgoAPI_BooleanOperation, - BRepAlgoAPI_Cut, + BRepAlgoAPI_Common, + BRepAlgoAPI_Section, BRepAlgoAPI_Splitter, ) -from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeFace -from OCP.BRepLib import BRepLib_FindSurface -from OCP.BRepOffsetAPI import BRepOffsetAPI_ThruSections -from OCP.BRepPrimAPI import BRepPrimAPI_MakePrism -from OCP.ShapeFix import ShapeFix_Face, ShapeFix_Shape -from OCP.TopAbs import TopAbs_ShapeEnum -from OCP.TopExp import TopExp_Explorer -from OCP.TopTools import TopTools_ListOfShape +from OCP.BRepBuilderAPI import ( + BRepBuilderAPI_DisconnectedWire, + BRepBuilderAPI_EmptyWire, + BRepBuilderAPI_MakeEdge, + BRepBuilderAPI_MakeEdge2d, + BRepBuilderAPI_MakeFace, + BRepBuilderAPI_MakePolygon, + BRepBuilderAPI_MakeWire, + BRepBuilderAPI_NonManifoldWire, +) +from OCP.BRepExtrema import BRepExtrema_DistShapeShape, BRepExtrema_SupportType +from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d +from OCP.BRepGProp import BRepGProp, BRepGProp_Face +from OCP.BRepLib import BRepLib, BRepLib_FindSurface +from OCP.BRepLProp import BRepLProp +from OCP.BRepOffset import BRepOffset_MakeOffset +from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset +from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace +from OCP.BRepProj import BRepProj_Projection +from OCP.BRepTools import BRepTools, BRepTools_WireExplorer +from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse +from OCP.GccEnt import GccEnt_unqualified, GccEnt_Position +from OCP.GCPnts import GCPnts_AbscissaPoint +from OCP.Geom import ( + Geom_BezierCurve, + Geom_BSplineCurve, + Geom_ConicalSurface, + Geom_CylindricalSurface, + Geom_Line, + Geom_Plane, + Geom_Surface, + Geom_TrimmedCurve, +) +from OCP.Geom2d import ( + Geom2d_CartesianPoint, + Geom2d_Circle, + Geom2d_Curve, + Geom2d_Line, + Geom2d_Point, + Geom2d_TrimmedCurve, +) +from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve +from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve +from OCP.Geom2dGcc import Geom2dGcc_Circ2d2TanRad, Geom2dGcc_QualifiedCurve +from OCP.GeomAbs import ( + GeomAbs_C0, + GeomAbs_C1, + GeomAbs_C2, + GeomAbs_G1, + GeomAbs_G2, + GeomAbs_JoinType, +) +from OCP.GeomAdaptor import GeomAdaptor_Curve +from OCP.GeomAPI import ( + GeomAPI, + GeomAPI_IntCS, + GeomAPI_Interpolate, + GeomAPI_PointsToBSpline, + GeomAPI_ProjectPointOnCurve, +) +from OCP.GeomConvert import GeomConvert_CompCurveToBSplineCurve +from OCP.GeomFill import ( + GeomFill_CorrectedFrenet, + GeomFill_Frenet, + GeomFill_TrihedronLaw, +) +from OCP.GeomProjLib import GeomProjLib +from OCP.gp import ( + gp_Ax1, + gp_Ax2, + gp_Ax3, + gp_Circ, + gp_Circ2d, + gp_Dir, + gp_Dir2d, + gp_Elips, + gp_Pln, + gp_Pnt, + gp_Pnt2d, + gp_Trsf, + gp_Vec, +) +from OCP.GProp import GProp_GProps +from OCP.HLRAlgo import HLRAlgo_Projector +from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape +from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds +from OCP.ShapeFix import ShapeFix_Shape, ShapeFix_Wireframe +from OCP.Standard import ( + Standard_ConstructionError, + Standard_Failure, + Standard_NoSuchObject, +) +from OCP.TColgp import TColgp_Array1OfPnt, TColgp_Array1OfVec, TColgp_HArray1OfPnt +from OCP.TColStd import ( + TColStd_Array1OfReal, + TColStd_HArray1OfBoolean, + TColStd_HArray1OfReal, +) +from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum +from OCP.TopExp import TopExp, TopExp_Explorer +from OCP.TopLoc import TopLoc_Location from OCP.TopoDS import ( TopoDS, - TopoDS_Builder, TopoDS_Compound, + TopoDS_Edge, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Vertex, - TopoDS_Edge, TopoDS_Wire, ) -from build123d.geometry import TOLERANCE, BoundBox, Vector, VectorLike +from OCP.TopTools import ( + TopTools_HSequenceOfShape, + TopTools_IndexedDataMapOfShapeListOfShape, + TopTools_IndexedMapOfShape, + TopTools_ListOfShape, +) +from scipy.optimize import minimize_scalar +from scipy.spatial import ConvexHull +from typing_extensions import Self -from .shape_core import Shape, ShapeList, downcast, shapetype, unwrap_topods_compound +from build123d.build_enums import ( + AngularDirection, + CenterOf, + ContinuityLevel, + FrameMethod, + GeomType, + Keep, + Kind, + LengthConstraint, + PositionConstraint, + PositionMode, + Side, +) +from build123d.geometry import ( + DEG2RAD, + TOL_DIGITS, + TOLERANCE, + Axis, + Color, + Location, + Plane, + Vector, + VectorLike, + logger, +) + +from .shape_core import ( + Shape, + ShapeList, + SkipClean, + TrimmingTool, + downcast, + get_top_level_topods_shapes, + shapetype, + topods_dim, + unwrap_topods_compound, +) +from .utils import ( + _extrude_topods_shape, + _make_topods_face_from_wires, + _topods_bool_op, + isclose_b, +) +from .zero_d import Vertex, topo_explore_common_vertex + +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from build123d.topology.one_d import Edge + +TWrap = TypeVar("TWrap") # whatever the factory returns (Edge or a subclass) + +# Reuse a single XY plane for 3D->2D projection and for 2D-edge building +_pln_xy = gp_Pln(gp_Ax3(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(0.0, 0.0, 1.0))) +_surf_xy = Geom_Plane(_pln_xy) -if TYPE_CHECKING: # pragma: no cover - from .zero_d import Vertex # pylint: disable=R0801 - from .one_d import Edge, Wire # pylint: disable=R0801 +# --------------------------- +# Normalization utilities +# --------------------------- +def _norm_on_period(u: float, first: float, per: float) -> float: + """Map parameter u into [first, first+per).""" + if per <= 0.0: + return u + k = floor((u - first) / per) + return u - k * per -def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: - """extrude - - Extrude a Shape in the provided direction. - * Vertices generate Edges - * Edges generate Faces - * Wires generate Shells - * Faces generate Solids - * Shells generate Compounds - - Args: - direction (VectorLike): direction and magnitude of extrusion - - Raises: - ValueError: Unsupported class - RuntimeError: Generated invalid result - - Returns: - TopoDS_Shape: extruded shape +def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: """ - direction = Vector(direction) - - if obj is None or not isinstance( - obj, - (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), - ): - raise ValueError(f"extrude not supported for {type(obj)}") - - prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) - extrusion = downcast(prism_builder.Shape()) - shape_type = extrusion.ShapeType() - if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: - solids = [] - explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) - while explorer.More(): - solids.append(downcast(explorer.Current())) - explorer.Next() - extrusion = _make_topods_compound_from_shapes(solids) - return extrusion - - -def _make_loft( - objs: Iterable[Vertex | Wire], - filled: bool, - ruled: bool = False, -) -> TopoDS_Shape: - """make loft - - Makes a loft from a list of wires and vertices. Vertices can appear only at the - beginning or end of the list, but cannot appear consecutively within the list - nor between wires. - - Args: - wires (list[Wire]): section perimeters - ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - - Raises: - ValueError: Too few wires - - Returns: - TopoDS_Shape: Lofted object + Forward (positive) delta from u1 to u2 on a periodic domain anchored at + 'first'. """ - objs = list(objs) # To determine its length - if len(objs) < 2: - raise ValueError("More than one wire is required") - vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] - vertex_count = len(vertices) + u1n = _norm_on_period(u1, first, period) + u2n = _norm_on_period(u2, first, period) + delta = u2n - u1n + if delta < 0.0: + delta += period + return delta - if vertex_count > 2: - raise ValueError("Only two vertices are allowed") - if vertex_count == 1 and not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - or isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertex must be either at the beginning or end of the list" +# --------------------------- +# Core helpers +# --------------------------- +def _edge_to_qualified_2d( + edge: TopoDS_Edge, position_constaint: PositionConstraint +) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float]: + """Convert a TopoDS_Edge into 2d curve & extract properties""" + + # 1) Underlying curve + range (also retrieve location to be safe) + loc = edge.Location() + hcurve3d = BRep_Tool.Curve_s(edge, float(), float()) + first, last = BRep_Tool.Range_s(edge) + + if hcurve3d is None: + raise ValueError("Edge has no underlying 3D curve.") + + # 2) Apply location if the edge is positioned by a TopLoc_Location + if not loc.IsIdentity(): + trsf = loc.Transformation() + hcurve3d = hcurve3d.Transformed(trsf) + + # 3) Convert to 2D on Plane.XY (Z-up frame at origin) + hcurve2d = GeomAPI.To2d_s(hcurve3d, _pln_xy) # -> Handle_Geom2d_Curve + + # 4) Wrap in an adaptor using the same parametric range + adapt2d = Geom2dAdaptor_Curve(hcurve2d, first, last) + + # 5) Create the qualified curve (unqualified is fine here) + qcurve = Geom2dGcc_QualifiedCurve(adapt2d, position_constaint.value) + return qcurve, hcurve2d, first, last + + +def _edge_from_circle(h2d_circle: Geom2d_Circle, u1: float, u2: float) -> TopoDS_Edge: + """Build a 3D edge on XY from a trimmed 2D circle segment [u1, u2].""" + arc2d = Geom2d_TrimmedCurve(h2d_circle, u1, u2, True) # sense=True + return BRepBuilderAPI_MakeEdge(arc2d, _surf_xy).Edge() + + +def _param_in_trim(u: float, first: float, last: float, h2d: Geom2d_Curve) -> bool: + """Normalize (if periodic) then test [first, last] with tolerance.""" + u = _norm_on_period(u, first, h2d.Period()) if h2d.IsPeriodic() else u + return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) + + +def _as_gcc_arg( + obj: Edge | Vertex | VectorLike, constaint: PositionConstraint +) -> tuple[ + Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, + Geom2d_Curve | None, + float | None, + float | None, + bool, +]: + """ + Normalize input to a GCC argument. + Returns: (q_obj, h2d, first, last, is_edge) + - Edge -> (QualifiedCurve, h2d, first, last, True) + - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) + """ + if isinstance(obj.wrapped, TopoDS_Edge): + return _edge_to_qualified_2d(obj.wrapped, constaint) + (True,) + + loc_xyz = obj.position if isinstance(obj, Vertex) else Vector() + try: + base = Vector(obj) + except (TypeError, ValueError) as exc: + raise ValueError("Expected Edge | Vertex | VectorLike") from exc + + gp_pnt = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) + return Geom2d_CartesianPoint(gp_pnt), None, None, None, False + + +def _two_arc_edges_from_params( + circ: gp_Circ2d, u1: float, u2: float +) -> ShapeList[Edge]: + """ + Given two parameters on a circle, return both the forward (minor) + and complementary (major) arcs as TopoDS_Edge(s). + Uses centralized normalization utilities. + """ + h2d_circle = Geom2d_Circle(circ) + per = h2d_circle.Period() # usually 2*pi + + # Minor (forward) span + d = _forward_delta(u1, u2, 0.0, per) # anchor at 0 for circle convenience + u1n = _norm_on_period(u1, 0.0, per) + u2n = _norm_on_period(u2, 0.0, per) + + # Guard degeneracy + if d <= TOLERANCE or abs(per - d) <= TOLERANCE: + return ShapeList() + + minor = _edge_from_circle(h2d_circle, u1n, u1n + d) + major = _edge_from_circle(h2d_circle, u2n, u2n + (per - d)) + return ShapeList([Edge(minor), Edge(major)]) + + +def _qstr(q) -> str: + # Works with OCP's GccEnt enum values + try: + from OCP.GccEnt import ( + GccEnt_enclosed, + GccEnt_enclosing, + GccEnt_outside, ) - if vertex_count == 2: - if len(objs) == 2: - raise ValueError( - "You can't have only 2 vertices to loft; try adding some wires" - ) - if not ( - isinstance(objs[0].wrapped, TopoDS_Vertex) - and isinstance(objs[-1].wrapped, TopoDS_Vertex) - ): - raise ValueError( - "The vertices must be at the beginning and end of the list" - ) - - loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) - - for obj in objs: - if isinstance(obj.wrapped, TopoDS_Vertex): - loft_builder.AddVertex(obj.wrapped) - elif isinstance(obj.wrapped, TopoDS_Wire): - loft_builder.AddWire(obj.wrapped) - - loft_builder.Build() - - return loft_builder.Shape() + try: + from OCP.GccEnt import GccEnt_unqualified + except ImportError: + # Some OCCT versions name this 'noqualifier' + from OCP.GccEnt import GccEnt_noqualifier as GccEnt_unqualified + mapping = { + GccEnt_enclosed: "enclosed", + GccEnt_enclosing: "enclosing", + GccEnt_outside: "outside", + GccEnt_unqualified: "unqualified", + } + return mapping.get(q, f"unknown({int(q)})") + except Exception: + # Fallback if enums aren't importable for any reason + return str(int(q)) -def _make_topods_compound_from_shapes( - occt_shapes: Iterable[TopoDS_Shape | None], -) -> TopoDS_Compound: - """Create an OCCT TopoDS_Compound - - Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects - - Args: - occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes - - Returns: - TopoDS_Compound: OCCT compound +def make_tangent_edges( + cls, + object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + radius: float, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + *, + edge_factory: Callable[[TopoDS_Edge], TWrap], +) -> list[TWrap]: """ - comp = TopoDS_Compound() - comp_builder = TopoDS_Builder() - comp_builder.MakeCompound(comp) + Create all planar circular arcs of a given radius that are tangent/contacting + the two provided objects on the XY plane. - for shape in occt_shapes: - if shape is not None: - comp_builder.Add(comp, shape) - - return comp - - -def _make_topods_face_from_wires( - outer_wire: TopoDS_Wire, inner_wires: Iterable[TopoDS_Wire] | None = None -) -> TopoDS_Face: - """_make_topods_face_from_wires - - Makes a planar face from one or more wires + Inputs must be coplanar with ``Plane.XY``. Non-coplanar edges are not supported. Args: - outer_wire (TopoDS_Wire): closed perimeter wire - inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. + object_one (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched + by the circle(s) + object_two (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched + by the circle(s) + radius (float): Circle radius for all candidate solutions. Raises: - ValueError: outer wire not closed - ValueError: wires not planar - ValueError: inner wire not closed - ValueError: internal error + ValueError: Invalid input + ValueError: Invalid curve + RuntimeError: no valid circle solutions found Returns: - TopoDS_Face: planar face potentially with holes - """ - if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): - raise ValueError("Cannot build face(s): outer wire is not closed") - inner_wires = list(inner_wires) if inner_wires else [] + ShapeList[Edge]: A list of planar circular edges (on XY) representing both + the minor and major arcs between the two tangency points for every valid + circle solution. - # check if wires are coplanar - verification_compound = _make_topods_compound_from_shapes( - [outer_wire] + inner_wires + """ + + if isinstance(object_1, tuple): + object_one, object_one_constraint = object_1 + else: + object_one = object_1 + if isinstance(object_2, tuple): + object_two, object_two_constraint = object_2 + else: + object_two = object_2 + + # --------------------------- + # Build inputs and GCC + # --------------------------- + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( + object_one, object_one_constraint + ) + q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( + object_two, object_two_constraint ) - if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): - raise ValueError("Cannot build face(s): wires not planar") - # fix outer wire - sf_s = ShapeFix_Shape(outer_wire) - sf_s.Perform() - topo_wire = TopoDS.Wire_s(sf_s.Shape()) + # Put the Edge arg first when exactly one is an Edge (improves robustness) + if is_edge1 ^ is_edge2: + q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) - face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) + gcc = Geom2dGcc_Circ2d2TanRad(q_o1, q_o2, radius, TOLERANCE) + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find a tangent arc") - for inner_wire in inner_wires: - if not BRep_Tool.IsClosed_s(inner_wire): - raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) + def _valid_on_arg1(u: float) -> bool: + return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) - face_builder.Build() + def _valid_on_arg2(u: float) -> bool: + return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) - if not face_builder.IsDone(): - raise ValueError(f"Cannot build face(s): {face_builder.Error()}") + # --------------------------- + # Solutions + # --------------------------- + solutions: list[Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + circ = gcc.ThisSolution(i) # gp_Circ2d - face = face_builder.Face() + # Tangency on curve 1 + p1 = gp_Pnt2d() + u_circ1, u_arg1 = gcc.Tangency1(i, p1) + if not _valid_on_arg1(u_arg1): + continue - sf_f = ShapeFix_Face(face) - sf_f.FixOrientation() - sf_f.Perform() + # Tangency on curve 2 + p2 = gp_Pnt2d() + u_circ2, u_arg2 = gcc.Tangency2(i, p2) + if not _valid_on_arg2(u_arg2): + continue - return TopoDS.Face_s(sf_f.Result()) + qual1 = GccEnt_Position(int()) + qual2 = GccEnt_Position(int()) + gcc.WhichQualifier(i, qual1, qual2) # returns two GccEnt_Position values + print( + f"Solution {i}: " + f"arg1={_qstr(qual1)}, arg2={_qstr(qual2)} | " + f"u_circ=({u_circ1:.6g}, {u_circ2:.6g}) " + f"u_arg=({u_arg1:.6g}, {u_arg2:.6g})" + ) - -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - -def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: - """Compare the OCCT objects of each list and return the differences""" - shapes_one = list(shapes_one) - shapes_two = list(shapes_two) - occt_one = {shape.wrapped for shape in shapes_one} - occt_two = {shape.wrapped for shape in shapes_two} - occt_delta = list(occt_one - occt_two) - - all_shapes = [] - for shapes in [shapes_one, shapes_two]: - all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) - shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] - return shape_delta - - -def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: - """Return the maximum dimension of one or more shapes""" - shapes = shapes if isinstance(shapes, Iterable) else [shapes] - composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) - bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) - return bbox.diagonal - - -def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: - """Determine whether two floating point numbers are close in value. - Overridden abs_tol default for the math.isclose function. - - Args: - x (float): First value to compare - y (float): Second value to compare - rel_tol (float, optional): Maximum difference for being considered "close", - relative to the magnitude of the input values. Defaults to 1e-9. - abs_tol (float, optional): Maximum difference for being considered "close", - regardless of the magnitude of the input values. Defaults to 1e-14 - (unlike math.isclose which defaults to zero). - - Returns: True if a is close in value to b, and False otherwise. - """ - return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) - - -def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: - """new_edges - - Given a sequence of shapes and the combination of those shapes, find the newly added edges - - Args: - objects (Shape): sequence of shapes - combined (Shape): result of the combination of objects - - Returns: - ShapeList[Edge]: new edges - """ - # Create a list of combined object edges - combined_topo_edges = TopTools_ListOfShape() - for edge in combined.edges(): - if edge.wrapped is not None: - combined_topo_edges.Append(edge.wrapped) - - # Create a list of original object edges - original_topo_edges = TopTools_ListOfShape() - for edge in [e for obj in objects for e in obj.edges()]: - if edge.wrapped is not None: - original_topo_edges.Append(edge.wrapped) - - # Cut the original edges from the combined edges - operation = BRepAlgoAPI_Cut() - operation.SetArguments(combined_topo_edges) - operation.SetTools(original_topo_edges) - operation.SetRunParallel(True) - operation.Build() - - edges = [] - explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) - while explorer.More(): - found_edge = combined.__class__.cast(downcast(explorer.Current())) - found_edge.topo_parent = combined - edges.append(found_edge) - explorer.Next() - - return ShapeList(edges) - - -def polar(length: float, angle: float) -> tuple[float, float]: - """Convert polar coordinates into cartesian coordinates""" - return (length * cos(radians(angle)), length * sin(radians(angle))) - - -def tuplify(obj: Any, dim: int) -> tuple | None: - """Create a size tuple""" - if obj is None: - result = None - elif isinstance(obj, (tuple, list)): - result = tuple(obj) - else: - result = tuple([obj] * dim) - return result - - -def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: - """Return Shape's TopAbs_ShapeEnum""" - if isinstance(obj.wrapped, TopoDS_Compound): - shapetypes = {shapetype(o.wrapped) for o in obj} - if len(shapetypes) == 1: - result = shapetypes.pop() + # Build BOTH sagitta arcs and select by LengthConstraint + if sagitta_constraint == LengthConstraint.BOTH: + solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) else: - result = shapetype(obj.wrapped) - else: - result = shapetype(obj.wrapped) - return result + arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) + arcs = sorted( + arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)) + ) + solutions.append(arcs[sagitta_constraint.value]) + return ShapeList([edge_factory(e) for e in solutions]) From 8b2886144ee3fe93aafc21f1a118d3eeb19410a6 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 8 Sep 2025 12:23:18 -0400 Subject: [PATCH 404/518] Initial commit of make_constrained_arcs --- src/build123d/topology/constrained_lines.py | 720 ++++++++++++++++++ src/build123d/topology/one_d.py | 485 ++++++------ src/build123d/topology/utils.py | 773 +++++++++----------- 3 files changed, 1311 insertions(+), 667 deletions(-) create mode 100644 src/build123d/topology/constrained_lines.py diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py new file mode 100644 index 0000000..d9ac708 --- /dev/null +++ b/src/build123d/topology/constrained_lines.py @@ -0,0 +1,720 @@ +""" +build123d topology + +name: constrained_lines.py +by: Gumyr +date: September 07, 2025 + +desc: + +This module generates lines and arcs that are constrained against other objects. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +from __future__ import annotations + +from math import floor +from typing import TYPE_CHECKING, Callable, TypeVar +from typing import cast as tcast + +from OCP.BRep import BRep_Tool +from OCP.BRepAdaptor import BRepAdaptor_Curve +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge +from OCP.GCPnts import GCPnts_AbscissaPoint +from OCP.Geom import Geom_Plane +from OCP.Geom2d import ( + Geom2d_CartesianPoint, + Geom2d_Circle, + Geom2d_Curve, + Geom2d_TrimmedCurve, +) +from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve +from OCP.Geom2dGcc import ( + Geom2dGcc_Circ2d2TanOn, + Geom2dGcc_Circ2d2TanOnGeo, + Geom2dGcc_Circ2d2TanRad, + Geom2dGcc_Circ2d3Tan, + Geom2dGcc_Circ2dTanCen, + Geom2dGcc_Circ2dTanOnRad, + Geom2dGcc_Circ2dTanOnRadGeo, + Geom2dGcc_QualifiedCurve, +) +from OCP.GeomAbs import GeomAbs_CurveType +from OCP.GeomAPI import GeomAPI +from OCP.gp import ( + gp_Ax2d, + gp_Ax3, + gp_Circ2d, + gp_Dir, + gp_Dir2d, + gp_Pln, + gp_Pnt, + gp_Pnt2d, +) +from OCP.TopoDS import TopoDS_Edge + +from build123d.build_enums import LengthConstraint, PositionConstraint +from build123d.geometry import TOLERANCE, Vector, VectorLike +from .zero_d import Vertex +from .shape_core import ShapeList + +if TYPE_CHECKING: + from build123d.topology.one_d import Edge + +TWrap = TypeVar("TWrap") # whatever the factory returns (Edge or a subclass) + +# Reuse a single XY plane for 3D->2D projection and for 2D-edge building +_pln_xy = gp_Pln(gp_Ax3(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(0.0, 0.0, 1.0))) +_surf_xy = Geom_Plane(_pln_xy) + + +# --------------------------- +# Normalization utilities +# --------------------------- +def _norm_on_period(u: float, first: float, per: float) -> float: + """Map parameter u into [first, first+per).""" + if per <= 0.0: + return u + k = floor((u - first) / per) + return u - k * per + + +def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: + """ + Forward (positive) delta from u1 to u2 on a periodic domain anchored at + 'first'. + """ + u1n = _norm_on_period(u1, first, period) + u2n = _norm_on_period(u2, first, period) + delta = u2n - u1n + if delta < 0.0: + delta += period + return delta + + +# --------------------------- +# Core helpers +# --------------------------- +def _edge_to_qualified_2d( + edge: TopoDS_Edge, position_constaint: PositionConstraint +) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float]: + """Convert a TopoDS_Edge into 2d curve & extract properties""" + + # 1) Underlying curve + range (also retrieve location to be safe) + loc = edge.Location() + hcurve3d = BRep_Tool.Curve_s(edge, float(), float()) + first, last = BRep_Tool.Range_s(edge) + + if hcurve3d is None: + raise ValueError("Edge has no underlying 3D curve.") + + # 2) Apply location if the edge is positioned by a TopLoc_Location + if not loc.IsIdentity(): + trsf = loc.Transformation() + hcurve3d = hcurve3d.Transformed(trsf) + + # 3) Convert to 2D on Plane.XY (Z-up frame at origin) + hcurve2d = GeomAPI.To2d_s(hcurve3d, _pln_xy) # -> Handle_Geom2d_Curve + + # 4) Wrap in an adaptor using the same parametric range + adapt2d = Geom2dAdaptor_Curve(hcurve2d, first, last) + + # 5) Create the qualified curve (unqualified is fine here) + qcurve = Geom2dGcc_QualifiedCurve(adapt2d, position_constaint.value) + return qcurve, hcurve2d, first, last + + +def _edge_from_circle(h2d_circle: Geom2d_Circle, u1: float, u2: float) -> TopoDS_Edge: + """Build a 3D edge on XY from a trimmed 2D circle segment [u1, u2].""" + arc2d = Geom2d_TrimmedCurve(h2d_circle, u1, u2, True) # sense=True + return BRepBuilderAPI_MakeEdge(arc2d, _surf_xy).Edge() + + +def _param_in_trim(u: float, first: float, last: float, h2d: Geom2d_Curve) -> bool: + """Normalize (if periodic) then test [first, last] with tolerance.""" + u = _norm_on_period(u, first, h2d.Period()) if h2d.IsPeriodic() else u + return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) + + +def _as_gcc_arg( + obj: Edge | Vertex | VectorLike, constaint: PositionConstraint +) -> tuple[ + Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, + Geom2d_Curve | None, + float | None, + float | None, + bool, +]: + """ + Normalize input to a GCC argument. + Returns: (q_obj, h2d, first, last, is_edge) + - Edge -> (QualifiedCurve, h2d, first, last, True) + - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) + """ + if isinstance(obj.wrapped, TopoDS_Edge): + return _edge_to_qualified_2d(obj.wrapped, constaint) + (True,) + + loc_xyz = obj.position if isinstance(obj, Vertex) else Vector() + try: + base = Vector(obj) + except (TypeError, ValueError) as exc: + raise ValueError("Expected Edge | Vertex | VectorLike") from exc + + gp_pnt = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) + return Geom2d_CartesianPoint(gp_pnt), None, None, None, False + + +def _two_arc_edges_from_params( + circ: gp_Circ2d, u1: float, u2: float +) -> list[TopoDS_Edge]: + """ + Given two parameters on a circle, return both the forward (minor) + and complementary (major) arcs as TopoDS_Edge(s). + Uses centralized normalization utilities. + """ + h2d_circle = Geom2d_Circle(circ) + per = h2d_circle.Period() # usually 2*pi + + # Minor (forward) span + d = _forward_delta(u1, u2, 0.0, per) # anchor at 0 for circle convenience + u1n = _norm_on_period(u1, 0.0, per) + u2n = _norm_on_period(u2, 0.0, per) + + # Guard degeneracy + if d <= TOLERANCE or abs(per - d) <= TOLERANCE: + return ShapeList() + + minor = _edge_from_circle(h2d_circle, u1n, u1n + d) + major = _edge_from_circle(h2d_circle, u2n, u2n + (per - d)) + return [minor, major] + + +def _qstr(q) -> str: + # Works with OCP's GccEnt enum values + try: + from OCP.GccEnt import GccEnt_enclosed, GccEnt_enclosing, GccEnt_outside + + try: + from OCP.GccEnt import GccEnt_unqualified + except ImportError: + # Some OCCT versions name this 'noqualifier' + from OCP.GccEnt import GccEnt_noqualifier as GccEnt_unqualified + mapping = { + GccEnt_enclosed: "enclosed", + GccEnt_enclosing: "enclosing", + GccEnt_outside: "outside", + GccEnt_unqualified: "unqualified", + } + return mapping.get(q, f"unknown({int(q)})") + except Exception: + # Fallback if enums aren't importable for any reason + return str(int(q)) + + +def _make_2tan_rad_arcs( + object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + radius: float, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + *, + edge_factory: Callable[[TopoDS_Edge], TWrap], +) -> list[Edge]: + """ + Create all planar circular arcs of a given radius that are tangent/contacting + the two provided objects on the XY plane. + + Inputs must be coplanar with ``Plane.XY``. Non-coplanar edges are not supported. + + Args: + object_one (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched + by the circle(s) + object_two (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched + by the circle(s) + radius (float): Circle radius for all candidate solutions. + + Raises: + ValueError: Invalid input + ValueError: Invalid curve + RuntimeError: no valid circle solutions found + + Returns: + ShapeList[Edge]: A list of planar circular edges (on XY) representing both + the minor and major arcs between the two tangency points for every valid + circle solution. + + """ + + if isinstance(object_1, tuple): + object_one, object_one_constraint = object_1 + else: + object_one = object_1 + if isinstance(object_2, tuple): + object_two, object_two_constraint = object_2 + else: + object_two = object_2 + + # --------------------------- + # Build inputs and GCC + # --------------------------- + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( + object_one, object_one_constraint + ) + q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( + object_two, object_two_constraint + ) + + # Put the Edge arg first when exactly one is an Edge (improves robustness) + if is_edge1 ^ is_edge2: + q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) + + gcc = Geom2dGcc_Circ2d2TanRad(q_o1, q_o2, radius, TOLERANCE) + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find a tangent arc") + + def _valid_on_arg1(u: float) -> bool: + return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) + + def _valid_on_arg2(u: float) -> bool: + return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) + + # --------------------------- + # Solutions + # --------------------------- + solutions: list[Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + circ = gcc.ThisSolution(i) # gp_Circ2d + + # Tangency on curve 1 + p1 = gp_Pnt2d() + u_circ1, u_arg1 = gcc.Tangency1(i, p1) + if not _valid_on_arg1(u_arg1): + continue + + # Tangency on curve 2 + p2 = gp_Pnt2d() + u_circ2, u_arg2 = gcc.Tangency2(i, p2) + if not _valid_on_arg2(u_arg2): + continue + + # qual1 = GccEnt_Position(int()) + # qual2 = GccEnt_Position(int()) + # gcc.WhichQualifier(i, qual1, qual2) # returns two GccEnt_Position values + # print( + # f"Solution {i}: " + # f"arg1={_qstr(qual1)}, arg2={_qstr(qual2)} | " + # f"u_circ=({u_circ1:.6g}, {u_circ2:.6g}) " + # f"u_arg=({u_arg1:.6g}, {u_arg2:.6g})" + # ) + + # Build BOTH sagitta arcs and select by LengthConstraint + if sagitta_constraint == LengthConstraint.BOTH: + solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) + else: + arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) + arcs = sorted( + arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)) + ) + solutions.append(arcs[sagitta_constraint.value]) + return ShapeList([edge_factory(e) for e in solutions]) + + +def _make_2tan_on_arcs( + object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + *, + edge_factory: Callable[[TopoDS_Edge], TWrap], +) -> ShapeList[Edge]: + """ + Create all planar circular arcs whose circle is tangent to two objects and whose + CENTER lies on a given locus (line/circle/curve) on the XY plane. + + Notes + ----- + - `center_on` is treated as a **center locus** (not a tangency target). For a line + locus this uses Geom2dGcc_Circ2d2TanOn; for other 2D curves it uses the *Geo variant*. + - A point is NOT a valid center locus for the 2TanOn solver; use the TanCen variant + (fixed center) for that case. + """ + + # Unpack optional qualifiers on the two tangency args + object_one_constraint = PositionConstraint.UNQUALIFIED + object_two_constraint = PositionConstraint.UNQUALIFIED + + if isinstance(object_1, tuple): + object_one, object_one_constraint = object_1 + else: + object_one = object_1 + + if isinstance(object_2, tuple): + object_two, object_two_constraint = object_2 + else: + object_two = object_2 + + # --------------------------- + # Build tangency inputs + # --------------------------- + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( + object_one, object_one_constraint + ) + q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( + object_two, object_two_constraint + ) + + # Prefer "edge-first" ordering when exactly one arg is an Edge + if is_edge1 ^ is_edge2: + q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) + h_e1, h_e2 = (h_e1, h_e2) if is_edge1 else (h_e2, h_e1) + e1_first, e1_last, e2_first, e2_last = ( + (e1_first, e1_last, e2_first, e2_last) + if is_edge1 + else (e2_first, e2_last, e1_first, e1_last) + ) + is_edge1, is_edge2 = (True, False) if is_edge1 else (False, True) + + # --------------------------- + # Build center locus ("On") input + # --------------------------- + # Allow an (Edge, PositionConstraint) tuple for symmetry, but ignore the qualifier here. + on_obj = center_on[0] if isinstance(center_on, tuple) else center_on + + # 2TanOn expects a 2D locus for the CENTER. Points are not supported here. + if isinstance(on_obj, (Vertex, Vector)): + raise TypeError( + "center_on cannot be a point for 2TanOn; use the 'center=' (TanCen) variant." + ) + + # Project the 'on' Edge to 2D and choose the appropriate solver + if isinstance(on_obj, Edge): + # Reuse your projection utility to get a 2D curve + # (qualifier irrelevant for the center locus) + _, h_on2d, on_first, on_last = _edge_to_qualified_2d(on_obj.wrapped) + adapt_on = Geom2dAdaptor_Curve(h_on2d, on_first, on_last) + + # Prefer the analytic 'On' constructor when the locus is a line; otherwise use the Geo variant + use_line = adapt_on.GetType() == GeomAbs_CurveType.GeomAbs_Line + if use_line: + gp_lin2d = adapt_on.Line() + gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, gp_lin2d, TOLERANCE) + else: + # Works for circles and general Geom2d curves as the center locus + gcc = Geom2dGcc_Circ2d2TanOnGeo(q_o1, q_o2, h_on2d, TOLERANCE) + else: + # If it's neither Edge/Vertex/VectorLike (shouldn't happen), bail out clearly + raise TypeError("center_on must be an Edge (line/circle/curve) for 2TanOn.") + + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find a tangent arc with center_on constraint") + + def _valid_on_arg1(u: float) -> bool: + return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) + + def _valid_on_arg2(u: float) -> bool: + return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) + + # --------------------------- + # Solutions + # --------------------------- + solutions: list[TopoDS_Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + circ = gcc.ThisSolution(i) # gp_Circ2d + + # Tangency on curve 1 + p1 = gp_Pnt2d() + u_circ1, u_arg1 = gcc.Tangency1(i, p1) + if not _valid_on_arg1(u_arg1): + continue + + # Tangency on curve 2 + p2 = gp_Pnt2d() + u_circ2, u_arg2 = gcc.Tangency2(i, p2) + if not _valid_on_arg2(u_arg2): + continue + + # Build sagitta arc(s) and select by LengthConstraint + if sagitta_constraint == LengthConstraint.BOTH: + solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) + else: + arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) + if not arcs: + continue + arcs = sorted( + arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)) + ) + solutions.append(arcs[sagitta_constraint.value]) + + return ShapeList([edge_factory(e) for e in solutions]) + + +def _make_3tan_arcs( + object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + object_3: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + *, + edge_factory: Callable[[TopoDS_Edge], TWrap], +) -> ShapeList[Edge]: + """ + Create planar circular arc(s) on XY tangent to three provided objects. + + The circle is determined by the three tangency constraints; the returned arc(s) + are trimmed between the two tangency points corresponding to `object_1` and + `object_2`. Use `sagitta_constraint` to select the shorter/longer (or both) arc. + Inputs must be representable on Plane.XY. + """ + + # Unpack optional per-edge qualifiers (default UNQUALIFIED) + obj1_qual = PositionConstraint.UNQUALIFIED + obj2_qual = PositionConstraint.UNQUALIFIED + obj3_qual = PositionConstraint.UNQUALIFIED + + if isinstance(object_1, tuple): + object_one, obj1_qual = object_1 + else: + object_one = object_1 + + if isinstance(object_2, tuple): + object_two, obj2_qual = object_2 + else: + object_two = object_2 + + if isinstance(object_3, tuple): + object_three, obj3_qual = object_3 + else: + object_three = object_3 + + # --------------------------- + # Build inputs for GCC + # --------------------------- + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, obj1_qual) + q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg(object_two, obj2_qual) + q_o3, h_e3, e3_first, e3_last, is_edge3 = _as_gcc_arg(object_three, obj3_qual) + + # For 3Tan we keep the user-given order so the arc endpoints remain (arg1,arg2) + gcc = Geom2dGcc_Circ2d3Tan(q_o1, q_o2, q_o3, TOLERANCE) + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find a circle tangent to all three objects") + + def _ok1(u: float) -> bool: + return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) + + def _ok2(u: float) -> bool: + return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) + + def _ok3(u: float) -> bool: + return True if not is_edge3 else _param_in_trim(u, e3_first, e3_last, h_e3) + + # --------------------------- + # Enumerate solutions + # --------------------------- + out_topos: list[TopoDS_Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + circ = gcc.ThisSolution(i) # gp_Circ2d + + # Tangency on curve 1 (arc endpoint A) + p1 = gp_Pnt2d() + u_circ1, u_arg1 = gcc.Tangency1(i, p1) + if not _ok1(u_arg1): + continue + + # Tangency on curve 2 (arc endpoint B) + p2 = gp_Pnt2d() + u_circ2, u_arg2 = gcc.Tangency2(i, p2) + if not _ok2(u_arg2): + continue + + # Tangency on curve 3 (validates circle; does not define arc endpoints) + p3 = gp_Pnt2d() + _u_circ3, u_arg3 = gcc.Tangency3(i, p3) + if not _ok3(u_arg3): + continue + + # Build arc(s) between u_circ1 and u_circ2 per LengthConstraint + if sagitta_constraint == LengthConstraint.BOTH: + out_topos.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) + else: + arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) + if not arcs: + continue + arcs = sorted( + arcs, + key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)), + ) + out_topos.append(arcs[sagitta_constraint.value]) + + return ShapeList([edge_factory(e) for e in out_topos]) + + +def _make_tan_cen_arcs( + object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + center: VectorLike | Vertex, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, # unused here + *, + edge_factory: Callable[[TopoDS_Edge], TWrap], +) -> ShapeList[Edge]: + """ + Create planar circle(s) on XY whose center is fixed and that are tangent/contacting + a single object. + + Notes + ----- + - With a **fixed center** and a single tangency constraint, the natural geometric + result is a full circle; there are no second endpoints to define an arc span. + This routine therefore returns closed circular edges (full 2π trims). + - If the tangency target is a point (Vertex/VectorLike), the circle is the one + centered at `center` and passing through that point (built directly). + """ + + # Unpack optional qualifier on the tangency arg (edges only) + obj1_qual = PositionConstraint.UNQUALIFIED + if isinstance(object_1, tuple): + object_one, obj1_qual = object_1 + else: + object_one = object_1 + + # --------------------------- + # Build fixed center (gp_Pnt2d) + # --------------------------- + if isinstance(center, Vertex): + loc_xyz = center.position + base = Vector(center) + c2d = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) + else: + v = Vector(center) + c2d = gp_Pnt2d(v.X, v.Y) + + # --------------------------- + # Tangency input + # --------------------------- + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, obj1_qual) + + solutions_topo: list[TopoDS_Edge] = [] + + # Case A: tangency target is a point -> circle passes through that point + if not is_edge1 and isinstance(q_o1, Geom2d_CartesianPoint): + p = q_o1.Pnt2d() + # radius = distance(center, point) + dx, dy = p.X() - c2d.X(), p.Y() - c2d.Y() + r = (dx * dx + dy * dy) ** 0.5 + if r <= TOLERANCE: + # Center coincides with point: no valid circle + return ShapeList([]) + # Build full circle + circ = gp_Circ2d(gp_Ax2d(c2d, gp_Dir2d(1.0, 0.0)), r) + h2d = Geom2d_Circle(circ) + per = h2d.Period() + solutions_topo.append(_edge_from_circle(h2d, 0.0, per)) + + else: + # Case B: tangency target is a curve/edge (qualified curve) + gcc = Geom2dGcc_Circ2dTanCen(q_o1, c2d, TOLERANCE) + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError( + "Unable to find circle(s) tangent to target with fixed center" + ) + + for i in range(1, gcc.NbSolutions() + 1): + circ = gcc.ThisSolution(i) # gp_Circ2d + + # Validate tangency lies on trimmed span if the target is an Edge + p1 = gp_Pnt2d() + _u_on_circ, u_on_arg = gcc.Tangency1(i, p1) + if is_edge1 and not _param_in_trim(u_on_arg, e1_first, e1_last, h_e1): + continue + + # Emit full circle (2π trim) + h2d = Geom2d_Circle(circ) + per = h2d.Period() + solutions_topo.append(_edge_from_circle(h2d, 0.0, per)) + + return ShapeList([edge_factory(e) for e in solutions_topo]) + + +def _make_tan_on_rad_arcs( + object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + radius: float, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, # unused here + *, + edge_factory: Callable[[TopoDS_Edge], TWrap], +) -> ShapeList[Edge]: + """ + Create planar circle(s) on XY that: + - are tangent/contacting a single object, and + - have a fixed radius, and + - have their CENTER constrained to lie on a given locus curve. + + Notes + ----- + - The center locus must be a 2D curve (line/circle/any Geom2d curve) — i.e. an Edge + after projection to XY. A point is not a valid 'center_on' locus for this solver. + - With only one tangency, the natural geometric result is a full circle; arc cropping + would require an additional endpoint constraint. This routine therefore returns + closed circular edges (2π trims) for each valid solution. + """ + + # --- unpack optional qualifier on the tangency arg (edges only) --- + obj1_qual = PositionConstraint.UNQUALIFIED + if isinstance(object_1, tuple): + object_one, obj1_qual = object_1 + else: + object_one = object_1 + + # --- build tangency input (point/edge) --- + q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, obj1_qual) + + # --- center locus ('center_on') must be a curve; ignore any qualifier there --- + on_obj = center_on[0] if isinstance(center_on, tuple) else center_on + if not isinstance(on_obj, Edge): + raise TypeError("center_on must be an Edge (line/circle/curve) for TanOnRad.") + + # Project the center locus Edge to 2D (XY) + _, h_on2d, on_first, on_last = _edge_to_qualified_2d(on_obj.wrapped) + adapt_on = Geom2dAdaptor_Curve(h_on2d, on_first, on_last) + + # Choose the appropriate GCC constructor + if adapt_on.GetType() == GeomAbs_CurveType.GeomAbs_Line: + gp_lin2d = adapt_on.Line() + gcc = Geom2dGcc_Circ2dTanOnRad(q_o1, gp_lin2d, radius, TOLERANCE) + else: + gcc = Geom2dGcc_Circ2dTanOnRadGeo(q_o1, h_on2d, radius, TOLERANCE) + + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find circle(s) for TanOnRad constraints") + + def _ok1(u: float) -> bool: + return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) + + # --- enumerate solutions; emit full circles (2π trims) --- + out_topos: list[TopoDS_Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + circ = gcc.ThisSolution(i) # gp_Circ2d + + # Validate tangency lies on trimmed span when the target is an Edge + p = gp_Pnt2d() + _u_on_circ, u_on_arg = gcc.Tangency1(i, p) + if not _ok1(u_on_arg): + continue + + h2d = Geom2d_Circle(circ) + per = h2d.Period() + out_topos.append(_edge_from_circle(h2d, 0.0, per)) + + return ShapeList([edge_factory(e) for e in out_topos]) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 3eea653..3b8f5ff 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -57,9 +57,8 @@ import warnings from collections.abc import Iterable from itertools import combinations from math import ceil, copysign, cos, floor, inf, isclose, pi, radians -from typing import TYPE_CHECKING, Literal +from typing import TYPE_CHECKING, Literal, TypeAlias, overload from typing import cast as tcast -from typing import overload import numpy as np import OCP.TopAbs as ta @@ -235,6 +234,13 @@ from .utils import ( isclose_b, ) from .zero_d import Vertex, topo_explore_common_vertex +from .constrained_lines import ( + _make_2tan_rad_arcs, + _make_2tan_on_arcs, + _make_3tan_arcs, + _make_tan_cen_arcs, + _make_tan_on_rad_arcs, +) if TYPE_CHECKING: # pragma: no cover from .composite import Compound, Curve, Part, Sketch # pylint: disable=R0801 @@ -1578,6 +1584,228 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return_value = cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) return return_value + @overload + @classmethod + def make_constrained_arcs( + cls, + tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_two: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *, + radius: float, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + ) -> ShapeList[Edge]: + """ + Create all planar circular arcs of a given radius that are tangent/contacting + the two provided objects on the XY plane. + Args: + tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_two (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + Geometric entities to be contacted/touched by the circle(s) + radius (float): arc radius + sagitta_constraint (LengthConstraint, optional): returned arc selector + (i.e. either the short, long or both arcs). Defaults to + LengthConstraint.SHORT. + + Returns: + ShapeList[Edge]: tangent arcs + """ + + @overload + @classmethod + def make_constrained_arcs( + cls, + tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_two: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *, + center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + ) -> ShapeList[Edge]: + """ + Create all planar circular arcs whose circle is tangent to two objects and whose + CENTER lies on a given locus (line/circle/curve) on the XY plane. + + Args: + tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_two (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + Geometric entities to be contacted/touched by the circle(s) + center_on (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + the **center locus** (not a tangency target) + sagitta_constraint (LengthConstraint, optional): returned arc selector + (i.e. either the short, long or both arcs). Defaults to + LengthConstraint.SHORT. + + Returns: + ShapeList[Edge]: tangent arcs + """ + + @overload + @classmethod + def make_constrained_arcs( + cls, + tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_two: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_three: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + ) -> ShapeList[Edge]: + """ + Create planar circular arc(s) on XY tangent to three provided objects. + + Args: + tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_two (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_three (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + Geometric entities to be contacted/touched by the circle(s) + sagitta_constraint (LengthConstraint, optional): returned arc selector + (i.e. either the short, long or both arcs). Defaults to + LengthConstraint.SHORT. + + Returns: + ShapeList[Edge]: tangent arcs + """ + + @overload + @classmethod + def make_constrained_arcs( + cls, + tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *, + center: VectorLike, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + ) -> ShapeList[Edge]: + """make_constrained_arcs + + Create planar circle(s) on XY whose center is fixed and that are tangent/contacting + a single object. + + Args: + tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + Geometric entity to be contacted/touched by the circle(s) + center (VectorLike): center position + sagitta_constraint (LengthConstraint, optional): returned arc selector + (i.e. either the short, long or both arcs). Defaults to + LengthConstraint.SHORT. + + Returns: + ShapeList[Edge]: tangent arcs + """ + + @overload + @classmethod + def make_constrained_arcs( + cls, + tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *, + radius: float, + center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + ) -> ShapeList[Edge]: + """make_constrained_arcs + + Create planar circle(s) on XY that: + - are tangent/contacting a single object, and + - have a fixed radius, and + - have their CENTER constrained to lie on a given locus curve. + + Args: + tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + Geometric entity to be contacted/touched by the circle(s) + radius (float): arc radius + center_on (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + the **center locus** (not a tangency target) + sagitta_constraint (LengthConstraint, optional): returned arc selector + (i.e. either the short, long or both arcs). Defaults to + LengthConstraint.SHORT. + + Returns: + ShapeList[Edge]: tangent arcs + """ + + @classmethod + def make_constrained_arcs( + cls, + *args, + sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + **kwargs, + ) -> ShapeList[Edge]: + + tangency_one = args[0] if len(args) > 0 else None + tangency_two = args[1] if len(args) > 1 else None + tangency_three = args[2] if len(args) > 2 else None + + tangency_one = kwargs.pop("tangency_one", tangency_one) + tangency_two = kwargs.pop("tangency_two", tangency_two) + tangency_three = kwargs.pop("tangency_three", tangency_three) + + radius = kwargs.pop("radius", None) + center = kwargs.pop("center", None) + center_on = kwargs.pop("center_on", None) + + # Handle unexpected kwargs + if kwargs: + raise TypeError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + + # --- validate inputs --- + tangencies = [ + t for t in (tangency_one, tangency_two, tangency_three) if t is not None + ] + tan_count = len(tangencies) + if not (1 <= tan_count <= 3): + raise TypeError("Provide 1 to 3 tangency targets.") + if ( + sum(x is not None for x in (radius, center, center_on)) > 1 + and tan_count != 2 + ): + raise TypeError("Ambiguous constraint combination.") + + # Disallow qualifiers on points/vertices (enforce at runtime) + if any(isinstance(t, tuple) and not isinstance(t[0], Edge) for t in tangencies): + raise TypeError("Only Edge targets may be qualified.") + + # Radius sanity + if radius is not None and radius <= 0: + raise ValueError("radius must be > 0.0") + + # --- decide problem kind --- + if ( + tan_count == 2 + and radius is not None + and center is None + and center_on is None + ): + return _make_2tan_rad_arcs( + *tangencies, + radius, + sagitta_constraint, + edge_factory=cls, + ) + if ( + tan_count == 2 + and center_on is not None + and radius is None + and center is None + ): + return _make_2tan_on_arcs( + *tangencies, center_on, sagitta_constraint, edge_factory=cls + ) + if tan_count == 3 and radius is None and center is None and center_on is None: + return _make_3tan_arcs(tangencies, sagitta_constraint, edge_factory=cls) + if ( + tan_count == 1 + and center is not None + and radius is None + and center_on is None + ): + return _make_tan_cen_arcs( + *tangencies, center, sagitta_constraint, edge_factory=cls + ) + if tan_count == 1 and center_on is not None and radius is not None: + return _make_tan_on_rad_arcs( + *tangencies, center_on, radius, sagitta_constraint, edge_factory=cls + ) + + raise ValueError("Unsupported or ambiguous combination of constraints.") + @classmethod def make_ellipse( cls, @@ -1908,259 +2136,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return cls(BRepBuilderAPI_MakeEdge(circle_geom).Edge()) - @classmethod - def make_tangent_arcs( - cls, - object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - radius: float, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, - ) -> ShapeList[Edge]: - """ - Create all planar circular arcs of a given radius that are tangent/contacting - the two provided objects on the XY plane. - - Inputs must be coplanar with ``Plane.XY``. Non-coplanar edges are not supported. - - Args: - object_one (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched - by the circle(s) - object_two (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched - by the circle(s) - radius (float): Circle radius for all candidate solutions. - - Raises: - ValueError: Invalid input - ValueError: Invalid curve - RuntimeError: no valid circle solutions found - - Returns: - ShapeList[Edge]: A list of planar circular edges (on XY) representing both - the minor and major arcs between the two tangency points for every valid - circle solution. - - """ - - if isinstance(object_1, tuple): - object_one, object_one_constraint = object_1 - else: - object_one = object_1 - if isinstance(object_2, tuple): - object_two, object_two_constraint = object_2 - else: - object_two = object_2 - - # Reuse a single XY plane for 3D->2D projection and for 2D-edge building - _pln_xy = gp_Pln(gp_Ax3(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(0.0, 0.0, 1.0))) - _surf_xy = Geom_Plane(_pln_xy) - - # --------------------------- - # Normalization utilities - # --------------------------- - def _norm_on_period(u: float, first: float, per: float) -> float: - """Map parameter u into [first, first+per).""" - if per <= 0.0: - return u - k = floor((u - first) / per) - return u - k * per - - def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: - """ - Forward (positive) delta from u1 to u2 on a periodic domain anchored at - 'first'. - """ - u1n = _norm_on_period(u1, first, period) - u2n = _norm_on_period(u2, first, period) - delta = u2n - u1n - if delta < 0.0: - delta += period - return delta - - # --------------------------- - # Core helpers - # --------------------------- - def _edge_to_qualified_2d( - edge: TopoDS_Edge, position_constaint: PositionConstraint - ) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float]: - """Convert a TopoDS_Edge into 2d curve & extract properties""" - - # 1) Underlying curve + range (also retrieve location to be safe) - loc = edge.Location() - hcurve3d = BRep_Tool.Curve_s(edge, float(), float()) - first, last = BRep_Tool.Range_s(edge) - - if hcurve3d is None: - raise ValueError("Edge has no underlying 3D curve.") - - # 2) Apply location if the edge is positioned by a TopLoc_Location - if not loc.IsIdentity(): - trsf = loc.Transformation() - hcurve3d = hcurve3d.Transformed(trsf) - - # 3) Convert to 2D on Plane.XY (Z-up frame at origin) - hcurve2d = GeomAPI.To2d_s(hcurve3d, _pln_xy) # -> Handle_Geom2d_Curve - - # 4) Wrap in an adaptor using the same parametric range - adapt2d = Geom2dAdaptor_Curve(hcurve2d, first, last) - - # 5) Create the qualified curve (unqualified is fine here) - qcurve = Geom2dGcc_QualifiedCurve(adapt2d, position_constaint.value) - return qcurve, hcurve2d, first, last - - def _edge_from_circle( - h2d_circle: Geom2d_Circle, u1: float, u2: float - ) -> TopoDS_Edge: - """Build a 3D edge on XY from a trimmed 2D circle segment [u1, u2].""" - arc2d = Geom2d_TrimmedCurve(h2d_circle, u1, u2, True) # sense=True - return BRepBuilderAPI_MakeEdge(arc2d, _surf_xy).Edge() - - def _param_in_trim( - u: float, first: float, last: float, h2d: Geom2d_Curve - ) -> bool: - """Normalize (if periodic) then test [first, last] with tolerance.""" - u = _norm_on_period(u, first, h2d.Period()) if h2d.IsPeriodic() else u - return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) - - def _as_gcc_arg( - obj: Edge | Vertex | VectorLike, constaint: PositionConstraint - ) -> tuple[ - Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, - Geom2d_Curve | None, - float | None, - float | None, - bool, - ]: - """ - Normalize input to a GCC argument. - Returns: (q_obj, h2d, first, last, is_edge) - - Edge -> (QualifiedCurve, h2d, first, last, True) - - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) - """ - if isinstance(obj, Edge): - return _edge_to_qualified_2d(obj.wrapped, constaint) + (True,) - - loc_xyz = obj.position if isinstance(obj, Vertex) else Vector() - try: - base = Vector(obj) - except (TypeError, ValueError) as exc: - raise ValueError("Expected Edge | Vertex | VectorLike") from exc - - gp_pnt = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) - return Geom2d_CartesianPoint(gp_pnt), None, None, None, False - - def _two_arc_edges_from_params( - circ: gp_Circ2d, u1: float, u2: float - ) -> ShapeList[Edge]: - """ - Given two parameters on a circle, return both the forward (minor) - and complementary (major) arcs as TopoDS_Edge(s). - Uses centralized normalization utilities. - """ - h2d_circle = Geom2d_Circle(circ) - per = h2d_circle.Period() # usually 2*pi - - # Minor (forward) span - d = _forward_delta(u1, u2, 0.0, per) # anchor at 0 for circle convenience - u1n = _norm_on_period(u1, 0.0, per) - u2n = _norm_on_period(u2, 0.0, per) - - # Guard degeneracy - if d <= TOLERANCE or abs(per - d) <= TOLERANCE: - return ShapeList() - - minor = _edge_from_circle(h2d_circle, u1n, u1n + d) - major = _edge_from_circle(h2d_circle, u2n, u2n + (per - d)) - return ShapeList([Edge(minor), Edge(major)]) - - def _qstr(q) -> str: - # Works with OCP's GccEnt enum values - try: - from OCP.GccEnt import ( - GccEnt_enclosed, - GccEnt_enclosing, - GccEnt_outside, - ) - - try: - from OCP.GccEnt import GccEnt_unqualified - except ImportError: - # Some OCCT versions name this 'noqualifier' - from OCP.GccEnt import GccEnt_noqualifier as GccEnt_unqualified - mapping = { - GccEnt_enclosed: "enclosed", - GccEnt_enclosing: "enclosing", - GccEnt_outside: "outside", - GccEnt_unqualified: "unqualified", - } - return mapping.get(q, f"unknown({int(q)})") - except Exception: - # Fallback if enums aren't importable for any reason - return str(int(q)) - - # --------------------------- - # Build inputs and GCC - # --------------------------- - q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( - object_one, object_one_constraint - ) - q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( - object_two, object_two_constraint - ) - - # Put the Edge arg first when exactly one is an Edge (improves robustness) - if is_edge1 ^ is_edge2: - q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) - - gcc = Geom2dGcc_Circ2d2TanRad(q_o1, q_o2, radius, TOLERANCE) - if not gcc.IsDone() or gcc.NbSolutions() == 0: - raise RuntimeError("Unable to find a tangent arc") - - def _valid_on_arg1(u: float) -> bool: - return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) - - def _valid_on_arg2(u: float) -> bool: - return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) - - # --------------------------- - # Solutions - # --------------------------- - solutions: list[Edge] = [] - for i in range(1, gcc.NbSolutions() + 1): - circ = gcc.ThisSolution(i) # gp_Circ2d - - # Tangency on curve 1 - p1 = gp_Pnt2d() - u_circ1, u_arg1 = gcc.Tangency1(i, p1) - if not _valid_on_arg1(u_arg1): - continue - - # Tangency on curve 2 - p2 = gp_Pnt2d() - u_circ2, u_arg2 = gcc.Tangency2(i, p2) - if not _valid_on_arg2(u_arg2): - continue - - qual1 = GccEnt_Position(int()) - qual2 = GccEnt_Position(int()) - gcc.WhichQualifier(i, qual1, qual2) # returns two GccEnt_Position values - print( - f"Solution {i}: " - f"arg1={_qstr(qual1)}, arg2={_qstr(qual2)} | " - f"u_circ=({u_circ1:.6g}, {u_circ2:.6g}) " - f"u_arg=({u_arg1:.6g}, {u_arg2:.6g})" - ) - - # Build BOTH sagitta arcs and select by LengthConstraint - if sagitta_constraint == LengthConstraint.BOTH: - solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) - else: - solutions.append( - _two_arc_edges_from_params(circ, u_circ1, u_circ2).sort_by( - Edge.length - )[sagitta_constraint.value] - ) - return ShapeList(solutions) - @classmethod def make_three_point_arc( cls, point1: VectorLike, point2: VectorLike, point3: VectorLike diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index 6fd50c5..c1bbb1e 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -3,11 +3,35 @@ build123d topology name: utils.py by: Gumyr -date: September 07, 2025 +date: January 07, 2025 desc: -This module houses utilities used within the topology modules. +This module provides utility functions and helper classes for the build123d CAD library, enabling +advanced geometric operations and facilitating the use of the OpenCascade CAD kernel. It complements +the core library by offering reusable and modular tools for manipulating shapes, performing Boolean +operations, and validating geometry. + +Key Features: +- **Geometric Utilities**: + - `polar`: Converts polar coordinates to Cartesian. + - `tuplify`: Normalizes inputs into consistent tuples. + - `find_max_dimension`: Computes the maximum bounding dimension of shapes. + +- **Shape Creation**: + - `_make_loft`: Creates lofted shapes from wires and vertices. + - `_make_topods_compound_from_shapes`: Constructs compounds from multiple shapes. + - `_make_topods_face_from_wires`: Generates planar faces with optional holes. + +- **Boolean Operations**: + - `_topods_bool_op`: Generic Boolean operations for TopoDS_Shapes. + - `new_edges`: Identifies newly created edges from combined shapes. + +- **Enhanced Math**: + - `isclose_b`: Overrides `math.isclose` with a stricter absolute tolerance. + +This module is a critical component of build123d, supporting complex CAD workflows and geometric +transformations while maintaining a clean, extensible API. license: @@ -29,453 +53,378 @@ license: from __future__ import annotations -import copy -import itertools -import warnings -from collections.abc import Iterable -from itertools import combinations -from math import ceil, copysign, cos, floor, inf, isclose, pi, radians -from typing import Callable, TypeVar, TYPE_CHECKING, Literal -from typing import cast as tcast -from typing import overload +from math import radians, sin, cos, isclose +from typing import Any, TYPE_CHECKING + +from collections.abc import Iterable -import numpy as np -import OCP.TopAbs as ta from OCP.BRep import BRep_Tool -from OCP.BRepAdaptor import BRepAdaptor_CompCurve, BRepAdaptor_Curve from OCP.BRepAlgoAPI import ( - BRepAlgoAPI_Common, - BRepAlgoAPI_Section, + BRepAlgoAPI_BooleanOperation, + BRepAlgoAPI_Cut, BRepAlgoAPI_Splitter, ) -from OCP.BRepBuilderAPI import ( - BRepBuilderAPI_DisconnectedWire, - BRepBuilderAPI_EmptyWire, - BRepBuilderAPI_MakeEdge, - BRepBuilderAPI_MakeEdge2d, - BRepBuilderAPI_MakeFace, - BRepBuilderAPI_MakePolygon, - BRepBuilderAPI_MakeWire, - BRepBuilderAPI_NonManifoldWire, -) -from OCP.BRepExtrema import BRepExtrema_DistShapeShape, BRepExtrema_SupportType -from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet2d -from OCP.BRepGProp import BRepGProp, BRepGProp_Face -from OCP.BRepLib import BRepLib, BRepLib_FindSurface -from OCP.BRepLProp import BRepLProp -from OCP.BRepOffset import BRepOffset_MakeOffset -from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeOffset -from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace -from OCP.BRepProj import BRepProj_Projection -from OCP.BRepTools import BRepTools, BRepTools_WireExplorer -from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse -from OCP.GccEnt import GccEnt_unqualified, GccEnt_Position -from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import ( - Geom_BezierCurve, - Geom_BSplineCurve, - Geom_ConicalSurface, - Geom_CylindricalSurface, - Geom_Line, - Geom_Plane, - Geom_Surface, - Geom_TrimmedCurve, -) -from OCP.Geom2d import ( - Geom2d_CartesianPoint, - Geom2d_Circle, - Geom2d_Curve, - Geom2d_Line, - Geom2d_Point, - Geom2d_TrimmedCurve, -) -from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve -from OCP.Geom2dAPI import Geom2dAPI_InterCurveCurve -from OCP.Geom2dGcc import Geom2dGcc_Circ2d2TanRad, Geom2dGcc_QualifiedCurve -from OCP.GeomAbs import ( - GeomAbs_C0, - GeomAbs_C1, - GeomAbs_C2, - GeomAbs_G1, - GeomAbs_G2, - GeomAbs_JoinType, -) -from OCP.GeomAdaptor import GeomAdaptor_Curve -from OCP.GeomAPI import ( - GeomAPI, - GeomAPI_IntCS, - GeomAPI_Interpolate, - GeomAPI_PointsToBSpline, - GeomAPI_ProjectPointOnCurve, -) -from OCP.GeomConvert import GeomConvert_CompCurveToBSplineCurve -from OCP.GeomFill import ( - GeomFill_CorrectedFrenet, - GeomFill_Frenet, - GeomFill_TrihedronLaw, -) -from OCP.GeomProjLib import GeomProjLib -from OCP.gp import ( - gp_Ax1, - gp_Ax2, - gp_Ax3, - gp_Circ, - gp_Circ2d, - gp_Dir, - gp_Dir2d, - gp_Elips, - gp_Pln, - gp_Pnt, - gp_Pnt2d, - gp_Trsf, - gp_Vec, -) -from OCP.GProp import GProp_GProps -from OCP.HLRAlgo import HLRAlgo_Projector -from OCP.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape -from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds -from OCP.ShapeFix import ShapeFix_Shape, ShapeFix_Wireframe -from OCP.Standard import ( - Standard_ConstructionError, - Standard_Failure, - Standard_NoSuchObject, -) -from OCP.TColgp import TColgp_Array1OfPnt, TColgp_Array1OfVec, TColgp_HArray1OfPnt -from OCP.TColStd import ( - TColStd_Array1OfReal, - TColStd_HArray1OfBoolean, - TColStd_HArray1OfReal, -) -from OCP.TopAbs import TopAbs_Orientation, TopAbs_ShapeEnum -from OCP.TopExp import TopExp, TopExp_Explorer -from OCP.TopLoc import TopLoc_Location +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeFace +from OCP.BRepLib import BRepLib_FindSurface +from OCP.BRepOffsetAPI import BRepOffsetAPI_ThruSections +from OCP.BRepPrimAPI import BRepPrimAPI_MakePrism +from OCP.ShapeFix import ShapeFix_Face, ShapeFix_Shape +from OCP.TopAbs import TopAbs_ShapeEnum +from OCP.TopExp import TopExp_Explorer +from OCP.TopTools import TopTools_ListOfShape from OCP.TopoDS import ( TopoDS, + TopoDS_Builder, TopoDS_Compound, - TopoDS_Edge, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Vertex, + TopoDS_Edge, TopoDS_Wire, ) -from OCP.TopTools import ( - TopTools_HSequenceOfShape, - TopTools_IndexedDataMapOfShapeListOfShape, - TopTools_IndexedMapOfShape, - TopTools_ListOfShape, -) -from scipy.optimize import minimize_scalar -from scipy.spatial import ConvexHull -from typing_extensions import Self +from build123d.geometry import TOLERANCE, BoundBox, Vector, VectorLike -from build123d.build_enums import ( - AngularDirection, - CenterOf, - ContinuityLevel, - FrameMethod, - GeomType, - Keep, - Kind, - LengthConstraint, - PositionConstraint, - PositionMode, - Side, -) -from build123d.geometry import ( - DEG2RAD, - TOL_DIGITS, - TOLERANCE, - Axis, - Color, - Location, - Plane, - Vector, - VectorLike, - logger, -) - -from .shape_core import ( - Shape, - ShapeList, - SkipClean, - TrimmingTool, - downcast, - get_top_level_topods_shapes, - shapetype, - topods_dim, - unwrap_topods_compound, -) -from .utils import ( - _extrude_topods_shape, - _make_topods_face_from_wires, - _topods_bool_op, - isclose_b, -) -from .zero_d import Vertex, topo_explore_common_vertex - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from build123d.topology.one_d import Edge - -TWrap = TypeVar("TWrap") # whatever the factory returns (Edge or a subclass) - -# Reuse a single XY plane for 3D->2D projection and for 2D-edge building -_pln_xy = gp_Pln(gp_Ax3(gp_Pnt(0.0, 0.0, 0.0), gp_Dir(0.0, 0.0, 1.0))) -_surf_xy = Geom_Plane(_pln_xy) +from .shape_core import Shape, ShapeList, downcast, shapetype, unwrap_topods_compound -# --------------------------- -# Normalization utilities -# --------------------------- -def _norm_on_period(u: float, first: float, per: float) -> float: - """Map parameter u into [first, first+per).""" - if per <= 0.0: - return u - k = floor((u - first) / per) - return u - k * per +if TYPE_CHECKING: # pragma: no cover + from .zero_d import Vertex # pylint: disable=R0801 + from .one_d import Edge, Wire # pylint: disable=R0801 -def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: - """ - Forward (positive) delta from u1 to u2 on a periodic domain anchored at - 'first'. - """ - u1n = _norm_on_period(u1, first, period) - u2n = _norm_on_period(u2, first, period) - delta = u2n - u1n - if delta < 0.0: - delta += period - return delta +def _extrude_topods_shape(obj: TopoDS_Shape, direction: VectorLike) -> TopoDS_Shape: + """extrude - -# --------------------------- -# Core helpers -# --------------------------- -def _edge_to_qualified_2d( - edge: TopoDS_Edge, position_constaint: PositionConstraint -) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float]: - """Convert a TopoDS_Edge into 2d curve & extract properties""" - - # 1) Underlying curve + range (also retrieve location to be safe) - loc = edge.Location() - hcurve3d = BRep_Tool.Curve_s(edge, float(), float()) - first, last = BRep_Tool.Range_s(edge) - - if hcurve3d is None: - raise ValueError("Edge has no underlying 3D curve.") - - # 2) Apply location if the edge is positioned by a TopLoc_Location - if not loc.IsIdentity(): - trsf = loc.Transformation() - hcurve3d = hcurve3d.Transformed(trsf) - - # 3) Convert to 2D on Plane.XY (Z-up frame at origin) - hcurve2d = GeomAPI.To2d_s(hcurve3d, _pln_xy) # -> Handle_Geom2d_Curve - - # 4) Wrap in an adaptor using the same parametric range - adapt2d = Geom2dAdaptor_Curve(hcurve2d, first, last) - - # 5) Create the qualified curve (unqualified is fine here) - qcurve = Geom2dGcc_QualifiedCurve(adapt2d, position_constaint.value) - return qcurve, hcurve2d, first, last - - -def _edge_from_circle(h2d_circle: Geom2d_Circle, u1: float, u2: float) -> TopoDS_Edge: - """Build a 3D edge on XY from a trimmed 2D circle segment [u1, u2].""" - arc2d = Geom2d_TrimmedCurve(h2d_circle, u1, u2, True) # sense=True - return BRepBuilderAPI_MakeEdge(arc2d, _surf_xy).Edge() - - -def _param_in_trim(u: float, first: float, last: float, h2d: Geom2d_Curve) -> bool: - """Normalize (if periodic) then test [first, last] with tolerance.""" - u = _norm_on_period(u, first, h2d.Period()) if h2d.IsPeriodic() else u - return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) - - -def _as_gcc_arg( - obj: Edge | Vertex | VectorLike, constaint: PositionConstraint -) -> tuple[ - Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, - Geom2d_Curve | None, - float | None, - float | None, - bool, -]: - """ - Normalize input to a GCC argument. - Returns: (q_obj, h2d, first, last, is_edge) - - Edge -> (QualifiedCurve, h2d, first, last, True) - - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) - """ - if isinstance(obj.wrapped, TopoDS_Edge): - return _edge_to_qualified_2d(obj.wrapped, constaint) + (True,) - - loc_xyz = obj.position if isinstance(obj, Vertex) else Vector() - try: - base = Vector(obj) - except (TypeError, ValueError) as exc: - raise ValueError("Expected Edge | Vertex | VectorLike") from exc - - gp_pnt = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) - return Geom2d_CartesianPoint(gp_pnt), None, None, None, False - - -def _two_arc_edges_from_params( - circ: gp_Circ2d, u1: float, u2: float -) -> ShapeList[Edge]: - """ - Given two parameters on a circle, return both the forward (minor) - and complementary (major) arcs as TopoDS_Edge(s). - Uses centralized normalization utilities. - """ - h2d_circle = Geom2d_Circle(circ) - per = h2d_circle.Period() # usually 2*pi - - # Minor (forward) span - d = _forward_delta(u1, u2, 0.0, per) # anchor at 0 for circle convenience - u1n = _norm_on_period(u1, 0.0, per) - u2n = _norm_on_period(u2, 0.0, per) - - # Guard degeneracy - if d <= TOLERANCE or abs(per - d) <= TOLERANCE: - return ShapeList() - - minor = _edge_from_circle(h2d_circle, u1n, u1n + d) - major = _edge_from_circle(h2d_circle, u2n, u2n + (per - d)) - return ShapeList([Edge(minor), Edge(major)]) - - -def _qstr(q) -> str: - # Works with OCP's GccEnt enum values - try: - from OCP.GccEnt import ( - GccEnt_enclosed, - GccEnt_enclosing, - GccEnt_outside, - ) - - try: - from OCP.GccEnt import GccEnt_unqualified - except ImportError: - # Some OCCT versions name this 'noqualifier' - from OCP.GccEnt import GccEnt_noqualifier as GccEnt_unqualified - mapping = { - GccEnt_enclosed: "enclosed", - GccEnt_enclosing: "enclosing", - GccEnt_outside: "outside", - GccEnt_unqualified: "unqualified", - } - return mapping.get(q, f"unknown({int(q)})") - except Exception: - # Fallback if enums aren't importable for any reason - return str(int(q)) - - -def make_tangent_edges( - cls, - object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - radius: float, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, - *, - edge_factory: Callable[[TopoDS_Edge], TWrap], -) -> list[TWrap]: - """ - Create all planar circular arcs of a given radius that are tangent/contacting - the two provided objects on the XY plane. - - Inputs must be coplanar with ``Plane.XY``. Non-coplanar edges are not supported. + Extrude a Shape in the provided direction. + * Vertices generate Edges + * Edges generate Faces + * Wires generate Shells + * Faces generate Solids + * Shells generate Compounds Args: - object_one (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched - by the circle(s) - object_two (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched - by the circle(s) - radius (float): Circle radius for all candidate solutions. + direction (VectorLike): direction and magnitude of extrusion Raises: - ValueError: Invalid input - ValueError: Invalid curve - RuntimeError: no valid circle solutions found + ValueError: Unsupported class + RuntimeError: Generated invalid result Returns: - ShapeList[Edge]: A list of planar circular edges (on XY) representing both - the minor and major arcs between the two tangency points for every valid - circle solution. - + TopoDS_Shape: extruded shape """ + direction = Vector(direction) - if isinstance(object_1, tuple): - object_one, object_one_constraint = object_1 - else: - object_one = object_1 - if isinstance(object_2, tuple): - object_two, object_two_constraint = object_2 - else: - object_two = object_2 + if obj is None or not isinstance( + obj, + (TopoDS_Vertex, TopoDS_Edge, TopoDS_Wire, TopoDS_Face, TopoDS_Shell), + ): + raise ValueError(f"extrude not supported for {type(obj)}") - # --------------------------- - # Build inputs and GCC - # --------------------------- - q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( - object_one, object_one_constraint - ) - q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( - object_two, object_two_constraint - ) + prism_builder = BRepPrimAPI_MakePrism(obj, direction.wrapped) + extrusion = downcast(prism_builder.Shape()) + shape_type = extrusion.ShapeType() + if shape_type == TopAbs_ShapeEnum.TopAbs_COMPSOLID: + solids = [] + explorer = TopExp_Explorer(extrusion, TopAbs_ShapeEnum.TopAbs_SOLID) + while explorer.More(): + solids.append(downcast(explorer.Current())) + explorer.Next() + extrusion = _make_topods_compound_from_shapes(solids) + return extrusion - # Put the Edge arg first when exactly one is an Edge (improves robustness) - if is_edge1 ^ is_edge2: - q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) - gcc = Geom2dGcc_Circ2d2TanRad(q_o1, q_o2, radius, TOLERANCE) - if not gcc.IsDone() or gcc.NbSolutions() == 0: - raise RuntimeError("Unable to find a tangent arc") +def _make_loft( + objs: Iterable[Vertex | Wire], + filled: bool, + ruled: bool = False, +) -> TopoDS_Shape: + """make loft - def _valid_on_arg1(u: float) -> bool: - return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) + Makes a loft from a list of wires and vertices. Vertices can appear only at the + beginning or end of the list, but cannot appear consecutively within the list + nor between wires. - def _valid_on_arg2(u: float) -> bool: - return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) + Args: + wires (list[Wire]): section perimeters + ruled (bool, optional): stepped or smooth. Defaults to False (smooth). - # --------------------------- - # Solutions - # --------------------------- - solutions: list[Edge] = [] - for i in range(1, gcc.NbSolutions() + 1): - circ = gcc.ThisSolution(i) # gp_Circ2d + Raises: + ValueError: Too few wires - # Tangency on curve 1 - p1 = gp_Pnt2d() - u_circ1, u_arg1 = gcc.Tangency1(i, p1) - if not _valid_on_arg1(u_arg1): - continue + Returns: + TopoDS_Shape: Lofted object + """ + objs = list(objs) # To determine its length + if len(objs) < 2: + raise ValueError("More than one wire is required") + vertices = [obj for obj in objs if isinstance(obj.wrapped, TopoDS_Vertex)] + vertex_count = len(vertices) - # Tangency on curve 2 - p2 = gp_Pnt2d() - u_circ2, u_arg2 = gcc.Tangency2(i, p2) - if not _valid_on_arg2(u_arg2): - continue + if vertex_count > 2: + raise ValueError("Only two vertices are allowed") - qual1 = GccEnt_Position(int()) - qual2 = GccEnt_Position(int()) - gcc.WhichQualifier(i, qual1, qual2) # returns two GccEnt_Position values - print( - f"Solution {i}: " - f"arg1={_qstr(qual1)}, arg2={_qstr(qual2)} | " - f"u_circ=({u_circ1:.6g}, {u_circ2:.6g}) " - f"u_arg=({u_arg1:.6g}, {u_arg2:.6g})" + if vertex_count == 1 and not ( + isinstance(objs[0].wrapped, TopoDS_Vertex) + or isinstance(objs[-1].wrapped, TopoDS_Vertex) + ): + raise ValueError( + "The vertex must be either at the beginning or end of the list" ) - # Build BOTH sagitta arcs and select by LengthConstraint - if sagitta_constraint == LengthConstraint.BOTH: - solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) - else: - arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) - arcs = sorted( - arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)) + if vertex_count == 2: + if len(objs) == 2: + raise ValueError( + "You can't have only 2 vertices to loft; try adding some wires" ) - solutions.append(arcs[sagitta_constraint.value]) - return ShapeList([edge_factory(e) for e in solutions]) + if not ( + isinstance(objs[0].wrapped, TopoDS_Vertex) + and isinstance(objs[-1].wrapped, TopoDS_Vertex) + ): + raise ValueError( + "The vertices must be at the beginning and end of the list" + ) + + loft_builder = BRepOffsetAPI_ThruSections(filled, ruled) + + for obj in objs: + if isinstance(obj.wrapped, TopoDS_Vertex): + loft_builder.AddVertex(obj.wrapped) + elif isinstance(obj.wrapped, TopoDS_Wire): + loft_builder.AddWire(obj.wrapped) + + loft_builder.Build() + + return loft_builder.Shape() + + +def _make_topods_compound_from_shapes( + occt_shapes: Iterable[TopoDS_Shape | None], +) -> TopoDS_Compound: + """Create an OCCT TopoDS_Compound + + Create an OCCT TopoDS_Compound object from an iterable of TopoDS_Shape objects + + Args: + occt_shapes (Iterable[TopoDS_Shape]): OCCT shapes + + Returns: + TopoDS_Compound: OCCT compound + """ + comp = TopoDS_Compound() + comp_builder = TopoDS_Builder() + comp_builder.MakeCompound(comp) + + for shape in occt_shapes: + if shape is not None: + comp_builder.Add(comp, shape) + + return comp + + +def _make_topods_face_from_wires( + outer_wire: TopoDS_Wire, inner_wires: Iterable[TopoDS_Wire] | None = None +) -> TopoDS_Face: + """_make_topods_face_from_wires + + Makes a planar face from one or more wires + + Args: + outer_wire (TopoDS_Wire): closed perimeter wire + inner_wires (Iterable[TopoDS_Wire], optional): holes. Defaults to None. + + Raises: + ValueError: outer wire not closed + ValueError: wires not planar + ValueError: inner wire not closed + ValueError: internal error + + Returns: + TopoDS_Face: planar face potentially with holes + """ + if inner_wires and not BRep_Tool.IsClosed_s(outer_wire): + raise ValueError("Cannot build face(s): outer wire is not closed") + inner_wires = list(inner_wires) if inner_wires else [] + + # check if wires are coplanar + verification_compound = _make_topods_compound_from_shapes( + [outer_wire] + inner_wires + ) + if not BRepLib_FindSurface(verification_compound, OnlyPlane=True).Found(): + raise ValueError("Cannot build face(s): wires not planar") + + # fix outer wire + sf_s = ShapeFix_Shape(outer_wire) + sf_s.Perform() + topo_wire = TopoDS.Wire_s(sf_s.Shape()) + + face_builder = BRepBuilderAPI_MakeFace(topo_wire, True) + + for inner_wire in inner_wires: + if not BRep_Tool.IsClosed_s(inner_wire): + raise ValueError("Cannot build face(s): inner wire is not closed") + face_builder.Add(inner_wire) + + face_builder.Build() + + if not face_builder.IsDone(): + raise ValueError(f"Cannot build face(s): {face_builder.Error()}") + + face = face_builder.Face() + + sf_f = ShapeFix_Face(face) + sf_f.FixOrientation() + sf_f.Perform() + + return TopoDS.Face_s(sf_f.Result()) + + +def _topods_bool_op( + args: Iterable[TopoDS_Shape], + tools: Iterable[TopoDS_Shape], + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, +) -> TopoDS_Shape: + """Generic boolean operation for TopoDS_Shapes + + Args: + args: Iterable[TopoDS_Shape]: + tools: Iterable[TopoDS_Shape]: + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: + + Returns: TopoDS_Shape + + """ + args = list(args) + tools = list(tools) + arg = TopTools_ListOfShape() + for obj in args: + arg.Append(obj) + + tool = TopTools_ListOfShape() + for obj in tools: + tool.Append(obj) + + operation.SetArguments(arg) + operation.SetTools(tool) + + operation.SetRunParallel(True) + operation.Build() + + result = downcast(operation.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(result, TopoDS_Compound): + result = unwrap_topods_compound(result, True) + + return result + + +def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: + """Compare the OCCT objects of each list and return the differences""" + shapes_one = list(shapes_one) + shapes_two = list(shapes_two) + occt_one = {shape.wrapped for shape in shapes_one} + occt_two = {shape.wrapped for shape in shapes_two} + occt_delta = list(occt_one - occt_two) + + all_shapes = [] + for shapes in [shapes_one, shapes_two]: + all_shapes.extend(shapes if isinstance(shapes, list) else [*shapes]) + shape_delta = [shape for shape in all_shapes if shape.wrapped in occt_delta] + return shape_delta + + +def find_max_dimension(shapes: Shape | Iterable[Shape]) -> float: + """Return the maximum dimension of one or more shapes""" + shapes = shapes if isinstance(shapes, Iterable) else [shapes] + composite = _make_topods_compound_from_shapes([s.wrapped for s in shapes]) + bbox = BoundBox.from_topo_ds(composite, tolerance=TOLERANCE, optimal=True) + return bbox.diagonal + + +def isclose_b(x: float, y: float, rel_tol=1e-9, abs_tol=1e-14) -> bool: + """Determine whether two floating point numbers are close in value. + Overridden abs_tol default for the math.isclose function. + + Args: + x (float): First value to compare + y (float): Second value to compare + rel_tol (float, optional): Maximum difference for being considered "close", + relative to the magnitude of the input values. Defaults to 1e-9. + abs_tol (float, optional): Maximum difference for being considered "close", + regardless of the magnitude of the input values. Defaults to 1e-14 + (unlike math.isclose which defaults to zero). + + Returns: True if a is close in value to b, and False otherwise. + """ + return isclose(x, y, rel_tol=rel_tol, abs_tol=abs_tol) + + +def new_edges(*objects: Shape, combined: Shape) -> ShapeList[Edge]: + """new_edges + + Given a sequence of shapes and the combination of those shapes, find the newly added edges + + Args: + objects (Shape): sequence of shapes + combined (Shape): result of the combination of objects + + Returns: + ShapeList[Edge]: new edges + """ + # Create a list of combined object edges + combined_topo_edges = TopTools_ListOfShape() + for edge in combined.edges(): + if edge.wrapped is not None: + combined_topo_edges.Append(edge.wrapped) + + # Create a list of original object edges + original_topo_edges = TopTools_ListOfShape() + for edge in [e for obj in objects for e in obj.edges()]: + if edge.wrapped is not None: + original_topo_edges.Append(edge.wrapped) + + # Cut the original edges from the combined edges + operation = BRepAlgoAPI_Cut() + operation.SetArguments(combined_topo_edges) + operation.SetTools(original_topo_edges) + operation.SetRunParallel(True) + operation.Build() + + edges = [] + explorer = TopExp_Explorer(operation.Shape(), TopAbs_ShapeEnum.TopAbs_EDGE) + while explorer.More(): + found_edge = combined.__class__.cast(downcast(explorer.Current())) + found_edge.topo_parent = combined + edges.append(found_edge) + explorer.Next() + + return ShapeList(edges) + + +def polar(length: float, angle: float) -> tuple[float, float]: + """Convert polar coordinates into cartesian coordinates""" + return (length * cos(radians(angle)), length * sin(radians(angle))) + + +def tuplify(obj: Any, dim: int) -> tuple | None: + """Create a size tuple""" + if obj is None: + result = None + elif isinstance(obj, (tuple, list)): + result = tuple(obj) + else: + result = tuple([obj] * dim) + return result + + +def unwrapped_shapetype(obj: Shape) -> TopAbs_ShapeEnum: + """Return Shape's TopAbs_ShapeEnum""" + if isinstance(obj.wrapped, TopoDS_Compound): + shapetypes = {shapetype(o.wrapped) for o in obj} + if len(shapetypes) == 1: + result = shapetypes.pop() + else: + result = shapetype(obj.wrapped) + else: + result = shapetype(obj.wrapped) + return result From 2d280a0deba47fcc10497cc4ed79c2548afded3f Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 9 Sep 2025 10:56:02 -0400 Subject: [PATCH 405/518] Fixed tan2 with points and on_curve --- src/build123d/build_enums.py | 2 +- src/build123d/topology/constrained_lines.py | 61 ++++++++------------- src/build123d/topology/one_d.py | 10 ++-- 3 files changed, 29 insertions(+), 44 deletions(-) diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index a912381..65ef0f7 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -255,7 +255,7 @@ class FontStyle(Enum): class LengthConstraint(Enum): - """Length Constraint for sagatti selection""" + """Length Constraint for sagitta selection""" SHORT = 0 LONG = -1 diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index d9ac708..1e47a5a 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -137,7 +137,7 @@ def _edge_to_qualified_2d( # 5) Create the qualified curve (unqualified is fine here) qcurve = Geom2dGcc_QualifiedCurve(adapt2d, position_constaint.value) - return qcurve, hcurve2d, first, last + return qcurve, hcurve2d, first, last, adapt2d def _edge_from_circle(h2d_circle: Geom2d_Circle, u1: float, u2: float) -> TopoDS_Edge: @@ -168,7 +168,7 @@ def _as_gcc_arg( - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) """ if isinstance(obj.wrapped, TopoDS_Edge): - return _edge_to_qualified_2d(obj.wrapped, constaint) + (True,) + return _edge_to_qualified_2d(obj.wrapped, constaint)[0:4] + (True,) loc_xyz = obj.position if isinstance(obj, Vertex) else Vector() try: @@ -263,11 +263,11 @@ def _make_2tan_rad_arcs( if isinstance(object_1, tuple): object_one, object_one_constraint = object_1 else: - object_one = object_1 + object_one, object_one_constraint = object_1, None if isinstance(object_2, tuple): object_two, object_two_constraint = object_2 else: - object_two = object_2 + object_two, object_two_constraint = object_2, None # --------------------------- # Build inputs and GCC @@ -337,7 +337,7 @@ def _make_2tan_rad_arcs( def _make_2tan_on_arcs( object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + center_on: Edge, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, *, edge_factory: Callable[[TopoDS_Edge], TWrap], @@ -392,33 +392,18 @@ def _make_2tan_on_arcs( # --------------------------- # Build center locus ("On") input # --------------------------- - # Allow an (Edge, PositionConstraint) tuple for symmetry, but ignore the qualifier here. - on_obj = center_on[0] if isinstance(center_on, tuple) else center_on + _, h_on2d, on_first, on_last, adapt_on = _edge_to_qualified_2d( + center_on.wrapped, PositionConstraint.UNQUALIFIED + ) + # Provide initial guess parameters for all of the lines + guesses = [] + if is_edge1: + guesses.append((e1_last - e1_first) / 2 + e1_first) + if is_edge2: + guesses.append((e2_last - e2_first) / 2 + e2_first) + guesses.append((on_last - on_first) / 2 + on_first) - # 2TanOn expects a 2D locus for the CENTER. Points are not supported here. - if isinstance(on_obj, (Vertex, Vector)): - raise TypeError( - "center_on cannot be a point for 2TanOn; use the 'center=' (TanCen) variant." - ) - - # Project the 'on' Edge to 2D and choose the appropriate solver - if isinstance(on_obj, Edge): - # Reuse your projection utility to get a 2D curve - # (qualifier irrelevant for the center locus) - _, h_on2d, on_first, on_last = _edge_to_qualified_2d(on_obj.wrapped) - adapt_on = Geom2dAdaptor_Curve(h_on2d, on_first, on_last) - - # Prefer the analytic 'On' constructor when the locus is a line; otherwise use the Geo variant - use_line = adapt_on.GetType() == GeomAbs_CurveType.GeomAbs_Line - if use_line: - gp_lin2d = adapt_on.Line() - gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, gp_lin2d, TOLERANCE) - else: - # Works for circles and general Geom2d curves as the center locus - gcc = Geom2dGcc_Circ2d2TanOnGeo(q_o1, q_o2, h_on2d, TOLERANCE) - else: - # If it's neither Edge/Vertex/VectorLike (shouldn't happen), bail out clearly - raise TypeError("center_on must be an Edge (line/circle/curve) for 2TanOn.") + gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, adapt_on, TOLERANCE, *guesses) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a tangent arc with center_on constraint") @@ -649,7 +634,7 @@ def _make_tan_cen_arcs( def _make_tan_on_rad_arcs( object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + center_on: Edge, radius: float, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, # unused here *, @@ -686,15 +671,17 @@ def _make_tan_on_rad_arcs( raise TypeError("center_on must be an Edge (line/circle/curve) for TanOnRad.") # Project the center locus Edge to 2D (XY) - _, h_on2d, on_first, on_last = _edge_to_qualified_2d(on_obj.wrapped) - adapt_on = Geom2dAdaptor_Curve(h_on2d, on_first, on_last) + _, h_on2d, on_first, on_last, adapt_on = _edge_to_qualified_2d( + on_obj.wrapped, PositionConstraint.UNQUALIFIED + ) + # adapt_on = Geom2dAdaptor_Curve(h_on2d, on_first, on_last) # Choose the appropriate GCC constructor if adapt_on.GetType() == GeomAbs_CurveType.GeomAbs_Line: - gp_lin2d = adapt_on.Line() - gcc = Geom2dGcc_Circ2dTanOnRad(q_o1, gp_lin2d, radius, TOLERANCE) + # gp_lin2d = adapt_on.Line() + gcc = Geom2dGcc_Circ2dTanOnRad(q_o1, adapt_on, radius, TOLERANCE) else: - gcc = Geom2dGcc_Circ2dTanOnRadGeo(q_o1, h_on2d, radius, TOLERANCE) + gcc = Geom2dGcc_Circ2dTanOnRadGeo(q_o1, adapt_on, radius, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find circle(s) for TanOnRad constraints") diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 3b8f5ff..8a8f3cd 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1617,7 +1617,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, tangency_two: tuple[Edge, PositionConstraint] | Vertex | VectorLike, *, - center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + center_on: Edge, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, ) -> ShapeList[Edge]: """ @@ -1628,8 +1628,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): tangency_two (tuple[Edge, PositionConstraint] | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) - center_on (tuple[Edge, PositionConstraint] | Vertex | VectorLike): - the **center locus** (not a tangency target) + center_on (Edge): center must lie on this edge sagitta_constraint (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. @@ -1697,7 +1696,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, *, radius: float, - center_on: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + center_on: Edge, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, ) -> ShapeList[Edge]: """make_constrained_arcs @@ -1711,8 +1710,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): Geometric entity to be contacted/touched by the circle(s) radius (float): arc radius - center_on (tuple[Edge, PositionConstraint] | Vertex | VectorLike): - the **center locus** (not a tangency target) + center_on (Edge): center must lie on this edge sagitta_constraint (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. From 32fb6c4ed6ebeb66fb9b94b2d7c3a13ab6846a18 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 9 Sep 2025 11:25:51 -0400 Subject: [PATCH 406/518] Fixed 1 tangent/pnt and center --- src/build123d/topology/constrained_lines.py | 5 ++--- src/build123d/topology/one_d.py | 8 +------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 1e47a5a..1ae51b0 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -550,7 +550,6 @@ def _make_3tan_arcs( def _make_tan_cen_arcs( object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, center: VectorLike | Vertex, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, # unused here *, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: @@ -572,7 +571,7 @@ def _make_tan_cen_arcs( if isinstance(object_1, tuple): object_one, obj1_qual = object_1 else: - object_one = object_1 + object_one, obj1_qual = object_1, None # --------------------------- # Build fixed center (gp_Pnt2d) @@ -609,7 +608,7 @@ def _make_tan_cen_arcs( else: # Case B: tangency target is a curve/edge (qualified curve) - gcc = Geom2dGcc_Circ2dTanCen(q_o1, c2d, TOLERANCE) + gcc = Geom2dGcc_Circ2dTanCen(q_o1, Geom2d_CartesianPoint(c2d), TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError( "Unable to find circle(s) tangent to target with fixed center" diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 8a8f3cd..12dfdff 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1670,7 +1670,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, *, center: VectorLike, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, ) -> ShapeList[Edge]: """make_constrained_arcs @@ -1681,9 +1680,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): Geometric entity to be contacted/touched by the circle(s) center (VectorLike): center position - sagitta_constraint (LengthConstraint, optional): returned arc selector - (i.e. either the short, long or both arcs). Defaults to - LengthConstraint.SHORT. Returns: ShapeList[Edge]: tangent arcs @@ -1794,9 +1790,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): and radius is None and center_on is None ): - return _make_tan_cen_arcs( - *tangencies, center, sagitta_constraint, edge_factory=cls - ) + return _make_tan_cen_arcs(*tangencies, center, edge_factory=cls) if tan_count == 1 and center_on is not None and radius is not None: return _make_tan_on_rad_arcs( *tangencies, center_on, radius, sagitta_constraint, edge_factory=cls From 76ec798d2127825c65c9bfc90b824a977dc007f6 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 9 Sep 2025 14:22:41 -0400 Subject: [PATCH 407/518] Basic sanity of all options --- src/build123d/topology/constrained_lines.py | 60 +++++++++++++++------ src/build123d/topology/one_d.py | 12 ++--- 2 files changed, 50 insertions(+), 22 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 1ae51b0..cb25f72 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -45,6 +45,7 @@ from OCP.Geom2d import ( Geom2d_TrimmedCurve, ) from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve +from OCP.Geom2dAPI import Geom2dAPI_ProjectPointOnCurve from OCP.Geom2dGcc import ( Geom2dGcc_Circ2d2TanOn, Geom2dGcc_Circ2d2TanOnGeo, @@ -56,7 +57,7 @@ from OCP.Geom2dGcc import ( Geom2dGcc_QualifiedCurve, ) from OCP.GeomAbs import GeomAbs_CurveType -from OCP.GeomAPI import GeomAPI +from OCP.GeomAPI import GeomAPI, GeomAPI_ProjectPointOnCurve from OCP.gp import ( gp_Ax2d, gp_Ax3, @@ -433,6 +434,23 @@ def _make_2tan_on_arcs( if not _valid_on_arg2(u_arg2): continue + # Center must lie on the trimmed center_on curve segment + center2d = circ.Location() # gp_Pnt2d + + # Project center onto the (trimmed) 2D locus + proj = Geom2dAPI_ProjectPointOnCurve(center2d, h_on2d) + if proj.NbPoints() == 0: + continue # no projection -> reject + + u_on = proj.Parameter(1) + # Optional: make sure it's actually on the curve (not just near) + if proj.Distance(1) > TOLERANCE: + continue + + # Respect the trimmed interval (handles periodic curves too) + if not _param_in_trim(u_on, on_first, on_last, h_on2d): + continue + # Build sagitta arc(s) and select by LengthConstraint if sagitta_constraint == LengthConstraint.BOTH: solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) @@ -492,8 +510,12 @@ def _make_3tan_arcs( q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg(object_two, obj2_qual) q_o3, h_e3, e3_first, e3_last, is_edge3 = _as_gcc_arg(object_three, obj3_qual) + guesses = [ + (l - f) / 2 + f + for f, l in [(e1_first, e1_last), (e2_first, e2_last), (e3_first, e3_last)] + ] # For 3Tan we keep the user-given order so the arc endpoints remain (arg1,arg2) - gcc = Geom2dGcc_Circ2d3Tan(q_o1, q_o2, q_o3, TOLERANCE) + gcc = Geom2dGcc_Circ2d3Tan(q_o1, q_o2, q_o3, TOLERANCE, *guesses) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a circle tangent to all three objects") @@ -635,7 +657,6 @@ def _make_tan_on_rad_arcs( object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, center_on: Edge, radius: float, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, # unused here *, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: @@ -648,39 +669,31 @@ def _make_tan_on_rad_arcs( Notes ----- - The center locus must be a 2D curve (line/circle/any Geom2d curve) — i.e. an Edge - after projection to XY. A point is not a valid 'center_on' locus for this solver. + after projection to XY. - With only one tangency, the natural geometric result is a full circle; arc cropping would require an additional endpoint constraint. This routine therefore returns closed circular edges (2π trims) for each valid solution. """ # --- unpack optional qualifier on the tangency arg (edges only) --- - obj1_qual = PositionConstraint.UNQUALIFIED if isinstance(object_1, tuple): object_one, obj1_qual = object_1 else: - object_one = object_1 + object_one, obj1_qual = object_1, PositionConstraint.UNQUALIFIED # --- build tangency input (point/edge) --- q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, obj1_qual) # --- center locus ('center_on') must be a curve; ignore any qualifier there --- on_obj = center_on[0] if isinstance(center_on, tuple) else center_on - if not isinstance(on_obj, Edge): + if not isinstance(on_obj.wrapped, TopoDS_Edge): raise TypeError("center_on must be an Edge (line/circle/curve) for TanOnRad.") # Project the center locus Edge to 2D (XY) _, h_on2d, on_first, on_last, adapt_on = _edge_to_qualified_2d( on_obj.wrapped, PositionConstraint.UNQUALIFIED ) - # adapt_on = Geom2dAdaptor_Curve(h_on2d, on_first, on_last) - - # Choose the appropriate GCC constructor - if adapt_on.GetType() == GeomAbs_CurveType.GeomAbs_Line: - # gp_lin2d = adapt_on.Line() - gcc = Geom2dGcc_Circ2dTanOnRad(q_o1, adapt_on, radius, TOLERANCE) - else: - gcc = Geom2dGcc_Circ2dTanOnRadGeo(q_o1, adapt_on, radius, TOLERANCE) + gcc = Geom2dGcc_Circ2dTanOnRad(q_o1, adapt_on, radius, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find circle(s) for TanOnRad constraints") @@ -699,6 +712,23 @@ def _make_tan_on_rad_arcs( if not _ok1(u_on_arg): continue + # Center must lie on the trimmed center_on curve segment + center2d = circ.Location() # gp_Pnt2d + + # Project center onto the (trimmed) 2D locus + proj = Geom2dAPI_ProjectPointOnCurve(center2d, h_on2d) + if proj.NbPoints() == 0: + continue # no projection -> reject + + u_on = proj.Parameter(1) + # Optional: make sure it's actually on the curve (not just near) + if proj.Distance(1) > TOLERANCE: + continue + + # Respect the trimmed interval (handles periodic curves too) + if not _param_in_trim(u_on, on_first, on_last, h_on2d): + continue + h2d = Geom2d_Circle(circ) per = h2d.Period() out_topos.append(_edge_from_circle(h2d, 0.0, per)) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 12dfdff..bf076ef 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1693,7 +1693,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): *, radius: float, center_on: Edge, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, ) -> ShapeList[Edge]: """make_constrained_arcs @@ -1746,10 +1745,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tan_count = len(tangencies) if not (1 <= tan_count <= 3): raise TypeError("Provide 1 to 3 tangency targets.") - if ( - sum(x is not None for x in (radius, center, center_on)) > 1 - and tan_count != 2 - ): + if sum( + x is not None for x in (radius, center, center_on) + ) > 1 and tan_count not in [1, 2]: raise TypeError("Ambiguous constraint combination.") # Disallow qualifiers on points/vertices (enforce at runtime) @@ -1783,7 +1781,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): *tangencies, center_on, sagitta_constraint, edge_factory=cls ) if tan_count == 3 and radius is None and center is None and center_on is None: - return _make_3tan_arcs(tangencies, sagitta_constraint, edge_factory=cls) + return _make_3tan_arcs(*tangencies, sagitta_constraint, edge_factory=cls) if ( tan_count == 1 and center is not None @@ -1793,7 +1791,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return _make_tan_cen_arcs(*tangencies, center, edge_factory=cls) if tan_count == 1 and center_on is not None and radius is not None: return _make_tan_on_rad_arcs( - *tangencies, center_on, radius, sagitta_constraint, edge_factory=cls + *tangencies, center_on, radius, edge_factory=cls ) raise ValueError("Unsupported or ambiguous combination of constraints.") From 3d8bbcc539f3fbe6335fbfb461c269dd3ee65212 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 9 Sep 2025 23:21:05 -0400 Subject: [PATCH 408/518] Add basic b123d lexer and change pygments style --- docs/OpenSCAD.rst | 4 +- docs/advantages.rst | 9 +-- docs/algebra_performance.rst | 6 +- docs/assemblies.rst | 8 ++- docs/build123d_lexer.py | 75 ++++++++++++++++++++ docs/build_line.rst | 8 +++ docs/build_part.rst | 2 + docs/build_sketch.rst | 8 ++- docs/conf.py | 2 + docs/debugging_logging.rst | 2 +- docs/examples_1.rst | 33 +++++++++ docs/import_export.rst | 8 +-- docs/index.rst | 3 +- docs/introductory_examples.rst | 76 ++++++++++++++++++++- docs/joints.rst | 7 +- docs/key_concepts_algebra.rst | 26 +++---- docs/key_concepts_builder.rst | 32 ++++----- docs/location_arithmetic.rst | 16 ++--- docs/moving_objects.rst | 24 +++---- docs/objects.rst | 9 +-- docs/operations.rst | 4 +- docs/selectors.rst | 4 +- docs/tech_drawing_tutorial.rst | 14 ++-- docs/tips.rst | 12 ++-- docs/topology_selection.rst | 24 +++---- docs/topology_selection/filter_examples.rst | 28 ++++---- docs/topology_selection/group_examples.rst | 18 ++--- docs/topology_selection/sort_examples.rst | 22 +++--- docs/tttt.rst | 13 ++++ docs/tutorial_design.rst | 48 ++++++------- docs/tutorial_joints.rst | 15 ++++ docs/tutorial_lego.rst | 11 +++ docs/tutorial_selectors.rst | 8 ++- docs/tutorial_surface_modeling.rst | 14 ++-- 34 files changed, 421 insertions(+), 172 deletions(-) create mode 100644 docs/build123d_lexer.py diff --git a/docs/OpenSCAD.rst b/docs/OpenSCAD.rst index 899cee9..3c64382 100644 --- a/docs/OpenSCAD.rst +++ b/docs/OpenSCAD.rst @@ -124,7 +124,7 @@ build123d of a piece of angle iron: **build123d Approach** -.. code-block:: python +.. code-block:: build123d # Builder mode with BuildPart() as angle_iron: @@ -135,7 +135,7 @@ build123d of a piece of angle iron: fillet(angle_iron.edges().filter_by(lambda e: e.is_interior), 5 * MM) -.. code-block:: python +.. code-block:: build123d # Algebra mode profile = Rectangle(3 * CM, 4 * MM, align=Align.MIN) diff --git a/docs/advantages.rst b/docs/advantages.rst index 51a6ac0..15f2b7e 100644 --- a/docs/advantages.rst +++ b/docs/advantages.rst @@ -20,7 +20,7 @@ python context manager. ... ) -.. code-block:: python +.. code-block:: build123d # build123d API with BuildPart() as pillow_block: @@ -43,7 +43,7 @@ Each object and operation is now a class instantiation that interacts with the active context implicitly for the user. These instantiations can be assigned to an instance variable as with standard python programming for direct use. -.. code-block:: python +.. code-block:: build123d with BuildSketch() as plan: r = Rectangle(width, height) @@ -62,7 +62,7 @@ with tangents equal to the tangents of l5 and l6 at their end and beginning resp Being able to extract information from existing features allows the user to "snap" new features to these points without knowing their numeric values. -.. code-block:: python +.. code-block:: build123d with BuildLine() as outline: ... @@ -81,6 +81,7 @@ by the last operation and fillets them. Such a selection would be quite difficul otherwise. .. literalinclude:: ../examples/intersecting_pipes.py + :language: build123d :lines: 30, 39-49 @@ -104,7 +105,7 @@ sorting which opens up the full functionality of python lists. To aid the user, common operations have been optimized as shown here along with a fully custom selection: -.. code-block:: python +.. code-block:: build123d top = rail.faces().filter_by(Axis.Z)[-1] ... diff --git a/docs/algebra_performance.rst b/docs/algebra_performance.rst index 3ec9a20..12784c3 100644 --- a/docs/algebra_performance.rst +++ b/docs/algebra_performance.rst @@ -7,7 +7,7 @@ Creating lots of Shapes in a loop means for every step ``fuse`` and ``clean`` wi In an example like the below, both functions get slower and slower the more objects are already fused. Overall it takes on an M1 Mac 4.76 sec. -.. code-block:: python +.. code-block:: build123d diam = 80 holes = Sketch() @@ -22,7 +22,7 @@ already fused. Overall it takes on an M1 Mac 4.76 sec. One way to avoid it is to use lazy evaluation for the algebra operations. Just collect all objects and then call ``fuse`` (``+``) once with all objects and ``clean`` once. Overall it takes 0.19 sec. -.. code-block:: python +.. code-block:: build123d r = Rectangle(2, 2) holes = [ @@ -36,7 +36,7 @@ then call ``fuse`` (``+``) once with all objects and ``clean`` once. Overall it Another way to leverage the vectorized algebra operations is to add a list comprehension of objects to an empty ``Part``, ``Sketch`` or ``Curve``: -.. code-block:: python +.. code-block:: build123d polygons = Sketch() + [ loc * RegularPolygon(radius=5, side_count=5) diff --git a/docs/assemblies.rst b/docs/assemblies.rst index 8889c28..4fe1ada 100644 --- a/docs/assemblies.rst +++ b/docs/assemblies.rst @@ -22,6 +22,7 @@ Here we'll assign labels to all of the components that will be part of the box assembly: .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Add labels] :end-before: [Create assembly] @@ -36,6 +37,7 @@ Creation of the assembly is done by simply creating a :class:`~topology.Compound appropriate ``parent`` and ``children`` attributes as shown here: .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Create assembly] :end-before: [Display assembly] @@ -43,6 +45,7 @@ To display the topology of an assembly :class:`~topology.Compound`, the :meth:`~ method can be used as follows: .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Display assembly] :end-before: [Add to the assembly by assigning the parent attribute of an object] @@ -59,6 +62,7 @@ which results in: To add to an assembly :class:`~topology.Compound` one can change either ``children`` or ``parent`` attributes. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Add to the assembly by assigning the parent attribute of an object] :end-before: [Check that the components in the assembly don't intersect] @@ -180,7 +184,7 @@ Compare this to assembly3_volume which only results in the volume of the top lev assembly2 = Compound(label='Assembly2', children=[assembly1, Box(1, 1, 1)]) assembly3 = Compound(label='Assembly3', children=[assembly2, Box(1, 1, 1)]) total_volume = sum(part.volume for part in assembly3.solids()) # 3 - assembly3_volume = assembly3.volume # 1 + assembly3_volume = assembly3.volume # 1 ****** pack @@ -269,6 +273,6 @@ If you place the arranged objects into a ``Compound``, you can easily determine # [bounding box] print(Compound(xy_pack).bounding_box()) # bbox: 0.0 <= x <= 159.0, 0.0 <= y <= 129.0, -54.0 <= z <= 100.0 - + print(Compound(z_pack).bounding_box()) # bbox: 0.0 <= x <= 159.0, 0.0 <= y <= 129.0, 0.0 <= z <= 100.0 diff --git a/docs/build123d_lexer.py b/docs/build123d_lexer.py new file mode 100644 index 0000000..f01e58f --- /dev/null +++ b/docs/build123d_lexer.py @@ -0,0 +1,75 @@ +import inspect +import enum +import sys +import os +from pygments.lexers.python import PythonLexer +from pygments.token import Name +from sphinx.highlighting import lexers + +sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../src"))) +import build123d + + +class Build123dLexer(PythonLexer): + """ + Python lexer extended with Build123d-specific highlighting. + Dynamically pulls symbols from build123d.__all__. + """ + + EXTRA_SYMBOLS = set(getattr(build123d, "__all__", [])) + + EXTRA_CLASSES = { + n for n in EXTRA_SYMBOLS + if n[0].isupper() + } + + EXTRA_CONSTANTS = { + n for n in EXTRA_SYMBOLS + if n.isupper() and not callable(getattr(build123d, n, None)) + } + + EXTRA_ENUMS = { + n for n in EXTRA_SYMBOLS + if inspect.isclass(getattr(build123d, n, None)) and issubclass(getattr(build123d, n), enum.Enum) + } + + EXTRA_FUNCTIONS = EXTRA_SYMBOLS - EXTRA_CLASSES - EXTRA_CONSTANTS - EXTRA_ENUMS + + def get_tokens_unprocessed(self, text): + """ + Yield tokens, highlighting Build123d symbols, including chained accesses. + """ + + dot_chain = False + for index, token, value in super().get_tokens_unprocessed(text): + if value == ".": + dot_chain = True + yield index, token, value + continue + + if dot_chain: + # In a chain, don't use top-level categories + if value[0].isupper(): + yield index, Name.Class, value + elif value.isupper(): + yield index, Name.Constant, value + else: + yield index, Name.Function, value + dot_chain = False + continue + + # Top-level classification from __all__ + if value in self.EXTRA_CLASSES: + yield index, Name.Class, value + elif value in self.EXTRA_FUNCTIONS: + yield index, Name.Function, value + elif value in self.EXTRA_CONSTANTS: + yield index, Name.Constant, value + elif value in self.EXTRA_ENUMS: + yield index, Name.Builtin, value + else: + yield index, token, value + +def setup(app): + lexers["build123d"] = Build123dLexer() + return {"version": "0.1"} \ No newline at end of file diff --git a/docs/build_line.rst b/docs/build_line.rst index 70c7f2a..f2f0f93 100644 --- a/docs/build_line.rst +++ b/docs/build_line.rst @@ -15,6 +15,7 @@ Basic Functionality The following is a simple BuildLine example: .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 1] :end-before: [Ex. 1] @@ -50,6 +51,7 @@ point ``(0,0)`` and ``(2,0)``. This can be improved upon by specifying constraints that lock the arc to those two end points, as follows: .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 2] :end-before: [Ex. 2] @@ -63,6 +65,7 @@ This example can be improved on further by calculating the mid-point of the arc as follows: .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 3] :end-before: [Ex. 3] @@ -73,6 +76,7 @@ To make the design even more parametric, the height of the arc can be calculated from ``l1`` as follows: .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 4] :end-before: [Ex. 4] @@ -87,6 +91,7 @@ The other operator that is commonly used within BuildLine is ``%`` the tangent a operator. Here is another example: .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 5] :end-before: [Ex. 5] @@ -124,6 +129,7 @@ Here is an example of using BuildLine to create an object that otherwise might b difficult to create: .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 6] :end-before: [Ex. 6] @@ -155,6 +161,7 @@ The other primary reasons to use BuildLine is to create paths for BuildPart define a path: .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 7] :end-before: [Ex. 7] @@ -184,6 +191,7 @@ to global coordinates. Sometimes it's convenient to work on another plane, espec creating paths for BuildPart ``Sweep`` operations. .. literalinclude:: objects_1d.py + :language: build123d :start-after: [Ex. 8] :end-before: [Ex. 8] diff --git a/docs/build_part.rst b/docs/build_part.rst index 6ea9d11..d5206c8 100644 --- a/docs/build_part.rst +++ b/docs/build_part.rst @@ -15,6 +15,7 @@ Basic Functionality The following is a simple BuildPart example: .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 2] :end-before: [Ex. 2] @@ -52,6 +53,7 @@ This tea cup example uses implicit parameters - note the :func:`~operations_gene operation on the last line: .. literalinclude:: ../examples/tea_cup.py + :language: build123d :start-after: [Code] :end-before: [End] :emphasize-lines: 52 diff --git a/docs/build_sketch.rst b/docs/build_sketch.rst index 803dcb7..76ed6f7 100644 --- a/docs/build_sketch.rst +++ b/docs/build_sketch.rst @@ -16,6 +16,7 @@ Basic Functionality The following is a simple BuildSketch example: .. literalinclude:: objects_2d.py + :language: build123d :start-after: [Ex. 13] :end-before: [Ex. 13] @@ -61,6 +62,7 @@ As an example, let's build the following simple control box with a display on an Here is the code: .. literalinclude:: objects_2d.py + :language: build123d :start-after: [Ex. 14] :end-before: [Ex. 14] :emphasize-lines: 14-25 @@ -88,14 +90,14 @@ on ``Plane.XY`` which one can see by looking at the ``sketch_local`` property of sketch. For example, to display the local version of the ``display`` sketch from above, one would use: -.. code-block:: python +.. code-block:: build123d show_object(display.sketch_local, name="sketch on Plane.XY") while the sketches as applied to their target workplanes is accessible through the ``sketch`` property, as follows: -.. code-block:: python +.. code-block:: build123d show_object(display.sketch, name="sketch on target workplane(s)") @@ -106,7 +108,7 @@ that the new Face may not be oriented as expected. To reorient the Face manually to ``Plane.XY`` one can use the :meth:`~geometry.to_local_coords` method as follows: -.. code-block:: python +.. code-block:: build123d reoriented_face = plane.to_local_coords(face) diff --git a/docs/conf.py b/docs/conf.py index 5ba9cea..ff46e9f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -49,6 +49,7 @@ extensions = [ "sphinx_design", "sphinx_copybutton", "hoverxref.extension", + "build123d_lexer" ] # Napoleon settings @@ -99,6 +100,7 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] # # html_theme = "alabaster" html_theme = "sphinx_rtd_theme" +pygments_style = "colorful" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, diff --git a/docs/debugging_logging.rst b/docs/debugging_logging.rst index 3e27acd..eb24d68 100644 --- a/docs/debugging_logging.rst +++ b/docs/debugging_logging.rst @@ -85,7 +85,7 @@ Sometimes the best debugging aid is just placing a print statement in your code. of the build123d classes are setup to provide useful information beyond their class and location in memory, as follows: -.. code-block:: python +.. code-block:: build123d plane = Plane.XY.offset(1) print(f"{plane=}") diff --git a/docs/examples_1.rst b/docs/examples_1.rst index 7da07de..32cc77d 100644 --- a/docs/examples_1.rst +++ b/docs/examples_1.rst @@ -164,6 +164,7 @@ modify it by replacing chimney with a BREP version. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/benchy.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -184,6 +185,7 @@ surface. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/bicycle_tire.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -204,12 +206,14 @@ The builder mode example also generates the SVG file `logo.svg`. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/build123d_logo.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/build123d_logo_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -228,6 +232,7 @@ using the `draft` operation to add appropriate draft angles for mold release. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/cast_bearing_unit.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -257,12 +262,14 @@ This example also demonstrates building complex lines that snap to existing feat .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/canadian_flag.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/canadian_flag_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -293,12 +300,14 @@ This example demonstrates placing holes around a part. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/circuit_board.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/circuit_board_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -313,12 +322,14 @@ Clock Face .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/clock.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/clock_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -340,6 +351,7 @@ Fast Grid Holes .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/fast_grid_holes.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -367,12 +379,14 @@ Handle .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/handle.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/handle_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -388,12 +402,14 @@ Heat Exchanger .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/heat_exchanger.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/heat_exchanger_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -412,12 +428,14 @@ Key Cap .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/key_cap.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/key_cap_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -444,6 +462,7 @@ YouTube channel. There are two key features: .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/maker_coin.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -462,12 +481,14 @@ the top and bottom by type, and shelling. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/loft.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/loft_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -488,6 +509,7 @@ to aid 3D printing. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/pegboard_j_hook.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -495,6 +517,7 @@ to aid 3D printing. .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/pegboard_j_hook_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -521,6 +544,7 @@ embodying ideals of symmetry and balance. .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/platonic_solids.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -539,6 +563,7 @@ imported as code from an SVG file and modified to the code found here. .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/playing_cards.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -558,6 +583,7 @@ are used to position all of objects. .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/stud_wall.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -571,12 +597,14 @@ Tea Cup .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/tea_cup.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/tea_cup_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -610,6 +638,7 @@ Toy Truck .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/toy_truck.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -630,12 +659,14 @@ Vase .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/vase.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/vase_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] @@ -677,11 +708,13 @@ selecting edges by position range and type for the application of fillets .. dropdown:: |Builder| Reference Implementation (Builder Mode) .. literalinclude:: ../examples/boxes_on_faces.py + :language: build123d :start-after: [Code] :end-before: [End] .. dropdown:: |Algebra| Reference Implementation (Algebra Mode) .. literalinclude:: ../examples/boxes_on_faces_algebra.py + :language: build123d :start-after: [Code] :end-before: [End] diff --git a/docs/import_export.rst b/docs/import_export.rst index 73b26b2..53e935f 100644 --- a/docs/import_export.rst +++ b/docs/import_export.rst @@ -6,7 +6,7 @@ Methods and functions specific to exporting and importing build123d objects are For example: -.. code-block:: python +.. code-block:: build123d with BuildPart() as box_builder: Box(1, 1, 1) @@ -142,7 +142,7 @@ The shapes generated from the above steps are to be added as shapes in one of the exporters described below and written as either a DXF or SVG file as shown in this example: -.. code-block:: python +.. code-block:: build123d view_port_origin=(-100, -50, 30) visible, hidden = part.project_to_viewport(view_port_origin) @@ -222,7 +222,7 @@ more complex API than the simple Shape exporters. For example: -.. code-block:: python +.. code-block:: build123d # Create the shapes and assign attributes blue_shape = Solid.make_cone(20, 0, 50) @@ -276,7 +276,7 @@ Both 3MF and STL import (and export) are provided with the :class:`~mesher.Meshe For example: -.. code-block:: python +.. code-block:: build123d importer = Mesher() cone, cyl = importer.read("example.3mf") diff --git a/docs/index.rst b/docs/index.rst index 0af6014..08f3299 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -66,7 +66,7 @@ file or used in an Assembly. There are three builders available: The three builders work together in a hierarchy as follows: -.. code-block:: python +.. code-block:: build123d with BuildPart() as my_part: ... @@ -83,6 +83,7 @@ added to ``my_part`` once the sketch is complete. As an example, consider the design of a tea cup: .. literalinclude:: ../examples/tea_cup.py + :language: build123d :start-after: [Code] :end-before: [End] diff --git a/docs/introductory_examples.rst b/docs/introductory_examples.rst index 1399a80..a887bb9 100644 --- a/docs/introductory_examples.rst +++ b/docs/introductory_examples.rst @@ -36,12 +36,14 @@ Just about the simplest possible example, a rectangular :class:`~objects_part.Bo * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 1] :end-before: [Ex. 1] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 1] :end-before: [Ex. 1] @@ -63,6 +65,7 @@ A rectangular box, but with a hole added. from the :class:`~objects_part.Box`. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 2] :end-before: [Ex. 2] @@ -73,6 +76,7 @@ A rectangular box, but with a hole added. from the :class:`~objects_part.Box`. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 2] :end-before: [Ex. 2] @@ -94,6 +98,7 @@ Build a prismatic solid using extrusion. and then use :class:`~build_part.BuildPart`'s :meth:`~operations_part.extrude` feature. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 3] :end-before: [Ex. 3] @@ -103,6 +108,7 @@ Build a prismatic solid using extrusion. :class:`~objects_sketch.Rectangle`` and then use the :meth:`~operations_part.extrude` operation for parts. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 3] :end-before: [Ex. 3] @@ -126,6 +132,7 @@ variables for the line segments, but it will be useful in a later example. from :class:`~build_line.BuildLine` into a closed Face. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 4] :end-before: [Ex. 4] @@ -138,6 +145,7 @@ variables for the line segments, but it will be useful in a later example. segments into a Face. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 4] :end-before: [Ex. 4] @@ -158,6 +166,7 @@ Note that to build a closed face it requires line segments that form a closed sh at one (or multiple) places. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 5] :end-before: [Ex. 5] @@ -168,6 +177,7 @@ Note that to build a closed face it requires line segments that form a closed sh (with :class:`geometry.Rot`) would rotate the object. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 5] :end-before: [Ex. 5] @@ -188,6 +198,7 @@ Sometimes you need to create a number of features at various You can use a list of points to construct multiple objects at once. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 6] :end-before: [Ex. 6] @@ -200,6 +211,7 @@ Sometimes you need to create a number of features at various is short for ``obj - obj1 - obj2 - ob3`` (and more efficient, see :ref:`algebra_performance`). .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 6] :end-before: [Ex. 6] @@ -218,6 +230,7 @@ Sometimes you need to create a number of features at various you would like. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 7] :end-before: [Ex. 7] @@ -227,6 +240,7 @@ Sometimes you need to create a number of features at various for each location via loops or list comprehensions. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 7] :end-before: [Ex. 7] @@ -247,12 +261,14 @@ create the final profile. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 8] :end-before: [Ex. 8] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 8] :end-before: [Ex. 8] @@ -273,12 +289,14 @@ edges, you could simply pass in ``ex9.edges()``. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 9] :end-before: [Ex. 9] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 9] :end-before: [Ex. 9] @@ -303,6 +321,7 @@ be the highest z-dimension group. makes use of :class:`~objects_part.Hole` which automatically cuts through the entire part. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 10] :end-before: [Ex. 10] @@ -314,6 +333,7 @@ be the highest z-dimension group. of :class:`~objects_part.Hole`. Different to the *context mode*, you have to add the ``depth`` of the whole. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 10] :end-before: [Ex. 10] @@ -339,6 +359,7 @@ be the highest z-dimension group. cut these from the parent. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 11] :end-before: [Ex. 11] @@ -355,6 +376,7 @@ be the highest z-dimension group. parent. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 11] :end-before: [Ex. 11] @@ -376,12 +398,14 @@ edge that needs a complex profile. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 12] :end-before: [Ex. 12] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 12] :end-before: [Ex. 12] @@ -401,6 +425,7 @@ Counter-sink and counter-bore holes are useful for creating recessed areas for f We use a face to establish a location for :class:`~build_common.Locations`. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 13] :end-before: [Ex. 13] @@ -410,6 +435,7 @@ Counter-sink and counter-bore holes are useful for creating recessed areas for f onto this plane. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 13] :end-before: [Ex. 13] @@ -417,7 +443,7 @@ Counter-sink and counter-bore holes are useful for creating recessed areas for f .. _ex 14: -14. Position on a line with '\@', '\%' and introduce Sweep +1. Position on a line with '\@', '\%' and introduce Sweep ------------------------------------------------------------ build123d includes a feature for finding the position along a line segment. This @@ -437,9 +463,10 @@ path, please see example 37 for a way to make this placement easier. The :meth:`~operations_generic.sweep` method takes any pending faces and sweeps them through the provided path (in this case the path is taken from the pending edges from ``ex14_ln``). - :meth:`~operations_part.revolve` requires a single connected wire. + :meth:`~operations_part.revolve` requires a single connected wire. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 14] :end-before: [Ex. 14] @@ -449,6 +476,7 @@ path, please see example 37 for a way to make this placement easier. path (in this case the path is taken from ``ex14_ln``). .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 14] :end-before: [Ex. 14] @@ -471,6 +499,7 @@ Additionally the '@' operator is used to simplify the line segment commands. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 15] :end-before: [Ex. 15] @@ -479,6 +508,7 @@ Additionally the '@' operator is used to simplify the line segment commands. Combine lines via the pattern ``Curve() + [l1, l2, l3, l4, l5]`` .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 15] :end-before: [Ex. 15] @@ -496,12 +526,14 @@ The ``Plane.offset()`` method shifts the plane in the normal direction (positive * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 16] :end-before: [Ex. 16] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 16] :end-before: [Ex. 16] @@ -520,12 +552,14 @@ Here we select the farthest face in the Y-direction and turn it into a :class:`~ * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 17] :end-before: [Ex. 17] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 17] :end-before: [Ex. 17] @@ -546,6 +580,7 @@ with a negative distance. We then use ``Mode.SUBTRACT`` to cut it out from the main body. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 18] :end-before: [Ex. 18] @@ -554,6 +589,7 @@ with a negative distance. We then use ``-=`` to cut it out from the main body. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 18] :end-before: [Ex. 18] @@ -578,6 +614,7 @@ this custom Axis. :class:`~build_common.Locations` then the part would be offset from the workplane by the vertex z-position. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 19] :end-before: [Ex. 19] @@ -588,6 +625,7 @@ this custom Axis. :class:`~geometry.Pos` then the part would be offset from the workplane by the vertex z-position. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 19] :end-before: [Ex. 19] @@ -606,12 +644,14 @@ negative x-direction. The resulting Plane is offset from the original position. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 20] :end-before: [Ex. 20] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 20] :end-before: [Ex. 20] @@ -630,12 +670,14 @@ positioning another cylinder perpendicular and halfway along the first. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 21] :end-before: [Ex. 21] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 21] :end-before: [Ex. 21] @@ -656,6 +698,7 @@ example. Use the :meth:`~geometry.Plane.rotated` method to rotate the workplane. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 22] :end-before: [Ex. 22] @@ -664,6 +707,7 @@ example. Use the operator ``*`` to relocate the plane (post-multiplication!). .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 22] :end-before: [Ex. 22] @@ -690,12 +734,14 @@ It is highly recommended to view your sketch before you attempt to call revolve. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 23] :end-before: [Ex. 23] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 23] :end-before: [Ex. 23] @@ -716,12 +762,14 @@ Loft can behave unexpectedly when the input faces are not parallel to each other * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 24] :end-before: [Ex. 24] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 24] :end-before: [Ex. 24] @@ -739,6 +787,7 @@ Loft can behave unexpectedly when the input faces are not parallel to each other BuildSketch faces can be transformed with a 2D :meth:`~operations_generic.offset`. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 25] :end-before: [Ex. 25] @@ -747,6 +796,7 @@ Loft can behave unexpectedly when the input faces are not parallel to each other Sketch faces can be transformed with a 2D :meth:`~operations_generic.offset`. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 25] :end-before: [Ex. 25] @@ -772,12 +822,14 @@ Note that self intersecting edges and/or faces can break both 2D and 3D offsets. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 26] :end-before: [Ex. 26] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 26] :end-before: [Ex. 26] @@ -796,12 +848,14 @@ a face and offset half the width of the box. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 27] :end-before: [Ex. 27] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 27] :end-before: [Ex. 27] @@ -820,6 +874,7 @@ a face and offset half the width of the box. use the faces of this object to cut holes in a sphere. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 28] :end-before: [Ex. 28] @@ -828,6 +883,7 @@ a face and offset half the width of the box. We create a triangular prism and then later use the faces of this object to cut holes in a sphere. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 28] :end-before: [Ex. 28] @@ -849,12 +905,14 @@ the bottle opening. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 29] :end-before: [Ex. 29] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 29] :end-before: [Ex. 29] @@ -874,12 +932,14 @@ create a closed line that is made into a face and extruded. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 30] :end-before: [Ex. 30] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 30] :end-before: [Ex. 30] @@ -899,12 +959,14 @@ rotates any "children" groups by default. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 31] :end-before: [Ex. 31] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 31] :end-before: [Ex. 31] @@ -927,12 +989,14 @@ separate calls to :meth:`~operations_part.extrude`. adding these faces until the for-loop. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 32] :end-before: [Ex. 32] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 32] :end-before: [Ex. 32] @@ -954,6 +1018,7 @@ progressively modify the size of each square. The function returns a :class:`~build_sketch.BuildSketch`. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 33] :end-before: [Ex. 33] @@ -962,6 +1027,7 @@ progressively modify the size of each square. The function returns a ``Sketch`` object. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 33] :end-before: [Ex. 33] @@ -983,6 +1049,7 @@ progressively modify the size of each square. the 2nd "World" text on the top of the "Hello" text. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 34] :end-before: [Ex. 34] @@ -993,6 +1060,7 @@ progressively modify the size of each square. the ``topf`` variable to select the same face and deboss (indented) the text "World". .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 34] :end-before: [Ex. 34] @@ -1012,6 +1080,7 @@ progressively modify the size of each square. arc for two instances of :class:`~objects_sketch.SlotArc`. .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 35] :end-before: [Ex. 35] @@ -1021,6 +1090,7 @@ progressively modify the size of each square. a :class:`~objects_curve.RadiusArc` to create an arc for two instances of :class:`~operations_sketch.SlotArc`. .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 35] :end-before: [Ex. 35] @@ -1041,11 +1111,13 @@ with ``Until.NEXT`` or ``Until.LAST``. * **Builder mode** .. literalinclude:: general_examples.py + :language: build123d :start-after: [Ex. 36] :end-before: [Ex. 36] * **Algebra mode** .. literalinclude:: general_examples_algebra.py + :language: build123d :start-after: [Ex. 36] :end-before: [Ex. 36] diff --git a/docs/joints.rst b/docs/joints.rst index 07cc623..3b117b0 100644 --- a/docs/joints.rst +++ b/docs/joints.rst @@ -46,14 +46,14 @@ A rigid joint positions two components relative to each another with no freedom and a ``joint_location`` which defines both the position and orientation of the joint (see :class:`~geometry.Location`) - as follows: -.. code-block:: python +.. code-block:: build123d RigidJoint(label="outlet", to_part=pipe, joint_location=path.location_at(1)) Once a joint is bound to a part this way, the :meth:`~topology.Joint.connect_to` method can be used to repositioning another part relative to ``self`` which stay fixed - as follows: -.. code-block:: python +.. code-block:: build123d pipe.joints["outlet"].connect_to(flange_outlet.joints["pipe"]) @@ -70,6 +70,7 @@ flanges are attached to the ends of a curved pipe: .. image:: assets/rigid_joints_pipe.png .. literalinclude:: rigid_joints_pipe.py + :language: build123d :emphasize-lines: 19-20, 23-24 Note how the locations of the joints are determined by the :meth:`~topology.Mixin1D.location_at` method @@ -132,6 +133,7 @@ Component moves along a single axis as with a sliding latch shown here: The code to generate these components follows: .. literalinclude:: slide_latch.py + :language: build123d :emphasize-lines: 30, 52, 55 .. image:: assets/joint-latch.png @@ -193,6 +195,7 @@ is found within a rod end as shown here: .. image:: assets/rod_end.png .. literalinclude:: rod_end.py + :language: build123d :emphasize-lines: 40-44,51,53 Note how limits are defined during the instantiation of the ball joint when ensures that the pin or bolt diff --git a/docs/key_concepts_algebra.rst b/docs/key_concepts_algebra.rst index 655b6c7..76f876a 100644 --- a/docs/key_concepts_algebra.rst +++ b/docs/key_concepts_algebra.rst @@ -12,26 +12,26 @@ Object arithmetic - Creating a box and a cylinder centered at ``(0, 0, 0)`` - .. code-block:: python + .. code-block:: build123d b = Box(1, 2, 3) c = Cylinder(0.2, 5) - Fusing a box and a cylinder - .. code-block:: python + .. code-block:: build123d r = Box(1, 2, 3) + Cylinder(0.2, 5) - Cutting a cylinder from a box - .. code-block:: python + .. code-block:: build123d r = Box(1, 2, 3) - Cylinder(0.2, 5) - Intersecting a box and a cylinder - .. code-block:: python + .. code-block:: build123d r = Box(1, 2, 3) & Cylinder(0.2, 5) @@ -54,7 +54,7 @@ The generic forms of object placement are: 1. Placement on ``plane`` or at ``location`` relative to XY plane: - .. code-block:: python + .. code-block:: build123d plane * alg_compound location * alg_compound @@ -62,7 +62,7 @@ The generic forms of object placement are: 2. Placement on the ``plane`` and then moved relative to the ``plane`` by ``location`` (the location is relative to the local coordinate system of the plane). - .. code-block:: python + .. code-block:: build123d plane * location * alg_compound @@ -73,7 +73,7 @@ Examples: - Box on the ``XY`` plane, centered at `(0, 0, 0)` (both forms are equivalent): - .. code-block:: python + .. code-block:: build123d Plane.XY * Box(1, 2, 3) @@ -84,7 +84,7 @@ Examples: - Box on the ``XY`` plane centered at `(0, 1, 0)` (all three are equivalent): - .. code-block:: python + .. code-block:: build123d Plane.XY * Pos(0, 1, 0) * Box(1, 2, 3) @@ -96,21 +96,21 @@ Examples: - Box on plane ``Plane.XZ``: - .. code-block:: python + .. code-block:: build123d Plane.XZ * Box(1, 2, 3) - Box on plane ``Plane.XZ`` with a location ``(X=1, Y=2, Z=3)`` relative to the ``XZ`` plane, i.e., using the x-, y- and z-axis of the ``XZ`` plane: - .. code-block:: python + .. code-block:: build123d Plane.XZ * Pos(1, 2, 3) * Box(1, 2, 3) - Box on plane ``Plane.XZ`` moved to ``(X=1, Y=2, Z=3)`` relative to this plane and rotated there by the angles `(X=0, Y=100, Z=45)` around ``Plane.XZ`` axes: - .. code-block:: python + .. code-block:: build123d Plane.XZ * Pos(1, 2, 3) * Rot(0, 100, 45) * Box(1, 2, 3) @@ -121,7 +121,7 @@ Examples: - Box on plane ``Plane.XZ`` rotated on this plane by the angles ``(X=0, Y=100, Z=45)`` (using the x-, y- and z-axis of the ``XZ`` plane) and then moved to ``(X=1, Y=2, Z=3)`` relative to the ``XZ`` plane: - .. code-block:: python + .. code-block:: build123d Plane.XZ * Rot(0, 100, 45) * Pos(0,1,2) * Box(1, 2, 3) @@ -131,7 +131,7 @@ Combing both concepts **Object arithmetic** and **Placement at locations** can be combined: - .. code-block:: python + .. code-block:: build123d b = Plane.XZ * Rot(X=30) * Box(1, 2, 3) + Plane.YZ * Pos(X=-1) * Cylinder(0.2, 5) diff --git a/docs/key_concepts_builder.rst b/docs/key_concepts_builder.rst index 20370f3..076882d 100644 --- a/docs/key_concepts_builder.rst +++ b/docs/key_concepts_builder.rst @@ -61,7 +61,7 @@ Example Workflow Here is an example of using a Builder to create a simple part: -.. code-block:: python +.. code-block:: build123d from build123d import * @@ -117,21 +117,21 @@ class for further processing. One can access the objects created by these builders by referencing the appropriate instance variable. For example: -.. code-block:: python +.. code-block:: build123d with BuildPart() as my_part: ... show_object(my_part.part) -.. code-block:: python +.. code-block:: build123d with BuildSketch() as my_sketch: ... show_object(my_sketch.sketch) -.. code-block:: python +.. code-block:: build123d with BuildLine() as my_line: ... @@ -144,7 +144,7 @@ Implicit Builder Instance Variables One might expect to have to reference a builder's instance variable when using objects or operations that impact that builder like this: -.. code-block:: python +.. code-block:: build123d with BuildPart() as part_builder: Box(part_builder, 10,10,10) @@ -153,7 +153,7 @@ Instead, build123d determines from the scope of the object or operation which builder it applies to thus eliminating the need for the user to provide this information - as follows: -.. code-block:: python +.. code-block:: build123d with BuildPart() as part_builder: Box(10,10,10) @@ -175,7 +175,7 @@ be generated on any plane which allows users to put a workplane where they are w and then work in local 2D coordinate space. -.. code-block:: python +.. code-block:: build123d with BuildPart(Plane.XY) as example: ... # a 3D-part @@ -199,7 +199,7 @@ One is not limited to a single workplane at a time. In the following example all faces of the first box are used to define workplanes which are then used to position rotated boxes. -.. code-block:: python +.. code-block:: build123d import build123d as bd @@ -223,7 +223,7 @@ When positioning objects or operations within a builder Location Contexts are us function in a very similar was to the builders in that they create a context where one or more locations are active within a scope. For example: -.. code-block:: python +.. code-block:: build123d with BuildPart(): with Locations((0,10),(0,-10)): @@ -244,7 +244,7 @@ its scope - much as the hour and minute indicator on an analogue clock. Also note that the locations are local to the current location(s) - i.e. ``Locations`` can be nested. It's easy for a user to retrieve the global locations: -.. code-block:: python +.. code-block:: build123d with Locations(Plane.XY, Plane.XZ): locs = GridLocations(1, 1, 2, 2) @@ -271,7 +271,7 @@ an iterable of objects is often required (often a ShapeList). Here is the definition of :meth:`~operations_generic.fillet` to help illustrate: -.. code-block:: python +.. code-block:: build123d def fillet( objects: Union[Union[Edge, Vertex], Iterable[Union[Edge, Vertex]]], @@ -281,7 +281,7 @@ Here is the definition of :meth:`~operations_generic.fillet` to help illustrate: To use this fillet operation, an edge or vertex or iterable of edges or vertices must be provided followed by a fillet radius with or without the keyword as follows: -.. code-block:: python +.. code-block:: build123d with BuildPart() as pipes: Box(10, 10, 10, rotation=(10, 20, 30)) @@ -297,7 +297,7 @@ Combination Modes Almost all objects or operations have a ``mode`` parameter which is defined by the ``Mode`` Enum class as follows: -.. code-block:: python +.. code-block:: build123d class Mode(Enum): ADD = auto() @@ -329,7 +329,7 @@ build123d stores points (to be specific ``Location`` (s)) internally to be used positions for the placement of new objects. By default, a single location will be created at the origin of the given workplane such that: -.. code-block:: python +.. code-block:: build123d with BuildPart() as pipes: Box(10, 10, 10, rotation=(10, 20, 30)) @@ -338,7 +338,7 @@ will create a single 10x10x10 box centered at (0,0,0) - by default objects are centered. One can create multiple objects by pushing points prior to creating objects as follows: -.. code-block:: python +.. code-block:: build123d with BuildPart() as pipes: with Locations((-10, -10, -10), (10, 10, 10)): @@ -370,7 +370,7 @@ Builder's Pending Objects When a builder exits, it will push the object created back to its parent if there was one. Here is an example: -.. code-block:: python +.. code-block:: build123d height, width, thickness, f_rad = 60, 80, 20, 10 diff --git a/docs/location_arithmetic.rst b/docs/location_arithmetic.rst index f26834e..d5c4b0e 100644 --- a/docs/location_arithmetic.rst +++ b/docs/location_arithmetic.rst @@ -9,7 +9,7 @@ Position a shape relative to the XY plane For the following use the helper function: -.. code-block:: python +.. code-block:: build123d def location_symbol(location: Location, scale: float = 1) -> Compound: return Compound.make_triad(axes_scale=scale).locate(location) @@ -22,7 +22,7 @@ For the following use the helper function: 1. **Positioning at a location** - .. code-block:: python + .. code-block:: build123d loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) @@ -35,7 +35,7 @@ For the following use the helper function: 2) **Positioning on a plane** - .. code-block:: python + .. code-block:: build123d plane = Plane.XZ @@ -54,7 +54,7 @@ Relative positioning to a plane 1. **Position an object on a plane relative to the plane** - .. code-block:: python + .. code-block:: build123d loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) @@ -77,7 +77,7 @@ Relative positioning to a plane 2. **Rotate an object on a plane relative to the plane** - .. code-block:: python + .. code-block:: build123d loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) @@ -96,7 +96,7 @@ Relative positioning to a plane More general: - .. code-block:: python + .. code-block:: build123d loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) @@ -114,7 +114,7 @@ Relative positioning to a plane 3. **Rotate and position an object relative to a location** - .. code-block:: python + .. code-block:: build123d loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) @@ -133,7 +133,7 @@ Relative positioning to a plane 4. **Position and rotate an object relative to a location** - .. code-block:: python + .. code-block:: build123d loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) diff --git a/docs/moving_objects.rst b/docs/moving_objects.rst index 088973c..b36dde4 100644 --- a/docs/moving_objects.rst +++ b/docs/moving_objects.rst @@ -22,7 +22,7 @@ construction process. The following tools are commonly used to specify locations Example: -.. code-block:: python +.. code-block:: build123d with Locations((10, 20, 30)): Box(5, 5, 5) @@ -42,7 +42,7 @@ an existing one. Example: -.. code-block:: python +.. code-block:: build123d rotated_box = Rotation(45, 0, 0) * box @@ -55,13 +55,13 @@ Position ^^^^^^^^ - **Absolute Position:** Set the position directly. -.. code-block:: python +.. code-block:: build123d shape.position = (x, y, z) - **Relative Position:** Adjust the position incrementally. -.. code-block:: python +.. code-block:: build123d shape.position += (x, y, z) shape.position -= (x, y, z) @@ -71,13 +71,13 @@ Orientation ^^^^^^^^^^^ - **Absolute Orientation:** Set the orientation directly. -.. code-block:: python +.. code-block:: build123d shape.orientation = (X, Y, Z) - **Relative Orientation:** Adjust the orientation incrementally. -.. code-block:: python +.. code-block:: build123d shape.orientation += (X, Y, Z) shape.orientation -= (X, Y, Z) @@ -86,25 +86,25 @@ Movement Methods ^^^^^^^^^^^^^^^^ - **Relative Move:** -.. code-block:: python +.. code-block:: build123d shape.move(Location) - **Relative Move of Copy:** -.. code-block:: python +.. code-block:: build123d relocated_shape = shape.moved(Location) - **Absolute Move:** -.. code-block:: python +.. code-block:: build123d shape.locate(Location) - **Absolute Move of Copy:** -.. code-block:: python +.. code-block:: build123d relocated_shape = shape.located(Location) @@ -119,12 +119,12 @@ Transformation a.k.a. Translation and Rotation - **Translation:** Move a shape relative to its current position. -.. code-block:: python +.. code-block:: build123d relocated_shape = shape.translate(x, y, z) - **Rotation:** Rotate a shape around a specified axis by a given angle. -.. code-block:: python +.. code-block:: build123d rotated_shape = shape.rotate(Axis, angle_in_degrees) diff --git a/docs/objects.rst b/docs/objects.rst index 0cff926..395d81d 100644 --- a/docs/objects.rst +++ b/docs/objects.rst @@ -7,7 +7,7 @@ For example, a :class:`~objects_part.Torus` is defined by a major and minor radi Builder mode, objects are positioned with ``Locations`` while in Algebra mode, objects are positioned with the ``*`` operator and shown in these examples: -.. code-block:: python +.. code-block:: build123d with BuildPart() as disk: with BuildSketch(): @@ -18,7 +18,7 @@ are positioned with the ``*`` operator and shown in these examples: Circle(d, mode=Mode.SUBTRACT) extrude(amount=c) -.. code-block:: python +.. code-block:: build123d sketch = Circle(a) - Pos(b, 0.0) * Rectangle(c, c) - Pos(0.0, b) * Circle(d) disk = extrude(sketch, c) @@ -36,7 +36,7 @@ right or left of each Axis. The following diagram shows how this alignment works For example: -.. code-block:: python +.. code-block:: build123d with BuildSketch(): Circle(1, align=(Align.MIN, Align.MIN)) @@ -49,7 +49,7 @@ In 3D the ``align`` parameter also contains a Z align value but otherwise works Note that the ``align`` will also accept a single ``Align`` value which will be used on all axes - as shown here: -.. code-block:: python +.. code-block:: build123d with BuildSketch(): Circle(1, align=Align.MIN) @@ -511,6 +511,7 @@ Here is an example of a custom sketch object specially created as part of the de this playing card storage box (:download:`see the playing_cards.py example <../examples/playing_cards.py>`): .. literalinclude:: ../examples/playing_cards.py + :language: build123d :start-after: [Club] :end-before: [Club] diff --git a/docs/operations.rst b/docs/operations.rst index e7532b6..8dedac9 100644 --- a/docs/operations.rst +++ b/docs/operations.rst @@ -6,14 +6,14 @@ Operations are functions that take objects as inputs and transform them into new Here are a couple ways to use :func:`~operations_part.extrude`, in Builder and Algebra mode: -.. code-block:: python +.. code-block:: build123d with BuildPart() as cylinder: with BuildSketch(): Circle(radius) extrude(amount=height) -.. code-block:: python +.. code-block:: build123d cylinder = extrude(Circle(radius), amount=height) diff --git a/docs/selectors.rst b/docs/selectors.rst index 189b367..ca41f9b 100644 --- a/docs/selectors.rst +++ b/docs/selectors.rst @@ -74,7 +74,7 @@ It is important to note that standard list methods such as `sorted` or `filtered be used to easily build complex selectors beyond what is available with the predefined sorts and filters. Here is an example of a custom filters: -.. code-block:: python +.. code-block:: build123d with BuildSketch() as din: ... @@ -88,7 +88,7 @@ The :meth:`~topology.ShapeList.filter_by` method can take lambda expressions as fluent chain of operations which enables integration of custom filters into a larger change of selectors as shown in this example: -.. code-block:: python +.. code-block:: build123d obj = Box(1, 1, 1) - Cylinder(0.2, 1) faces_with_holes = obj.faces().filter_by(lambda f: f.inner_wires()) diff --git a/docs/tech_drawing_tutorial.rst b/docs/tech_drawing_tutorial.rst index 227caab..b4f9db6 100644 --- a/docs/tech_drawing_tutorial.rst +++ b/docs/tech_drawing_tutorial.rst @@ -4,14 +4,14 @@ Technical Drawing Tutorial ########################## -This example demonstrates how to generate a standard technical drawing of a 3D part -using `build123d`. It creates orthographic and isometric views of a Nema 23 stepper +This example demonstrates how to generate a standard technical drawing of a 3D part +using `build123d`. It creates orthographic and isometric views of a Nema 23 stepper motor and exports the result as an SVG file suitable for printing or inspection. Overview -------- -A technical drawing represents a 3D object in 2D using a series of standardized views. +A technical drawing represents a 3D object in 2D using a series of standardized views. These include: - **Plan (Top View)** – as seen from directly above (Z-axis down) @@ -24,8 +24,8 @@ Each view is aligned to a position on the page and optionally scaled or annotate How It Works ------------ -The script uses the `project_to_viewport` method to project the 3D part geometry into 2D. -A helper function, `project_to_2d`, sets up the viewport (camera origin and up direction) +The script uses the `project_to_viewport` method to project the 3D part geometry into 2D. +A helper function, `project_to_2d`, sets up the viewport (camera origin and up direction) and places the result onto a virtual drawing sheet. The steps involved are: @@ -34,7 +34,7 @@ The steps involved are: 2. Define a `TechnicalDrawing` border and title block using A4 page size. 3. Generate each of the standard views and apply transformations to place them. 4. Add dimensions using `ExtensionLine` and labels using `Text`. -5. Export the drawing using `ExportSVG`, separating visible and hidden edges by layer +5. Export the drawing using `ExportSVG`, separating visible and hidden edges by layer and style. Result @@ -59,7 +59,7 @@ Code ---- .. literalinclude:: technical_drawing.py - :language: python + :language: build123d :start-after: [code] :end-before: [end] diff --git a/docs/tips.rst b/docs/tips.rst index ad5c299..2567088 100644 --- a/docs/tips.rst +++ b/docs/tips.rst @@ -92,7 +92,7 @@ consider a plate with four chamfered holes like this: When selecting edges to be chamfered one might first select the face that these edges belong to then select the edges as shown here: -.. code-block:: python +.. code-block:: build123d from build123d import * @@ -118,7 +118,7 @@ a common OpenCascade Python wrapper (`OCP `_) i interchange objects both from CadQuery to build123d and vice-versa by transferring the ``wrapped`` objects as follows (first from CadQuery to build123d): -.. code-block:: python +.. code-block:: build123d import build123d as b3d b3d_solid = b3d.Solid.make_box(1,1,1) @@ -129,7 +129,7 @@ objects as follows (first from CadQuery to build123d): Secondly, from build123d to CadQuery as follows: -.. code-block:: python +.. code-block:: build123d import build123d as b3d import cadquery as cq @@ -209,7 +209,7 @@ Why doesn't BuildSketch(Plane.XZ) work? When creating a sketch not on the default ``Plane.XY`` users may expect that they are drawing directly on the workplane / coordinate system provided. For example: -.. code-block:: python +.. code-block:: build123d with BuildSketch(Plane.XZ) as vertical_sketch: Rectangle(1, 1) @@ -229,7 +229,7 @@ Why does ``BuildSketch`` work this way? Consider an example where the user wants plane not aligned with any Axis, as follows (this is often done when creating a sketch on a ``Face`` of a 3D part but is simulated here by rotating a ``Plane``): -.. code-block:: python +.. code-block:: build123d with BuildSketch(Plane.YZ.rotated((123, 45, 6))) as custom_plane: Rectangle(1, 1, align=Align.MIN) @@ -251,7 +251,7 @@ Why is BuildLine not working as expected within the scope of BuildSketch? As described above, all sketching is done on a local ``Plane.XY``; however, the following is a common issue: -.. code-block:: python +.. code-block:: build123d with BuildSketch() as sketch: with BuildLine(Plane.XZ): diff --git a/docs/topology_selection.rst b/docs/topology_selection.rst index f1ef50e..694c75f 100644 --- a/docs/topology_selection.rst +++ b/docs/topology_selection.rst @@ -40,7 +40,7 @@ Overview Both shape objects and builder objects have access to selector methods to select all of a feature as long as they can contain the feature being selected. -.. code-block:: python +.. code-block:: build123d # In context with BuildSketch() as context: @@ -70,7 +70,7 @@ existed in the referenced object before the last operation, nor the modifying ob :class:`~build_enums.Select` as selector criteria is only valid for builder objects! - .. code-block:: python + .. code-block:: build123d # In context with BuildPart() as context: @@ -85,7 +85,7 @@ existed in the referenced object before the last operation, nor the modifying ob Create a simple part to demonstrate selectors. Select using the default criteria ``Select.ALL``. Specifying ``Select.ALL`` for the selector is not required. -.. code-block:: python +.. code-block:: build123d with BuildPart() as part: Box(5, 5, 1) @@ -107,7 +107,7 @@ Create a simple part to demonstrate selectors. Select using the default criteria Select features changed in the last operation with criteria ``Select.LAST``. -.. code-block:: python +.. code-block:: build123d with BuildPart() as part: Box(5, 5, 1) @@ -125,7 +125,7 @@ Select features changed in the last operation with criteria ``Select.LAST``. Select only new edges from the last operation with ``Select.NEW``. This option is only available for a ``ShapeList`` of edges! -.. code-block:: python +.. code-block:: build123d with BuildPart() as part: Box(5, 5, 1) @@ -142,7 +142,7 @@ This only returns new edges which are not reused from Box or Cylinder, in this c the objects `intersect`. But what happens if the objects don't intersect and all the edges are reused? -.. code-block:: python +.. code-block:: build123d with BuildPart() as part: Box(5, 5, 1, align=(Align.CENTER, Align.CENTER, Align.MAX)) @@ -164,7 +164,7 @@ only completely new edges created by the operation. Chamfer and fillet modify the current object, but do not have new edges via ``Select.NEW``. - .. code-block:: python + .. code-block:: build123d with BuildPart() as part: Box(5, 5, 1) @@ -187,7 +187,7 @@ another "combined" shape object and returns the edges new to the combined shape. ``new_edges`` is available both Algebra mode or Builder mode, but is necessary in Algebra Mode where ``Select.NEW`` is unavailable -.. code-block:: python +.. code-block:: build123d box = Box(5, 5, 1) circle = Cylinder(2, 5) @@ -200,7 +200,7 @@ Algebra Mode where ``Select.NEW`` is unavailable ``new_edges`` can also find edges created during a chamfer or fillet operation by comparing the object before the operation to the "combined" object. -.. code-block:: python +.. code-block:: build123d box = Box(5, 5, 1) circle = Cylinder(2, 5) @@ -263,7 +263,7 @@ Finally, the vertices can be captured with a list slice for the last 4 list item items are sorted from least to greatest ``X`` position. Remember, ``ShapeList`` is a subclass of ``list``, so any list slice can be used. -.. code-block:: python +.. code-block:: build123d part.vertices().sort_by(Axis.X)[-4:] @@ -320,7 +320,7 @@ group by ``SortBy.AREA``. The ``ShapeList`` of smallest faces is available from list index. Finally, a ``ShapeList`` has access to selectors, so calling |edges| will return a new list of all edges in the previous list. -.. code-block:: python +.. code-block:: build123d part.faces().group_by(SortBy.AREA)[0].edges()) @@ -368,7 +368,7 @@ might be with a list comprehension, however |filter_by| has the capability to ta lambda function as a filter condition on the entire list. In this case, the normal of each face can be checked against a vector direction and filtered accordingly. -.. code-block:: python +.. code-block:: build123d part.faces().filter_by(lambda f: f.normal_at() == Vector(0, 0, 1)) diff --git a/docs/topology_selection/filter_examples.rst b/docs/topology_selection/filter_examples.rst index f7233b8..0b0f3fc 100644 --- a/docs/topology_selection/filter_examples.rst +++ b/docs/topology_selection/filter_examples.rst @@ -18,11 +18,11 @@ operations, and are sometimes necessary e.g. before sorting or filtering by radi .. dropdown:: Setup .. literalinclude:: examples/filter_geomtype.py - :language: python + :language: build123d :lines: 3, 8-13 .. literalinclude:: examples/filter_geomtype.py - :language: python + :language: build123d :lines: 15 .. figure:: ../assets/topology_selection/filter_geomtype_line.png @@ -31,7 +31,7 @@ operations, and are sometimes necessary e.g. before sorting or filtering by radi | .. literalinclude:: examples/filter_geomtype.py - :language: python + :language: build123d :lines: 17 .. figure:: ../assets/topology_selection/filter_geomtype_cylinder.png @@ -52,11 +52,11 @@ circular edges selects the counterbore faces that meet the joint criteria. .. dropdown:: Setup .. literalinclude:: examples/filter_all_edges_circle.py - :language: python + :language: build123d :lines: 3, 8-41 .. literalinclude:: examples/filter_all_edges_circle.py - :language: python + :language: build123d :lines: 43-47 .. figure:: ../assets/topology_selection/filter_all_edges_circle.png @@ -74,14 +74,14 @@ Plane will select faces parallel to the plane. .. dropdown:: Setup - .. code-block:: python + .. code-block:: build123d from build123d import * with BuildPart() as part: Box(1, 1, 1) -.. code-block:: python +.. code-block:: build123d part.faces().filter_by(Axis.Z) part.faces().filter_by(Plane.XY) @@ -96,7 +96,7 @@ accomplish this with feature properties or methods. Here, we are looking for fac the dot product of face normal and either the axis direction or the plane normal is about to 0. The result is faces parallel to the axis or perpendicular to the plane. -.. code-block:: python +.. code-block:: build123d part.faces().filter_by(lambda f: abs(f.normal_at().dot(Axis.Z.direction) < 1e-6) part.faces().filter_by(lambda f: abs(f.normal_at().dot(Plane.XY.z_dir)) < 1e-6) @@ -122,11 +122,11 @@ and then filtering for the specific inner wire by radius. .. dropdown:: Setup .. literalinclude:: examples/filter_inner_wire_count.py - :language: python + :language: build123d :lines: 4, 9-16 .. literalinclude:: examples/filter_inner_wire_count.py - :language: python + :language: build123d :lines: 18-21 .. figure:: ../assets/topology_selection/filter_inner_wire_count.png @@ -140,7 +140,7 @@ axis and range. To do that we can filter for faces with 6 inner wires, sort for select the top face, and then filter for the circular edges of the inner wires. .. literalinclude:: examples/filter_inner_wire_count.py - :language: python + :language: build123d :lines: 25-32 .. figure:: ../assets/topology_selection/filter_inner_wire_count_linear.png @@ -163,11 +163,11 @@ any line edges. .. dropdown:: Setup .. literalinclude:: examples/filter_nested.py - :language: python + :language: build123d :lines: 4, 9-22 .. literalinclude:: examples/filter_nested.py - :language: python + :language: build123d :lines: 26-32 .. figure:: ../assets/topology_selection/filter_nested.png @@ -186,7 +186,7 @@ different fillets accordingly. Then the ``Face`` ``is_circular_*`` properties ar to highlight the resulting fillets. .. literalinclude:: examples/filter_shape_properties.py - :language: python + :language: build123d :lines: 3-4, 8-22 .. figure:: ../assets/topology_selection/filter_shape_properties.png diff --git a/docs/topology_selection/group_examples.rst b/docs/topology_selection/group_examples.rst index 3f0057b..d91de21 100644 --- a/docs/topology_selection/group_examples.rst +++ b/docs/topology_selection/group_examples.rst @@ -14,7 +14,7 @@ result knowing how many edges to expect. .. dropdown:: Setup .. literalinclude:: examples/group_axis.py - :language: python + :language: build123d :lines: 4, 9-17 .. figure:: ../assets/topology_selection/group_axis_without.png @@ -26,7 +26,7 @@ However, ``group_by`` can be used to first group all the edges by z-axis positio group again by length. In both cases, you can select the desired edges from the last group. .. literalinclude:: examples/group_axis.py - :language: python + :language: build123d :lines: 21-22 .. figure:: ../assets/topology_selection/group_axis_with.png @@ -46,11 +46,11 @@ with the largest hole. .. dropdown:: Setup .. literalinclude:: examples/group_hole_area.py - :language: python + :language: build123d :lines: 4, 9-17 .. literalinclude:: examples/group_hole_area.py - :language: python + :language: build123d :lines: 21-24 .. figure:: ../assets/topology_selection/group_hole_area.png @@ -72,11 +72,11 @@ then the desired groups are selected with the ``group`` method using the lengths .. dropdown:: Setup .. literalinclude:: examples/group_properties_with_keys.py - :language: python + :language: build123d :lines: 4, 9-26 .. literalinclude:: examples/group_properties_with_keys.py - :language: python + :language: build123d :lines: 30, 31 .. figure:: ../assets/topology_selection/group_length_key.png @@ -94,11 +94,11 @@ and then further specify only the edges the bearings and pins are installed from .. dropdown:: Adding holes .. literalinclude:: examples/group_properties_with_keys.py - :language: python + :language: build123d :lines: 35-43 .. literalinclude:: examples/group_properties_with_keys.py - :language: python + :language: build123d :lines: 47-50 .. figure:: ../assets/topology_selection/group_radius_key.png @@ -109,7 +109,7 @@ and then further specify only the edges the bearings and pins are installed from Note that ``group_by`` is not the only way to capture edges with a known property value! ``filter_by`` with a lambda expression can be used as well: -.. code-block:: python +.. code-block:: build123d radius_groups = part.edges().filter_by(GeomType.CIRCLE) bearing_edges = radius_groups.filter_by(lambda e: e.radius == 8) diff --git a/docs/topology_selection/sort_examples.rst b/docs/topology_selection/sort_examples.rst index a4779fc..ecdbf96 100644 --- a/docs/topology_selection/sort_examples.rst +++ b/docs/topology_selection/sort_examples.rst @@ -23,11 +23,11 @@ be used with``group_by``. .. dropdown:: Setup .. literalinclude:: examples/sort_sortby.py - :language: python + :language: build123d :lines: 3, 8-13 .. literalinclude:: examples/sort_sortby.py - :language: python + :language: build123d :lines: 19-22 .. figure:: ../assets/topology_selection/sort_sortby_length.png @@ -36,7 +36,7 @@ be used with``group_by``. | .. literalinclude:: examples/sort_sortby.py - :language: python + :language: build123d :lines: 24-27 .. figure:: ../assets/topology_selection/sort_sortby_distance.png @@ -57,11 +57,11 @@ the order is random. .. dropdown:: Setup .. literalinclude:: examples/sort_along_wire.py - :language: python + :language: build123d :lines: 3, 8-12 .. literalinclude:: examples/sort_along_wire.py - :language: python + :language: build123d :lines: 14-15 .. figure:: ../assets/topology_selection/sort_not_along_wire.png @@ -73,7 +73,7 @@ Vertices may be sorted along the wire they fall on to create order. Notice the f radii now increase in order. .. literalinclude:: examples/sort_along_wire.py - :language: python + :language: build123d :lines: 26-28 .. figure:: ../assets/topology_selection/sort_along_wire.png @@ -94,11 +94,11 @@ edge can be found sorting along y-axis. .. dropdown:: Setup .. literalinclude:: examples/sort_axis.py - :language: python + :language: build123d :lines: 4, 9-18 .. literalinclude:: examples/sort_axis.py - :language: python + :language: build123d :lines: 22-24 .. figure:: ../assets/topology_selection/sort_axis.png @@ -118,11 +118,11 @@ Here we are sorting the boxes by distance from the origin, using an empty ``Vert .. dropdown:: Setup .. literalinclude:: examples/sort_distance_from.py - :language: python + :language: build123d :lines: 2-5, 9-13 .. literalinclude:: examples/sort_distance_from.py - :language: python + :language: build123d :lines: 15-16 .. figure:: ../assets/topology_selection/sort_distance_from_origin.png @@ -135,7 +135,7 @@ property ``volume``, and getting the last (largest) box. Then, the boxes sorted their distance from the largest box. .. literalinclude:: examples/sort_distance_from.py - :language: python + :language: build123d :lines: 19-20 .. figure:: ../assets/topology_selection/sort_distance_from_largest.png diff --git a/docs/tttt.rst b/docs/tttt.rst index 8379142..1c1f75f 100644 --- a/docs/tttt.rst +++ b/docs/tttt.rst @@ -98,6 +98,7 @@ Party Pack 01-01 Bearing Bracket .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0101.py + :language: build123d .. _ttt-ppp0102: @@ -114,6 +115,7 @@ Party Pack 01-02 Post Cap .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0102.py + :language: build123d .. _ttt-ppp0103: @@ -129,6 +131,7 @@ Party Pack 01-03 C Clamp Base .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0103.py + :language: build123d .. _ttt-ppp0104: @@ -144,6 +147,7 @@ Party Pack 01-04 Angle Bracket .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0104.py + :language: build123d .. _ttt-ppp0105: @@ -159,6 +163,7 @@ Party Pack 01-05 Paste Sleeve .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0105.py + :language: build123d .. _ttt-ppp0106: @@ -174,6 +179,7 @@ Party Pack 01-06 Bearing Jig .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0106.py + :language: build123d .. _ttt-ppp0107: @@ -189,6 +195,7 @@ Party Pack 01-07 Flanged Hub .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0107.py + :language: build123d .. _ttt-ppp0108: @@ -204,6 +211,7 @@ Party Pack 01-08 Tie Plate .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0108.py + :language: build123d .. _ttt-ppp0109: @@ -219,6 +227,7 @@ Party Pack 01-09 Corner Tie .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0109.py + :language: build123d .. _ttt-ppp0110: @@ -234,6 +243,7 @@ Party Pack 01-10 Light Cap .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-ppp0110.py + :language: build123d .. _ttt-23-02-02-sm_hanger: @@ -249,6 +259,7 @@ Party Pack 01-10 Light Cap .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-23-02-02-sm_hanger.py + :language: build123d .. _ttt-23-t-24: @@ -265,6 +276,7 @@ Party Pack 01-10 Light Cap .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-23-t-24-curved_support.py + :language: build123d .. _ttt-24-spo-06: @@ -281,3 +293,4 @@ Party Pack 01-10 Light Cap .. dropdown:: Reference Implementation .. literalinclude:: assets/ttt/ttt-24-SPO-06-Buffer_Stand.py + :language: build123d diff --git a/docs/tutorial_design.rst b/docs/tutorial_design.rst index 3950399..f16afbc 100644 --- a/docs/tutorial_design.rst +++ b/docs/tutorial_design.rst @@ -4,8 +4,8 @@ Designing a Part in build123d ############################# -Designing a part with build123d involves a systematic approach that leverages the power -of 2D profiles, extrusions, and revolutions. Where possible, always work in the lowest +Designing a part with build123d involves a systematic approach that leverages the power +of 2D profiles, extrusions, and revolutions. Where possible, always work in the lowest possible dimension, 1D lines before 2D sketches before 3D parts. The following guide will get you started: @@ -18,8 +18,8 @@ get you started: Step 1. Examine the Part in All Three Orientations ************************************************** -Start by visualizing the part from the front, top, and side views. Identify any symmetries -in these orientations, as symmetries can simplify the design by reducing the number of +Start by visualizing the part from the front, top, and side views. Identify any symmetries +in these orientations, as symmetries can simplify the design by reducing the number of unique features you need to model. *In the following view of the bracket one can see two planes of symmetry @@ -31,8 +31,8 @@ so we'll only need to design one quarter of it.* Step 2. Identify Rotational Symmetries ************************************** -Look for structures that could be created through the rotation of a 2D shape. For instance, -cylindrical or spherical features are often the result of revolving a profile around an axis. +Look for structures that could be created through the rotation of a 2D shape. For instance, +cylindrical or spherical features are often the result of revolving a profile around an axis. Identify the axis of rotation and make a note of it. *There are no rotational structures in the example bracket.* @@ -40,17 +40,17 @@ Identify the axis of rotation and make a note of it. Step 3. Select a Convenient Origin ********************************** -Choose an origin point that minimizes the need to move or transform components later in the -design process. Ideally, the origin should be placed at a natural center of symmetry or a +Choose an origin point that minimizes the need to move or transform components later in the +design process. Ideally, the origin should be placed at a natural center of symmetry or a critical reference point on the part. -*The planes of symmetry for the bracket was identified in step 1, making it logical to -place the origin at the intersection of these planes on the bracket's front face. Additionally, -we'll define the coordinate system we'll be working in: Plane.XY (the default), where -the origin is set at the global (0,0,0) position. In this system, the x-axis aligns with -the front of the bracket, and the z-axis corresponds to its width. It’s important to note +*The planes of symmetry for the bracket was identified in step 1, making it logical to +place the origin at the intersection of these planes on the bracket's front face. Additionally, +we'll define the coordinate system we'll be working in: Plane.XY (the default), where +the origin is set at the global (0,0,0) position. In this system, the x-axis aligns with +the front of the bracket, and the z-axis corresponds to its width. It’s important to note that all coordinate systems/planes in build123d adhere to the* -`right-hand rule `_ *meaning the y-axis is +`right-hand rule `_ *meaning the y-axis is automatically determined by this convention.* .. image:: assets/bracket_with_origin.png @@ -58,18 +58,18 @@ automatically determined by this convention.* Step 4. Create 2D Profiles ************************** -Design the 2D profiles of your part in the appropriate orientation(s). These profiles are -the foundation of the part's geometry and can often represent cross-sections of the part. +Design the 2D profiles of your part in the appropriate orientation(s). These profiles are +the foundation of the part's geometry and can often represent cross-sections of the part. Mirror parts of profiles across any axes of symmetry identified earlier. *The 2D profile of the bracket is as follows:* .. image:: assets/bracket_sketch.png :align: center - + *The build123d code to generate this profile is as follows:* -.. code-block:: python +.. code-block:: build123d with BuildSketch() as sketch: with BuildLine() as profile: @@ -109,7 +109,7 @@ Use the resulting geometry as sub-parts if needed. *The next step in implementing our design in build123d is to convert the above sketch into a part by extruding it as shown in this code:* -.. code-block:: python +.. code-block:: build123d with BuildPart() as bracket: with BuildSketch() as sketch: @@ -156,7 +156,7 @@ ensure the correct edges have been modified. define these corners need to be isolated. The following code, placed to follow the previous code block, captures just these edges:* -.. code-block:: python +.. code-block:: build123d corners = bracket.edges().filter_by(Axis.X).group_by(Axis.Y)[-1] fillet(corners, fillet_radius) @@ -191,7 +191,7 @@ and functionality in the final assembly. *Our example has two circular holes and a slot that need to be created. First we'll create the two circular holes:* -.. code-block:: python +.. code-block:: build123d with Locations(bracket.faces().sort_by(Axis.X)[-1]): Hole(hole_diameter / 2) @@ -219,7 +219,7 @@ the two circular holes:* *Next the slot needs to be created in the bracket with will be done by sketching a slot on the front of the bracket and extruding the sketch through the part.* -.. code-block:: python +.. code-block:: build123d with BuildSketch(bracket.faces().sort_by(Axis.Y)[0]): SlotOverall(20 * MM, hole_diameter) @@ -262,7 +262,7 @@ or if variations of the part are needed. *The dimensions of the bracket are defined as follows:* -.. code-block:: python +.. code-block:: build123d thickness = 3 * MM width = 25 * MM @@ -285,7 +285,7 @@ These steps should guide you through a logical and efficient workflow in build12 *The entire code block for the bracket example is shown here:* -.. code-block:: python +.. code-block:: build123d from build123d import * from ocp_vscode import show_all diff --git a/docs/tutorial_joints.rst b/docs/tutorial_joints.rst index 47a4026..d7c7658 100644 --- a/docs/tutorial_joints.rst +++ b/docs/tutorial_joints.rst @@ -19,6 +19,7 @@ Before getting to the CAD operations, this selector script needs to import the b environment. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [import] :end-before: [Hinge Class] @@ -32,6 +33,7 @@ tutorial is the joints and not the CAD operations to create objects, this code i described in detail. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Hinge Class] :end-before: [Create the Joints] @@ -62,6 +64,7 @@ The first joint to add is a :class:`~topology.RigidJoint` that is used to fix th or lid. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Create the Joints] :end-before: [Hinge Axis] @@ -78,6 +81,7 @@ The second joint to add is either a :class:`~topology.RigidJoint` (on the inner (on the outer leaf) that describes the hinge axis. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Create the Joints] :end-before: [Fastener holes] :emphasize-lines: 10-24 @@ -96,6 +100,7 @@ The third set of joints to add are :class:`~topology.CylindricalJoint`'s that de screws used to attach the leaves move. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Fastener holes] :end-before: [End Fastener holes] @@ -115,6 +120,7 @@ Step 3d: Call Super To finish off, the base class for the Hinge class is initialized: .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [End Fastener holes] :end-before: [Hinge Class] @@ -125,6 +131,7 @@ Now that the Hinge class is complete it can be used to instantiate the two hinge required to attach the box and lid together. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Create instances of the two leaves of the hinge] :end-before: [Create the box with a RigidJoint to mount the hinge] @@ -139,6 +146,7 @@ the joint used to attach the outer hinge leaf. :align: center .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Create the box with a RigidJoint to mount the hinge] :end-before: [Demonstrate that objects with Joints can be moved and the joints follow] :emphasize-lines: 13-16 @@ -157,6 +165,7 @@ having to recreate or modify :class:`~topology.Joint`'s. Here is the box is move property. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Demonstrate that objects with Joints can be moved and the joints follow] :end-before: [The lid with a RigidJoint for the hinge] @@ -170,6 +179,7 @@ Much like the box, the lid is created in a :class:`~build_part.BuildPart` contex :align: center .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [The lid with a RigidJoint for the hinge] :end-before: [A screw to attach the hinge to the box] :emphasize-lines: 6-9 @@ -191,6 +201,7 @@ screw. :align: center .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [A screw to attach the hinge to the box] :end-before: [End of screw creation] @@ -210,6 +221,7 @@ Step 7a: Hinge to Box To start, the outer hinge leaf will be connected to the box, as follows: .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Connect Box to Outer Hinge] :end-before: [Connect Box to Outer Hinge] @@ -227,6 +239,7 @@ Next, the hinge inner leaf is connected to the hinge outer leaf which is attache box. .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Connect Hinge Leaves] :end-before: [Connect Hinge Leaves] @@ -243,6 +256,7 @@ Step 7c: Lid to Hinge Now the ``lid`` is connected to the ``hinge_inner``: .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Connect Hinge to Lid] :end-before: [Connect Hinge to Lid] @@ -260,6 +274,7 @@ Step 7d: Screw to Hinge The last step in this example is to place a screw in one of the hinges: .. literalinclude:: tutorial_joints.py + :language: build123d :start-after: [Connect Screw to Hole] :end-before: [Connect Screw to Hole] diff --git a/docs/tutorial_lego.rst b/docs/tutorial_lego.rst index 0ac2ab4..fdd02de 100644 --- a/docs/tutorial_lego.rst +++ b/docs/tutorial_lego.rst @@ -21,6 +21,7 @@ The dimensions of the Lego block follow. A key parameter is ``pip_count``, the l of the Lego blocks in pips. This parameter must be at least 2. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 30,31, 34-47 ******************** @@ -31,6 +32,7 @@ The Lego block will be created by the ``BuildPart`` builder as it's a discrete t dimensional part; therefore, we'll instantiate a ``BuildPart`` with the name ``lego``. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49 ********************** @@ -43,6 +45,7 @@ object. As this sketch will be part of the lego part, we'll create a sketch bui in the context of the part builder as follows: .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-51 :emphasize-lines: 3 @@ -59,6 +62,7 @@ of the Lego block. The following step is going to refer to this rectangle, so it be assigned the identifier ``perimeter``. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53 :emphasize-lines: 5 @@ -76,6 +80,7 @@ hollowed out. This will be done with the ``Offset`` operation which is going to create a new object from ``perimeter``. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53,58-64 :emphasize-lines: 7-12 @@ -104,6 +109,7 @@ objects are in the scope of a location context (``GridLocations`` in this case) that defined multiple points, multiple rectangles are created. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53,58-64,69-73 :emphasize-lines: 13-17 @@ -125,6 +131,7 @@ To convert the internal grid to ridges, the center needs to be removed. This wil with another ``Rectangle``. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53,58-64,69-73,78-83 :emphasize-lines: 18-23 @@ -142,6 +149,7 @@ Lego blocks use a set of internal hollow cylinders that the pips push against to hold two blocks together. These will be created with ``Circle``. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53,58-64,69-73,78-83,88-93 :emphasize-lines: 24-29 @@ -162,6 +170,7 @@ Now that the sketch is complete it needs to be extruded into the three dimension wall object. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53,58-64,69-73,78-83,88-93,98-99 :emphasize-lines: 30-31 @@ -183,6 +192,7 @@ Now that the walls are complete, the top of the block needs to be added. Althoug could be done with another sketch, we'll add a box to the top of the walls. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53,58-64,69-73,78-83,88-93,98-99,110-118 :emphasize-lines: 32-40 @@ -211,6 +221,7 @@ The final step is to add the pips to the top of the Lego block. To do this we'll a new workplane on top of the block where we can position the pips. .. literalinclude:: ../examples/lego.py + :language: build123d :lines: 49-53,58-64,69-73,78-83,88-93,98-99,110-118,129-137 :emphasize-lines: 41-49 diff --git a/docs/tutorial_selectors.rst b/docs/tutorial_selectors.rst index ed974f1..f0ee8db 100644 --- a/docs/tutorial_selectors.rst +++ b/docs/tutorial_selectors.rst @@ -11,7 +11,7 @@ this part: .. note:: One can see any object in the following tutorial by using the ``ocp_vscode`` (or any other supported viewer) by using the ``show(object_to_be_viewed)`` command. - Alternatively, the ``show_all()`` command will display all objects that have been + Alternatively, the ``show_all()`` command will display all objects that have been assigned an identifier. ************* @@ -22,6 +22,7 @@ Before getting to the CAD operations, this selector script needs to import the b environment. .. literalinclude:: selector_example.py + :language: build123d :start-after: [Code] :end-before: [End] :lines: 1-2 @@ -34,6 +35,7 @@ To start off, the part will be based on a cylinder so we'll use the :class:`~obj of :class:`~build_part.BuildPart`: .. literalinclude:: selector_example.py + :language: build123d :start-after: [Code] :end-before: [End] :lines: 1-5 @@ -50,6 +52,7 @@ surfaces) , so we'll create a sketch centered on the top of the cylinder. To lo this sketch we'll use the cylinder's top Face as shown here: .. literalinclude:: selector_example.py + :language: build123d :start-after: [Code] :end-before: [End] :lines: 1-6 @@ -82,6 +85,7 @@ The object has a hexagonal hole in the top with a central cylinder which we'll d in the sketch. .. literalinclude:: selector_example.py + :language: build123d :start-after: [Code] :end-before: [End] :lines: 1-8 @@ -107,6 +111,7 @@ To create the hole we'll :func:`~operations_part.extrude` the sketch we just cre the :class:`~objects_part.Cylinder` and subtract it. .. literalinclude:: selector_example.py + :language: build123d :start-after: [Code] :end-before: [End] :lines: 1-9 @@ -128,6 +133,7 @@ Step 6: Fillet the top perimeter Edge The final step is to apply a fillet to the top perimeter. .. literalinclude:: selector_example.py + :language: build123d :start-after: [Code] :end-before: [End] :lines: 1-9,18-24,33-34 diff --git a/docs/tutorial_surface_modeling.rst b/docs/tutorial_surface_modeling.rst index 08ed253..79aeada 100644 --- a/docs/tutorial_surface_modeling.rst +++ b/docs/tutorial_surface_modeling.rst @@ -31,7 +31,7 @@ the perimeter of the surface and a central point on that surface. To create the perimeter, we'll use a ``BuildLine`` instance as follows. Since the heart is symmetric, we'll only create half of its surface here: -.. code-block:: python +.. code-block:: build123d with BuildLine() as heart_half: l1 = JernArc((0, 0), (1, 1.4), 40, -17) @@ -48,13 +48,13 @@ of the heart and archs up off ``Plane.XY``. In preparation for creating the surface, we'll define a point on the surface: -.. code-block:: python +.. code-block:: build123d surface_pnt = l2.edge().arc_center + Vector(0, 0, 1.5) We will then use this point to create a non-planar ``Face``: -.. code-block:: python +.. code-block:: build123d top_right_surface = -Face.make_surface(heart_half.wire(), [surface_pnt]).locate( Pos(Z=0.5) @@ -71,7 +71,7 @@ is up, which isn't necessary but helps with viewing. Now that one half of the top of the heart has been created, the remainder of the top and bottom can be created by mirroring: -.. code-block:: python +.. code-block:: build123d top_left_surface = top_right_surface.mirror(Plane.YZ) bottom_right_surface = top_right_surface.mirror(Plane.XY) @@ -80,7 +80,7 @@ and bottom can be created by mirroring: The sides of the heart are going to be created by extruding the outside of the perimeter as follows: -.. code-block:: python +.. code-block:: build123d left_wire = Wire([l3.edge(), l2.edge(), l1.edge()]) left_side = Face.extrude(left_wire, (0, 0, 1)).locate(Pos(Z=-0.5)) @@ -94,7 +94,7 @@ With the top, bottom, and sides, the complete boundary of the object is defined. now put them together, first into a :class:`~topology.Shell` and then into a :class:`~topology.Solid`: -.. code-block:: python +.. code-block:: build123d heart = Solid( Shell( @@ -122,7 +122,7 @@ now put them together, first into a :class:`~topology.Shell` and then into a Finally, we'll create the frame around the heart as a simple extrusion of a planar shape defined by the perimeter of the heart and merge all of the components together: - .. code-block:: python + .. code-block:: build123d with BuildPart() as heart_token: with BuildSketch() as outline: From 3b11f40d9debc629b692f3e99b24b62ecd21db9a Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 11 Sep 2025 10:09:56 -0400 Subject: [PATCH 409/518] Moved edge/point ordering to make_constrained_arcs --- src/build123d/topology/constrained_lines.py | 50 ++++++++------------- src/build123d/topology/one_d.py | 42 ++++++++++------- 2 files changed, 43 insertions(+), 49 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index cb25f72..39cc35f 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -264,11 +264,11 @@ def _make_2tan_rad_arcs( if isinstance(object_1, tuple): object_one, object_one_constraint = object_1 else: - object_one, object_one_constraint = object_1, None + object_one, object_one_constraint = object_1, PositionConstraint.UNQUALIFIED if isinstance(object_2, tuple): object_two, object_two_constraint = object_2 else: - object_two, object_two_constraint = object_2, None + object_two, object_two_constraint = object_2, PositionConstraint.UNQUALIFIED # --------------------------- # Build inputs and GCC @@ -280,10 +280,6 @@ def _make_2tan_rad_arcs( object_two, object_two_constraint ) - # Put the Edge arg first when exactly one is an Edge (improves robustness) - if is_edge1 ^ is_edge2: - q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) - gcc = Geom2dGcc_Circ2d2TanRad(q_o1, q_o2, radius, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a tangent arc") @@ -349,25 +345,18 @@ def _make_2tan_on_arcs( Notes ----- - - `center_on` is treated as a **center locus** (not a tangency target). For a line - locus this uses Geom2dGcc_Circ2d2TanOn; for other 2D curves it uses the *Geo variant*. - - A point is NOT a valid center locus for the 2TanOn solver; use the TanCen variant - (fixed center) for that case. + - `center_on` is treated as a **center locus** (not a tangency target). """ - # Unpack optional qualifiers on the two tangency args - object_one_constraint = PositionConstraint.UNQUALIFIED - object_two_constraint = PositionConstraint.UNQUALIFIED - if isinstance(object_1, tuple): object_one, object_one_constraint = object_1 else: - object_one = object_1 + object_one, object_one_constraint = object_1, PositionConstraint.UNQUALIFIED if isinstance(object_2, tuple): object_two, object_two_constraint = object_2 else: - object_two = object_2 + object_two, object_two_constraint = object_2, PositionConstraint.UNQUALIFIED # --------------------------- # Build tangency inputs @@ -379,17 +368,6 @@ def _make_2tan_on_arcs( object_two, object_two_constraint ) - # Prefer "edge-first" ordering when exactly one arg is an Edge - if is_edge1 ^ is_edge2: - q_o1, q_o2 = (q_o1, q_o2) if is_edge1 else (q_o2, q_o1) - h_e1, h_e2 = (h_e1, h_e2) if is_edge1 else (h_e2, h_e1) - e1_first, e1_last, e2_first, e2_last = ( - (e1_first, e1_last, e2_first, e2_last) - if is_edge1 - else (e2_first, e2_last, e1_first, e1_last) - ) - is_edge1, is_edge2 = (True, False) if is_edge1 else (False, True) - # --------------------------- # Build center locus ("On") input # --------------------------- @@ -404,7 +382,10 @@ def _make_2tan_on_arcs( guesses.append((e2_last - e2_first) / 2 + e2_first) guesses.append((on_last - on_first) / 2 + on_first) - gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, adapt_on, TOLERANCE, *guesses) + if is_edge1 or is_edge2: + gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, adapt_on, TOLERANCE, *guesses) + else: + gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, adapt_on, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a tangent arc with center_on constraint") @@ -510,10 +491,15 @@ def _make_3tan_arcs( q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg(object_two, obj2_qual) q_o3, h_e3, e3_first, e3_last, is_edge3 = _as_gcc_arg(object_three, obj3_qual) - guesses = [ - (l - f) / 2 + f - for f, l in [(e1_first, e1_last), (e2_first, e2_last), (e3_first, e3_last)] - ] + # Provide initial guess parameters for all of the lines + guesses = [] + if is_edge1: + guesses.append((e1_last - e1_first) / 2 + e1_first) + if is_edge2: + guesses.append((e2_last - e2_first) / 2 + e2_first) + if is_edge3: + guesses.append((e3_last - e3_first) / 2 + e3_first) + # For 3Tan we keep the user-given order so the arc endpoints remain (arg1,arg2) gcc = Geom2dGcc_Circ2d3Tan(q_o1, q_o2, q_o3, TOLERANCE, *guesses) if not gcc.IsDone() or gcc.NbSolutions() == 0: diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index bf076ef..ac47101 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1588,8 +1588,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - tangency_two: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_two: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, *, radius: float, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, @@ -1598,8 +1598,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Create all planar circular arcs of a given radius that are tangent/contacting the two provided objects on the XY plane. Args: - tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): - tangency_two (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) radius (float): arc radius sagitta_constraint (LengthConstraint, optional): returned arc selector @@ -1614,8 +1614,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - tangency_two: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_two: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, *, center_on: Edge, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, @@ -1625,8 +1625,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): CENTER lies on a given locus (line/circle/curve) on the XY plane. Args: - tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): - tangency_two (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) center_on (Edge): center must lie on this edge sagitta_constraint (LengthConstraint, optional): returned arc selector @@ -1641,9 +1641,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - tangency_two: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - tangency_three: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_two: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_three: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, *, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, ) -> ShapeList[Edge]: @@ -1651,9 +1651,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Create planar circular arc(s) on XY tangent to three provided objects. Args: - tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): - tangency_two (tuple[Edge, PositionConstraint] | Vertex | VectorLike): - tangency_three (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_three (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) sagitta_constraint (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to @@ -1667,7 +1667,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, *, center: VectorLike, ) -> ShapeList[Edge]: @@ -1677,7 +1677,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): a single object. Args: - tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): Geometric entity to be contacted/touched by the circle(s) center (VectorLike): center position @@ -1689,7 +1689,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, *, radius: float, center_on: Edge, @@ -1742,6 +1742,14 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangencies = [ t for t in (tangency_one, tangency_two, tangency_three) if t is not None ] + + # Sort the tangency inputs so points are always last + tangent_tuples = [t if isinstance(t, tuple) else (t, None) for t in tangencies] + tangent_tuples = sorted( + tangent_tuples, key=lambda t: not issubclass(type(t[0]), Edge) + ) + tangencies = [t[0] if t[1] is None else t for t in tangent_tuples] + tan_count = len(tangencies) if not (1 <= tan_count <= 3): raise TypeError("Provide 1 to 3 tangency targets.") From 1bcbde29bce8a8463975bd9a2f385feaa3806369 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 11 Sep 2025 11:38:50 -0400 Subject: [PATCH 410/518] Add intersection test framework with tests from issues --- tests/test_direct_api/test_intersection.py | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 tests/test_direct_api/test_intersection.py diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py new file mode 100644 index 0000000..d39c4df --- /dev/null +++ b/tests/test_direct_api/test_intersection.py @@ -0,0 +1,114 @@ +import pytest +from collections import Counter +from dataclasses import dataclass +from build123d import * +from build123d.topology.shape_core import Shape + +INTERSECT_DEBUG = False +if INTERSECT_DEBUG: + from ocp_vscode import show + + +@dataclass +class Case: + object: Shape | Vector | Location | Axis | Plane + target: Shape | Vector | Location | Axis | Plane + expected: list | Vector | Location | Axis | Plane + name: str + xfail: None | str = None + + +@pytest.mark.skip +def run_test(obj, target, expected): + if isinstance(target, list): + result = obj.intersect(*target) + else: + result = obj.intersect(target) + if INTERSECT_DEBUG: + show([obj, target, result]) + if expected is None: + assert result == expected, f"Expected None, but got {result}" + else: + e_type = ShapeList if isinstance(expected, list) else expected + assert isinstance(result, e_type), f"Expected {e_type}, but got {result}" + if e_type == ShapeList: + assert len(result) >= len(expected), f"Expected {len(expected)} objects, but got {len(result)}" + + actual_counts = Counter(type(obj) for obj in result) + expected_counts = Counter(expected) + assert all(actual_counts[t] >= count for t, count in expected_counts.items()), f"Expected {expected}, but got {[type(r) for r in result]}" + + +@pytest.mark.skip +def make_params(matrix): + params = [] + for case in matrix: + obj_type = type(case.object).__name__ + tar_type = type(case.target).__name__ + i = len(params) + if case.xfail and not INTERSECT_DEBUG: + marks = [pytest.mark.xfail(reason=case.xfail)] + else: + marks = [] + uid = f"{i} {obj_type}, {tar_type}, {case.name}" + params.append(pytest.param(case.object, case.target, case.expected, marks=marks, id=uid)) + if tar_type != obj_type and not isinstance(case.target, list): + uid = f"{i + 1} {tar_type}, {obj_type}, {case.name}" + params.append(pytest.param(case.target, case.object, case.expected, marks=marks, id=uid)) + + return params + + +# FreeCAD issue example +c1 = CenterArc((0, 0), 10, 0, 360).edge() +c2 = CenterArc((19, 0), 10, 0, 360).edge() +skew = Line((-12, 0), (30, 10)).edge() +vert = Line((10, 0), (10, 20)).edge() +horz = Line((0, 10), (30, 10)).edge() +e1 = EllipticalCenterArc((5, 0), 5, 10, 0, 360).edge() + +freecad_matrix = [ + Case(c1, skew, [Vertex, Vertex], "circle, skew, intersect", None), + Case(c2, skew, [Vertex, Vertex], "circle, skew, intersect", None), + Case(c1, e1, [Vertex, Vertex, Vertex], "circle, ellipse, intersect + tangent", None), + Case(c2, e1, [Vertex, Vertex], "circle, ellipse, intersect", None), + Case(skew, e1, [Vertex, Vertex], "skew, ellipse, intersect", None), + Case(skew, horz, [Vertex], "skew, horizontal, coincident", None), + Case(skew, vert, [Vertex], "skew, vertical, intersect", None), + Case(horz, vert, [Vertex], "horizontal, vertical, intersect", None), + Case(vert, e1, [Vertex], "vertical, ellipse, tangent", None), + Case(horz, e1, [Vertex], "horizontal, ellipse, tangent", None), + + Case(c1, c2, [Vertex, Vertex], "circle, skew, intersect", "Should return 2 Vertices"), + Case(c1, horz, [Vertex], "circle, horiz, tangent", None), + Case(c2, horz, [Vertex], "circle, horiz, tangent", None), + Case(c1, vert, [Vertex], "circle, vert, tangent", None), + Case(c2, vert, [Vertex], "circle, vert, intersect", None), +] + +@pytest.mark.parametrize("obj, target, expected", make_params(freecad_matrix)) +def test_freecad(obj, target, expected): + run_test(obj, target, expected) + + +# Issue tests +t = Sketch() + GridLocations(5, 0, 2, 1) * Circle(2) +s = Circle(10).face() +l = Line(-20, 20).edge() +a = Rectangle(10,10).face() +b = (Plane.XZ * a).face() +e1 = Edge.make_line((-1, 0), (1, 0)) +w1 = Wire.make_circle(0.5) +f1 = Face(Wire.make_circle(0.5)) + +issues_matrix = [ + Case(t, t, [Face, Face], "issue #1015", "Returns Compound"), + Case(l, s, [Edge], "issue #945", "Edge.intersect only takes 1D"), + Case(a, b, [Edge], "issue #918", "Returns empty Compound"), + Case(e1, w1, [Vertex, Vertex], "issue #697", "Returns None"), + Case(e1, f1, [Edge], "issue #697", "Edge.intersect only takes 1D"), +] + +@pytest.mark.parametrize("obj, target, expected", make_params(issues_matrix)) +def test_issues(obj, target, expected): + run_test(obj, target, expected) \ No newline at end of file From a291a942a17e56c8f0c7f0e7f8d0f87137a6e72b Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 11 Sep 2025 12:30:32 -0400 Subject: [PATCH 411/518] Mark test_freecad xfail due to type missmatches --- tests/test_direct_api/test_intersection.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index d39c4df..135e0a3 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -86,6 +86,7 @@ freecad_matrix = [ Case(c2, vert, [Vertex], "circle, vert, intersect", None), ] +@pytest.mark.xfail @pytest.mark.parametrize("obj, target, expected", make_params(freecad_matrix)) def test_freecad(obj, target, expected): run_test(obj, target, expected) From da1294a390aac28b8741dbd37165a9e8a3979d32 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 11 Sep 2025 12:32:23 -0400 Subject: [PATCH 412/518] Add geometry intersection tests. Tighten intersection with Vector from Location and coplanar Planes. --- src/build123d/geometry.py | 47 +++++++++------- tests/test_direct_api/test_intersection.py | 63 ++++++++++++++++++++++ 2 files changed, 91 insertions(+), 19 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index fa54fe7..69fae4f 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -909,15 +909,15 @@ class Axis(metaclass=AxisMeta): """Find intersection of vector and axis""" @overload - def intersect(self, location: Location) -> Location | None: + def intersect(self, location: Location) -> Vector | Location | None: """Find intersection of location and axis""" @overload - def intersect(self, axis: Axis) -> Axis | None: + def intersect(self, axis: Axis) -> Vector | Axis | None: """Find intersection of axis and axis""" @overload - def intersect(self, plane: Plane) -> Axis | None: + def intersect(self, plane: Plane) -> Vector | Axis | None: """Find intersection of plane and axis""" def intersect(self, *args, **kwargs): @@ -965,12 +965,12 @@ class Axis(metaclass=AxisMeta): # Find the "direction" of the location location_dir = Plane(location).z_dir - # Is the location on the axis with the same direction? - if ( - self.intersect(location.position) is not None - and location_dir == self.direction - ): - return location + if self.intersect(location.position) is not None: + # Is the location on the axis with the same direction? + if location_dir == self.direction: + return location + else: + return location.position if shape is not None: return shape.intersect(self) @@ -1932,15 +1932,15 @@ class Location: """Find intersection of vector and location""" @overload - def intersect(self, location: Location) -> Location | None: + def intersect(self, location: Location) -> Vector | Location | None: """Find intersection of location and location""" @overload - def intersect(self, axis: Axis) -> Location | None: + def intersect(self, axis: Axis) -> Vector | Location | None: """Find intersection of axis and location""" @overload - def intersect(self, plane: Plane) -> Location | None: + def intersect(self, plane: Plane) -> Vector | Location | None: """Find intersection of plane and location""" def intersect(self, *args, **kwargs): @@ -1956,8 +1956,11 @@ class Location: if vector is not None and self.position == vector: return vector - if location is not None and self == location: - return self + if location is not None: + if self == location: + return self + elif self.position == location.position: + return self.position if shape is not None: return shape.intersect(self) @@ -3131,15 +3134,15 @@ class Plane(metaclass=PlaneMeta): """Find intersection of vector and plane""" @overload - def intersect(self, location: Location) -> Location | None: + def intersect(self, location: Location) -> Vector | Location | None: """Find intersection of location and plane""" @overload - def intersect(self, axis: Axis) -> Axis | Vector | None: + def intersect(self, axis: Axis) -> Vector | Axis | None: """Find intersection of axis and plane""" @overload - def intersect(self, plane: Plane) -> Axis | None: + def intersect(self, plane: Plane) -> Axis | Plane | None: """Find intersection of plane and plane""" @overload @@ -3172,6 +3175,9 @@ class Plane(metaclass=PlaneMeta): return intersection_point if plane is not None: + if self.contains(plane.origin) and self.z_dir == plane.z_dir: + return self + surface1 = Geom_Plane(self.wrapped) surface2 = Geom_Plane(plane.wrapped) intersector = GeomAPI_IntSS(surface1, surface2, TOLERANCE) @@ -3187,8 +3193,11 @@ class Plane(metaclass=PlaneMeta): if location is not None: pln = Plane(location) - if pln.origin == self.origin and pln.z_dir == self.z_dir: - return location + if self.contains(pln.origin): + if self.z_dir == pln.z_dir: + return location + else: + return pln.origin if shape is not None: return shape.intersect(self) diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index 135e0a3..b885cd0 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -59,6 +59,69 @@ def make_params(matrix): return params +# Geometric test objects +ax1 = Axis.X +ax2 = Axis.Y +ax3 = Axis((0, 0, 5), (1, 0, 0)) +pl1 = Plane.YZ +pl2 = Plane.XY +pl3 = Plane.XY.offset(5) +pl4 = Plane((0, 5, 0)) +vl1 = Vector(2, 0, 0) +vl2 = Vector(2, 0, 5) +lc1 = Location((2, 0, 0)) +lc2 = Location((2, 0, 5)) +lc3 = Location((0, 0, 0), (0, 90, 90)) +lc4 = Location((2, 0, 0), (0, 90, 90)) + +# Geometric test matrix +geometry_matrix = [ + Case(ax1, ax3, None, "parallel/skew", None), + Case(ax1, ax1, Axis, "collinear", None), + Case(ax1, ax2, Vector, "intersecting", None), + + Case(ax1, pl3, None, "parallel", None), + Case(ax1, pl2, Axis, "coplanar", None), + Case(ax1, pl1, Vector, "intersecting", None), + + Case(ax1, vl2, None, "non-coincident", None), + Case(ax1, vl1, Vector, "coincident", None), + + Case(ax1, lc2, None, "non-coincident", None), + Case(ax1, lc4, Location, "intersecting, co-z", None), + Case(ax1, lc1, Vector, "intersecting", None), + + Case(pl2, pl3, None, "parallel", None), + Case(pl2, pl4, Plane, "coplanar", None), + Case(pl1, pl2, Axis, "intersecting", None), + + Case(pl3, ax1, None, "parallel", None), + Case(pl2, ax1, Axis, "coplanar", None), + Case(pl1, ax1, Vector, "intersecting", None), + + Case(pl1, vl2, None, "non-coincident", None), + Case(pl2, vl1, Vector, "coincident", None), + + Case(pl1, lc2, None, "non-coincident", None), + Case(pl1, lc3, Location, "intersecting, co-z", None), + Case(pl2, lc4, Vector, "coincident", None), + + Case(vl1, vl2, None, "non-coincident", None), + Case(vl1, vl1, Vector, "coincident", None), + + Case(vl1, lc2, None, "non-coincident", None), + Case(vl1, lc1, Vector, "coincident", None), + + Case(lc1, lc2, None, "non-coincident", None), + Case(lc1, lc4, Vector, "coincident", None), + Case(lc1, lc1, Location, "coincident, co-z", None), +] + +@pytest.mark.parametrize("obj, target, expected", make_params(geometry_matrix)) +def test_geometry(obj, target, expected): + run_test(obj, target, expected) + + # FreeCAD issue example c1 = CenterArc((0, 0), 10, 0, 360).edge() c2 = CenterArc((19, 0), 10, 0, 360).edge() From d313ebda60613cebb04627881cfb373538b7807c Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 11 Sep 2025 12:52:43 -0400 Subject: [PATCH 413/518] Add Vertex.intersect Vertex is always treated as Vector with point-like objects --- src/build123d/topology/zero_d.py | 39 +++++++++++++++++++++- tests/test_direct_api/test_intersection.py | 29 ++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index bd19653..7d52245 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -66,7 +66,7 @@ from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeVertex from OCP.TopExp import TopExp_Explorer from OCP.TopoDS import TopoDS, TopoDS_Shape, TopoDS_Vertex, TopoDS_Edge from OCP.gp import gp_Pnt -from build123d.geometry import Matrix, Vector, VectorLike +from build123d.geometry import Matrix, Vector, VectorLike, Location, Axis, Plane from typing_extensions import Self from .shape_core import Shape, ShapeList, downcast, shapetype @@ -168,6 +168,43 @@ class Vertex(Shape[TopoDS_Vertex]): """extrude - invalid operation for Vertex""" raise NotImplementedError("Vertices can't be created by extrusion") + def intersect( + self, *to_intersect: Shape | Vector | Location | Axis | Plane + ) -> None | ShapeList[Vertex]: + """Intersection of the arguments and this shape + + Args: + to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to + intersect with + + Returns: + ShapeList[Shape]: Resulting object may be of a ShapeList of multiple + non-Compound object created + """ + points_sets: list[set] = [] + for obj in to_intersect: + # Treat as Vector, otherwise call intersection from Shape + match obj: + case Vertex(): + result = Vector(self).intersect(Vector(obj)) + case Vector() | Location() | Axis() | Plane(): + result = obj.intersect(Vector(self)) + case _ if issubclass(type(obj), Shape): + result = obj.intersect(self) + case _: + raise ValueError(f"Unknown object type: {type(obj)}") + + if isinstance(result, Vector): + points_sets.append(set([result])) + else: + points_sets.append(set()) + + common_points = set.intersection(*points_sets) + if common_points: + return ShapeList([Vertex(p) for p in common_points]) + else: + return None + # ---- Instance Methods ---- def __add__( # type: ignore diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index b885cd0..e3f9495 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -122,6 +122,35 @@ def test_geometry(obj, target, expected): run_test(obj, target, expected) +# Shape test matrices +vt1 = Vertex(2, 0, 0) +vt2 = Vertex(2, 0, 5) + +shape_0d_matrix = [ + Case(vt1, vt2, None, "non-coincident", None), + Case(vt1, vt1, [Vertex], "coincident", None), + + Case(vt1, vl2, None, "non-coincident", None), + Case(vt1, vl1, [Vertex], "coincident", None), + + Case(vt1, lc2, None, "non-coincident", None), + Case(vt1, lc1, [Vertex], "coincident", None), + + Case(vt2, ax1, None, "non-coincident", None), + Case(vt1, ax1, [Vertex], "coincident", None), + + Case(vt2, pl1, None, "non-coincident", None), + Case(vt1, pl2, [Vertex], "coincident", None), + + Case(vt1, [vt2, lc1], None, "multi to_intersect, non-coincident", None), + Case(vt1, [vt1, lc1], [Vertex], "multi to_intersect, coincident", None), +] + +@pytest.mark.parametrize("obj, target, expected", make_params(shape_0d_matrix)) +def test_shape_0d(obj, target, expected): + run_test(obj, target, expected) + + # FreeCAD issue example c1 = CenterArc((0, 0), 10, 0, 360).edge() c2 = CenterArc((19, 0), 10, 0, 360).edge() From 9e679046b15cc12e0c69f107d7120f6c48def18e Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 12 Sep 2025 10:40:54 -0400 Subject: [PATCH 414/518] Cleaning up code --- src/build123d/topology/constrained_lines.py | 220 ++++++++------------ src/build123d/topology/one_d.py | 17 +- 2 files changed, 96 insertions(+), 141 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 39cc35f..020133f 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -229,11 +229,9 @@ def _qstr(q) -> str: def _make_2tan_rad_arcs( - object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *tangencies: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, # 2 radius: float, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, - *, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> list[Edge]: """ @@ -243,10 +241,8 @@ def _make_2tan_rad_arcs( Inputs must be coplanar with ``Plane.XY``. Non-coplanar edges are not supported. Args: - object_one (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched - by the circle(s) - object_two (Edge | Vertex | VectorLike): Geometric entity to be contacted/touched - by the circle(s) + tangencies (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike: + Geometric entity to be contacted/touched by the circle(s) radius (float): Circle radius for all candidate solutions. Raises: @@ -261,34 +257,28 @@ def _make_2tan_rad_arcs( """ - if isinstance(object_1, tuple): - object_one, object_one_constraint = object_1 - else: - object_one, object_one_constraint = object_1, PositionConstraint.UNQUALIFIED - if isinstance(object_2, tuple): - object_two, object_two_constraint = object_2 - else: - object_two, object_two_constraint = object_2, PositionConstraint.UNQUALIFIED + # Unpack optional per-edge qualifiers (default UNQUALIFIED) + tangent_tuples = [ + t if isinstance(t, tuple) else (t, PositionConstraint.UNQUALIFIED) + for t in tangencies + ] - # --------------------------- - # Build inputs and GCC - # --------------------------- - q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( - object_one, object_one_constraint - ) - q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( - object_two, object_two_constraint - ) + # Build inputs for GCC + q_o, h_e, e_first, e_last, is_edge = [[None] * 2 for _ in range(5)] + for i in range(len(tangent_tuples)): + q_o[i], h_e[i], e_first[i], e_last[i], is_edge[i] = _as_gcc_arg( + *tangent_tuples[i] + ) - gcc = Geom2dGcc_Circ2d2TanRad(q_o1, q_o2, radius, TOLERANCE) + gcc = Geom2dGcc_Circ2d2TanRad(*q_o, radius, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a tangent arc") - def _valid_on_arg1(u: float) -> bool: - return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) - - def _valid_on_arg2(u: float) -> bool: - return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) + def _ok(i: int, u: float) -> bool: + """Does the given parameter value lie within the edge range?""" + return ( + True if not is_edge[i] else _param_in_trim(u, e_first[i], e_last[i], h_e[i]) + ) # --------------------------- # Solutions @@ -300,13 +290,13 @@ def _make_2tan_rad_arcs( # Tangency on curve 1 p1 = gp_Pnt2d() u_circ1, u_arg1 = gcc.Tangency1(i, p1) - if not _valid_on_arg1(u_arg1): + if not _ok(0, u_arg1): continue # Tangency on curve 2 p2 = gp_Pnt2d() u_circ2, u_arg2 = gcc.Tangency2(i, p2) - if not _valid_on_arg2(u_arg2): + if not _ok(1, u_arg2): continue # qual1 = GccEnt_Position(int()) @@ -332,11 +322,9 @@ def _make_2tan_rad_arcs( def _make_2tan_on_arcs( - object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *tangencies: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, # 2 center_on: Edge, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, - *, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: """ @@ -348,53 +336,41 @@ def _make_2tan_on_arcs( - `center_on` is treated as a **center locus** (not a tangency target). """ - if isinstance(object_1, tuple): - object_one, object_one_constraint = object_1 - else: - object_one, object_one_constraint = object_1, PositionConstraint.UNQUALIFIED + # Unpack optional per-edge qualifiers (default UNQUALIFIED) + tangent_tuples = [ + t if isinstance(t, tuple) else (t, PositionConstraint.UNQUALIFIED) + for t in tangencies + ] - if isinstance(object_2, tuple): - object_two, object_two_constraint = object_2 - else: - object_two, object_two_constraint = object_2, PositionConstraint.UNQUALIFIED + # Build inputs for GCC + q_o, h_e, e_first, e_last, is_edge = [[None] * 3 for _ in range(5)] + for i in range(len(tangent_tuples)): + q_o[i], h_e[i], e_first[i], e_last[i], is_edge[i] = _as_gcc_arg( + *tangent_tuples[i] + ) - # --------------------------- - # Build tangency inputs - # --------------------------- - q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg( - object_one, object_one_constraint - ) - q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg( - object_two, object_two_constraint - ) - - # --------------------------- # Build center locus ("On") input - # --------------------------- - _, h_on2d, on_first, on_last, adapt_on = _edge_to_qualified_2d( + _, h_on2d, e_first[2], e_last[2], adapt_on = _edge_to_qualified_2d( center_on.wrapped, PositionConstraint.UNQUALIFIED ) - # Provide initial guess parameters for all of the lines - guesses = [] - if is_edge1: - guesses.append((e1_last - e1_first) / 2 + e1_first) - if is_edge2: - guesses.append((e2_last - e2_first) / 2 + e2_first) - guesses.append((on_last - on_first) / 2 + on_first) + is_edge[2] = True - if is_edge1 or is_edge2: - gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, adapt_on, TOLERANCE, *guesses) + # Provide initial middle guess parameters for all of the edges + guesses = [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] + + if sum(is_edge) > 1: + gcc = Geom2dGcc_Circ2d2TanOn(*q_o[0:2], adapt_on, TOLERANCE, *guesses) else: - gcc = Geom2dGcc_Circ2d2TanOn(q_o1, q_o2, adapt_on, TOLERANCE) + gcc = Geom2dGcc_Circ2d2TanOn(*q_o[0:2], adapt_on, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a tangent arc with center_on constraint") - def _valid_on_arg1(u: float) -> bool: - return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) - - def _valid_on_arg2(u: float) -> bool: - return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) + def _ok(i: int, u: float) -> bool: + """Does the given parameter value lie within the edge range?""" + return ( + True if not is_edge[i] else _param_in_trim(u, e_first[i], e_last[i], h_e[i]) + ) # --------------------------- # Solutions @@ -406,13 +382,13 @@ def _make_2tan_on_arcs( # Tangency on curve 1 p1 = gp_Pnt2d() u_circ1, u_arg1 = gcc.Tangency1(i, p1) - if not _valid_on_arg1(u_arg1): + if not _ok(0, u_arg1): continue # Tangency on curve 2 p2 = gp_Pnt2d() u_circ2, u_arg2 = gcc.Tangency2(i, p2) - if not _valid_on_arg2(u_arg2): + if not _ok(1, u_arg2): continue # Center must lie on the trimmed center_on curve segment @@ -429,7 +405,7 @@ def _make_2tan_on_arcs( continue # Respect the trimmed interval (handles periodic curves too) - if not _param_in_trim(u_on, on_first, on_last, h_on2d): + if not _param_in_trim(u_on, e_first[2], e_last[2], h_on2d): continue # Build sagitta arc(s) and select by LengthConstraint @@ -448,71 +424,46 @@ def _make_2tan_on_arcs( def _make_3tan_arcs( - object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - object_2: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - object_3: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + *tangencies: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, # 3 sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, - *, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: """ Create planar circular arc(s) on XY tangent to three provided objects. The circle is determined by the three tangency constraints; the returned arc(s) - are trimmed between the two tangency points corresponding to `object_1` and - `object_2`. Use `sagitta_constraint` to select the shorter/longer (or both) arc. + are trimmed between the two tangency points corresponding to `tangencies[0]` and + `tangencies[1]`. Use `sagitta_constraint` to select the shorter/longer (or both) arc. Inputs must be representable on Plane.XY. """ # Unpack optional per-edge qualifiers (default UNQUALIFIED) - obj1_qual = PositionConstraint.UNQUALIFIED - obj2_qual = PositionConstraint.UNQUALIFIED - obj3_qual = PositionConstraint.UNQUALIFIED + tangent_tuples = [ + t if isinstance(t, tuple) else (t, PositionConstraint.UNQUALIFIED) + for t in tangencies + ] - if isinstance(object_1, tuple): - object_one, obj1_qual = object_1 - else: - object_one = object_1 - - if isinstance(object_2, tuple): - object_two, obj2_qual = object_2 - else: - object_two = object_2 - - if isinstance(object_3, tuple): - object_three, obj3_qual = object_3 - else: - object_three = object_3 - - # --------------------------- # Build inputs for GCC - # --------------------------- - q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, obj1_qual) - q_o2, h_e2, e2_first, e2_last, is_edge2 = _as_gcc_arg(object_two, obj2_qual) - q_o3, h_e3, e3_first, e3_last, is_edge3 = _as_gcc_arg(object_three, obj3_qual) + q_o, h_e, e_first, e_last, is_edge = [[None] * 3 for _ in range(5)] + for i in range(len(tangent_tuples)): + q_o[i], h_e[i], e_first[i], e_last[i], is_edge[i] = _as_gcc_arg( + *tangent_tuples[i] + ) - # Provide initial guess parameters for all of the lines - guesses = [] - if is_edge1: - guesses.append((e1_last - e1_first) / 2 + e1_first) - if is_edge2: - guesses.append((e2_last - e2_first) / 2 + e2_first) - if is_edge3: - guesses.append((e3_last - e3_first) / 2 + e3_first) + # Provide initial middle guess parameters for all of the edges + guesses = [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] + + # Generate all valid circles tangent to the 3 inputs + gcc = Geom2dGcc_Circ2d3Tan(*q_o, TOLERANCE, *guesses) - # For 3Tan we keep the user-given order so the arc endpoints remain (arg1,arg2) - gcc = Geom2dGcc_Circ2d3Tan(q_o1, q_o2, q_o3, TOLERANCE, *guesses) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a circle tangent to all three objects") - def _ok1(u: float) -> bool: - return True if not is_edge1 else _param_in_trim(u, e1_first, e1_last, h_e1) - - def _ok2(u: float) -> bool: - return True if not is_edge2 else _param_in_trim(u, e2_first, e2_last, h_e2) - - def _ok3(u: float) -> bool: - return True if not is_edge3 else _param_in_trim(u, e3_first, e3_last, h_e3) + def _ok(i: int, u: float) -> bool: + """Does the given parameter value lie within the edge range?""" + return ( + True if not is_edge[i] else _param_in_trim(u, e_first[i], e_last[i], h_e[i]) + ) # --------------------------- # Enumerate solutions @@ -524,19 +475,19 @@ def _make_3tan_arcs( # Tangency on curve 1 (arc endpoint A) p1 = gp_Pnt2d() u_circ1, u_arg1 = gcc.Tangency1(i, p1) - if not _ok1(u_arg1): + if not _ok(0, u_arg1): continue # Tangency on curve 2 (arc endpoint B) p2 = gp_Pnt2d() u_circ2, u_arg2 = gcc.Tangency2(i, p2) - if not _ok2(u_arg2): + if not _ok(1, u_arg2): continue # Tangency on curve 3 (validates circle; does not define arc endpoints) p3 = gp_Pnt2d() _u_circ3, u_arg3 = gcc.Tangency3(i, p3) - if not _ok3(u_arg3): + if not _ok(2, u_arg3): continue # Build arc(s) between u_circ1 and u_circ2 per LengthConstraint @@ -556,9 +507,9 @@ def _make_3tan_arcs( def _make_tan_cen_arcs( - object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, - center: VectorLike | Vertex, + tangency: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, *, + center: VectorLike | Vertex, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: """ @@ -575,11 +526,10 @@ def _make_tan_cen_arcs( """ # Unpack optional qualifier on the tangency arg (edges only) - obj1_qual = PositionConstraint.UNQUALIFIED - if isinstance(object_1, tuple): - object_one, obj1_qual = object_1 + if isinstance(tangency, tuple): + object_one, obj1_qual = tangency else: - object_one, obj1_qual = object_1, None + object_one, obj1_qual = tangency, PositionConstraint.UNQUALIFIED # --------------------------- # Build fixed center (gp_Pnt2d) @@ -640,10 +590,10 @@ def _make_tan_cen_arcs( def _make_tan_on_rad_arcs( - object_1: tuple[Edge, PositionConstraint] | Vertex | VectorLike, + tangency: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + *, center_on: Edge, radius: float, - *, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: """ @@ -662,10 +612,10 @@ def _make_tan_on_rad_arcs( """ # --- unpack optional qualifier on the tangency arg (edges only) --- - if isinstance(object_1, tuple): - object_one, obj1_qual = object_1 + if isinstance(tangency, tuple): + object_one, obj1_qual = tangency else: - object_one, obj1_qual = object_1, PositionConstraint.UNQUALIFIED + object_one, obj1_qual = tangency, PositionConstraint.UNQUALIFIED # --- build tangency input (point/edge) --- q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, obj1_qual) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index ac47101..1f1f1c7 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1775,8 +1775,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): ): return _make_2tan_rad_arcs( *tangencies, - radius, - sagitta_constraint, + radius=radius, + sagitta_constraint=sagitta_constraint, edge_factory=cls, ) if ( @@ -1786,20 +1786,25 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): and center is None ): return _make_2tan_on_arcs( - *tangencies, center_on, sagitta_constraint, edge_factory=cls + *tangencies, + center_on=center_on, + sagitta_constraint=sagitta_constraint, + edge_factory=cls, ) if tan_count == 3 and radius is None and center is None and center_on is None: - return _make_3tan_arcs(*tangencies, sagitta_constraint, edge_factory=cls) + return _make_3tan_arcs( + *tangencies, sagitta_constraint=sagitta_constraint, edge_factory=cls + ) if ( tan_count == 1 and center is not None and radius is None and center_on is None ): - return _make_tan_cen_arcs(*tangencies, center, edge_factory=cls) + return _make_tan_cen_arcs(*tangencies, center=center, edge_factory=cls) if tan_count == 1 and center_on is not None and radius is not None: return _make_tan_on_rad_arcs( - *tangencies, center_on, radius, edge_factory=cls + *tangencies, center_on=center_on, radius=radius, edge_factory=cls ) raise ValueError("Unsupported or ambiguous combination of constraints.") From 872c62c645bc66ef55e163c10af40619454c9e3d Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 12 Sep 2025 13:42:44 -0400 Subject: [PATCH 415/518] Added support for point inputs & some tests --- src/build123d/topology/constrained_lines.py | 10 +- src/build123d/topology/one_d.py | 24 +- .../test_direct_api/test_constrained_arcs.py | 239 ++++++++++++++++++ 3 files changed, 258 insertions(+), 15 deletions(-) create mode 100644 tests/test_direct_api/test_constrained_arcs.py diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 020133f..d9df8f0 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -229,7 +229,7 @@ def _qstr(q) -> str: def _make_2tan_rad_arcs( - *tangencies: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, # 2 + *tangencies: tuple[Edge, PositionConstraint] | Edge | Vector, # 2 radius: float, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, edge_factory: Callable[[TopoDS_Edge], TWrap], @@ -322,7 +322,7 @@ def _make_2tan_rad_arcs( def _make_2tan_on_arcs( - *tangencies: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, # 2 + *tangencies: tuple[Edge, PositionConstraint] | Edge | Vector, # 2 center_on: Edge, sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, edge_factory: Callable[[TopoDS_Edge], TWrap], @@ -424,7 +424,7 @@ def _make_2tan_on_arcs( def _make_3tan_arcs( - *tangencies: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, # 3 + *tangencies: tuple[Edge, PositionConstraint] | Edge | Vector, # 3 sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: @@ -507,7 +507,7 @@ def _make_3tan_arcs( def _make_tan_cen_arcs( - tangency: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency: tuple[Edge, PositionConstraint] | Edge | Vector, *, center: VectorLike | Vertex, edge_factory: Callable[[TopoDS_Edge], TWrap], @@ -590,7 +590,7 @@ def _make_tan_cen_arcs( def _make_tan_on_rad_arcs( - tangency: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency: tuple[Edge, PositionConstraint] | Edge | Vector, *, center_on: Edge, radius: float, diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 1f1f1c7..abccdd1 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1738,10 +1738,22 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): if kwargs: raise TypeError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - # --- validate inputs --- - tangencies = [ + tangencies_raw = [ t for t in (tangency_one, tangency_two, tangency_three) if t is not None ] + tangencies = [] + for tangency_raw in tangencies_raw: + if ( + isinstance(tangency_raw, tuple) + and not isinstance(tangency_raw[0], Edge) + ) or not isinstance(tangency_raw, Edge): + try: + tangency = Vector(tangency_raw) + except: + raise TypeError("Invalid tangency") + else: + tangency = tangency_raw + tangencies.append(tangency) # Sort the tangency inputs so points are always last tangent_tuples = [t if isinstance(t, tuple) else (t, None) for t in tangencies] @@ -1753,14 +1765,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tan_count = len(tangencies) if not (1 <= tan_count <= 3): raise TypeError("Provide 1 to 3 tangency targets.") - if sum( - x is not None for x in (radius, center, center_on) - ) > 1 and tan_count not in [1, 2]: - raise TypeError("Ambiguous constraint combination.") - - # Disallow qualifiers on points/vertices (enforce at runtime) - if any(isinstance(t, tuple) and not isinstance(t[0], Edge) for t in tangencies): - raise TypeError("Only Edge targets may be qualified.") # Radius sanity if radius is not None and radius <= 0: diff --git a/tests/test_direct_api/test_constrained_arcs.py b/tests/test_direct_api/test_constrained_arcs.py new file mode 100644 index 0000000..cb36217 --- /dev/null +++ b/tests/test_direct_api/test_constrained_arcs.py @@ -0,0 +1,239 @@ +""" +build123d tests + +name: test_constrained_arcs.py +by: Gumyr +date: September 12, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import pytest +from build123d.objects_curve import ( + CenterArc, + Line, + PolarLine, + JernArc, + IntersectingLine, + ThreePointArc, +) +from build123d.objects_sketch import Rectangle +from build123d.topology import Edge, Solid, Vertex +from build123d.geometry import Axis, Vector +from build123d.build_enums import PositionConstraint, LengthConstraint, LengthMode + + +radius = 0.5 +e1 = Line((-2, 0), (2, 0)) +# e2 = (1, 1) +e2 = Line((0, -2), (0, 2)) +e1 = CenterArc((0, 0), 1, 0, 90) +e2 = Line((1, 0), (2, 0)) +e1.color = "Grey" +e2.color = "Red" + + +def test_constrained_arcs_0(): + """Test input error handling""" + with pytest.raises(TypeError): + Edge.make_constrained_arcs(Solid.make_box(1, 1, 1), (1, 0), radius=0.5) + with pytest.raises(TypeError): + Edge.make_constrained_arcs( + (Vector(0, 0), PositionConstraint.UNQUALIFIED), (1, 0), radius=0.5 + ) + with pytest.raises(TypeError): + Edge.make_constrained_arcs(pnt1=(1, 1, 1), pnt2=(1, 0), radius=0.5) + with pytest.raises(TypeError): + Edge.make_constrained_arcs(radius=0.1) + with pytest.raises(ValueError): + Edge.make_constrained_arcs((0, 0), (0, 0.5), radius=0.5, center=(0, 0.25)) + with pytest.raises(ValueError): + Edge.make_constrained_arcs((0, 0), (0, 0.5), radius=-0.5) + + +def test_constrained_arcs_1(): + """2 edges & radius""" + e1 = Line((-2, 0), (2, 0)) + e2 = Line((0, -2), (0, 2)) + + tan2_rad_edges = Edge.make_constrained_arcs( + e1, + e2, + radius=0.5, + sagitta_constraint=LengthConstraint.BOTH, + ) + assert len(tan2_rad_edges) == 8 + + tan2_rad_edges = Edge.make_constrained_arcs(e1, e2, radius=0.5) + assert len(tan2_rad_edges) == 4 + + +def test_constrained_arcs_2(): + """2 edges & radius""" + e1 = CenterArc((0, 0), 1, 0, 90) + e2 = Line((1, 0), (2, 0)) + + tan2_rad_edges = Edge.make_constrained_arcs(e1, e2, radius=0.5) + assert len(tan2_rad_edges) == 1 + + +def test_constrained_arcs_3(): + """2 points & radius""" + tan2_rad_edges = Edge.make_constrained_arcs((0, 0), (0, 0.5), radius=0.5) + assert len(tan2_rad_edges) == 2 + + tan2_rad_edges = Edge.make_constrained_arcs( + Vertex(0, 0), Vertex(0, 0.5), radius=0.5 + ) + assert len(tan2_rad_edges) == 2 + + tan2_rad_edges = Edge.make_constrained_arcs( + Vector(0, 0), Vector(0, 0.5), radius=0.5 + ) + assert len(tan2_rad_edges) == 2 + + +# tan2_rad_edges = Edge.make_constrained_arcs( +# (e1, PositionConstraint.OUTSIDE), +# (e2, PositionConstraint.UNQUALIFIED), +# radius=radius, +# sagitta_constraint=LengthConstraint.SHORT, +# ) + + +# # 2 lines & radius + +# # 2 points & radius +# p1 = Vector(0, 0, 0) +# p2 = Vector(3, 0, 0) +# tan2_rad_pnts = Edge().make_constrained_arcs(p1, p2, radius=3) + +# # +# # 2 tangents & center on +# c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) +# c2 = Line((4, -2), (4, 2)) +# c3_center_on_this_line = Line((3, -2), (3, 2)) +# c4 = Line((0, 0), (0, 10)) +# for c in (c1, c2, c3_center_on_this_line, c4): +# c.color = "LightGrey" +# tan2_on_edge = Edge.make_constrained_arcs( +# (c1, PositionConstraint.UNQUALIFIED), +# (c2, PositionConstraint.UNQUALIFIED), +# center_on=c3_center_on_this_line, +# )[0] +# l1 = Line(tan2_on_edge @ 0, (0, 0)) +# l2 = JernArc(tan2_on_edge @ 1, tan2_on_edge % 1, tan2_on_edge.radius, 45) +# l3 = IntersectingLine(l2 @ 1, l2 % 1, c4) + +# # +# # tangent & center +# c5 = PolarLine((0, 0), 4, 60) +# center1 = Vector(2, 1) +# tan_center = Edge.make_constrained_arcs( +# (c5, PositionConstraint.UNQUALIFIED), center=center1 +# ) +# # +# # point & center +# p3 = Vector(-2.5, 1.5) +# center2 = Vector(-2, 1) +# pnt_center = Edge.make_constrained_arcs(p3, center=center2) + +# # +# # tangent, radius, center on +# # tan_rad_on = Edge.make_constrained_arcs( +# # (c1, PositionConstraint.UNQUALIFIED), radius=1, center_on=c3_center_on_this_line +# # ) +# tan_rad_on = Edge.make_constrained_arcs(c1, radius=1, center_on=c3_center_on_this_line) + +# print(f"{len(tan_rad_on)=}") + +# objects = [ +# (c1, PositionConstraint.ENCLOSED), +# (Vector(1, 2, 3), None), +# (Edge.make_line((0, 0), (1, 0)), PositionConstraint.UNQUALIFIED), +# ] +# s = sorted(objects, key=lambda t: not issubclass(type(t[0]), Edge)) +# print(f"{objects=},{s=}") +# # +# # 3 tangents +# c6 = PolarLine((0, 0), 4, 40) +# c7 = CenterArc((0, 0), 4, 0, 90) +# tan3 = Edge.make_constrained_arcs( +# (c5, PositionConstraint.UNQUALIFIED), +# (c6, PositionConstraint.UNQUALIFIED), +# (c7, PositionConstraint.UNQUALIFIED), +# ) +# tan3 = Edge.make_constrained_arcs(c5, c6, c7) + +# # v = Vertex(1, 2, 0) +# # v.color = "Teal" +# # show(e1, e2, tan2_rad, v) + +# r_left, r_right = 0.75, 1.0 +# r_bottom, r_top = 6, 8 +# con_circle_left = CenterArc((-2, 0), r_left, 0, 360) +# con_circle_right = CenterArc((2, 0), r_right, 0, 360) +# for c in [con_circle_left, con_circle_right]: +# c.color = "LightGrey" +# # for con1, con2 in itertools.product(PositionConstraint, PositionConstraint): +# # try: +# # egg1 = Edge.make_constrained_arcs( +# # (c8, con1), +# # (c9, con2), +# # radius=10, +# # ) +# # except: +# # print(f"{con1},{con2} failed") +# # else: +# # print(f"{con1},{con2} {len(egg1)=}") +# egg_bottom = Edge.make_constrained_arcs( +# (con_circle_right, PositionConstraint.OUTSIDE), +# (con_circle_left, PositionConstraint.OUTSIDE), +# radius=r_bottom, +# ).sort_by(Axis.Y)[0] +# egg_top = Edge.make_constrained_arcs( +# (con_circle_right, PositionConstraint.ENCLOSING), +# (con_circle_left, PositionConstraint.ENCLOSING), +# radius=r_top, +# ).sort_by(Axis.Y)[-1] +# egg_right = ThreePointArc( +# egg_bottom.vertices().sort_by(Axis.X)[-1], +# con_circle_right @ 0, +# egg_top.vertices().sort_by(Axis.X)[-1], +# ) +# egg_left = ThreePointArc( +# egg_bottom.vertices().sort_by(Axis.X)[0], +# con_circle_left @ 0.5, +# egg_top.vertices().sort_by(Axis.X)[0], +# ) + +# egg_plant = Wire([egg_left, egg_top, egg_right, egg_bottom]) + + +# make_constrained_arcs + + +# class TestConstrainedArcs(unittest.TestCase): +# def test_close(self): +# self.assertAlmostEqual( +# Edge.make_circle(1, end_angle=180).close().length, math.pi + 2, 5 +# ) +# self.assertAlmostEqual(Edge.make_circle(1).close().length, 2 * math.pi, 5) From f0f79fccd463730d4ed214128db51a35ae986445 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 13 Sep 2025 14:17:04 -0400 Subject: [PATCH 416/518] Refining code and adding tests --- src/build123d/__init__.py | 4 +- src/build123d/build_enums.py | 8 +- src/build123d/topology/constrained_lines.py | 55 ++-- src/build123d/topology/one_d.py | 72 +++--- .../test_direct_api/test_constrained_arcs.py | 240 ++++++++---------- 5 files changed, 172 insertions(+), 207 deletions(-) diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index a7aa36c..6d52b40 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -55,13 +55,13 @@ __all__ = [ "Intrinsic", "Keep", "Kind", - "LengthConstraint", + "Sagitta", "LengthMode", "MeshType", "Mode", "NumberDisplay", "PageSize", - "PositionConstraint", + "Tangency", "PositionMode", "PrecisionMode", "Select", diff --git a/src/build123d/build_enums.py b/src/build123d/build_enums.py index 65ef0f7..44d7c8b 100644 --- a/src/build123d/build_enums.py +++ b/src/build123d/build_enums.py @@ -254,8 +254,8 @@ class FontStyle(Enum): return f"<{self.__class__.__name__}.{self.name}>" -class LengthConstraint(Enum): - """Length Constraint for sagitta selection""" +class Sagitta(Enum): + """Sagitta selection""" SHORT = 0 LONG = -1 @@ -320,8 +320,8 @@ class PageSize(Enum): return f"<{self.__class__.__name__}.{self.name}>" -class PositionConstraint(Enum): - """Position Constraint for edge selection""" +class Tangency(Enum): + """Tangency constraint for solvers edge selection""" UNQUALIFIED = GccEnt_unqualified ENCLOSING = GccEnt_enclosing diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index d9df8f0..6fa87ff 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -70,7 +70,7 @@ from OCP.gp import ( ) from OCP.TopoDS import TopoDS_Edge -from build123d.build_enums import LengthConstraint, PositionConstraint +from build123d.build_enums import Sagitta, Tangency from build123d.geometry import TOLERANCE, Vector, VectorLike from .zero_d import Vertex from .shape_core import ShapeList @@ -113,7 +113,7 @@ def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: # Core helpers # --------------------------- def _edge_to_qualified_2d( - edge: TopoDS_Edge, position_constaint: PositionConstraint + edge: TopoDS_Edge, position_constaint: Tangency ) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float]: """Convert a TopoDS_Edge into 2d curve & extract properties""" @@ -153,9 +153,7 @@ def _param_in_trim(u: float, first: float, last: float, h2d: Geom2d_Curve) -> bo return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) -def _as_gcc_arg( - obj: Edge | Vertex | VectorLike, constaint: PositionConstraint -) -> tuple[ +def _as_gcc_arg(obj: Edge | Vertex | VectorLike, constaint: Tangency) -> tuple[ Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, Geom2d_Curve | None, float | None, @@ -229,9 +227,9 @@ def _qstr(q) -> str: def _make_2tan_rad_arcs( - *tangencies: tuple[Edge, PositionConstraint] | Edge | Vector, # 2 + *tangencies: tuple[Edge, Tangency] | Edge | Vector, # 2 radius: float, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + sagitta: Sagitta = Sagitta.SHORT, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> list[Edge]: """ @@ -259,8 +257,7 @@ def _make_2tan_rad_arcs( # Unpack optional per-edge qualifiers (default UNQUALIFIED) tangent_tuples = [ - t if isinstance(t, tuple) else (t, PositionConstraint.UNQUALIFIED) - for t in tangencies + t if isinstance(t, tuple) else (t, Tangency.UNQUALIFIED) for t in tangencies ] # Build inputs for GCC @@ -310,21 +307,21 @@ def _make_2tan_rad_arcs( # ) # Build BOTH sagitta arcs and select by LengthConstraint - if sagitta_constraint == LengthConstraint.BOTH: + if sagitta == Sagitta.BOTH: solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) else: arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) arcs = sorted( arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)) ) - solutions.append(arcs[sagitta_constraint.value]) + solutions.append(arcs[sagitta.value]) return ShapeList([edge_factory(e) for e in solutions]) def _make_2tan_on_arcs( - *tangencies: tuple[Edge, PositionConstraint] | Edge | Vector, # 2 + *tangencies: tuple[Edge, Tangency] | Edge | Vector, # 2 center_on: Edge, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + sagitta: Sagitta = Sagitta.SHORT, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: """ @@ -338,8 +335,7 @@ def _make_2tan_on_arcs( # Unpack optional per-edge qualifiers (default UNQUALIFIED) tangent_tuples = [ - t if isinstance(t, tuple) else (t, PositionConstraint.UNQUALIFIED) - for t in tangencies + t if isinstance(t, tuple) else (t, Tangency.UNQUALIFIED) for t in tangencies ] # Build inputs for GCC @@ -351,7 +347,7 @@ def _make_2tan_on_arcs( # Build center locus ("On") input _, h_on2d, e_first[2], e_last[2], adapt_on = _edge_to_qualified_2d( - center_on.wrapped, PositionConstraint.UNQUALIFIED + center_on.wrapped, Tangency.UNQUALIFIED ) is_edge[2] = True @@ -409,7 +405,7 @@ def _make_2tan_on_arcs( continue # Build sagitta arc(s) and select by LengthConstraint - if sagitta_constraint == LengthConstraint.BOTH: + if sagitta == Sagitta.BOTH: solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) else: arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) @@ -418,14 +414,14 @@ def _make_2tan_on_arcs( arcs = sorted( arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)) ) - solutions.append(arcs[sagitta_constraint.value]) + solutions.append(arcs[sagitta.value]) return ShapeList([edge_factory(e) for e in solutions]) def _make_3tan_arcs( - *tangencies: tuple[Edge, PositionConstraint] | Edge | Vector, # 3 - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + *tangencies: tuple[Edge, Tangency] | Edge | Vector, # 3 + sagitta: Sagitta = Sagitta.SHORT, edge_factory: Callable[[TopoDS_Edge], TWrap], ) -> ShapeList[Edge]: """ @@ -433,14 +429,13 @@ def _make_3tan_arcs( The circle is determined by the three tangency constraints; the returned arc(s) are trimmed between the two tangency points corresponding to `tangencies[0]` and - `tangencies[1]`. Use `sagitta_constraint` to select the shorter/longer (or both) arc. + `tangencies[1]`. Use `sagitta` to select the shorter/longer (or both) arc. Inputs must be representable on Plane.XY. """ # Unpack optional per-edge qualifiers (default UNQUALIFIED) tangent_tuples = [ - t if isinstance(t, tuple) else (t, PositionConstraint.UNQUALIFIED) - for t in tangencies + t if isinstance(t, tuple) else (t, Tangency.UNQUALIFIED) for t in tangencies ] # Build inputs for GCC @@ -491,7 +486,7 @@ def _make_3tan_arcs( continue # Build arc(s) between u_circ1 and u_circ2 per LengthConstraint - if sagitta_constraint == LengthConstraint.BOTH: + if sagitta == Sagitta.BOTH: out_topos.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) else: arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) @@ -501,13 +496,13 @@ def _make_3tan_arcs( arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)), ) - out_topos.append(arcs[sagitta_constraint.value]) + out_topos.append(arcs[sagitta.value]) return ShapeList([edge_factory(e) for e in out_topos]) def _make_tan_cen_arcs( - tangency: tuple[Edge, PositionConstraint] | Edge | Vector, + tangency: tuple[Edge, Tangency] | Edge | Vector, *, center: VectorLike | Vertex, edge_factory: Callable[[TopoDS_Edge], TWrap], @@ -529,7 +524,7 @@ def _make_tan_cen_arcs( if isinstance(tangency, tuple): object_one, obj1_qual = tangency else: - object_one, obj1_qual = tangency, PositionConstraint.UNQUALIFIED + object_one, obj1_qual = tangency, Tangency.UNQUALIFIED # --------------------------- # Build fixed center (gp_Pnt2d) @@ -590,7 +585,7 @@ def _make_tan_cen_arcs( def _make_tan_on_rad_arcs( - tangency: tuple[Edge, PositionConstraint] | Edge | Vector, + tangency: tuple[Edge, Tangency] | Edge | Vector, *, center_on: Edge, radius: float, @@ -615,7 +610,7 @@ def _make_tan_on_rad_arcs( if isinstance(tangency, tuple): object_one, obj1_qual = tangency else: - object_one, obj1_qual = tangency, PositionConstraint.UNQUALIFIED + object_one, obj1_qual = tangency, Tangency.UNQUALIFIED # --- build tangency input (point/edge) --- q_o1, h_e1, e1_first, e1_last, is_edge1 = _as_gcc_arg(object_one, obj1_qual) @@ -627,7 +622,7 @@ def _make_tan_on_rad_arcs( # Project the center locus Edge to 2D (XY) _, h_on2d, on_first, on_last, adapt_on = _edge_to_qualified_2d( - on_obj.wrapped, PositionConstraint.UNQUALIFIED + on_obj.wrapped, Tangency.UNQUALIFIED ) gcc = Geom2dGcc_Circ2dTanOnRad(q_o1, adapt_on, radius, TOLERANCE) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index abccdd1..9ae7556 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -198,8 +198,8 @@ from build123d.build_enums import ( GeomType, Keep, Kind, - LengthConstraint, - PositionConstraint, + Sagitta, + Tangency, PositionMode, Side, ) @@ -1588,11 +1588,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, - tangency_two: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_two: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, *, radius: float, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + sagitta: Sagitta = Sagitta.SHORT, ) -> ShapeList[Edge]: """ Create all planar circular arcs of a given radius that are tangent/contacting @@ -1602,7 +1602,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) radius (float): arc radius - sagitta_constraint (LengthConstraint, optional): returned arc selector + sagitta (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. @@ -1614,11 +1614,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, - tangency_two: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_two: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, *, center_on: Edge, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + sagitta: Sagitta = Sagitta.SHORT, ) -> ShapeList[Edge]: """ Create all planar circular arcs whose circle is tangent to two objects and whose @@ -1629,7 +1629,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) center_on (Edge): center must lie on this edge - sagitta_constraint (LengthConstraint, optional): returned arc selector + sagitta (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. @@ -1641,11 +1641,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, - tangency_two: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, - tangency_three: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_two: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_three: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, *, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + sagitta: Sagitta = Sagitta.SHORT, ) -> ShapeList[Edge]: """ Create planar circular arc(s) on XY tangent to three provided objects. @@ -1655,7 +1655,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): tangency_three (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) - sagitta_constraint (LengthConstraint, optional): returned arc selector + sagitta (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. @@ -1667,7 +1667,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, *, center: VectorLike, ) -> ShapeList[Edge]: @@ -1689,7 +1689,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike, + tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, *, radius: float, center_on: Edge, @@ -1706,7 +1706,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Geometric entity to be contacted/touched by the circle(s) radius (float): arc radius center_on (Edge): center must lie on this edge - sagitta_constraint (LengthConstraint, optional): returned arc selector + sagitta (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. @@ -1718,7 +1718,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def make_constrained_arcs( cls, *args, - sagitta_constraint: LengthConstraint = LengthConstraint.SHORT, + sagitta: Sagitta = Sagitta.SHORT, **kwargs, ) -> ShapeList[Edge]: @@ -1738,22 +1738,22 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): if kwargs: raise TypeError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") - tangencies_raw = [ + tangency_args = [ t for t in (tangency_one, tangency_two, tangency_three) if t is not None ] tangencies = [] - for tangency_raw in tangencies_raw: - if ( - isinstance(tangency_raw, tuple) - and not isinstance(tangency_raw[0], Edge) - ) or not isinstance(tangency_raw, Edge): - try: - tangency = Vector(tangency_raw) - except: - raise TypeError("Invalid tangency") - else: - tangency = tangency_raw - tangencies.append(tangency) + for tangency_arg in tangency_args: + if isinstance(tangency_arg, Edge): + tangencies.append(tangency_arg) + continue + if isinstance(tangency_arg, tuple) and isinstance(tangency_arg[0], Edge): + tangencies.append(tangency_arg) + continue + # if not Edges or constrained Edges convert to Vectors + try: + tangencies.append(Vector(tangency_arg)) + except Exception as exc: + raise TypeError(f"Invalid tangency: {tangency_arg!r}") from exc # Sort the tangency inputs so points are always last tangent_tuples = [t if isinstance(t, tuple) else (t, None) for t in tangencies] @@ -1780,7 +1780,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return _make_2tan_rad_arcs( *tangencies, radius=radius, - sagitta_constraint=sagitta_constraint, + sagitta=sagitta, edge_factory=cls, ) if ( @@ -1792,13 +1792,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return _make_2tan_on_arcs( *tangencies, center_on=center_on, - sagitta_constraint=sagitta_constraint, + sagitta=sagitta, edge_factory=cls, ) if tan_count == 3 and radius is None and center is None and center_on is None: - return _make_3tan_arcs( - *tangencies, sagitta_constraint=sagitta_constraint, edge_factory=cls - ) + return _make_3tan_arcs(*tangencies, sagitta=sagitta, edge_factory=cls) if ( tan_count == 1 and center is not None diff --git a/tests/test_direct_api/test_constrained_arcs.py b/tests/test_direct_api/test_constrained_arcs.py index cb36217..c98e3ed 100644 --- a/tests/test_direct_api/test_constrained_arcs.py +++ b/tests/test_direct_api/test_constrained_arcs.py @@ -35,11 +35,12 @@ from build123d.objects_curve import ( IntersectingLine, ThreePointArc, ) -from build123d.objects_sketch import Rectangle -from build123d.topology import Edge, Solid, Vertex -from build123d.geometry import Axis, Vector -from build123d.build_enums import PositionConstraint, LengthConstraint, LengthMode - +from build123d.topology import Edge, Solid, Vertex, Wire, topo_explore_common_vertex +from build123d.geometry import Axis, Vector, TOLERANCE +from build123d.build_enums import Tangency, Sagitta, LengthMode +from OCP.BRep import BRep_Tool +from OCP.GeomAbs import GeomAbs_C1 +from OCP.LocalAnalysis import LocalAnalysis_CurveContinuity radius = 0.5 e1 = Line((-2, 0), (2, 0)) @@ -51,13 +52,13 @@ e1.color = "Grey" e2.color = "Red" -def test_constrained_arcs_0(): +def test_constrained_arcs_arg_processing(): """Test input error handling""" with pytest.raises(TypeError): Edge.make_constrained_arcs(Solid.make_box(1, 1, 1), (1, 0), radius=0.5) with pytest.raises(TypeError): Edge.make_constrained_arcs( - (Vector(0, 0), PositionConstraint.UNQUALIFIED), (1, 0), radius=0.5 + (Vector(0, 0), Tangency.UNQUALIFIED), (1, 0), radius=0.5 ) with pytest.raises(TypeError): Edge.make_constrained_arcs(pnt1=(1, 1, 1), pnt2=(1, 0), radius=0.5) @@ -69,24 +70,26 @@ def test_constrained_arcs_0(): Edge.make_constrained_arcs((0, 0), (0, 0.5), radius=-0.5) -def test_constrained_arcs_1(): +def test_tan2_rad_arcs_1(): """2 edges & radius""" e1 = Line((-2, 0), (2, 0)) e2 = Line((0, -2), (0, 2)) tan2_rad_edges = Edge.make_constrained_arcs( - e1, - e2, - radius=0.5, - sagitta_constraint=LengthConstraint.BOTH, + e1, e2, radius=0.5, sagitta=Sagitta.BOTH ) assert len(tan2_rad_edges) == 8 tan2_rad_edges = Edge.make_constrained_arcs(e1, e2, radius=0.5) assert len(tan2_rad_edges) == 4 + tan2_rad_edges = Edge.make_constrained_arcs( + (e1, Tangency.UNQUALIFIED), (e2, Tangency.UNQUALIFIED), radius=0.5 + ) + assert len(tan2_rad_edges) == 4 -def test_constrained_arcs_2(): + +def test_tan2_rad_arcs_2(): """2 edges & radius""" e1 = CenterArc((0, 0), 1, 0, 90) e2 = Line((1, 0), (2, 0)) @@ -95,7 +98,7 @@ def test_constrained_arcs_2(): assert len(tan2_rad_edges) == 1 -def test_constrained_arcs_3(): +def test_tan2_rad_arcs_3(): """2 points & radius""" tan2_rad_edges = Edge.make_constrained_arcs((0, 0), (0, 0.5), radius=0.5) assert len(tan2_rad_edges) == 2 @@ -111,129 +114,98 @@ def test_constrained_arcs_3(): assert len(tan2_rad_edges) == 2 -# tan2_rad_edges = Edge.make_constrained_arcs( -# (e1, PositionConstraint.OUTSIDE), -# (e2, PositionConstraint.UNQUALIFIED), -# radius=radius, -# sagitta_constraint=LengthConstraint.SHORT, -# ) +def test_tan2_center_on_1(): + """2 tangents & center on""" + c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) + c2 = Line((4, -2), (4, 2)) + c3_center_on = Line((3, -2), (3, 2)) + tan2_on_edge = Edge.make_constrained_arcs( + (c1, Tangency.UNQUALIFIED), + (c2, Tangency.UNQUALIFIED), + center_on=c3_center_on, + ) + assert len(tan2_on_edge) == 1 -# # 2 lines & radius - -# # 2 points & radius -# p1 = Vector(0, 0, 0) -# p2 = Vector(3, 0, 0) -# tan2_rad_pnts = Edge().make_constrained_arcs(p1, p2, radius=3) - -# # -# # 2 tangents & center on -# c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) -# c2 = Line((4, -2), (4, 2)) -# c3_center_on_this_line = Line((3, -2), (3, 2)) -# c4 = Line((0, 0), (0, 10)) -# for c in (c1, c2, c3_center_on_this_line, c4): -# c.color = "LightGrey" -# tan2_on_edge = Edge.make_constrained_arcs( -# (c1, PositionConstraint.UNQUALIFIED), -# (c2, PositionConstraint.UNQUALIFIED), -# center_on=c3_center_on_this_line, -# )[0] -# l1 = Line(tan2_on_edge @ 0, (0, 0)) -# l2 = JernArc(tan2_on_edge @ 1, tan2_on_edge % 1, tan2_on_edge.radius, 45) -# l3 = IntersectingLine(l2 @ 1, l2 % 1, c4) - -# # -# # tangent & center -# c5 = PolarLine((0, 0), 4, 60) -# center1 = Vector(2, 1) -# tan_center = Edge.make_constrained_arcs( -# (c5, PositionConstraint.UNQUALIFIED), center=center1 -# ) -# # -# # point & center -# p3 = Vector(-2.5, 1.5) -# center2 = Vector(-2, 1) -# pnt_center = Edge.make_constrained_arcs(p3, center=center2) - -# # -# # tangent, radius, center on -# # tan_rad_on = Edge.make_constrained_arcs( -# # (c1, PositionConstraint.UNQUALIFIED), radius=1, center_on=c3_center_on_this_line -# # ) -# tan_rad_on = Edge.make_constrained_arcs(c1, radius=1, center_on=c3_center_on_this_line) - -# print(f"{len(tan_rad_on)=}") - -# objects = [ -# (c1, PositionConstraint.ENCLOSED), -# (Vector(1, 2, 3), None), -# (Edge.make_line((0, 0), (1, 0)), PositionConstraint.UNQUALIFIED), -# ] -# s = sorted(objects, key=lambda t: not issubclass(type(t[0]), Edge)) -# print(f"{objects=},{s=}") -# # -# # 3 tangents -# c6 = PolarLine((0, 0), 4, 40) -# c7 = CenterArc((0, 0), 4, 0, 90) -# tan3 = Edge.make_constrained_arcs( -# (c5, PositionConstraint.UNQUALIFIED), -# (c6, PositionConstraint.UNQUALIFIED), -# (c7, PositionConstraint.UNQUALIFIED), -# ) -# tan3 = Edge.make_constrained_arcs(c5, c6, c7) - -# # v = Vertex(1, 2, 0) -# # v.color = "Teal" -# # show(e1, e2, tan2_rad, v) - -# r_left, r_right = 0.75, 1.0 -# r_bottom, r_top = 6, 8 -# con_circle_left = CenterArc((-2, 0), r_left, 0, 360) -# con_circle_right = CenterArc((2, 0), r_right, 0, 360) -# for c in [con_circle_left, con_circle_right]: -# c.color = "LightGrey" -# # for con1, con2 in itertools.product(PositionConstraint, PositionConstraint): -# # try: -# # egg1 = Edge.make_constrained_arcs( -# # (c8, con1), -# # (c9, con2), -# # radius=10, -# # ) -# # except: -# # print(f"{con1},{con2} failed") -# # else: -# # print(f"{con1},{con2} {len(egg1)=}") -# egg_bottom = Edge.make_constrained_arcs( -# (con_circle_right, PositionConstraint.OUTSIDE), -# (con_circle_left, PositionConstraint.OUTSIDE), -# radius=r_bottom, -# ).sort_by(Axis.Y)[0] -# egg_top = Edge.make_constrained_arcs( -# (con_circle_right, PositionConstraint.ENCLOSING), -# (con_circle_left, PositionConstraint.ENCLOSING), -# radius=r_top, -# ).sort_by(Axis.Y)[-1] -# egg_right = ThreePointArc( -# egg_bottom.vertices().sort_by(Axis.X)[-1], -# con_circle_right @ 0, -# egg_top.vertices().sort_by(Axis.X)[-1], -# ) -# egg_left = ThreePointArc( -# egg_bottom.vertices().sort_by(Axis.X)[0], -# con_circle_left @ 0.5, -# egg_top.vertices().sort_by(Axis.X)[0], -# ) - -# egg_plant = Wire([egg_left, egg_top, egg_right, egg_bottom]) +def test_tan_center_on_1(): + """1 tangent & center on""" + c5 = PolarLine((0, 0), 4, 60) + tan_center = Edge.make_constrained_arcs((c5, Tangency.UNQUALIFIED), center=(2, 1)) + assert len(tan_center) == 1 + assert tan_center[0].is_closed -# make_constrained_arcs +def test_pnt_center_1(): + """pnt & center""" + pnt_center = Edge.make_constrained_arcs((-2.5, 1.5), center=(-2, 1)) + assert len(pnt_center) == 1 + assert pnt_center[0].is_closed -# class TestConstrainedArcs(unittest.TestCase): -# def test_close(self): -# self.assertAlmostEqual( -# Edge.make_circle(1, end_angle=180).close().length, math.pi + 2, 5 -# ) -# self.assertAlmostEqual(Edge.make_circle(1).close().length, 2 * math.pi, 5) +def test_tan_rad_center_on_1(): + """tangent, radius, center on""" + c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) + c3_center_on = Line((3, -2), (3, 2)) + tan_rad_on = Edge.make_constrained_arcs( + (c1, Tangency.UNQUALIFIED), radius=1, center_on=c3_center_on + ) + assert len(tan_rad_on) == 1 + assert tan_rad_on[0].is_closed + + +def test_tan3_1(): + """3 tangents""" + c5 = PolarLine((0, 0), 4, 60) + c6 = PolarLine((0, 0), 4, 40) + c7 = CenterArc((0, 0), 4, 0, 90) + tan3 = Edge.make_constrained_arcs( + (c5, Tangency.UNQUALIFIED), + (c6, Tangency.UNQUALIFIED), + (c7, Tangency.UNQUALIFIED), + ) + assert len(tan3) == 1 + assert not tan3[0].is_closed + + +def test_eggplant(): + """complex set of 4 arcs""" + r_left, r_right = 0.75, 1.0 + r_bottom, r_top = 6, 8 + con_circle_left = CenterArc((-2, 0), r_left, 0, 360) + con_circle_right = CenterArc((2, 0), r_right, 0, 360) + egg_bottom = Edge.make_constrained_arcs( + (con_circle_right, Tangency.OUTSIDE), + (con_circle_left, Tangency.OUTSIDE), + radius=r_bottom, + ).sort_by(Axis.Y)[0] + egg_top = Edge.make_constrained_arcs( + (con_circle_right, Tangency.ENCLOSING), + (con_circle_left, Tangency.ENCLOSING), + radius=r_top, + ).sort_by(Axis.Y)[-1] + egg_right = ThreePointArc( + egg_bottom.vertices().sort_by(Axis.X)[-1], + con_circle_right @ 0, + egg_top.vertices().sort_by(Axis.X)[-1], + ) + egg_left = ThreePointArc( + egg_bottom.vertices().sort_by(Axis.X)[0], + con_circle_left @ 0.5, + egg_top.vertices().sort_by(Axis.X)[0], + ) + + egg_plant = Wire([egg_left, egg_top, egg_right, egg_bottom]) + assert egg_plant.is_closed + egg_plant_edges = egg_plant.edges().sort_by(egg_plant) + common_vertex_cnt = sum( + topo_explore_common_vertex(egg_plant_edges[i], egg_plant_edges[(i + 1) % 4]) + is not None + for i in range(4) + ) + assert common_vertex_cnt == 4 + + # C1 continuity + assert all( + (egg_plant_edges[i] % 1 - egg_plant_edges[(i + 1) % 4] % 0).length < TOLERANCE + for i in range(4) + ) From d8f7da348c1bfe28df5842c273a6b100eee8cf7d Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 14 Sep 2025 19:09:29 -0400 Subject: [PATCH 417/518] Fixing typing --- src/build123d/topology/constrained_lines.py | 96 ++++++++++--------- src/build123d/topology/one_d.py | 16 ++-- .../test_direct_api/test_constrained_arcs.py | 8 ++ 3 files changed, 68 insertions(+), 52 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 6fa87ff..25e0f53 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -37,11 +37,12 @@ from OCP.BRep import BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_Curve from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge from OCP.GCPnts import GCPnts_AbscissaPoint -from OCP.Geom import Geom_Plane +from OCP.Geom import Geom_Curve, Geom_Plane from OCP.Geom2d import ( Geom2d_CartesianPoint, Geom2d_Circle, Geom2d_Curve, + Geom2d_Point, Geom2d_TrimmedCurve, ) from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve @@ -73,7 +74,7 @@ from OCP.TopoDS import TopoDS_Edge from build123d.build_enums import Sagitta, Tangency from build123d.geometry import TOLERANCE, Vector, VectorLike from .zero_d import Vertex -from .shape_core import ShapeList +from .shape_core import ShapeList, downcast if TYPE_CHECKING: from build123d.topology.one_d import Edge @@ -114,7 +115,7 @@ def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: # --------------------------- def _edge_to_qualified_2d( edge: TopoDS_Edge, position_constaint: Tangency -) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float]: +) -> tuple[Geom2dGcc_QualifiedCurve, Geom2d_Curve, float, float, Geom2dAdaptor_Curve]: """Convert a TopoDS_Edge into 2d curve & extract properties""" # 1) Underlying curve + range (also retrieve location to be safe) @@ -128,7 +129,7 @@ def _edge_to_qualified_2d( # 2) Apply location if the edge is positioned by a TopLoc_Location if not loc.IsIdentity(): trsf = loc.Transformation() - hcurve3d = hcurve3d.Transformed(trsf) + hcurve3d = tcast(Geom_Curve, hcurve3d.Transformed(trsf)) # 3) Convert to 2D on Plane.XY (Z-up frame at origin) hcurve2d = GeomAPI.To2d_s(hcurve3d, _pln_xy) # -> Handle_Geom2d_Curve @@ -147,13 +148,17 @@ def _edge_from_circle(h2d_circle: Geom2d_Circle, u1: float, u2: float) -> TopoDS return BRepBuilderAPI_MakeEdge(arc2d, _surf_xy).Edge() -def _param_in_trim(u: float, first: float, last: float, h2d: Geom2d_Curve) -> bool: +def _param_in_trim( + u: float | None, first: float | None, last: float | None, h2d: Geom2d_Curve | None +) -> bool: """Normalize (if periodic) then test [first, last] with tolerance.""" + if u is None or first is None or last is None or h2d is None: # for typing + raise TypeError("Invalid parameters to _param_in_trim") u = _norm_on_period(u, first, h2d.Period()) if h2d.IsPeriodic() else u return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) -def _as_gcc_arg(obj: Edge | Vertex | VectorLike, constaint: Tangency) -> tuple[ +def _as_gcc_arg(obj: Edge | Vector, constaint: Tangency) -> tuple[ Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, Geom2d_Curve | None, float | None, @@ -166,16 +171,18 @@ def _as_gcc_arg(obj: Edge | Vertex | VectorLike, constaint: Tangency) -> tuple[ - Edge -> (QualifiedCurve, h2d, first, last, True) - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) """ + if obj.wrapped is None: + raise TypeError("Can't create a qualified curve from empty edge") + if isinstance(obj.wrapped, TopoDS_Edge): return _edge_to_qualified_2d(obj.wrapped, constaint)[0:4] + (True,) - loc_xyz = obj.position if isinstance(obj, Vertex) else Vector() try: base = Vector(obj) except (TypeError, ValueError) as exc: raise ValueError("Expected Edge | Vertex | VectorLike") from exc - gp_pnt = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) + gp_pnt = gp_Pnt2d(base.X, base.Y) return Geom2d_CartesianPoint(gp_pnt), None, None, None, False @@ -230,8 +237,8 @@ def _make_2tan_rad_arcs( *tangencies: tuple[Edge, Tangency] | Edge | Vector, # 2 radius: float, sagitta: Sagitta = Sagitta.SHORT, - edge_factory: Callable[[TopoDS_Edge], TWrap], -) -> list[Edge]: + edge_factory: Callable[[TopoDS_Edge], Edge], +) -> ShapeList[Edge]: """ Create all planar circular arcs of a given radius that are tangent/contacting the two provided objects on the XY plane. @@ -261,11 +268,9 @@ def _make_2tan_rad_arcs( ] # Build inputs for GCC - q_o, h_e, e_first, e_last, is_edge = [[None] * 2 for _ in range(5)] - for i in range(len(tangent_tuples)): - q_o[i], h_e[i], e_first[i], e_last[i], is_edge[i] = _as_gcc_arg( - *tangent_tuples[i] - ) + results = [_as_gcc_arg(*t) for t in tangent_tuples] + q_o: tuple[Geom2dGcc_QualifiedCurve, Geom2dGcc_QualifiedCurve] + q_o, h_e, e_first, e_last, is_edge = map(tuple, zip(*results)) gcc = Geom2dGcc_Circ2d2TanRad(*q_o, radius, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: @@ -280,7 +285,7 @@ def _make_2tan_rad_arcs( # --------------------------- # Solutions # --------------------------- - solutions: list[Edge] = [] + solutions: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): circ = gcc.ThisSolution(i) # gp_Circ2d @@ -322,7 +327,7 @@ def _make_2tan_on_arcs( *tangencies: tuple[Edge, Tangency] | Edge | Vector, # 2 center_on: Edge, sagitta: Sagitta = Sagitta.SHORT, - edge_factory: Callable[[TopoDS_Edge], TWrap], + edge_factory: Callable[[TopoDS_Edge], Edge], ) -> ShapeList[Edge]: """ Create all planar circular arcs whose circle is tangent to two objects and whose @@ -335,29 +340,29 @@ def _make_2tan_on_arcs( # Unpack optional per-edge qualifiers (default UNQUALIFIED) tangent_tuples = [ - t if isinstance(t, tuple) else (t, Tangency.UNQUALIFIED) for t in tangencies + t if isinstance(t, tuple) else (t, Tangency.UNQUALIFIED) + for t in list(tangencies) + [center_on] ] # Build inputs for GCC - q_o, h_e, e_first, e_last, is_edge = [[None] * 3 for _ in range(5)] - for i in range(len(tangent_tuples)): - q_o[i], h_e[i], e_first[i], e_last[i], is_edge[i] = _as_gcc_arg( - *tangent_tuples[i] - ) - - # Build center locus ("On") input - _, h_on2d, e_first[2], e_last[2], adapt_on = _edge_to_qualified_2d( - center_on.wrapped, Tangency.UNQUALIFIED - ) - is_edge[2] = True + results = [_as_gcc_arg(*t) for t in tangent_tuples] + q_o: tuple[ + Geom2dGcc_QualifiedCurve, Geom2dGcc_QualifiedCurve, Geom2dGcc_QualifiedCurve + ] + q_o, h_e, e_first, e_last, is_edge = map(tuple, zip(*results)) + adapt_on = Geom2dAdaptor_Curve(h_e[2], e_first[2], e_last[2]) # Provide initial middle guess parameters for all of the edges - guesses = [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] + guesses: tuple[float, float, float] = tuple( + [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] + ) if sum(is_edge) > 1: - gcc = Geom2dGcc_Circ2d2TanOn(*q_o[0:2], adapt_on, TOLERANCE, *guesses) + gcc = Geom2dGcc_Circ2d2TanOn(q_o[0], q_o[1], adapt_on, TOLERANCE, *guesses) else: - gcc = Geom2dGcc_Circ2d2TanOn(*q_o[0:2], adapt_on, TOLERANCE) + assert isinstance(q_o[0], Geom2d_Point) + assert isinstance(q_o[1], Geom2d_Point) + gcc = Geom2dGcc_Circ2d2TanOn(q_o[0], q_o[1], adapt_on, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find a tangent arc with center_on constraint") @@ -391,7 +396,7 @@ def _make_2tan_on_arcs( center2d = circ.Location() # gp_Pnt2d # Project center onto the (trimmed) 2D locus - proj = Geom2dAPI_ProjectPointOnCurve(center2d, h_on2d) + proj = Geom2dAPI_ProjectPointOnCurve(center2d, h_e[2]) if proj.NbPoints() == 0: continue # no projection -> reject @@ -401,7 +406,7 @@ def _make_2tan_on_arcs( continue # Respect the trimmed interval (handles periodic curves too) - if not _param_in_trim(u_on, e_first[2], e_last[2], h_on2d): + if not _param_in_trim(u_on, e_first[2], e_last[2], h_e[2]): continue # Build sagitta arc(s) and select by LengthConstraint @@ -422,7 +427,7 @@ def _make_2tan_on_arcs( def _make_3tan_arcs( *tangencies: tuple[Edge, Tangency] | Edge | Vector, # 3 sagitta: Sagitta = Sagitta.SHORT, - edge_factory: Callable[[TopoDS_Edge], TWrap], + edge_factory: Callable[[TopoDS_Edge], Edge], ) -> ShapeList[Edge]: """ Create planar circular arc(s) on XY tangent to three provided objects. @@ -439,14 +444,16 @@ def _make_3tan_arcs( ] # Build inputs for GCC - q_o, h_e, e_first, e_last, is_edge = [[None] * 3 for _ in range(5)] - for i in range(len(tangent_tuples)): - q_o[i], h_e[i], e_first[i], e_last[i], is_edge[i] = _as_gcc_arg( - *tangent_tuples[i] - ) + results = [_as_gcc_arg(*t) for t in tangent_tuples] + q_o: tuple[ + Geom2dGcc_QualifiedCurve, Geom2dGcc_QualifiedCurve, Geom2dGcc_QualifiedCurve + ] + q_o, h_e, e_first, e_last, is_edge = map(tuple, zip(*results)) # Provide initial middle guess parameters for all of the edges - guesses = [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] + guesses: tuple[float, float, float] = tuple( + [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] + ) # Generate all valid circles tangent to the 3 inputs gcc = Geom2dGcc_Circ2d3Tan(*q_o, TOLERANCE, *guesses) @@ -505,7 +512,7 @@ def _make_tan_cen_arcs( tangency: tuple[Edge, Tangency] | Edge | Vector, *, center: VectorLike | Vertex, - edge_factory: Callable[[TopoDS_Edge], TWrap], + edge_factory: Callable[[TopoDS_Edge], Edge], ) -> ShapeList[Edge]: """ Create planar circle(s) on XY whose center is fixed and that are tangent/contacting @@ -530,7 +537,7 @@ def _make_tan_cen_arcs( # Build fixed center (gp_Pnt2d) # --------------------------- if isinstance(center, Vertex): - loc_xyz = center.position + loc_xyz = center.position if center.position is not None else Vector(0, 0) base = Vector(center) c2d = gp_Pnt2d(base.X + loc_xyz.X, base.Y + loc_xyz.Y) else: @@ -560,6 +567,7 @@ def _make_tan_cen_arcs( solutions_topo.append(_edge_from_circle(h2d, 0.0, per)) else: + assert isinstance(q_o1, Geom2dGcc_QualifiedCurve) # Case B: tangency target is a curve/edge (qualified curve) gcc = Geom2dGcc_Circ2dTanCen(q_o1, Geom2d_CartesianPoint(c2d), TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: @@ -589,7 +597,7 @@ def _make_tan_on_rad_arcs( *, center_on: Edge, radius: float, - edge_factory: Callable[[TopoDS_Edge], TWrap], + edge_factory: Callable[[TopoDS_Edge], Edge], ) -> ShapeList[Edge]: """ Create planar circle(s) on XY that: diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 9ae7556..0f0069d 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1741,7 +1741,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_args = [ t for t in (tangency_one, tangency_two, tangency_three) if t is not None ] - tangencies = [] + tangencies: list[tuple[Edge, Tangency] | Edge | Vector] = [] for tangency_arg in tangency_args: if isinstance(tangency_arg, Edge): tangencies.append(tangency_arg) @@ -1749,18 +1749,18 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): if isinstance(tangency_arg, tuple) and isinstance(tangency_arg[0], Edge): tangencies.append(tangency_arg) continue - # if not Edges or constrained Edges convert to Vectors + if isinstance(tangency_arg, Vertex): + tangencies.append(Vector(tangency_arg) + tangency_arg.position) + continue + + # if not Edges, constrained Edges or Vertex convert to Vectors try: tangencies.append(Vector(tangency_arg)) except Exception as exc: raise TypeError(f"Invalid tangency: {tangency_arg!r}") from exc - # Sort the tangency inputs so points are always last - tangent_tuples = [t if isinstance(t, tuple) else (t, None) for t in tangencies] - tangent_tuples = sorted( - tangent_tuples, key=lambda t: not issubclass(type(t[0]), Edge) - ) - tangencies = [t[0] if t[1] is None else t for t in tangent_tuples] + # # Sort the tangency inputs so points are always last + tangencies = sorted(tangencies, key=lambda x: isinstance(x, Vector)) tan_count = len(tangencies) if not (1 <= tan_count <= 3): diff --git a/tests/test_direct_api/test_constrained_arcs.py b/tests/test_direct_api/test_constrained_arcs.py index c98e3ed..f016876 100644 --- a/tests/test_direct_api/test_constrained_arcs.py +++ b/tests/test_direct_api/test_constrained_arcs.py @@ -114,6 +114,14 @@ def test_tan2_rad_arcs_3(): assert len(tan2_rad_edges) == 2 +def test_tan2_rad_arcs_4(): + """edge & 1 points & radius""" + # the point should be automatically moved after the edge + e1 = Line((0, 0), (1, 0)) + tan2_rad_edges = Edge.make_constrained_arcs((0, 0.5), e1, radius=0.5) + assert len(tan2_rad_edges) == 1 + + def test_tan2_center_on_1(): """2 tangents & center on""" c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) From e215a120dfa17ce7bed970ba768d99e32b5b730d Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 15 Sep 2025 11:36:27 -0400 Subject: [PATCH 418/518] Fixing typing after mypy upgrade --- src/build123d/drafting.py | 4 ++-- src/build123d/topology/composite.py | 13 ++++++++++--- src/build123d/topology/shape_core.py | 12 ++++++------ src/build123d/topology/two_d.py | 2 +- tests/test_direct_api/test_shape.py | 9 ++++++--- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index ea93fd4..07a5193 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -52,7 +52,7 @@ from build123d.objects_curve import Line, TangentArc from build123d.objects_sketch import BaseSketchObject, Polygon, Text from build123d.operations_generic import fillet, mirror, sweep from build123d.operations_sketch import make_face, trace -from build123d.topology import Compound, Curve, Edge, Sketch, Vertex, Wire +from build123d.topology import Compound, Curve, Edge, ShapeList, Sketch, Vertex, Wire class ArrowHead(BaseSketchObject): @@ -709,7 +709,7 @@ class TechnicalDrawing(BaseSketchObject): # Text Box Frame bf_pnt1 = frame_wire.edges().sort_by(Axis.Y)[0] @ 0.5 bf_pnt2 = frame_wire.edges().sort_by(Axis.X)[-1] @ 0.75 - box_frame_curve = Wire.make_polygon( + box_frame_curve: Edge | Wire | ShapeList[Edge] = Wire.make_polygon( [bf_pnt1, (bf_pnt1.X, bf_pnt2.Y), bf_pnt2], close=False ) bf_pnt3 = box_frame_curve.edges().sort_by(Axis.X)[0] @ (1 / 3) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 63bdb14..cc08e59 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -448,7 +448,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): # ---- Instance Methods ---- - def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound: + def __add__(self, other: None | Shape | Iterable[Shape]) -> Compound | Wire: """Combine other to self `+` operator Note that if all of the objects are connected Edges/Wires the result @@ -456,8 +456,15 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): """ if self._dim == 1: curve = Curve() if self.wrapped is None else Curve(self.wrapped) - self.copy_attributes_to(curve, ["wrapped", "_NodeMixin__children"]) - return curve + other + sum1d: Edge | Wire | ShapeList[Edge] = curve + other + if isinstance(sum1d, ShapeList): + result: Curve | Wire = Curve(sum1d) + elif isinstance(sum1d, Edge): + result = Curve([sum1d]) + else: # Wire + result = sum1d + self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) + return result summands: ShapeList[Shape] if other is None: diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index ec9e2ae..65fe6f9 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -472,10 +472,10 @@ class Shape(NodeMixin, Generic[TOPODS]): return reduce(lambda loc, n: loc * n.location, self.path, Location()) @property - def location(self) -> Location | None: + def location(self) -> Location: """Get this Shape's Location""" if self.wrapped is None: - return None + raise ValueError("Can't find the location of an empty shape") return Location(self.wrapped.Location()) @location.setter @@ -529,10 +529,10 @@ class Shape(NodeMixin, Generic[TOPODS]): return matrix @property - def orientation(self) -> Vector | None: + def orientation(self) -> Vector: """Get the orientation component of this Shape's Location""" if self.location is None: - return None + raise ValueError("Can't find the orientation of an empty shape") return self.location.orientation @orientation.setter @@ -544,10 +544,10 @@ class Shape(NodeMixin, Generic[TOPODS]): self.location = loc @property - def position(self) -> Vector | None: + def position(self) -> Vector: """Get the position component of this Shape's Location""" if self.wrapped is None or self.location is None: - return None + raise ValueError("Can't find the position of an empty shape") return self.location.position @position.setter diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 91cbc65..306c5b8 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -649,7 +649,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): continue top_list = ShapeList(top if isinstance(top, list) else [top]) - bottom_list = ShapeList(bottom if isinstance(top, list) else [bottom]) + bottom_list = ShapeList(bottom if isinstance(bottom, list) else [bottom]) if len(top_list) != len(bottom_list): # exit early unequal length continue diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 02f9de0..2c0bb3c 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -531,9 +531,12 @@ class TestShape(unittest.TestCase): def test_empty_shape(self): empty = Solid() box = Solid.make_box(1, 1, 1) - self.assertIsNone(empty.location) - self.assertIsNone(empty.position) - self.assertIsNone(empty.orientation) + with self.assertRaises(ValueError): + empty.location + with self.assertRaises(ValueError): + empty.position + with self.assertRaises(ValueError): + empty.orientation self.assertFalse(empty.is_manifold) with self.assertRaises(ValueError): empty.geom_type From bc8fd456251ea5497be65eedf3d8b91f5e6d752f Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 15 Sep 2025 11:40:26 -0400 Subject: [PATCH 419/518] Another typing fix --- src/build123d/topology/composite.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index cc08e59..823eece 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -458,13 +458,13 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): curve = Curve() if self.wrapped is None else Curve(self.wrapped) sum1d: Edge | Wire | ShapeList[Edge] = curve + other if isinstance(sum1d, ShapeList): - result: Curve | Wire = Curve(sum1d) + result1d: Curve | Wire = Curve(sum1d) elif isinstance(sum1d, Edge): - result = Curve([sum1d]) + result1d = Curve([sum1d]) else: # Wire - result = sum1d - self.copy_attributes_to(result, ["wrapped", "_NodeMixin__children"]) - return result + result1d = sum1d + self.copy_attributes_to(result1d, ["wrapped", "_NodeMixin__children"]) + return result1d summands: ShapeList[Shape] if other is None: From 4b8a4e92c11964aeacec7f55d0bcab98084de92a Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 16 Sep 2025 12:42:47 -0400 Subject: [PATCH 420/518] Tidy geometry and zero_d intersection typing and docstrings. --- src/build123d/geometry.py | 44 +++++++++++++------- src/build123d/topology/shape_core.py | 2 +- src/build123d/topology/zero_d.py | 62 ++++++++++++++-------------- 3 files changed, 60 insertions(+), 48 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 69fae4f..e4c0eeb 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -527,18 +527,22 @@ class Vector: @overload def intersect(self, location: Location) -> Vector | None: - """Find intersection of location and vector""" + """Find intersection of vector and location""" @overload def intersect(self, axis: Axis) -> Vector | None: - """Find intersection of axis and vector""" + """Find intersection of vector and axis""" @overload def intersect(self, plane: Plane) -> Vector | None: - """Find intersection of plane and vector""" + """Find intersection of vector and plane""" + + @overload + def intersect(self, shape: Shape) -> Shape | None: + """Find intersection of vector and shape""" def intersect(self, *args, **kwargs): - """Find intersection of geometric objects and vector""" + """Find intersection of vector and geometric object or shape""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) if axis is not None: @@ -906,11 +910,11 @@ class Axis(metaclass=AxisMeta): @overload def intersect(self, vector: VectorLike) -> Vector | None: - """Find intersection of vector and axis""" + """Find intersection of axis and vector""" @overload def intersect(self, location: Location) -> Vector | Location | None: - """Find intersection of location and axis""" + """Find intersection of axis and location""" @overload def intersect(self, axis: Axis) -> Vector | Axis | None: @@ -918,10 +922,14 @@ class Axis(metaclass=AxisMeta): @overload def intersect(self, plane: Plane) -> Vector | Axis | None: - """Find intersection of plane and axis""" + """Find intersection of axis and plane""" + + @overload + def intersect(self, shape: Shape) -> Shape | None: + """Find intersection of axis and shape""" def intersect(self, *args, **kwargs): - """Find intersection of geometric object and axis""" + """Find intersection of axis and geometric object or shape""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) if axis is not None: @@ -1929,7 +1937,7 @@ class Location: @overload def intersect(self, vector: VectorLike) -> Vector | None: - """Find intersection of vector and location""" + """Find intersection of location and vector""" @overload def intersect(self, location: Location) -> Vector | Location | None: @@ -1937,14 +1945,18 @@ class Location: @overload def intersect(self, axis: Axis) -> Vector | Location | None: - """Find intersection of axis and location""" + """Find intersection of location and axis""" @overload def intersect(self, plane: Plane) -> Vector | Location | None: - """Find intersection of plane and location""" + """Find intersection of location and plane""" + + @overload + def intersect(self, shape: Shape) -> Shape | None: + """Find intersection of location and shape""" def intersect(self, *args, **kwargs): - """Find intersection of geometric object and location""" + """Find intersection of location and geometric object or shape""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) if axis is not None: @@ -3131,15 +3143,15 @@ class Plane(metaclass=PlaneMeta): @overload def intersect(self, vector: VectorLike) -> Vector | None: - """Find intersection of vector and plane""" + """Find intersection of plane and vector""" @overload def intersect(self, location: Location) -> Vector | Location | None: - """Find intersection of location and plane""" + """Find intersection of plane and location""" @overload def intersect(self, axis: Axis) -> Vector | Axis | None: - """Find intersection of axis and plane""" + """Find intersection of plane and axis""" @overload def intersect(self, plane: Plane) -> Axis | Plane | None: @@ -3150,7 +3162,7 @@ class Plane(metaclass=PlaneMeta): """Find intersection of plane and shape""" def intersect(self, *args, **kwargs): - """Find intersection of geometric object and shape""" + """Find intersection of plane and geometric object or shape""" axis, plane, vector, location, shape = _parse_intersect_args(*args, **kwargs) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index ec9e2ae..4d06397 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -1326,7 +1326,7 @@ class Shape(NodeMixin, Generic[TOPODS]): ) def intersect( - self, *to_intersect: Shape | Axis | Plane + self, *to_intersect: Shape | Vector | Location | Axis | Plane ) -> None | Self | ShapeList[Self]: """Intersection of the arguments and this shape diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index 7d52245..bb36513 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -169,41 +169,41 @@ class Vertex(Shape[TopoDS_Vertex]): raise NotImplementedError("Vertices can't be created by extrusion") def intersect( - self, *to_intersect: Shape | Vector | Location | Axis | Plane - ) -> None | ShapeList[Vertex]: - """Intersection of the arguments and this shape + self, *to_intersect: Shape | Vector | Location | Axis | Plane + ) -> ShapeList[Vertex] | None: + """Intersection of vertex and geometric objects or shapes. - Args: - to_intersect (sequence of Union[Shape, Axis, Plane]): Shape(s) to - intersect with + Args: + to_intersect (sequence of [Shape | Vector | Location | Axis | Plane]): + Objects(s) to intersect with - Returns: - ShapeList[Shape]: Resulting object may be of a ShapeList of multiple - non-Compound object created - """ - points_sets: list[set] = [] - for obj in to_intersect: - # Treat as Vector, otherwise call intersection from Shape - match obj: - case Vertex(): - result = Vector(self).intersect(Vector(obj)) - case Vector() | Location() | Axis() | Plane(): - result = obj.intersect(Vector(self)) - case _ if issubclass(type(obj), Shape): - result = obj.intersect(self) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") + Returns: + ShapeList[Vertex] | None: Vertex intersection in a ShapeList or None + """ + points_sets: list[set] = [] + result: Shape | ShapeList[Shape] | Vector | None + for obj in to_intersect: + # Treat as Vector, otherwise call intersection from Shape + match obj: + case Vertex(): + result = Vector(self).intersect(Vector(obj)) + case Vector() | Location() | Axis() | Plane(): + result = obj.intersect(Vector(self)) + case _ if issubclass(type(obj), Shape): + result = obj.intersect(self) + case _: + raise ValueError(f"Unknown object type: {type(obj)}") - if isinstance(result, Vector): - points_sets.append(set([result])) - else: - points_sets.append(set()) - - common_points = set.intersection(*points_sets) - if common_points: - return ShapeList([Vertex(p) for p in common_points]) + if isinstance(result, Vector): + points_sets.append(set([result])) else: - return None + points_sets.append(set()) + + common_points = set.intersection(*points_sets) + if common_points: + return ShapeList([Vertex(p) for p in common_points]) + + return None # ---- Instance Methods ---- From 6f41cd851cec90ddc35e240ef5d3d6f02c75fdec Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 16 Sep 2025 19:36:41 -0400 Subject: [PATCH 421/518] Improving test coverage --- src/build123d/topology/constrained_lines.py | 33 +++++++++-------- .../test_direct_api/test_constrained_arcs.py | 36 +++++++++++++++++++ 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 25e0f53..bbfdf9c 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -89,12 +89,9 @@ _surf_xy = Geom_Plane(_pln_xy) # --------------------------- # Normalization utilities # --------------------------- -def _norm_on_period(u: float, first: float, per: float) -> float: +def _norm_on_period(u: float, first: float, period: float) -> float: """Map parameter u into [first, first+per).""" - if per <= 0.0: - return u - k = floor((u - first) / per) - return u - k * per + return (u - first) % period + first def _forward_delta(u1: float, u2: float, first: float, period: float) -> float: @@ -195,24 +192,24 @@ def _two_arc_edges_from_params( Uses centralized normalization utilities. """ h2d_circle = Geom2d_Circle(circ) - per = h2d_circle.Period() # usually 2*pi + period = h2d_circle.Period() # usually 2*pi # Minor (forward) span - d = _forward_delta(u1, u2, 0.0, per) # anchor at 0 for circle convenience - u1n = _norm_on_period(u1, 0.0, per) - u2n = _norm_on_period(u2, 0.0, per) + d = _forward_delta(u1, u2, 0.0, period) # anchor at 0 for circle convenience + u1n = _norm_on_period(u1, 0.0, period) + u2n = _norm_on_period(u2, 0.0, period) # Guard degeneracy - if d <= TOLERANCE or abs(per - d) <= TOLERANCE: + if d <= TOLERANCE or abs(period - d) <= TOLERANCE: return ShapeList() minor = _edge_from_circle(h2d_circle, u1n, u1n + d) - major = _edge_from_circle(h2d_circle, u2n, u2n + (per - d)) + major = _edge_from_circle(h2d_circle, u2n, u2n + (period - d)) return [minor, major] -def _qstr(q) -> str: - # Works with OCP's GccEnt enum values +def _qstr(q) -> str: # pragma: no cover + """Debugging facility that works with OCP's GccEnt enum values""" try: from OCP.GccEnt import GccEnt_enclosed, GccEnt_enclosing, GccEnt_outside @@ -353,9 +350,11 @@ def _make_2tan_on_arcs( adapt_on = Geom2dAdaptor_Curve(h_e[2], e_first[2], e_last[2]) # Provide initial middle guess parameters for all of the edges - guesses: tuple[float, float, float] = tuple( - [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] - ) + guesses: list[float] = [ + (e_last[i] - e_first[i]) / 2 + e_first[i] + for i in range(len(tangent_tuples)) + if is_edge[i] + ] if sum(is_edge) > 1: gcc = Geom2dGcc_Circ2d2TanOn(q_o[0], q_o[1], adapt_on, TOLERANCE, *guesses) @@ -452,7 +451,7 @@ def _make_3tan_arcs( # Provide initial middle guess parameters for all of the edges guesses: tuple[float, float, float] = tuple( - [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(len(is_edge))] + [(e_last[i] - e_first[i]) / 2 + e_first[i] for i in range(3)] ) # Generate all valid circles tangent to the 3 inputs diff --git a/tests/test_direct_api/test_constrained_arcs.py b/tests/test_direct_api/test_constrained_arcs.py index f016876..b076011 100644 --- a/tests/test_direct_api/test_constrained_arcs.py +++ b/tests/test_direct_api/test_constrained_arcs.py @@ -122,6 +122,13 @@ def test_tan2_rad_arcs_4(): assert len(tan2_rad_edges) == 1 +def test_tan2_rad_arcs_5(): + """no solution""" + with pytest.raises(RuntimeError) as excinfo: + Edge.make_constrained_arcs((0, 0), (10, 0), radius=2) + assert "Unable to find a tangent arc" in str(excinfo.value) + + def test_tan2_center_on_1(): """2 tangents & center on""" c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) @@ -135,6 +142,35 @@ def test_tan2_center_on_1(): assert len(tan2_on_edge) == 1 +def test_tan2_center_on_2(): + """2 tangents & center on""" + tan2_on_edge = Edge.make_constrained_arcs( + (0, 3), (5, 0), center_on=Line((0, -5), (0, 5)) + ) + assert len(tan2_on_edge) == 1 + + +def test_tan2_center_on_3(): + """2 tangents & center on""" + tan2_on_edge = Edge.make_constrained_arcs( + Line((-5, 3), (5, 3)), (5, 0), center_on=Line((0, -5), (0, 5)) + ) + assert len(tan2_on_edge) == 1 + + +def test_tan2_center_on_4(): + """2 tangents & center on""" + with pytest.raises(RuntimeError) as excinfo: + Edge.make_constrained_arcs( + Line((-5, 3), (5, 3)), + Line((-5, 0), (5, 0)), + center_on=Line((-5, -1), (5, -1)), + ) + assert "Unable to find a tangent arc with center_on constraint" in str( + excinfo.value + ) + + def test_tan_center_on_1(): """1 tangent & center on""" c5 = PolarLine((0, 0), 4, 60) From 71534e3e9fa0007d37f0dbda04d0bca7f834773a Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 17 Sep 2025 11:43:45 -0400 Subject: [PATCH 422/518] Improving test coverage --- src/build123d/topology/constrained_lines.py | 40 ++++----- .../test_direct_api/test_constrained_arcs.py | 83 ++++++++++++++++--- 2 files changed, 92 insertions(+), 31 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index bbfdf9c..66cbd73 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -29,7 +29,7 @@ license: from __future__ import annotations -from math import floor +from math import floor, pi from typing import TYPE_CHECKING, Callable, TypeVar from typing import cast as tcast @@ -69,6 +69,7 @@ from OCP.gp import ( gp_Pnt, gp_Pnt2d, ) +from OCP.Standard import Standard_ConstructionError from OCP.TopoDS import TopoDS_Edge from build123d.build_enums import Sagitta, Tangency @@ -77,7 +78,7 @@ from .zero_d import Vertex from .shape_core import ShapeList, downcast if TYPE_CHECKING: - from build123d.topology.one_d import Edge + from build123d.topology.one_d import Edge # pragma: no cover TWrap = TypeVar("TWrap") # whatever the factory returns (Edge or a subclass) @@ -120,9 +121,6 @@ def _edge_to_qualified_2d( hcurve3d = BRep_Tool.Curve_s(edge, float(), float()) first, last = BRep_Tool.Range_s(edge) - if hcurve3d is None: - raise ValueError("Edge has no underlying 3D curve.") - # 2) Apply location if the edge is positioned by a TopLoc_Location if not loc.IsIdentity(): trsf = loc.Transformation() @@ -166,7 +164,7 @@ def _as_gcc_arg(obj: Edge | Vector, constaint: Tangency) -> tuple[ Normalize input to a GCC argument. Returns: (q_obj, h2d, first, last, is_edge) - Edge -> (QualifiedCurve, h2d, first, last, True) - - Vertex/VectorLike -> (CartesianPoint, None, None, None, False) + - Vector -> (CartesianPoint, None, None, None, False) """ if obj.wrapped is None: raise TypeError("Can't create a qualified curve from empty edge") @@ -174,12 +172,7 @@ def _as_gcc_arg(obj: Edge | Vector, constaint: Tangency) -> tuple[ if isinstance(obj.wrapped, TopoDS_Edge): return _edge_to_qualified_2d(obj.wrapped, constaint)[0:4] + (True,) - try: - base = Vector(obj) - except (TypeError, ValueError) as exc: - raise ValueError("Expected Edge | Vertex | VectorLike") from exc - - gp_pnt = gp_Pnt2d(base.X, base.Y) + gp_pnt = gp_Pnt2d(obj.X, obj.Y) return Geom2d_CartesianPoint(gp_pnt), None, None, None, False @@ -284,7 +277,7 @@ def _make_2tan_rad_arcs( # --------------------------- solutions: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): - circ = gcc.ThisSolution(i) # gp_Circ2d + circ: gp_Circ2d = gcc.ThisSolution(i) # Tangency on curve 1 p1 = gp_Pnt2d() @@ -377,7 +370,7 @@ def _make_2tan_on_arcs( # --------------------------- solutions: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): - circ = gcc.ThisSolution(i) # gp_Circ2d + circ: gp_Circ2d = gcc.ThisSolution(i) # Tangency on curve 1 p1 = gp_Pnt2d() @@ -455,10 +448,13 @@ def _make_3tan_arcs( ) # Generate all valid circles tangent to the 3 inputs - gcc = Geom2dGcc_Circ2d3Tan(*q_o, TOLERANCE, *guesses) - + msg = "Unable to find a circle tangent to all three objects" + try: + gcc = Geom2dGcc_Circ2d3Tan(*q_o, TOLERANCE, *guesses) + except Standard_ConstructionError as con_err: + raise RuntimeError(msg) from con_err if not gcc.IsDone() or gcc.NbSolutions() == 0: - raise RuntimeError("Unable to find a circle tangent to all three objects") + raise RuntimeError(msg) def _ok(i: int, u: float) -> bool: """Does the given parameter value lie within the edge range?""" @@ -471,7 +467,13 @@ def _make_3tan_arcs( # --------------------------- out_topos: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): - circ = gcc.ThisSolution(i) # gp_Circ2d + circ: gp_Circ2d = gcc.ThisSolution(i) + + # Look at all of the solutions + # h2d_circle = Geom2d_Circle(circ) + # arc2d = Geom2d_TrimmedCurve(h2d_circle, 0, 2 * pi, True) + # out_topos.append(BRepBuilderAPI_MakeEdge(arc2d, _surf_xy).Edge()) + # continue # Tangency on curve 1 (arc endpoint A) p1 = gp_Pnt2d() @@ -642,7 +644,7 @@ def _make_tan_on_rad_arcs( # --- enumerate solutions; emit full circles (2π trims) --- out_topos: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): - circ = gcc.ThisSolution(i) # gp_Circ2d + circ: gp_Circ2d = gcc.ThisSolution(i) # Validate tangency lies on trimmed span when the target is an Edge p = gp_Pnt2d() diff --git a/tests/test_direct_api/test_constrained_arcs.py b/tests/test_direct_api/test_constrained_arcs.py index b076011..5cd8a97 100644 --- a/tests/test_direct_api/test_constrained_arcs.py +++ b/tests/test_direct_api/test_constrained_arcs.py @@ -35,21 +35,46 @@ from build123d.objects_curve import ( IntersectingLine, ThreePointArc, ) +from build123d.operations_generic import mirror from build123d.topology import Edge, Solid, Vertex, Wire, topo_explore_common_vertex -from build123d.geometry import Axis, Vector, TOLERANCE +from build123d.geometry import Axis, Plane, Vector, TOLERANCE from build123d.build_enums import Tangency, Sagitta, LengthMode -from OCP.BRep import BRep_Tool -from OCP.GeomAbs import GeomAbs_C1 -from OCP.LocalAnalysis import LocalAnalysis_CurveContinuity +from build123d.topology.constrained_lines import ( + _as_gcc_arg, + _param_in_trim, + _edge_to_qualified_2d, + _two_arc_edges_from_params, +) +from OCP.gp import gp_Ax2d, gp_Dir2d, gp_Circ2d, gp_Pnt2d -radius = 0.5 -e1 = Line((-2, 0), (2, 0)) -# e2 = (1, 1) -e2 = Line((0, -2), (0, 2)) -e1 = CenterArc((0, 0), 1, 0, 90) -e2 = Line((1, 0), (2, 0)) -e1.color = "Grey" -e2.color = "Red" + +def test_edge_to_qualified_2d(): + e = Line((0, 0), (1, 0)) + e.position += (1, 1, 1) + qc, curve_2d, first, last, adaptor = _edge_to_qualified_2d( + e.wrapped, Tangency.UNQUALIFIED + ) + assert first < last + + +def test_two_arc_edges_from_params(): + circle = gp_Circ2d(gp_Ax2d(gp_Pnt2d(0, 0), gp_Dir2d(1.0, 0.0)), 1) + arcs = _two_arc_edges_from_params(circle, 0, TOLERANCE / 10) + assert len(arcs) == 0 + + +def test_param_in_trim(): + with pytest.raises(TypeError) as excinfo: + _param_in_trim(None, 0.0, 1.0, None) + assert "Invalid parameters to _param_in_trim" in str(excinfo.value) + + +def test_as_gcc_arg(): + e = Line((0, 0), (1, 0)) + e.wrapped = None + with pytest.raises(TypeError) as excinfo: + _as_gcc_arg(e, Tangency.UNQUALIFIED) + assert "Can't create a qualified curve from empty edge" in str(excinfo.value) def test_constrained_arcs_arg_processing(): @@ -185,6 +210,10 @@ def test_pnt_center_1(): assert len(pnt_center) == 1 assert pnt_center[0].is_closed + pnt_center = Edge.make_constrained_arcs((-2.5, 1.5), center=Vertex(-2, 1)) + assert len(pnt_center) == 1 + assert pnt_center[0].is_closed + def test_tan_rad_center_on_1(): """tangent, radius, center on""" @@ -210,6 +239,36 @@ def test_tan3_1(): assert len(tan3) == 1 assert not tan3[0].is_closed + tan3b = Edge.make_constrained_arcs(c5, c6, c7, sagitta=Sagitta.BOTH) + assert len(tan3b) == 2 + + +def test_tan3_2(): + with pytest.raises(RuntimeError) as excinfo: + Edge.make_constrained_arcs( + Line((0, 0), (0, 1)), + Line((0, 0), (1, 0)), + Line((0, 0), (0, -1)), + ) + assert "Unable to find a circle tangent to all three objects" in str(excinfo.value) + + +def test_tan3_3(): + l1 = Line((0, 0), (10, 0)) + l2 = Line((0, 2), (10, 2)) + l3 = Line((0, 5), (10, 5)) + with pytest.raises(RuntimeError) as excinfo: + Edge.make_constrained_arcs(l1, l2, l3) + assert "Unable to find a circle tangent to all three objects" in str(excinfo.value) + + +def test_tan3_4(): + l1 = Line((-1, 0), (-1, 2)) + l2 = Line((1, 0), (1, 2)) + l3 = Line((-1, 0), (-0.75, 0)) + tan3 = Edge.make_constrained_arcs(l1, l2, l3) + assert len(tan3) == 0 + def test_eggplant(): """complex set of 4 arcs""" From d8a2a3b0891e46732a696d1222d3fd1f4feeaaaa Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 18 Sep 2025 17:20:48 -0400 Subject: [PATCH 423/518] Support results of Vertex or list[Vertex] for set intersection --- src/build123d/topology/zero_d.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index bb36513..87b40db 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -174,7 +174,7 @@ class Vertex(Shape[TopoDS_Vertex]): """Intersection of vertex and geometric objects or shapes. Args: - to_intersect (sequence of [Shape | Vector | Location | Axis | Plane]): + to_intersect (sequence of [Shape | Vector | Location | Axis | Plane]): Objects(s) to intersect with Returns: @@ -196,14 +196,15 @@ class Vertex(Shape[TopoDS_Vertex]): if isinstance(result, Vector): points_sets.append(set([result])) + elif isinstance(result, Vertex): + points_sets.append(set([Vector(result)])) + elif isinstance(result, list): + points_sets.append(set(Vector(r) for r in result)) else: points_sets.append(set()) common_points = set.intersection(*points_sets) - if common_points: - return ShapeList([Vertex(p) for p in common_points]) - - return None + return ShapeList([Vertex(p) for p in common_points]) if common_points else None # ---- Instance Methods ---- From ca748f0f2e86556cb604f9f80ca4adba297f2399 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Thu, 18 Sep 2025 18:58:19 -0400 Subject: [PATCH 424/518] Move intersect from Edge to Mixin1D, support Wire, tidy up logic --- src/build123d/topology/one_d.py | 230 +++++++++++++-------- tests/test_direct_api/test_intersection.py | 74 ++++++- tests/test_direct_api/test_location.py | 4 +- 3 files changed, 218 insertions(+), 90 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index e019df7..d4cb000 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -52,7 +52,6 @@ license: from __future__ import annotations import copy -import itertools import numpy as np import warnings from collections.abc import Iterable @@ -665,6 +664,151 @@ class Mixin1D(Shape): return Vector(curve.Value(umax)) + def intersect( + self, *to_intersect: Shape | Vector | Location | Axis | Plane + ) -> None | ShapeList[Vertex | Edge]: + """Intersect Edge with Shape or geometry object + + Args: + to_intersect (Shape | Vector | Location | Axis | Plane): objects to intersect + + Returns: + ShapeList[Vertex | Edge] | None: ShapeList of vertices and/or edges + """ + # targets takes ShapeLists of edges from Edge/Wire + targets: list[ShapeList] = [ShapeList(self.edges())] + points: list[Vertex] = [] + shapes: list[Shape] = [] + planes: list[Plane] = [] + for obj in to_intersect: + match obj: + case Axis(): + targets.append(ShapeList([Edge(obj)])) + case Plane(): + planes.append(obj) + case Vector(): + points.append(Vertex(obj)) + case Location(): + points.append(Vertex(obj.position)) + case Vertex(): + points.append(obj) + case Edge(): + targets.append(ShapeList([obj])) + case Wire(): + targets.append(ShapeList(obj.edges())) + case _ if issubclass(type(obj), Shape): + shapes.append(obj) + case _: + raise ValueError(f"Unknown object type: {type(obj)}") + + # Find intersections of all combinations + # Pool order biases combination order + pool = targets + points + shapes + planes + common_sets = [] + for pair in combinations(pool, 2): + common = [] + match pair: + case (ShapeList() as objs, ShapeList() as tars): + # Find any edge / edge intersection points + for obj in objs: + for tar in tars: + # Find crossing points + try: + intersection_points = obj.find_intersection_points(tar) + common.extend(intersection_points) + except ValueError: + pass + + # Find common end points + obj_end_points = set(Vector(v) for v in obj.vertices()) + tar_end_points = set(Vector(v) for v in tar.vertices()) + common.extend( + set.intersection(obj_end_points, tar_end_points) + ) + + # Find Edge/Edge overlaps + result = obj._bool_op( + (obj,), tars, BRepAlgoAPI_Common() + ).edges() + common.extend(result if isinstance(result, list) else [result]) + + case (ShapeList() as objs, Vertex() as tar): + for obj in objs: + result = Shape.intersect(obj, tar) + if result: + common.append(Vector(result)) + + case (ShapeList() as objs, Plane() as plane): + # Find any edge / plane intersection points & edges + for obj in objs: + # Find point intersections + geom_line = BRep_Tool.Curve_s( + obj.wrapped, obj.param_at(0), obj.param_at(1) + ) + geom_plane = Geom_Plane(plane.local_coord_system) + intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) + plane_intersection_points: list[Vector] = [] + if intersection_calculator.IsDone(): + plane_intersection_points = [ + Vector(intersection_calculator.Point(i + 1)) + for i in range(intersection_calculator.NbPoints()) + ] + common.extend(plane_intersection_points) + + # Find edge intersections + if all( + plane.contains(v) + for v in obj.positions(i / 7 for i in range(8)) + ): # is a 2D edge + common.append(obj) + + case (ShapeList() as objs, tar): + # Find Shape with Edge/Wire + if not isinstance(tar, ShapeList): + for obj in objs: + common.append(tar.intersect(obj)) + else: + raise RuntimeError("Unexpected target of type Shapelist") + + case (Vertex() as obj, Vertex() as tar): + common.append(tar.intersect(obj)) + + case (Plane() as obj, Plane() as tar): + result = tar.intersect(obj) + if isinstance(result, Axis): + common.append(Edge(result)) + else: + common.append(None) + + case _: + obj, tar = pair + # Always run Shape first in a pair + if isinstance(tar, Shape): + common.append(tar.intersect(obj)) + elif isinstance(obj, Shape) and not isinstance(tar, ShapeList): + common.append(obj.intersect(tar)) + else: + raise RuntimeError(f"Invalid intersection {pair}.") + + common_sets.append(set(common)) + + result = set.intersection(*common_sets) + result = ShapeList([Vertex(r) if isinstance(r, Vector) else r for r in result]) + + # Remove Vertices if part of Edges + if result: + vts = result.vertices() + eds = result.edges() + if vts and eds: + filtered_vts = list( + filter( + lambda v: all(v.distance_to(e) > TOLERANCE for e in eds), vts + ) + ) + result = filtered_vts + eds + + return ShapeList(result) if result else None + def location_at( self, distance: float, @@ -2151,90 +2295,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): raise ValueError("Can't find adaptor for empty edge") return BRepAdaptor_Curve(self.wrapped) - def intersect( - self, *to_intersect: Edge | Axis | Plane - ) -> None | Vertex | Edge | ShapeList[Vertex | Edge]: - """intersect Edge with Edge or Axis - - Args: - other (Edge | Axis): other object - - Returns: - Shape | None: Compound of vertices and/or edges - """ - edges: list[Edge] = [] - planes: list[Plane] = [] - edges_common_to_planes: list[Edge] = [] - - for obj in to_intersect: - match obj: - case Axis(): - edges.append(Edge(obj)) - case Edge(): - edges.append(obj) - case Plane(): - planes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - - # Find any edge / edge intersection points - points_sets: list[set[Vector]] = [] - # Find crossing points - for edge_pair in combinations([self] + edges, 2): - intersection_points = edge_pair[0].find_intersection_points(edge_pair[1]) - points_sets.append(set(intersection_points)) - - # Find common end points - self_end_points = set(Vector(v) for v in self.vertices()) - edge_end_points = set(Vector(v) for edge in edges for v in edge.vertices()) - common_end_points = set.intersection(self_end_points, edge_end_points) - - # Find any edge / plane intersection points & edges - for edge, plane in itertools.product([self] + edges, planes): - if edge.wrapped is None: - continue - # Find point intersections - geom_line = BRep_Tool.Curve_s( - edge.wrapped, edge.param_at(0), edge.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - points_sets.append(set(plane_intersection_points)) - - # Find edge intersections - if all( - plane.contains(v) for v in edge.positions(i / 7 for i in range(8)) - ): # is a 2D edge - edges_common_to_planes.append(edge) - - edges.extend(edges_common_to_planes) - - # Find the intersection of all sets - common_points = set.intersection(*points_sets) - common_vertices = [ - Vertex(pnt) for pnt in common_points.union(common_end_points) - ] - - # Find Edge/Edge overlaps - common_edges: list[Edge] = [] - if edges: - common_edges = self._bool_op((self,), edges, BRepAlgoAPI_Common()).edges() - - if common_vertices or common_edges: - # If there is just one vertex or edge return it - if len(common_vertices) == 1 and len(common_edges) == 0: - return common_vertices[0] - if len(common_vertices) == 0 and len(common_edges) == 1: - return common_edges[0] - return ShapeList(common_vertices + common_edges) - return None - def _occt_param_at( self, position: float, position_mode: PositionMode = PositionMode.PARAMETER ) -> tuple[BRepAdaptor_Curve, float, bool]: diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index e3f9495..c388fa5 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -32,7 +32,7 @@ def run_test(obj, target, expected): e_type = ShapeList if isinstance(expected, list) else expected assert isinstance(result, e_type), f"Expected {e_type}, but got {result}" if e_type == ShapeList: - assert len(result) >= len(expected), f"Expected {len(expected)} objects, but got {len(result)}" + assert len(result) == len(expected), f"Expected {len(expected)} objects, but got {len(result)}" actual_counts = Counter(type(obj) for obj in result) expected_counts = Counter(expected) @@ -67,6 +67,7 @@ pl1 = Plane.YZ pl2 = Plane.XY pl3 = Plane.XY.offset(5) pl4 = Plane((0, 5, 0)) +pl5 = Plane.YZ.offset(1) vl1 = Vector(2, 0, 0) vl2 = Vector(2, 0, 5) lc1 = Location((2, 0, 0)) @@ -151,6 +152,74 @@ def test_shape_0d(obj, target, expected): run_test(obj, target, expected) +ed1 = Line((0, 0), (5, 0)).edge() +ed2 = Line((0, -1), (5, 1)).edge() +ed3 = Line((0, 0, 5), (5, 0, 5)).edge() +ed4 = CenterArc((3, 1), 2, 0, 360).edge() +ed5 = CenterArc((3, 1), 5, 0, 360).edge() + +ed6 = Edge.make_line((0, -1), (2, 1)) +ed7 = Edge.make_line((0, 1), (2, -1)) +ed8 = Edge.make_line((0, 0), (2, 0)) + +wi1 = Wire() + [Line((0, 0), (1, 0)), RadiusArc((1, 0), (3, 1.5), 2)] +wi2 = wi1 + Line((3, 1.5), (3, -1)) +wi3 = Wire() + [Line((0, 0), (1, 0)), RadiusArc((1, 0), (3, 0), 2), Line((3, 0), (5, 0))] +wi4 = Wire() + [Line((0, 1), (2, -1)) , Line((2, -1), (3, -1))] +wi5 = wi4 + Line((3, -1), (4, 1)) +wi6 = Wire() + [Line((0, 1, 1), (2, -1, 1)), Line((2, -1, 1), (4, 1, 1))] + +shape_1d_matrix = [ + Case(ed1, vl2, None, "non-coincident", None), + Case(ed1, vl1, [Vertex], "coincident", None), + + Case(ed1, lc2, None, "non-coincident", None), + Case(ed1, lc1, [Vertex], "coincident", None), + + Case(ed3, ax1, None, "parallel/skew", None), + Case(ed2, ax1, [Vertex], "intersecting", None), + Case(ed1, ax1, [Edge], "collinear", None), + Case(ed4, ax1, [Vertex, Vertex], "multi intersect", None), + + Case(ed1, pl3, None, "parallel/skew", None), + Case(ed1, pl1, [Vertex], "intersecting", None), + Case(ed1, pl2, [Edge], "collinear", None), + Case(ed5, pl1, [Vertex, Vertex], "multi intersect", None), + + Case(ed1, vt2, None, "non-coincident", None), + Case(ed1, vt1, [Vertex], "coincident", None), + + Case(ed3, ed1, None, "parallel/skew", None), + Case(ed2, ed1, [Vertex], "intersecting", None), + Case(ed1, ed1, [Edge], "collinear", None), + Case(ed4, ed1, [Vertex, Vertex], "multi intersect", None), + + Case(ed6, [ed7, ed8], [Vertex], "multi to_intersect, intersect", None), + Case(ed6, [ed7, pl5], [Vertex], "multi to_intersect, intersect", None), + Case(ed6, [ed7, Vector(1, 0)], [Vertex], "multi to_intersect, intersect", None), + + Case(wi6, ax1, None, "parallel/skew", None), + Case(wi4, ax1, [Vertex], "intersecting", None), + Case(wi1, ax1, [Edge], "collinear", None), + Case(wi5, ax1, [Vertex, Vertex], "multi intersect", None), + Case(wi2, ax1, [Vertex, Edge], "intersect + collinear", None), + Case(wi3, ax1, [Edge, Edge], "2 collinear", None), + + Case(wi6, ed1, None, "parallel/skew", None), + Case(wi4, ed1, [Vertex], "intersecting", None), + Case(wi1, ed1, [Edge], "collinear", None), + Case(wi5, ed1, [Vertex, Vertex], "multi intersect", None), + Case(wi2, ed1, [Vertex, Edge], "intersect + collinear", None), + Case(wi3, ed1, [Edge, Edge], "2 collinear", None), + + Case(wi5, [ed1, Vector(1, 0)], [Vertex], "multi to_intersect, multi intersect", None), +] + +@pytest.mark.parametrize("obj, target, expected", make_params(shape_1d_matrix)) +def test_shape_1d(obj, target, expected): + run_test(obj, target, expected) + + # FreeCAD issue example c1 = CenterArc((0, 0), 10, 0, 360).edge() c2 = CenterArc((19, 0), 10, 0, 360).edge() @@ -178,7 +247,6 @@ freecad_matrix = [ Case(c2, vert, [Vertex], "circle, vert, intersect", None), ] -@pytest.mark.xfail @pytest.mark.parametrize("obj, target, expected", make_params(freecad_matrix)) def test_freecad(obj, target, expected): run_test(obj, target, expected) @@ -198,7 +266,7 @@ issues_matrix = [ Case(t, t, [Face, Face], "issue #1015", "Returns Compound"), Case(l, s, [Edge], "issue #945", "Edge.intersect only takes 1D"), Case(a, b, [Edge], "issue #918", "Returns empty Compound"), - Case(e1, w1, [Vertex, Vertex], "issue #697", "Returns None"), + Case(e1, w1, [Vertex, Vertex], "issue #697"), Case(e1, f1, [Edge], "issue #697", "Edge.intersect only takes 1D"), ] diff --git a/tests/test_direct_api/test_location.py b/tests/test_direct_api/test_location.py index 40f0e0a..d22cb6c 100644 --- a/tests/test_direct_api/test_location.py +++ b/tests/test_direct_api/test_location.py @@ -388,8 +388,8 @@ class TestLocation(unittest.TestCase): e3 = Edge.make_line((0, 0), (2, 0)) i = e1.intersect(e2, e3) - self.assertTrue(isinstance(i, Vertex)) - self.assertAlmostEqual(Vector(i), (1, 0, 0), 5) + self.assertTrue(isinstance(i, list)) + self.assertAlmostEqual(Vector(i[0]), (1, 0, 0), 5) e4 = Edge.make_line((1, -1), (1, 1)) e5 = Edge.make_line((2, -1), (2, 1)) From 5bf505341cee5f4a56290ed99f1b74ed9eda7081 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 22 Sep 2025 14:17:04 -0400 Subject: [PATCH 425/518] Handling MAC error codes --- src/build123d/topology/constrained_lines.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 66cbd73..3738f12 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -69,7 +69,7 @@ from OCP.gp import ( gp_Pnt, gp_Pnt2d, ) -from OCP.Standard import Standard_ConstructionError +from OCP.Standard import Standard_ConstructionError, Standard_Failure from OCP.TopoDS import TopoDS_Edge from build123d.build_enums import Sagitta, Tangency @@ -451,7 +451,7 @@ def _make_3tan_arcs( msg = "Unable to find a circle tangent to all three objects" try: gcc = Geom2dGcc_Circ2d3Tan(*q_o, TOLERANCE, *guesses) - except Standard_ConstructionError as con_err: + except (Standard_ConstructionError, Standard_Failure) as con_err: raise RuntimeError(msg) from con_err if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError(msg) From 26c723ccb6d8e6375b34f46d51b21c04461faedf Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 22 Sep 2025 14:48:36 -0400 Subject: [PATCH 426/518] Add exception tests --- tests/test_direct_api/test_intersection.py | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index c388fa5..6eebc41 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -272,4 +272,28 @@ issues_matrix = [ @pytest.mark.parametrize("obj, target, expected", make_params(issues_matrix)) def test_issues(obj, target, expected): - run_test(obj, target, expected) \ No newline at end of file + run_test(obj, target, expected) + + +# Exceptions +exception_matrix = [ + Case(vt1, Color(), None, "Unsupported type", None), + Case(ed1, Color(), None, "Unsupported type", None), +] + +@pytest.mark.skip +def make_exception_params(matrix): + params = [] + for case in matrix: + obj_type = type(case.object).__name__ + tar_type = type(case.target).__name__ + i = len(params) + uid = f"{i} {obj_type}, {tar_type}, {case.name}" + params.append(pytest.param(case.object, case.target, case.expected, id=uid)) + + return params + +@pytest.mark.parametrize("obj, target, expected", make_exception_params(exception_matrix)) +def test_exceptions(obj, target, expected): + with pytest.raises(Exception): + obj.intersect(target) \ No newline at end of file From 1754da47fa2b65cfe7334dda75cfeac1ac31704a Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 22 Sep 2025 14:50:44 -0400 Subject: [PATCH 427/518] Restructure intersection loops to intersect next in to_intersect with the previous intersect result, exit early if None --- src/build123d/topology/one_d.py | 177 +++++++++++++++---------------- src/build123d/topology/zero_d.py | 29 ++--- 2 files changed, 98 insertions(+), 108 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index d4cb000..a287f86 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -675,43 +675,71 @@ class Mixin1D(Shape): Returns: ShapeList[Vertex | Edge] | None: ShapeList of vertices and/or edges """ - # targets takes ShapeLists of edges from Edge/Wire - targets: list[ShapeList] = [ShapeList(self.edges())] - points: list[Vertex] = [] - shapes: list[Shape] = [] - planes: list[Plane] = [] - for obj in to_intersect: - match obj: - case Axis(): - targets.append(ShapeList([Edge(obj)])) - case Plane(): - planes.append(obj) - case Vector(): - points.append(Vertex(obj)) - case Location(): - points.append(Vertex(obj.position)) - case Vertex(): - points.append(obj) - case Edge(): - targets.append(ShapeList([obj])) - case Wire(): - targets.append(ShapeList(obj.edges())) - case _ if issubclass(type(obj), Shape): - shapes.append(obj) - case _: - raise ValueError(f"Unknown object type: {type(obj)}") - # Find intersections of all combinations - # Pool order biases combination order - pool = targets + points + shapes + planes - common_sets = [] - for pair in combinations(pool, 2): - common = [] - match pair: - case (ShapeList() as objs, ShapeList() as tars): - # Find any edge / edge intersection points - for obj in objs: - for tar in tars: + def to_vector(objs: Iterable) -> ShapeList: + return ShapeList([Vector(v) if isinstance(v, Vertex) else v for v in objs]) + + def to_vertex(objs: Iterable) -> ShapeList: + return ShapeList([Vertex(v) if isinstance(v, Vector) else v for v in objs]) + + common_set: ShapeList[Vertex | Edge] = ShapeList(self.edges()) + target: ShapeList | Shape | Plane + for other in to_intersect: + # Conform target type + # Vertices need to be Vector for set() + match other: + case Axis(): + target = ShapeList([Edge(other)]) + case Plane(): + target = other + case Vector(): + target = Vertex(other) + case Location(): + target = Vertex(other.position) + case Edge(): + target = ShapeList([other]) + case Wire(): + target = ShapeList(other.edges()) + case _ if issubclass(type(other), Shape): + target = other + case _: + raise ValueError(f"Unsupported type to_intersect: {type(other)}") + + # Find common matches + common: list[Vector | Edge] = [] + result: ShapeList | Shape | None + for obj in common_set: + match (obj, target): + case obj, Shape() as target: + # Find Shape with Edge/Wire + if isinstance(target, Vertex): + result = Shape.intersect(obj, target) + else: + result = target.intersect(obj) + + if result: + if not isinstance(result, list): + result = ShapeList([result]) + common.extend(to_vector(result)) + + case Vertex() as obj, target: + if not isinstance(target, ShapeList): + target = ShapeList([target]) + + for tar in target: + if isinstance(tar, Edge): + result = Shape.intersect(obj, tar) + else: + result = obj.intersect(tar) + + if result: + if not isinstance(result, list): + result = ShapeList([result]) + common.extend(to_vector(result)) + + case Edge() as obj, ShapeList() as targets: + # Find any edge / edge intersection points + for tar in targets: # Find crossing points try: intersection_points = obj.find_intersection_points(tar) @@ -722,25 +750,17 @@ class Mixin1D(Shape): # Find common end points obj_end_points = set(Vector(v) for v in obj.vertices()) tar_end_points = set(Vector(v) for v in tar.vertices()) - common.extend( - set.intersection(obj_end_points, tar_end_points) - ) + points = set.intersection(obj_end_points, tar_end_points) + common.extend(points) # Find Edge/Edge overlaps result = obj._bool_op( - (obj,), tars, BRepAlgoAPI_Common() + (obj,), targets, BRepAlgoAPI_Common() ).edges() common.extend(result if isinstance(result, list) else [result]) - case (ShapeList() as objs, Vertex() as tar): - for obj in objs: - result = Shape.intersect(obj, tar) - if result: - common.append(Vector(result)) - - case (ShapeList() as objs, Plane() as plane): - # Find any edge / plane intersection points & edges - for obj in objs: + case Edge() as obj, Plane() as plane: + # Find any edge / plane intersection points & edges # Find point intersections geom_line = BRep_Tool.Curve_s( obj.wrapped, obj.param_at(0), obj.param_at(1) @@ -762,52 +782,21 @@ class Mixin1D(Shape): ): # is a 2D edge common.append(obj) - case (ShapeList() as objs, tar): - # Find Shape with Edge/Wire - if not isinstance(tar, ShapeList): - for obj in objs: - common.append(tar.intersect(obj)) - else: - raise RuntimeError("Unexpected target of type Shapelist") + if common: + common_set = to_vertex(set(common)) + # Remove Vertex intersections coincident to Edge intersections + vts = common_set.vertices() + eds = common_set.edges() + if vts and eds: + filtered_vts = ShapeList([ + v for v in vts + if all(v.distance_to(e) > TOLERANCE for e in eds) + ]) + common_set = filtered_vts + eds + else: + return None - case (Vertex() as obj, Vertex() as tar): - common.append(tar.intersect(obj)) - - case (Plane() as obj, Plane() as tar): - result = tar.intersect(obj) - if isinstance(result, Axis): - common.append(Edge(result)) - else: - common.append(None) - - case _: - obj, tar = pair - # Always run Shape first in a pair - if isinstance(tar, Shape): - common.append(tar.intersect(obj)) - elif isinstance(obj, Shape) and not isinstance(tar, ShapeList): - common.append(obj.intersect(tar)) - else: - raise RuntimeError(f"Invalid intersection {pair}.") - - common_sets.append(set(common)) - - result = set.intersection(*common_sets) - result = ShapeList([Vertex(r) if isinstance(r, Vector) else r for r in result]) - - # Remove Vertices if part of Edges - if result: - vts = result.vertices() - eds = result.edges() - if vts and eds: - filtered_vts = list( - filter( - lambda v: all(v.distance_to(e) > TOLERANCE for e in eds), vts - ) - ) - result = filtered_vts + eds - - return ShapeList(result) if result else None + return ShapeList(common_set) def location_at( self, diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index 87b40db..cf53676 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -59,6 +59,7 @@ import warnings from typing import overload, TYPE_CHECKING from collections.abc import Iterable +from typing_extensions import Self import OCP.TopAbs as ta from OCP.BRep import BRep_Tool @@ -67,7 +68,6 @@ from OCP.TopExp import TopExp_Explorer from OCP.TopoDS import TopoDS, TopoDS_Shape, TopoDS_Vertex, TopoDS_Edge from OCP.gp import gp_Pnt from build123d.geometry import Matrix, Vector, VectorLike, Location, Axis, Plane -from typing_extensions import Self from .shape_core import Shape, ShapeList, downcast, shapetype @@ -180,31 +180,32 @@ class Vertex(Shape[TopoDS_Vertex]): Returns: ShapeList[Vertex] | None: Vertex intersection in a ShapeList or None """ - points_sets: list[set] = [] + common = Vector(self) result: Shape | ShapeList[Shape] | Vector | None for obj in to_intersect: # Treat as Vector, otherwise call intersection from Shape match obj: case Vertex(): - result = Vector(self).intersect(Vector(obj)) + result = common.intersect(Vector(obj)) case Vector() | Location() | Axis() | Plane(): - result = obj.intersect(Vector(self)) + result = obj.intersect(common) case _ if issubclass(type(obj), Shape): result = obj.intersect(self) case _: - raise ValueError(f"Unknown object type: {type(obj)}") + raise ValueError(f"Unsupported type to_intersect:: {type(obj)}") - if isinstance(result, Vector): - points_sets.append(set([result])) - elif isinstance(result, Vertex): - points_sets.append(set([Vector(result)])) - elif isinstance(result, list): - points_sets.append(set(Vector(r) for r in result)) + if isinstance(result, Vector) and result == common: + pass + elif ( + isinstance(result, list) + and len(result) == 1 + and Vector(result[0]) == common + ): + pass else: - points_sets.append(set()) + return None - common_points = set.intersection(*points_sets) - return ShapeList([Vertex(p) for p in common_points]) if common_points else None + return ShapeList([self]) # ---- Instance Methods ---- From 404aed73d6d497fea7f208474ce1fc3d7249728d Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 23 Sep 2025 10:48:06 -0400 Subject: [PATCH 428/518] Added Axis as tangent/center_on types --- src/build123d/topology/one_d.py | 65 ++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 0f0069d..bac4507 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1588,8 +1588,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, - tangency_two: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, + tangency_two: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, *, radius: float, sagitta: Sagitta = Sagitta.SHORT, @@ -1598,8 +1598,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Create all planar circular arcs of a given radius that are tangent/contacting the two provided objects on the XY plane. Args: - tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): - tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_one, tangency_two + (tuple[Axis | Edge, PositionConstraint] | Axis | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) radius (float): arc radius sagitta (LengthConstraint, optional): returned arc selector @@ -1614,10 +1614,10 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, - tangency_two: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, + tangency_two: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, *, - center_on: Edge, + center_on: Axis | Edge, sagitta: Sagitta = Sagitta.SHORT, ) -> ShapeList[Edge]: """ @@ -1625,10 +1625,10 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): CENTER lies on a given locus (line/circle/curve) on the XY plane. Args: - tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): - tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_one, tangency_two + (tuple[Axus | Edge, PositionConstraint] | Axis | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) - center_on (Edge): center must lie on this edge + center_on (Axis | Edge): center must lie on this object sagitta (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. @@ -1641,9 +1641,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, - tangency_two: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, - tangency_three: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, + tangency_two: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, + tangency_three: ( + tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike + ), *, sagitta: Sagitta = Sagitta.SHORT, ) -> ShapeList[Edge]: @@ -1651,9 +1653,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Create planar circular arc(s) on XY tangent to three provided objects. Args: - tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): - tangency_two (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): - tangency_three (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_one, tangency_two, tangency_three + (tuple[Axis | Edge, PositionConstraint] | Axis | Edge | Vertex | VectorLike): Geometric entities to be contacted/touched by the circle(s) sagitta (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to @@ -1667,7 +1668,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, *, center: VectorLike, ) -> ShapeList[Edge]: @@ -1677,7 +1678,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): a single object. Args: - tangency_one (tuple[Edge, PositionConstraint] | Edge | Vertex | VectorLike): + tangency_one + (tuple[Axis | Edge, PositionConstraint] | Axis | Edge | Vertex | VectorLike): Geometric entity to be contacted/touched by the circle(s) center (VectorLike): center position @@ -1689,7 +1691,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_arcs( cls, - tangency_one: tuple[Edge, Tangency] | Edge | Vertex | VectorLike, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge | Vertex | VectorLike, *, radius: float, center_on: Edge, @@ -1702,10 +1704,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): - have their CENTER constrained to lie on a given locus curve. Args: - tangency_one (tuple[Edge, PositionConstraint] | Vertex | VectorLike): + tangency_one + (tuple[Axis | Edge, PositionConstraint] | Axis | Edge | Vertex | VectorLike): Geometric entity to be contacted/touched by the circle(s) radius (float): arc radius - center_on (Edge): center must lie on this edge + center_on (Axis | Edge): center must lie on this object sagitta (LengthConstraint, optional): returned arc selector (i.e. either the short, long or both arcs). Defaults to LengthConstraint.SHORT. @@ -1743,17 +1746,24 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): ] tangencies: list[tuple[Edge, Tangency] | Edge | Vector] = [] for tangency_arg in tangency_args: - if isinstance(tangency_arg, Edge): - tangencies.append(tangency_arg) - continue - if isinstance(tangency_arg, tuple) and isinstance(tangency_arg[0], Edge): + if isinstance(tangency_arg, Axis): + tangencies.append(Edge(tangency_arg)) + continue + elif isinstance(tangency_arg, Edge): tangencies.append(tangency_arg) continue + if isinstance(tangency_arg, tuple): + if isinstance(tangency_arg[0], Axis): + tangencies.append(tuple(Edge(tangency_arg[0], tangency_arg[1]))) + continue + elif isinstance(tangency_arg[0], Edge): + tangencies.append(tangency_arg) + continue if isinstance(tangency_arg, Vertex): tangencies.append(Vector(tangency_arg) + tangency_arg.position) continue - # if not Edges, constrained Edges or Vertex convert to Vectors + # if not Axes, Edges, constrained Edges or Vertex convert to Vectors try: tangencies.append(Vector(tangency_arg)) except Exception as exc: @@ -1770,6 +1780,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): if radius is not None and radius <= 0: raise ValueError("radius must be > 0.0") + if center_on is not None and isinstance(center_on, Axis): + center_on = Edge(center_on) + # --- decide problem kind --- if ( tan_count == 2 From fed77612c0d68663dffd7eac305ae6bc2456067a Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 23 Sep 2025 13:46:12 -0400 Subject: [PATCH 429/518] Coverage at 100% --- src/build123d/topology/constrained_lines.py | 34 +-- .../test_direct_api/test_constrained_arcs.py | 205 +++++++++++++++++- 2 files changed, 207 insertions(+), 32 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 3738f12..624ee37 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -384,30 +384,11 @@ def _make_2tan_on_arcs( if not _ok(1, u_arg2): continue - # Center must lie on the trimmed center_on curve segment - center2d = circ.Location() # gp_Pnt2d - - # Project center onto the (trimmed) 2D locus - proj = Geom2dAPI_ProjectPointOnCurve(center2d, h_e[2]) - if proj.NbPoints() == 0: - continue # no projection -> reject - - u_on = proj.Parameter(1) - # Optional: make sure it's actually on the curve (not just near) - if proj.Distance(1) > TOLERANCE: - continue - - # Respect the trimmed interval (handles periodic curves too) - if not _param_in_trim(u_on, e_first[2], e_last[2], h_e[2]): - continue - # Build sagitta arc(s) and select by LengthConstraint if sagitta == Sagitta.BOTH: solutions.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) else: arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) - if not arcs: - continue arcs = sorted( arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)) ) @@ -498,8 +479,6 @@ def _make_3tan_arcs( out_topos.extend(_two_arc_edges_from_params(circ, u_circ1, u_circ2)) else: arcs = _two_arc_edges_from_params(circ, u_circ1, u_circ2) - if not arcs: - continue arcs = sorted( arcs, key=lambda e: GCPnts_AbscissaPoint.Length_s(BRepAdaptor_Curve(e)), @@ -571,10 +550,9 @@ def _make_tan_cen_arcs( assert isinstance(q_o1, Geom2dGcc_QualifiedCurve) # Case B: tangency target is a curve/edge (qualified curve) gcc = Geom2dGcc_Circ2dTanCen(q_o1, Geom2d_CartesianPoint(c2d), TOLERANCE) - if not gcc.IsDone() or gcc.NbSolutions() == 0: - raise RuntimeError( - "Unable to find circle(s) tangent to target with fixed center" - ) + assert ( + gcc.IsDone() and gcc.NbSolutions() > 0 + ), "Unexpected: GCC failed to return a tangent circle" for i in range(1, gcc.NbSolutions() + 1): circ = gcc.ThisSolution(i) # gp_Circ2d @@ -657,13 +635,7 @@ def _make_tan_on_rad_arcs( # Project center onto the (trimmed) 2D locus proj = Geom2dAPI_ProjectPointOnCurve(center2d, h_on2d) - if proj.NbPoints() == 0: - continue # no projection -> reject - u_on = proj.Parameter(1) - # Optional: make sure it's actually on the curve (not just near) - if proj.Distance(1) > TOLERANCE: - continue # Respect the trimmed interval (handles periodic curves too) if not _param_in_trim(u_on, on_first, on_last, h_on2d): diff --git a/tests/test_direct_api/test_constrained_arcs.py b/tests/test_direct_api/test_constrained_arcs.py index 5cd8a97..3eaab09 100644 --- a/tests/test_direct_api/test_constrained_arcs.py +++ b/tests/test_direct_api/test_constrained_arcs.py @@ -36,7 +36,14 @@ from build123d.objects_curve import ( ThreePointArc, ) from build123d.operations_generic import mirror -from build123d.topology import Edge, Solid, Vertex, Wire, topo_explore_common_vertex +from build123d.topology import ( + Edge, + Face, + Solid, + Vertex, + Wire, + topo_explore_common_vertex, +) from build123d.geometry import Axis, Plane, Vector, TOLERANCE from build123d.build_enums import Tangency, Sagitta, LengthMode from build123d.topology.constrained_lines import ( @@ -184,6 +191,14 @@ def test_tan2_center_on_3(): def test_tan2_center_on_4(): + """2 tangents & center on""" + tan2_on_edge = Edge.make_constrained_arcs( + Line((-5, 3), (5, 3)), (5, 0), center_on=Axis.Y + ) + assert len(tan2_on_edge) == 1 + + +def test_tan2_center_on_5(): """2 tangents & center on""" with pytest.raises(RuntimeError) as excinfo: Edge.make_constrained_arcs( @@ -196,6 +211,142 @@ def test_tan2_center_on_4(): ) +def test_tan2_center_on_6(): + """2 tangents & center on""" + l1 = Line((0, 0), (5, 0)) + l2 = Line((0, 0), (0, 5)) + l3 = Line((20, 20), (22, 22)) + with pytest.raises(RuntimeError) as excinfo: + Edge.make_constrained_arcs(l1, l2, center_on=l3) + assert "Unable to find a tangent arc with center_on constraint" in str( + excinfo.value + ) + + +# --- Sagitta selection branches --- + + +def test_tan2_center_on_sagitta_both_returns_two_arcs(): + """ + TWO lines, center_on a line that crosses *both* angle bisectors → multiple + circle solutions; with Sagitta.BOTH we should get 2 arcs per solution. + Setup: x-axis & y-axis; center_on y=1. + """ + c1 = Line((-10, 0), (10, 0)) # y = 0 + c2 = Line((0, -10), (0, 10)) # x = 0 + center_on = Line((-10, 1), (10, 1)) # y = 1 + + arcs = Edge.make_constrained_arcs( + (c1, Tangency.UNQUALIFIED), + (c2, Tangency.UNQUALIFIED), + center_on=center_on, + sagitta=Sagitta.BOTH, + ) + # Expect 2 solutions (centers at (1,1) and (-1,1)), each yielding 2 arcs → 4 + assert len(arcs) >= 2 # be permissive across kernels; typically 4 + # At least confirms BOTH path is covered and multiple solutions iterate + + +def test_tan2_center_on_sagitta_long_is_longer_than_short(): + """ + Verify LONG branch by comparing lengths against SHORT for the same geometry. + """ + c1 = Line((-10, 0), (10, 0)) # y = 0 + c2 = Line((0, -10), (0, 10)) # x = 0 + center_on = Line((3, -10), (3, 10)) # x = 3 (unique center) + + short_arc = Edge.make_constrained_arcs( + (c1, Tangency.UNQUALIFIED), + (c2, Tangency.UNQUALIFIED), + center_on=center_on, + sagitta=Sagitta.SHORT, + ) + long_arc = Edge.make_constrained_arcs( + (c1, Tangency.UNQUALIFIED), + (c2, Tangency.UNQUALIFIED), + center_on=center_on, + sagitta=Sagitta.LONG, + ) + assert len(short_arc) == 2 + assert len(long_arc) == 2 + assert long_arc[0].length > short_arc[0].length + + +# --- Filtering branches inside the Solutions loop --- + + +def test_tan2_center_on_filters_outside_first_tangent_segment(): + """ + Cause _ok(0, u_arg1) to fail: + - First tangency is a *very short* horizontal segment near x∈[0, 0.01]. + - Second tangency is a vertical line far away. + - Center_on is x=5 (vertical). + The resulting tangency on the infinite horizontal line occurs near x≈center.x (≈5), + which lies *outside* the trimmed first segment → filtered out, no arcs. + """ + tiny_first = Line((0.0, 0.0), (0.01, 0.0)) # very short horizontal + c2 = Line((10.0, -10.0), (10.0, 10.0)) # vertical line + center_on = Line((5.0, -10.0), (5.0, 10.0)) # x = 5 + + arcs = Edge.make_constrained_arcs( + (tiny_first, Tangency.UNQUALIFIED), + (c2, Tangency.UNQUALIFIED), + center_on=center_on, + sagitta=Sagitta.SHORT, + ) + # GCC likely finds solutions, but they should be filtered out by _ok(0) + assert len(arcs) == 0 + + +def test_tan2_center_on_filters_outside_second_tangent_segment(): + """ + Cause _ok(1, u_arg2) to fail: + - First tangency is a *point* (so _ok(0) is trivially True). + - Second tangency is a *very short* vertical segment around y≈0 on x=10. + - Center_on is y=2 (horizontal), and first point is at (0,2). + For a circle through (0,2) and tangent to x=10 with center_on y=2, + the center is at (5,2), radius=5, so tangency on x=10 occurs at y=2, + which is *outside* the tiny segment around y≈0 → filtered by _ok(1). + """ + first_point = (0.0, 2.0) # acts as a "point object" + tiny_second = Line((10.0, -0.005), (10.0, 0.005)) # very short vertical near y=0 + center_on = Line((-10.0, 2.0), (10.0, 2.0)) # y = 2 + + arcs = Edge.make_constrained_arcs( + first_point, + (tiny_second, Tangency.UNQUALIFIED), + center_on=center_on, + sagitta=Sagitta.SHORT, + ) + assert len(arcs) == 0 + + +# --- Multiple-solution loop coverage with BOTH again (robust geometry) --- + + +def test_tan2_center_on_multiple_solutions_both_counts(): + """ + Another geometry with 2+ GCC solutions: + c1: y=0, c2: y=4 (two non-intersecting parallels), center_on x=0. + Any circle tangent to both has radius=2 and center on y=2; with center_on x=0, + the center fixes at (0,2) — single center → two arcs (BOTH). + Use intersecting lines instead to guarantee >1 solutions: c1: y=0, c2: x=0, + center_on y=-2 (intersects both angle bisectors at (-2,-2) and (2,-2)). + """ + c1 = Line((-20, 0), (20, 0)) # y = 0 + c2 = Line((0, -20), (0, 20)) # x = 0 + center_on = Line((-20, -2), (20, -2)) # y = -2 + + arcs = Edge.make_constrained_arcs( + (c1, Tangency.UNQUALIFIED), + (c2, Tangency.UNQUALIFIED), + center_on=center_on, + sagitta=Sagitta.BOTH, + ) + # Expect at least 2 arcs (often 4); asserts loop over multiple i values + assert len(arcs) >= 2 + + def test_tan_center_on_1(): """1 tangent & center on""" c5 = PolarLine((0, 0), 4, 60) @@ -204,6 +355,21 @@ def test_tan_center_on_1(): assert tan_center[0].is_closed +def test_tan_center_on_2(): + """1 tangent & center on""" + tan_center = Edge.make_constrained_arcs(Axis.X, center=(2, 1, 5)) + assert len(tan_center) == 1 + assert tan_center[0].is_closed + + +def test_tan_center_on_3(): + """1 tangent & center on""" + l1 = CenterArc((0, 0), 1, 180, 5) + tan_center = Edge.make_constrained_arcs(l1, center=(2, 0)) + assert len(tan_center) == 1 + assert tan_center[0].is_closed + + def test_pnt_center_1(): """pnt & center""" pnt_center = Edge.make_constrained_arcs((-2.5, 1.5), center=(-2, 1)) @@ -215,6 +381,21 @@ def test_pnt_center_1(): assert pnt_center[0].is_closed +def test_tan_cen_arcs_center_equals_point_returns_empty(): + """ + If the fixed center coincides with the tangency point, + the computed radius is zero and no valid circle exists. + Function should return an empty ShapeList. + """ + center = (0, 0) + tangency_point = (0, 0) # same as center + + arcs = Edge.make_constrained_arcs(tangency_point, center=center) + + assert isinstance(arcs, list) # ShapeList subclass + assert len(arcs) == 0 + + def test_tan_rad_center_on_1(): """tangent, radius, center on""" c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) @@ -226,6 +407,28 @@ def test_tan_rad_center_on_1(): assert tan_rad_on[0].is_closed +def test_tan_rad_center_on_2(): + """tangent, radius, center on""" + c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) + tan_rad_on = Edge.make_constrained_arcs(c1, radius=1, center_on=Axis.X) + assert len(tan_rad_on) == 1 + assert tan_rad_on[0].is_closed + + +def test_tan_rad_center_on_3(): + """tangent, radius, center on""" + c1 = PolarLine((0, 0), 4, -20, length_mode=LengthMode.HORIZONTAL) + with pytest.raises(TypeError) as excinfo: + Edge.make_constrained_arcs(c1, radius=1, center_on=Face.make_rect(1, 1)) + + +def test_tan_rad_center_on_4(): + """tangent, radius, center on""" + c1 = Line((0, 10), (10, 10)) + with pytest.raises(RuntimeError) as excinfo: + Edge.make_constrained_arcs(c1, radius=1, center_on=Axis.X) + + def test_tan3_1(): """3 tangents""" c5 = PolarLine((0, 0), 4, 60) From 25de6af76b348f8a602dfa0f909239e9e7e9eabc Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 23 Sep 2025 13:20:58 -0500 Subject: [PATCH 430/518] objects_curve.py -> add deprecations to unreleased arc type objects --- src/build123d/objects_curve.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index e697145..497310a 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -29,6 +29,7 @@ license: from __future__ import annotations import copy as copy_module +import warnings from collections.abc import Iterable from itertools import product from math import copysign, cos, radians, sin, sqrt @@ -1237,6 +1238,12 @@ class PointArcTangentLine(BaseEdgeObject): mode (Mode, optional): combination mode. Defaults to Mode.ADD """ + warnings.warn( + "The 'PointArcTangentLine' object is deprecated and will be removed in a future version.", + DeprecationWarning, + stacklevel=2, + ) + _applies_to = [BuildLine._tag] def __init__( @@ -1316,6 +1323,12 @@ class PointArcTangentArc(BaseEdgeObject): RuntimeError: No tangent arc found """ + warnings.warn( + "The 'PointArcTangentArc' object is deprecated and will be removed in a future version.", + DeprecationWarning, + stacklevel=2, + ) + _applies_to = [BuildLine._tag] def __init__( @@ -1459,6 +1472,11 @@ class ArcArcTangentLine(BaseEdgeObject): Defaults to Keep.INSIDE mode (Mode, optional): combination mode. Defaults to Mode.ADD """ + warnings.warn( + "The 'ArcArcTangentLine' object is deprecated and will be removed in a future version.", + DeprecationWarning, + stacklevel=2, + ) _applies_to = [BuildLine._tag] @@ -1560,6 +1578,12 @@ class ArcArcTangentArc(BaseEdgeObject): mode (Mode, optional): combination mode. Defaults to Mode.ADD """ + warnings.warn( + "The 'ArcArcTangentArc' object is deprecated and will be removed in a future version.", + DeprecationWarning, + stacklevel=2, + ) + _applies_to = [BuildLine._tag] def __init__( From f4c79db263d42ec372328cb42fccdc9ef4da2622 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 24 Sep 2025 23:16:35 -0400 Subject: [PATCH 431/518] Change kwarg capitalization to fix #1026. Unindent code blocks, fix doublespace + formatting --- docs/location_arithmetic.rst | 136 +++++++++++++++++------------------ 1 file changed, 66 insertions(+), 70 deletions(-) diff --git a/docs/location_arithmetic.rst b/docs/location_arithmetic.rst index f26834e..a28c105 100644 --- a/docs/location_arithmetic.rst +++ b/docs/location_arithmetic.rst @@ -3,7 +3,6 @@ Location arithmetic for algebra mode ====================================== - Position a shape relative to the XY plane --------------------------------------------- @@ -19,134 +18,131 @@ For the following use the helper function: circle = Circle(scale * .8).edge() return (triad + circle).locate(plane.location) - 1. **Positioning at a location** - .. code-block:: python +.. code-block:: python - loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) + loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) - face = loc * Rectangle(1,2) + face = loc * Rectangle(1, 2) - show_object(face, name="face") - show_object(location_symbol(loc), name="location") + show_object(face, name="face") + show_object(location_symbol(loc), name="location") - .. image:: assets/location-example-01.png +.. image:: assets/location-example-01.png 2) **Positioning on a plane** - .. code-block:: python +.. code-block:: python - plane = Plane.XZ + plane = Plane.XZ - face = plane * Rectangle(1, 2) + face = plane * Rectangle(1, 2) - show_object(face, name="face") - show_object(plane_symbol(plane), name="plane") + show_object(face, name="face") + show_object(plane_symbol(plane), name="plane") - .. image:: assets/location-example-07.png - - Note that the ``x``-axis and the ``y``-axis of the plane are on the ``x``-axis and the ``z``-axis of the world coordinate system (red and blue axis) +.. image:: assets/location-example-07.png +Note: The ``x``-axis and the ``y``-axis of the plane are on the ``x``-axis and the ``z``-axis of the world coordinate system (red and blue axis). Relative positioning to a plane ------------------------------------ 1. **Position an object on a plane relative to the plane** - .. code-block:: python +.. code-block:: python - loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) + loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) - face = loc * Rectangle(1,2) + face = loc * Rectangle(1,2) - box = Plane(loc) * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) - # box = Plane(face.location) * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) - # box = loc * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) + box = Plane(loc) * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) + # box = Plane(face.location) * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) + # box = loc * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) - show_object(face, name="face") - show_object(location_symbol(loc), name="location") - show_object(box, name="box") + show_object(face, name="face") + show_object(location_symbol(loc), name="location") + show_object(box, name="box") - .. image:: assets/location-example-02.png +.. image:: assets/location-example-02.png - The ``x``, ``y``, ``z`` components of ``Pos(0.2, 0.4, 0.1)`` are relative to the ``x``-axis, ``y``-axis or - ``z``-axis of the underlying location ``loc``. +The ``X``, ``Y``, ``Z`` components of ``Pos(0.2, 0.4, 0.1)`` are relative to the ``x``-axis, ``y``-axis or +``z``-axis of the underlying location ``loc``. - Note: ``Plane(loc) *``, ``Plane(face.location) *`` and ``loc *`` are equivalent in this example. +Note: ``Plane(loc) *``, ``Plane(face.location) *`` and ``loc *`` are equivalent in this example. 2. **Rotate an object on a plane relative to the plane** - .. code-block:: python +.. code-block:: python - loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) + loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) - face = loc * Rectangle(1,2) + face = loc * Rectangle(1,2) - box = Plane(loc) * Rot(z=80) * Box(0.2, 0.2, 0.2) + box = Plane(loc) * Rot(Z=80) * Box(0.2, 0.2, 0.2) - show_object(face, name="face") - show_object(location_symbol(loc), name="location") - show_object(box, name="box") + show_object(face, name="face") + show_object(location_symbol(loc), name="location") + show_object(box, name="box") - .. image:: assets/location-example-03.png +.. image:: assets/location-example-03.png - The box is rotated via ``Rot(z=80)`` around the ``z``-axis of the underlying location - (and not of the z-axis of the world). +The box is rotated via ``Rot(Z=80)`` around the ``z``-axis of the underlying location +(and not of the z-axis of the world). - More general: +More general: - .. code-block:: python +.. code-block:: python - loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) + loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) - face = loc * Rectangle(1,2) + face = loc * Rectangle(1,2) - box = loc * Rot(20, 40, 80) * Box(0.2, 0.2, 0.2) + box = loc * Rot(20, 40, 80) * Box(0.2, 0.2, 0.2) - show_object(face, name="face") - show_object(location_symbol(loc), name="location") - show_object(box, name="box") + show_object(face, name="face") + show_object(location_symbol(loc), name="location") + show_object(box, name="box") - .. image:: assets/location-example-04.png +.. image:: assets/location-example-04.png - The box is rotated via ``Rot(20, 40, 80)`` around all three axes relative to the plane. +The box is rotated via ``Rot(20, 40, 80)`` around all three axes relative to the plane. 3. **Rotate and position an object relative to a location** - .. code-block:: python +.. code-block:: python - loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) + loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) - face = loc * Rectangle(1,2) + face = loc * Rectangle(1,2) - box = loc * Rot(20, 40, 80) * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) + box = loc * Rot(20, 40, 80) * Pos(0.2, 0.4, 0.1) * Box(0.2, 0.2, 0.2) - show_object(face, name="face") - show_object(location_symbol(loc), name="location") - show_object(box, name="box") - show_object(location_symbol(loc * Rot(20, 40, 80), 0.5), options={"color":(0, 255, 255)}, name="local_location") + show_object(face, name="face") + show_object(location_symbol(loc), name="location") + show_object(box, name="box") + show_object(location_symbol(loc * Rot(20, 40, 80), 0.5), options={"color":(0, 255, 255)}, name="local_location") - .. image:: assets/location-example-05.png +.. image:: assets/location-example-05.png - The box is positioned via ``Pos(0.2, 0.4, 0.1)`` relative to the location ``loc * Rot(20, 40, 80)`` +The box is positioned via ``Pos(0.2, 0.4, 0.1)`` relative to the location ``loc * Rot(20, 40, 80)`` 4. **Position and rotate an object relative to a location** - .. code-block:: python +.. code-block:: python - loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) + loc = Location((0.1, 0.2, 0.3), (10, 20, 30)) - face = loc * Rectangle(1,2) + face = loc * Rectangle(1,2) - box = loc * Pos(0.2, 0.4, 0.1) * Rot(20, 40, 80) * Box(0.2, 0.2, 0.2) + box = loc * Pos(0.2, 0.4, 0.1) * Rot(20, 40, 80) * Box(0.2, 0.2, 0.2) - show_object(face, name="face") - show_object(location_symbol(loc), name="location") - show_object(box, name="box") - show_object(location_symbol(loc * Pos(0.2, 0.4, 0.1), 0.5), options={"color":(0, 255, 255)}, name="local_location") + show_object(face, name="face") + show_object(location_symbol(loc), name="location") + show_object(box, name="box") + show_object(location_symbol(loc * Pos(0.2, 0.4, 0.1), 0.5), options={"color":(0, 255, 255)}, name="local_location") - .. image:: assets/location-example-06.png - - Note: This is the same as `box = loc * Location((0.2, 0.4, 0.1), (20, 40, 80)) * Box(0.2, 0.2, 0.2)` +.. image:: assets/location-example-06.png +Note: This is the same as ``box = loc * Location((0.2, 0.4, 0.1), (20, 40, 80)) * Box(0.2, 0.2, 0.2)`` From bb9495a821970feaa1b6bbdf403d570e58d024cd Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 24 Sep 2025 23:28:22 -0400 Subject: [PATCH 432/518] Reorder mirror / make_face bot best practice to resolve #1053 --- docs/assets/ttt/ttt-ppp0106.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/ttt/ttt-ppp0106.py b/docs/assets/ttt/ttt-ppp0106.py index 596a47b..abd6751 100644 --- a/docs/assets/ttt/ttt-ppp0106.py +++ b/docs/assets/ttt/ttt-ppp0106.py @@ -21,8 +21,8 @@ with BuildSketch(Location((0, -r1, y3))) as sk_body: m3 = IntersectingLine(m2 @ 1, m2 % 1, c1) m4 = Line(m3 @ 1, (r1, r1)) m5 = JernArc(m4 @ 1, m4 % 1, r1, -90) - m6 = Line(m5 @ 1, m1 @ 0) - mirror(make_face(l.line), Plane.YZ) + mirror(about=Plane.YZ) + make_face() fillet(sk_body.vertices().group_by(Axis.Y)[1], 12) with Locations((x1 / 2, y_tot - 10), (-x1 / 2, y_tot - 10)): Circle(r2, mode=Mode.SUBTRACT) From 640b5300583151eb43860690e46f96983ad0d885 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 24 Sep 2025 23:48:46 -0400 Subject: [PATCH 433/518] Fix doctrings for sphinx make --- src/build123d/topology/one_d.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index bac4507..b750697 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -531,7 +531,7 @@ class Mixin1D(Shape): A curvature comb is a set of short line segments (“teeth”) erected perpendicular to the curve that visualize the signed curvature κ(u). - Tooth length is proportional to |κ| and the direction encodes the sign + Tooth length is proportional to \|κ\| and the direction encodes the sign (left normal for κ>0, right normal for κ<0). This is useful for inspecting fairness and continuity (C0/C1/C2) of edges and wires. @@ -554,7 +554,7 @@ class Mixin1D(Shape): - On straight segments, κ = 0 so no teeth are drawn. - At inflection points κ→0 and the tooth flips direction. - At C0 corners the tangent is discontinuous; nearby teeth may jump. - C1 yields continuous direction; C2 yields continuous magnitude as well. + C1 yields continuous direction; C2 yields continuous magnitude as well. Example: >>> comb = my_wire.curvature_comb(count=200, max_tooth_size=2.0) @@ -961,16 +961,16 @@ class Mixin1D(Shape): The meaning of the returned parameter depends on the type of self: - **Edge**: Returns the native OCCT curve parameter corresponding to the - given normalized `position` (0.0 → start, 1.0 → end). For closed/periodic - edges, OCCT may return a value **outside** the edge's nominal parameter - range `[param_min, param_max]` (e.g., by adding/subtracting multiples of - the period). If you require a value folded into the edge's range, apply a - modulo with the parameter span. + given normalized `position` (0.0 → start, 1.0 → end). For closed/periodic + edges, OCCT may return a value **outside** the edge's nominal parameter + range `[param_min, param_max]` (e.g., by adding/subtracting multiples of + the period). If you require a value folded into the edge's range, apply a + modulo with the parameter span. - **Wire**: Returns a *composite* parameter encoding both the edge index - and the position within that edge: the **integer part** is the zero-based - count of fully traversed edges, and the **fractional part** is the - normalized position in `[0.0, 1.0]` along the current edge. + and the position within that edge: the **integer part** is the zero-based + count of fully traversed edges, and the **fractional part** is the + normalized position in `[0.0, 1.0]` along the current edge. Args: position (float): Normalized arc-length position along the shape, From 31a73bacdaf82bc711f1ce676971937f556c32b8 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 1 Oct 2025 11:36:49 -0400 Subject: [PATCH 434/518] Basic make_constrained_lines working --- src/build123d/topology/constrained_lines.py | 141 ++++++++++++++++++- src/build123d/topology/one_d.py | 146 +++++++++++++++++++- 2 files changed, 279 insertions(+), 8 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 624ee37..0d2925a 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -29,7 +29,7 @@ license: from __future__ import annotations -from math import floor, pi +from math import cos, sin from typing import TYPE_CHECKING, Callable, TypeVar from typing import cast as tcast @@ -49,33 +49,34 @@ from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve from OCP.Geom2dAPI import Geom2dAPI_ProjectPointOnCurve from OCP.Geom2dGcc import ( Geom2dGcc_Circ2d2TanOn, - Geom2dGcc_Circ2d2TanOnGeo, Geom2dGcc_Circ2d2TanRad, Geom2dGcc_Circ2d3Tan, Geom2dGcc_Circ2dTanCen, Geom2dGcc_Circ2dTanOnRad, - Geom2dGcc_Circ2dTanOnRadGeo, + Geom2dGcc_Lin2dTanObl, + Geom2dGcc_Lin2d2Tan, Geom2dGcc_QualifiedCurve, ) -from OCP.GeomAbs import GeomAbs_CurveType -from OCP.GeomAPI import GeomAPI, GeomAPI_ProjectPointOnCurve +from OCP.GeomAPI import GeomAPI from OCP.gp import ( gp_Ax2d, gp_Ax3, gp_Circ2d, gp_Dir, gp_Dir2d, + gp_Lin2d, gp_Pln, gp_Pnt, gp_Pnt2d, ) +from OCP.IntAna2d import IntAna2d_AnaIntersection from OCP.Standard import Standard_ConstructionError, Standard_Failure from OCP.TopoDS import TopoDS_Edge from build123d.build_enums import Sagitta, Tangency -from build123d.geometry import TOLERANCE, Vector, VectorLike +from build123d.geometry import Axis, TOLERANCE, Vector, VectorLike from .zero_d import Vertex -from .shape_core import ShapeList, downcast +from .shape_core import ShapeList if TYPE_CHECKING: from build123d.topology.one_d import Edge # pragma: no cover @@ -201,6 +202,40 @@ def _two_arc_edges_from_params( return [minor, major] +def _edge_from_line( + p1: gp_Pnt2d, + p2: gp_Pnt2d, +) -> TopoDS_Edge: + """ + Build a finite Edge from two 2D contact points. + + Parameters + ---------- + p1, p2 : gp_Pnt2d + Endpoints of the line segment (in 2D). + edge_factory : type[Edge], optional + Factory for building the Edge subtype (defaults to Edge). + + Returns + ------- + TopoDS_Edge + Finite line segment between the two points. + """ + mk_edge = BRepBuilderAPI_MakeEdge( + Vertex(p1.X(), p1.Y()).wrapped, Vertex(p2.X(), p2.Y()).wrapped + ) + if not mk_edge.IsDone(): + raise RuntimeError("Failed to build edge from line contacts") + return mk_edge.Edge() + + +def _gp_lin2d_from_axis(ax: Axis) -> gp_Lin2d: + """Build a 2D reference line from an Axis (XY plane).""" + p = gp_Pnt2d(ax.position.X, ax.position.Y) + d = gp_Dir2d(ax.direction.X, ax.direction.Y) + return gp_Lin2d(gp_Ax2d(p, d)) + + def _qstr(q) -> str: # pragma: no cover """Debugging facility that works with OCP's GccEnt enum values""" try: @@ -646,3 +681,95 @@ def _make_tan_on_rad_arcs( out_topos.append(_edge_from_circle(h2d, 0.0, per)) return ShapeList([edge_factory(e) for e in out_topos]) + + +# ----------------------------------------------------------------------------- +# Line solvers (siblings of constrained arcs) +# ----------------------------------------------------------------------------- + + +def _make_2tan_lines( + curve1: Edge, + curve2: Edge | Vector, + *, + edge_factory: Callable[[TopoDS_Edge], Edge], +) -> ShapeList[Edge]: + """ + Construct line(s) tangent to two curves. + + Parameters + ---------- + curve1, curve2 : Edge + Target curves. + + Returns + ------- + ShapeList[Edge] + Finite tangent line(s). + """ + q1, _, _, _, _ = _as_gcc_arg(curve1, Tangency.UNQUALIFIED) + + if isinstance(curve2, Vector): + pnt_2d = gp_Pnt2d(curve2.X, curve2.Y) + gcc = Geom2dGcc_Lin2d2Tan(q1, pnt_2d, TOLERANCE) + else: + q2, _, _, _, _ = _as_gcc_arg(curve2, Tangency.UNQUALIFIED) + gcc = Geom2dGcc_Lin2d2Tan(q1, q2, TOLERANCE) + + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find common tangent line(s)") + + out_edges: list[Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + # Two tangency points + p1, p2 = gp_Pnt2d(), gp_Pnt2d() + gcc.Tangency1(i, p1) + gcc.Tangency2(i, p2) + contacts = [p1, p2] + + out_edges.append(_edge_from_line(*contacts)) + return ShapeList([edge_factory(e) for e in out_edges]) + + +def _make_tan_oriented_lines( + curve: Edge, + reference: Axis, + angle: float | None = None, # radians; absolute angle offset from `reference` + *, + edge_factory: Callable[[TopoDS_Edge], Edge], +) -> ShapeList[Edge]: + """ + Construct line(s) tangent to a curve and forming a given angle with a + reference line (Axis) per Geom2dGcc_Lin2dTanObl. Trimmed between: + - the tangency point on the curve, and + - the intersection with the reference line. + """ + q_curve, _, _, _, _ = _as_gcc_arg(curve, Tangency.UNQUALIFIED) + + dir2d = gp_Dir2d(cos(angle), sin(angle)) + + # Reference axis as gp_Lin2d + ref_lin = _gp_lin2d_from_axis(reference) + + gcc = Geom2dGcc_Lin2dTanObl(q_curve, ref_lin, TOLERANCE, angle) + if not gcc.IsDone() or gcc.NbSolutions() == 0: + raise RuntimeError("Unable to find tangent line for given orientation") + + out: list[TopoDS_Edge] = [] + for i in range(1, gcc.NbSolutions() + 1): + # Tangency on the curve + p_tan = gp_Pnt2d() + gcc.Tangency1(i, p_tan) + + tan_line = gp_Lin2d(p_tan, dir2d) + + # Intersect with reference axis + # Note: Intersection2 doesn't seem reliable + inter = IntAna2d_AnaIntersection(tan_line, ref_lin) + if not inter.IsDone() or inter.NbPoints() == 0: + continue + p_isect = inter.Point(1).Value() + + out.append(_edge_from_line(p_tan, p_isect)) + + return ShapeList([edge_factory(e) for e in out]) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index bac4507..9cbb41f 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -56,7 +56,7 @@ import itertools import warnings from collections.abc import Iterable from itertools import combinations -from math import ceil, copysign, cos, floor, inf, isclose, pi, radians +from math import atan2, ceil, copysign, cos, floor, inf, isclose, pi, radians from typing import TYPE_CHECKING, Literal, TypeAlias, overload from typing import cast as tcast @@ -240,6 +240,8 @@ from .constrained_lines import ( _make_3tan_arcs, _make_tan_cen_arcs, _make_tan_on_rad_arcs, + _make_tan_oriented_lines, + _make_2tan_lines, ) if TYPE_CHECKING: # pragma: no cover @@ -1824,6 +1826,148 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): raise ValueError("Unsupported or ambiguous combination of constraints.") + @overload + @classmethod + def make_constrained_lines( + cls, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge, + tangency_two: tuple[Axis | Edge, Tangency] | Axis | Edge, + ) -> ShapeList[Edge]: + """ + Create all planar line(s) on the XY plane tangent to two provided curves. + + Args: + tangency_one, tangency_two + (tuple[Axis | Edge, Tangency] | Axis | Edge): + Geometric entities to be contacted/touched by the line(s). + + Returns: + ShapeList[Edge]: tangent lines + """ + + @overload + @classmethod + def make_constrained_lines( + cls, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge, + tangency_two: Vector, + *, + angle: float | None = None, + direction: Vector | None = None, + ) -> ShapeList[Edge]: + """ + Create all planar line(s) on the XY plane tangent to one curve and passing + through a fixed point. + + Args: + tangency_one + (tuple[Axis | Edge, Tangency] | Axis | Edge): + Geometric entity to be contacted/touched by the line(s). + tangency_two (Vector): + Fixed point through which the line(s) must pass. + angle : float, optional + Line orientation in degrees (measured CCW from the X-axis). + direction : Vector, optional + Direction vector for the line (only X and Y components are used). + + Returns: + ShapeList[Edge]: tangent lines + """ + + @overload + @classmethod + def make_constrained_lines( + cls, + tangency_one: Edge, + tangency_two: Axis, + *, + angle: float | None = None, + direction: Vector | None = None, + ) -> ShapeList[Edge]: + """ + Create all planar line(s) on the XY plane tangent to one curve and passing + through a fixed point. + + Args: + tangency_one + Fixed point through which the line(s) must pass. + tangency_two (Vector): + (tuple[Axis | Edge, Tangency] | Axis | Edge): + Geometric entity to be contacted/touched by the line(s). + angle : float, optional + Line orientation in degrees (measured CCW from the X-axis). + direction : Vector, optional + Direction vector for the line (only X and Y components are used). + + Returns: + ShapeList[Edge]: tangent lines + """ + + @classmethod + def make_constrained_lines(cls, *args, **kwargs) -> ShapeList[Edge]: + """ + Create planar line(s) on XY subject to tangency/contact constraints. + + Supported cases + --------------- + 1. Tangent to two curves + 2. Tangent to one curve and passing through a given point + """ + tangency_one = args[0] if len(args) > 0 else None + tangency_two = args[1] if len(args) > 1 else None + + tangency_one = kwargs.pop("tangency_one", tangency_one) + tangency_two = kwargs.pop("tangency_two", tangency_two) + + angle = kwargs.pop("angle", None) + direction = kwargs.pop("direction", None) + + # Handle unexpected kwargs + if kwargs: + raise TypeError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") + + tangency_args = [t for t in (tangency_one, tangency_two) if t is not None] + if len(tangency_args) != 2: + raise TypeError("Provide exactly 2 tangency targets.") + + tangencies: list[tuple[Edge, Tangency] | Edge | Vector] = [] + for tangency_arg in tangency_args: + if isinstance(tangency_arg, Axis): + tangencies.append(tangency_arg) + continue + elif isinstance(tangency_arg, Edge): + tangencies.append(tangency_arg) + continue + if isinstance(tangency_arg, tuple): + if isinstance(tangency_arg[0], Axis): + tangencies.append((Edge(tangency_arg[0]), tangency_arg[1])) + continue + elif isinstance(tangency_arg[0], Edge): + tangencies.append(tangency_arg) + continue + # Fallback: treat as a point + try: + tangencies.append(Vector(tangency_arg)) + except Exception as exc: + raise TypeError(f"Invalid tangency: {tangency_arg!r}") from exc + + # Sort so Vector (point) is always last + tangencies = sorted(tangencies, key=lambda x: isinstance(x, (Axis, Vector))) + + # --- decide problem kind --- + if isinstance(tangencies[1], Axis): + if angle is not None: + ang_rad = radians(angle) + elif direction is not None: + ang_rad = atan2(direction.Y, direction.X) + else: + raise ValueError("Specify exactly one of 'angle' or 'direction'") + return _make_tan_oriented_lines( + tangencies[0], tangencies[1], ang_rad, edge_factory=cls + ) + else: + return _make_2tan_lines(tangencies[0], tangencies[1], edge_factory=cls) + @classmethod def make_ellipse( cls, From 59a6e3623f6e21a2baec8d901d0b05be55a2a795 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 1 Oct 2025 11:55:42 -0400 Subject: [PATCH 435/518] Fixing docstring & angle calculation --- src/build123d/topology/constrained_lines.py | 11 +++++++++-- src/build123d/topology/one_d.py | 15 +++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 0d2925a..914eed7 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -29,7 +29,7 @@ license: from __future__ import annotations -from math import cos, sin +from math import atan2, cos, sin from typing import TYPE_CHECKING, Callable, TypeVar from typing import cast as tcast @@ -746,7 +746,14 @@ def _make_tan_oriented_lines( """ q_curve, _, _, _, _ = _as_gcc_arg(curve, Tangency.UNQUALIFIED) - dir2d = gp_Dir2d(cos(angle), sin(angle)) + # reference axis direction (2D angle in radians) + ref_dir = reference.direction + theta_ref = atan2(ref_dir.Y, ref_dir.X) + + # total absolute angle + theta_abs = theta_ref + angle + + dir2d = gp_Dir2d(cos(theta_abs), sin(theta_abs)) # Reference axis as gp_Lin2d ref_lin = _gp_lin2d_from_axis(reference) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 9cbb41f..e5847a4 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1851,9 +1851,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): cls, tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge, tangency_two: Vector, - *, - angle: float | None = None, - direction: Vector | None = None, ) -> ShapeList[Edge]: """ Create all planar line(s) on the XY plane tangent to one curve and passing @@ -1865,10 +1862,6 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Geometric entity to be contacted/touched by the line(s). tangency_two (Vector): Fixed point through which the line(s) must pass. - angle : float, optional - Line orientation in degrees (measured CCW from the X-axis). - direction : Vector, optional - Direction vector for the line (only X and Y components are used). Returns: ShapeList[Edge]: tangent lines @@ -1889,15 +1882,13 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): through a fixed point. Args: - tangency_one - Fixed point through which the line(s) must pass. - tangency_two (Vector): - (tuple[Axis | Edge, Tangency] | Axis | Edge): - Geometric entity to be contacted/touched by the line(s). + tangency_one (Edge): edge that line will be tangent to + tangency_two (Axis): axis that angle will be measured against angle : float, optional Line orientation in degrees (measured CCW from the X-axis). direction : Vector, optional Direction vector for the line (only X and Y components are used). + Note: one of angle or direction must be provided Returns: ShapeList[Edge]: tangent lines From 6ac2e67a2eed74bca1c397bd61332c139cbbbb8f Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 1 Oct 2025 19:13:51 -0400 Subject: [PATCH 436/518] Fixed typing problems --- src/build123d/topology/constrained_lines.py | 57 +++++++++++++++------ src/build123d/topology/one_d.py | 21 ++++++-- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 914eed7..12329da 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -30,12 +30,12 @@ license: from __future__ import annotations from math import atan2, cos, sin -from typing import TYPE_CHECKING, Callable, TypeVar +from typing import overload, TYPE_CHECKING, Callable, TypeVar from typing import cast as tcast from OCP.BRep import BRep_Tool from OCP.BRepAdaptor import BRepAdaptor_Curve -from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge +from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeVertex from OCP.GCPnts import GCPnts_AbscissaPoint from OCP.Geom import Geom_Curve, Geom_Plane from OCP.Geom2d import ( @@ -71,7 +71,7 @@ from OCP.gp import ( ) from OCP.IntAna2d import IntAna2d_AnaIntersection from OCP.Standard import Standard_ConstructionError, Standard_Failure -from OCP.TopoDS import TopoDS_Edge +from OCP.TopoDS import TopoDS_Edge, TopoDS_Vertex from build123d.build_enums import Sagitta, Tangency from build123d.geometry import Axis, TOLERANCE, Vector, VectorLike @@ -154,6 +154,18 @@ def _param_in_trim( return (u >= first - TOLERANCE) and (u <= last + TOLERANCE) +@overload +def _as_gcc_arg( + obj: Edge, constaint: Tangency +) -> tuple[ + Geom2dGcc_QualifiedCurve, Geom2d_Curve | None, float | None, float | None, bool +]: ... +@overload +def _as_gcc_arg( + obj: Vector, constaint: Tangency +) -> tuple[Geom2d_CartesianPoint, None, None, None, bool]: ... + + def _as_gcc_arg(obj: Edge | Vector, constaint: Tangency) -> tuple[ Geom2dGcc_QualifiedCurve | Geom2d_CartesianPoint, Geom2d_Curve | None, @@ -221,9 +233,10 @@ def _edge_from_line( TopoDS_Edge Finite line segment between the two points. """ - mk_edge = BRepBuilderAPI_MakeEdge( - Vertex(p1.X(), p1.Y()).wrapped, Vertex(p2.X(), p2.Y()).wrapped - ) + v1 = BRepBuilderAPI_MakeVertex(gp_Pnt(p1.X(), p1.Y(), 0)).Vertex() + v2 = BRepBuilderAPI_MakeVertex(gp_Pnt(p2.X(), p2.Y(), 0)).Vertex() + + mk_edge = BRepBuilderAPI_MakeEdge(v1, v2) if not mk_edge.IsDone(): raise RuntimeError("Failed to build edge from line contacts") return mk_edge.Edge() @@ -689,8 +702,8 @@ def _make_tan_on_rad_arcs( def _make_2tan_lines( - curve1: Edge, - curve2: Edge | Vector, + tangency1: tuple[Edge, Tangency] | Edge, + tangency2: tuple[Edge, Tangency] | Edge | Vector, *, edge_factory: Callable[[TopoDS_Edge], Edge], ) -> ShapeList[Edge]: @@ -707,19 +720,27 @@ def _make_2tan_lines( ShapeList[Edge] Finite tangent line(s). """ - q1, _, _, _, _ = _as_gcc_arg(curve1, Tangency.UNQUALIFIED) + if isinstance(tangency1, tuple): + object_one, obj1_qual = tangency1 + else: + object_one, obj1_qual = tangency1, Tangency.UNQUALIFIED + q1, _, _, _, _ = _as_gcc_arg(object_one, obj1_qual) - if isinstance(curve2, Vector): - pnt_2d = gp_Pnt2d(curve2.X, curve2.Y) + if isinstance(tangency2, Vector): + pnt_2d = gp_Pnt2d(tangency2.X, tangency2.Y) gcc = Geom2dGcc_Lin2d2Tan(q1, pnt_2d, TOLERANCE) else: - q2, _, _, _, _ = _as_gcc_arg(curve2, Tangency.UNQUALIFIED) + if isinstance(tangency2, tuple): + object_two, obj2_qual = tangency2 + else: + object_two, obj2_qual = tangency2, Tangency.UNQUALIFIED + q2, _, _, _, _ = _as_gcc_arg(object_two, obj2_qual) gcc = Geom2dGcc_Lin2d2Tan(q1, q2, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: raise RuntimeError("Unable to find common tangent line(s)") - out_edges: list[Edge] = [] + out_edges: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): # Two tangency points p1, p2 = gp_Pnt2d(), gp_Pnt2d() @@ -732,9 +753,9 @@ def _make_2tan_lines( def _make_tan_oriented_lines( - curve: Edge, + tangency: tuple[Edge, Tangency] | Edge, reference: Axis, - angle: float | None = None, # radians; absolute angle offset from `reference` + angle: float, # radians; absolute angle offset from `reference` *, edge_factory: Callable[[TopoDS_Edge], Edge], ) -> ShapeList[Edge]: @@ -744,7 +765,11 @@ def _make_tan_oriented_lines( - the tangency point on the curve, and - the intersection with the reference line. """ - q_curve, _, _, _, _ = _as_gcc_arg(curve, Tangency.UNQUALIFIED) + if isinstance(tangency, tuple): + object_one, obj1_qual = tangency + else: + object_one, obj1_qual = tangency, Tangency.UNQUALIFIED + q_curve, _, _, _, _ = _as_gcc_arg(object_one, obj1_qual) # reference axis direction (2D angle in radians) ref_dir = reference.direction diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index e5847a4..2018474 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1871,7 +1871,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_lines( cls, - tangency_one: Edge, + tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge, tangency_two: Axis, *, angle: float | None = None, @@ -1913,6 +1913,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): angle = kwargs.pop("angle", None) direction = kwargs.pop("direction", None) + is_ref = angle is not None or direction is not None # Handle unexpected kwargs if kwargs: raise TypeError(f"Unexpected argument(s): {', '.join(kwargs.keys())}") @@ -1921,10 +1922,13 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): if len(tangency_args) != 2: raise TypeError("Provide exactly 2 tangency targets.") - tangencies: list[tuple[Edge, Tangency] | Edge | Vector] = [] - for tangency_arg in tangency_args: + tangencies: list[tuple[Edge, Tangency] | Axis | Edge | Vector] = [] + for i, tangency_arg in enumerate(tangency_args): if isinstance(tangency_arg, Axis): - tangencies.append(tangency_arg) + if i == 1 and is_ref: + tangencies.append(tangency_arg) + else: + tangencies.append(Edge(tangency_arg)) continue elif isinstance(tangency_arg, Edge): tangencies.append(tangency_arg) @@ -1942,11 +1946,14 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): except Exception as exc: raise TypeError(f"Invalid tangency: {tangency_arg!r}") from exc - # Sort so Vector (point) is always last + # Sort so Vector (point) | Axis is always last tangencies = sorted(tangencies, key=lambda x: isinstance(x, (Axis, Vector))) # --- decide problem kind --- if isinstance(tangencies[1], Axis): + assert isinstance( + tangencies[0], Edge + ), "Internal error - 1st tangency must be Edge" if angle is not None: ang_rad = radians(angle) elif direction is not None: @@ -1957,6 +1964,10 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangencies[0], tangencies[1], ang_rad, edge_factory=cls ) else: + assert not isinstance( + tangencies[0], (Axis, Vector) + ), "Internal error - 1st tangency can't be an Axis | Vector" + return _make_2tan_lines(tangencies[0], tangencies[1], edge_factory=cls) @classmethod From 64267ab3f777cf0615e06c205624f78ccd9ae7c0 Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Wed, 1 Oct 2025 22:10:19 -0400 Subject: [PATCH 437/518] feat: add Gordon surface implementation and test modified: pyproject.toml modified: src/build123d/topology/two_d.py modified: tests/test_direct_api/test_face.py --- pyproject.toml | 1 + src/build123d/topology/two_d.py | 33 ++++++++++++++ tests/test_direct_api/test_face.py | 72 ++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 0a2c87a..be18ea2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,6 +44,7 @@ dependencies = [ "ipython >= 8.0.0, < 10", "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", + "ocp_gordon >= 0.1.10", "trianglesolver", "sympy", "scipy", diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 306c5b8..d265114 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -105,6 +105,7 @@ from OCP.TopExp import TopExp from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape from typing_extensions import Self +from ocp_gordon import interpolate_curve_network from build123d.build_enums import ( CenterOf, @@ -864,6 +865,38 @@ class Face(Mixin2D, Shape[TopoDS_Face]): raise ValueError("Can't extrude empty object") return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) + @classmethod + def gordon_surface( + cls, + profiles: Iterable[Edge], + guides: Iterable[Edge], + tolerance: float = 3e-4, + ) -> Face: + """ + Creates a Gordon surface from a network of profile and guide curves. + + Args: + profiles (Iterable[Edge]): Edges representing profile curves. + guides (Iterable[Edge]): Edges representing guide curves. + tolerance (float, optional): Tolerance for surface creation and + intersection calculations. + + Returns: + Face: the interpolated Gordon surface + """ + ocp_profiles = [BRep_Tool.Curve_s(edge.wrapped, 0, 1) for edge in profiles] + ocp_guides = [BRep_Tool.Curve_s(edge.wrapped, 0, 1) for edge in guides] + + gordon_bspline_surface = interpolate_curve_network( + ocp_profiles, ocp_guides, tolerance=tolerance + ) + + return cls( + BRepBuilderAPI_MakeFace( + gordon_bspline_surface, Precision.Confusion_s() + ).Face() + ) + @classmethod def make_bezier_surface( cls, diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 82460c0..3e14740 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -502,6 +502,78 @@ class TestFace(unittest.TestCase): ] ) + def test_gordon_surface(self): + def create_test_curves( + num_profiles: int = 3, + num_guides: int = 4, + u_range: float = 1.0, + v_range: float = 1.0, + ): + profiles: list[Edge] = [] + guides: list[Edge] = [] + + intersection_points = [ + [(0.0, 0.0, 0.0) for _ in range(num_guides)] + for _ in range(num_profiles) + ] + + for i in range(num_profiles): + for j in range(num_guides): + u = i * u_range / (num_profiles - 1) + v = j * v_range / (num_guides - 1) + z = 0.2 * math.sin(u * math.pi) * math.cos(v * math.pi) + intersection_points[i][j] = (u, v, z) + + for i in range(num_profiles): + points = [intersection_points[i][j] for j in range(num_guides)] + profiles.append(Spline(points)) + + for j in range(num_guides): + points = [intersection_points[i][j] for i in range(num_profiles)] + guides.append(Spline(points)) + + return profiles, guides + + profiles, guides = create_test_curves() + + tolerance = 3e-4 + gordon_surface = Face.gordon_surface(profiles, guides, tolerance=tolerance) + + self.assertIsInstance( + gordon_surface, Face, "The returned object should be a Face." + ) + + def point_at_uv_against_expected(u: float, v: float, expected_point: Vector): + point_at_uv = gordon_surface.position_at(u, v) + self.assertAlmostEqual( + point_at_uv.X, + expected_point.X, + delta=tolerance, + msg=f"X coordinate mismatch at ({u},{v})", + ) + self.assertAlmostEqual( + point_at_uv.Y, + expected_point.Y, + delta=tolerance, + msg=f"Y coordinate mismatch at ({u},{v})", + ) + self.assertAlmostEqual( + point_at_uv.Z, + expected_point.Z, + delta=tolerance, + msg=f"Z coordinate mismatch at ({u},{v})", + ) + + point_at_uv_against_expected( + u=1.0, v=0.0, expected_point=profiles[0].position_at(1.0) + ) + point_at_uv_against_expected( + u=0.0, v=1.0, expected_point=guides[0].position_at(1.0) + ) + point_at_uv_against_expected( + u=1.0, v=1.0, expected_point=profiles[-1].position_at(1.0) + ) + # def test_to_arcs(self): # with BuildSketch() as bs: # with BuildLine() as bl: From 9a7c9493d325699225f4d41bfb60d948f51c6eb8 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 2 Oct 2025 12:16:29 -0500 Subject: [PATCH 438/518] test.yml -> move to macos-15-intel --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b1416d..0f9dabc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: # "3.12", "3.13", ] - os: [macos-13, macos-14, ubuntu-latest, windows-latest] + os: [macos-15-intel, macos-14, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: From bde1ee08a9529d08543eab49bc6f6a4b358eb19d Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 2 Oct 2025 12:16:51 -0500 Subject: [PATCH 439/518] benchmark.yml -> macos-15-intel --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 56976c4..ff389dc 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -12,7 +12,7 @@ jobs: # "3.11", "3.12", ] - os: [macos-13, macos-14, ubuntu-latest, windows-latest] + os: [macos-15-intel, macos-14, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: From 925d12ff7c78298496f3773fa2a0eb85c8f6efac Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Thu, 2 Oct 2025 21:01:28 -0400 Subject: [PATCH 440/518] fix: change function name to make_gordon_surface fix: change the test name accordingly fix: corrected the type error for Edge.wrapped fix: change min version of ocp_gordon to 0.1.12 modified: pyproject.toml modified: src/build123d/topology/two_d.py modified: tests/test_direct_api/test_face.py --- pyproject.toml | 2 +- src/build123d/topology/two_d.py | 73 +++++++------- tests/test_direct_api/test_face.py | 147 +++++++++++++++-------------- 3 files changed, 117 insertions(+), 105 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index be18ea2..15c5e14 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ dependencies = [ "ipython >= 8.0.0, < 10", "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", - "ocp_gordon >= 0.1.10", + "ocp_gordon >= 0.1.12", "trianglesolver", "sympy", "scipy", diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index d265114..5d5fe96 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -865,38 +865,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): raise ValueError("Can't extrude empty object") return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) - @classmethod - def gordon_surface( - cls, - profiles: Iterable[Edge], - guides: Iterable[Edge], - tolerance: float = 3e-4, - ) -> Face: - """ - Creates a Gordon surface from a network of profile and guide curves. - - Args: - profiles (Iterable[Edge]): Edges representing profile curves. - guides (Iterable[Edge]): Edges representing guide curves. - tolerance (float, optional): Tolerance for surface creation and - intersection calculations. - - Returns: - Face: the interpolated Gordon surface - """ - ocp_profiles = [BRep_Tool.Curve_s(edge.wrapped, 0, 1) for edge in profiles] - ocp_guides = [BRep_Tool.Curve_s(edge.wrapped, 0, 1) for edge in guides] - - gordon_bspline_surface = interpolate_curve_network( - ocp_profiles, ocp_guides, tolerance=tolerance - ) - - return cls( - BRepBuilderAPI_MakeFace( - gordon_bspline_surface, Precision.Confusion_s() - ).Face() - ) - @classmethod def make_bezier_surface( cls, @@ -946,6 +914,47 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return cls(BRepBuilderAPI_MakeFace(bezier, Precision.Confusion_s()).Face()) + @classmethod + def make_gordon_surface( + cls, + profiles: Iterable[Edge], + guides: Iterable[Edge], + tolerance: float = 3e-4, + ) -> Face: + """ + Creates a Gordon surface from a network of profile and guide curves. + + Args: + profiles (Iterable[Edge]): Edges representing profile curves. + guides (Iterable[Edge]): Edges representing guide curves. + tolerance (float, optional): Tolerance for surface creation and + intersection calculations. + + Raises: + ValueError: Input edge cannot be empty + + Returns: + Face: the interpolated Gordon surface + """ + + def to_geom_curve(edge: Edge): + if edge.wrapped is None: + raise ValueError("input edge cannot be empty") + return BRep_Tool.Curve_s(edge.wrapped, 0, 1) + + ocp_profiles = [to_geom_curve(edge) for edge in profiles] + ocp_guides = [to_geom_curve(edge) for edge in guides] + + gordon_bspline_surface = interpolate_curve_network( + ocp_profiles, ocp_guides, tolerance=tolerance + ) + + return cls( + BRepBuilderAPI_MakeFace( + gordon_bspline_surface, Precision.Confusion_s() + ).Face() + ) + @classmethod def make_plane( cls, diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 3e14740..5006680 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -359,6 +359,81 @@ class TestFace(unittest.TestCase): self.assertAlmostEqual(loc.position, (0.0, 1.0, 1.5), 5) self.assertAlmostEqual(loc.orientation, (0, -90, 0), 5) + def test_make_gordon_surface(self): + def create_test_curves( + num_profiles: int = 3, + num_guides: int = 4, + u_range: float = 1.0, + v_range: float = 1.0, + ): + profiles: list[Edge] = [] + guides: list[Edge] = [] + + intersection_points = [ + [(0.0, 0.0, 0.0) for _ in range(num_guides)] + for _ in range(num_profiles) + ] + + for i in range(num_profiles): + for j in range(num_guides): + u = i * u_range / (num_profiles - 1) + v = j * v_range / (num_guides - 1) + z = 0.2 * math.sin(u * math.pi) * math.cos(v * math.pi) + intersection_points[i][j] = (u, v, z) + + for i in range(num_profiles): + points = [intersection_points[i][j] for j in range(num_guides)] + profiles.append(Spline(points)) + + for j in range(num_guides): + points = [intersection_points[i][j] for i in range(num_profiles)] + guides.append(Spline(points)) + + return profiles, guides + + profiles, guides = create_test_curves() + + tolerance = 3e-4 + gordon_surface = Face.make_gordon_surface(profiles, guides, tolerance=tolerance) + + self.assertIsInstance( + gordon_surface, Face, "The returned object should be a Face." + ) + + def point_at_uv_against_expected(u: float, v: float, expected_point: Vector): + point_at_uv = gordon_surface.position_at(u, v) + self.assertAlmostEqual( + point_at_uv.X, + expected_point.X, + delta=tolerance, + msg=f"X coordinate mismatch at ({u},{v})", + ) + self.assertAlmostEqual( + point_at_uv.Y, + expected_point.Y, + delta=tolerance, + msg=f"Y coordinate mismatch at ({u},{v})", + ) + self.assertAlmostEqual( + point_at_uv.Z, + expected_point.Z, + delta=tolerance, + msg=f"Z coordinate mismatch at ({u},{v})", + ) + + point_at_uv_against_expected( + u=0.0, v=0.0, expected_point=guides[0].position_at(0.0) + ) + point_at_uv_against_expected( + u=1.0, v=0.0, expected_point=profiles[0].position_at(1.0) + ) + point_at_uv_against_expected( + u=0.0, v=1.0, expected_point=guides[0].position_at(1.0) + ) + point_at_uv_against_expected( + u=1.0, v=1.0, expected_point=profiles[-1].position_at(1.0) + ) + def test_make_surface(self): corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] net_exterior = Wire( @@ -502,78 +577,6 @@ class TestFace(unittest.TestCase): ] ) - def test_gordon_surface(self): - def create_test_curves( - num_profiles: int = 3, - num_guides: int = 4, - u_range: float = 1.0, - v_range: float = 1.0, - ): - profiles: list[Edge] = [] - guides: list[Edge] = [] - - intersection_points = [ - [(0.0, 0.0, 0.0) for _ in range(num_guides)] - for _ in range(num_profiles) - ] - - for i in range(num_profiles): - for j in range(num_guides): - u = i * u_range / (num_profiles - 1) - v = j * v_range / (num_guides - 1) - z = 0.2 * math.sin(u * math.pi) * math.cos(v * math.pi) - intersection_points[i][j] = (u, v, z) - - for i in range(num_profiles): - points = [intersection_points[i][j] for j in range(num_guides)] - profiles.append(Spline(points)) - - for j in range(num_guides): - points = [intersection_points[i][j] for i in range(num_profiles)] - guides.append(Spline(points)) - - return profiles, guides - - profiles, guides = create_test_curves() - - tolerance = 3e-4 - gordon_surface = Face.gordon_surface(profiles, guides, tolerance=tolerance) - - self.assertIsInstance( - gordon_surface, Face, "The returned object should be a Face." - ) - - def point_at_uv_against_expected(u: float, v: float, expected_point: Vector): - point_at_uv = gordon_surface.position_at(u, v) - self.assertAlmostEqual( - point_at_uv.X, - expected_point.X, - delta=tolerance, - msg=f"X coordinate mismatch at ({u},{v})", - ) - self.assertAlmostEqual( - point_at_uv.Y, - expected_point.Y, - delta=tolerance, - msg=f"Y coordinate mismatch at ({u},{v})", - ) - self.assertAlmostEqual( - point_at_uv.Z, - expected_point.Z, - delta=tolerance, - msg=f"Z coordinate mismatch at ({u},{v})", - ) - - point_at_uv_against_expected( - u=1.0, v=0.0, expected_point=profiles[0].position_at(1.0) - ) - point_at_uv_against_expected( - u=0.0, v=1.0, expected_point=guides[0].position_at(1.0) - ) - point_at_uv_against_expected( - u=1.0, v=1.0, expected_point=profiles[-1].position_at(1.0) - ) - # def test_to_arcs(self): # with BuildSketch() as bs: # with BuildLine() as bl: From b3cec27cfb8333bbb4332fcbdaa0a4503f8fa362 Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Thu, 2 Oct 2025 22:32:41 -0400 Subject: [PATCH 441/518] fix: add test for ValueError for gordon surface modified: tests/test_direct_api/test_face.py --- tests/test_direct_api/test_face.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 5006680..57a4f8f 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -434,6 +434,22 @@ class TestFace(unittest.TestCase): u=1.0, v=1.0, expected_point=profiles[-1].position_at(1.0) ) + temp_curve = profiles[0] + with self.assertRaises(ValueError): + profiles[0] = Edge() + tolerance = 3e-4 + gordon_surface = Face.make_gordon_surface( + profiles, guides, tolerance=tolerance + ) + + profiles[0] = temp_curve + with self.assertRaises(ValueError): + guides[0] = Edge() + tolerance = 3e-4 + gordon_surface = Face.make_gordon_surface( + profiles, guides, tolerance=tolerance + ) + def test_make_surface(self): corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] net_exterior = Wire( From 3bd4b39b0a6f356a9f1fe57f39d6e6ff581ef570 Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Thu, 2 Oct 2025 22:37:39 -0400 Subject: [PATCH 442/518] fix: minor adjust to test_make_gordon_surface modified: tests/test_direct_api/test_face.py --- tests/test_direct_api/test_face.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 57a4f8f..769ede3 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -435,17 +435,15 @@ class TestFace(unittest.TestCase): ) temp_curve = profiles[0] + profiles[0] = Edge() with self.assertRaises(ValueError): - profiles[0] = Edge() - tolerance = 3e-4 gordon_surface = Face.make_gordon_surface( profiles, guides, tolerance=tolerance ) profiles[0] = temp_curve + guides[0] = Edge() with self.assertRaises(ValueError): - guides[0] = Edge() - tolerance = 3e-4 gordon_surface = Face.make_gordon_surface( profiles, guides, tolerance=tolerance ) From a00ae674aeba8ae79069876d41537f7b5478b91f Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Sun, 5 Oct 2025 08:14:25 -0400 Subject: [PATCH 443/518] fix: make_gordon_surface supports all edge types fix: upgrade ocp_gordon to make intersect stable modified: pyproject.toml modified: src/build123d/topology/two_d.py modified: tests/test_direct_api/test_face.py --- pyproject.toml | 2 +- src/build123d/topology/two_d.py | 24 ++++++-- tests/test_direct_api/test_face.py | 90 ++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 15c5e14..c90ec65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ dependencies = [ "ipython >= 8.0.0, < 10", "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", - "ocp_gordon >= 0.1.12", + "ocp_gordon >= 0.1.13", "trianglesolver", "sympy", "scipy", diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 5d5fe96..0cd9dc8 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -64,7 +64,7 @@ from typing import TYPE_CHECKING, Any, TypeVar, overload import OCP.TopAbs as ta from OCP.BRep import BRep_Builder, BRep_Tool -from OCP.BRepAdaptor import BRepAdaptor_Surface +from OCP.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Surface from OCP.BRepAlgo import BRepAlgo from OCP.BRepAlgoAPI import BRepAlgoAPI_Common from OCP.BRepBuilderAPI import ( @@ -81,8 +81,13 @@ from OCP.BRepOffsetAPI import BRepOffsetAPI_MakeFilling, BRepOffsetAPI_MakePipeS from OCP.BRepPrimAPI import BRepPrimAPI_MakeRevol from OCP.BRepTools import BRepTools, BRepTools_ReShape from OCP.gce import gce_MakeLin -from OCP.Geom import Geom_BezierSurface, Geom_RectangularTrimmedSurface, Geom_Surface -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_G1, GeomAbs_G2 +from OCP.Geom import ( + Geom_BezierSurface, + Geom_RectangularTrimmedSurface, + Geom_Surface, + Geom_TrimmedCurve, +) +from OCP.GeomAbs import GeomAbs_C0, GeomAbs_G1, GeomAbs_G2, GeomAbs_CurveType from OCP.GeomAPI import ( GeomAPI_ExtremaCurveCurve, GeomAPI_PointsToBSplineSurface, @@ -940,7 +945,18 @@ class Face(Mixin2D, Shape[TopoDS_Face]): def to_geom_curve(edge: Edge): if edge.wrapped is None: raise ValueError("input edge cannot be empty") - return BRep_Tool.Curve_s(edge.wrapped, 0, 1) + + adaptor = BRepAdaptor_Curve(edge.wrapped) + curve = BRep_Tool.Curve_s(edge.wrapped, 0, 1) + if not ( + (adaptor.IsPeriodic() and adaptor.IsClosed()) + or adaptor.GetType() == GeomAbs_CurveType.GeomAbs_BSplineCurve + or adaptor.GetType() == GeomAbs_CurveType.GeomAbs_BezierCurve + ): + curve = Geom_TrimmedCurve( + curve, adaptor.FirstParameter(), adaptor.LastParameter() + ) + return curve ocp_profiles = [to_geom_curve(edge) for edge in profiles] ocp_guides = [to_geom_curve(edge) for edge in guides] diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 769ede3..043c22c 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -448,6 +448,96 @@ class TestFace(unittest.TestCase): profiles, guides, tolerance=tolerance ) + def test_make_gordon_surface_edge_types(self): + tolerance = 3e-4 + + def point_at_uv_against_expected(u: float, v: float, expected_point: Vector): + point_at_uv = gordon_surface.position_at(u, v) + self.assertAlmostEqual( + point_at_uv.X, + expected_point.X, + delta=tolerance, + msg=f"X coordinate mismatch at ({u},{v})", + ) + self.assertAlmostEqual( + point_at_uv.Y, + expected_point.Y, + delta=tolerance, + msg=f"Y coordinate mismatch at ({u},{v})", + ) + self.assertAlmostEqual( + point_at_uv.Z, + expected_point.Z, + delta=tolerance, + msg=f"Z coordinate mismatch at ({u},{v})", + ) + + points = [ + Vector(0, 0, 0), + Vector(10, 0, 0), + Vector(12, 20, 1), + Vector(4, 22, -1), + ] + + profiles = [Line(points[0], points[1]), Line(points[3], points[2])] + guides = [Line(points[0], points[3]), Line(points[1], points[2])] + gordon_surface = Face.make_gordon_surface(profiles, guides, tolerance=tolerance) + point_at_uv_against_expected( + u=0.5, + v=0.5, + expected_point=(points[0] + points[1] + points[2] + points[3]) / 4, + ) + + profiles = [ + ThreePointArc( + points[0], (points[0] + points[1]) / 2 + Vector(0, 0, 2), points[1] + ), + ThreePointArc( + points[3], (points[3] + points[2]) / 2 + Vector(0, 0, 3), points[2] + ), + ] + guides = [ + Line(profiles[0] @ 0, profiles[1] @ 0), + Line(profiles[0] @ 1, profiles[1] @ 1), + ] + gordon_surface = Face.make_gordon_surface(profiles, guides, tolerance=tolerance) + point_at_uv_against_expected(u=0.0, v=0.5, expected_point=guides[0] @ 0.5) + point_at_uv_against_expected(u=1.0, v=0.5, expected_point=guides[1] @ 0.5) + + profiles = [ + Edge.make_bezier( + points[0], + points[0] + Vector(1, 0, 1), + points[1] - Vector(1, 0, 1), + points[1], + ), + Edge.make_bezier( + points[3], + points[3] + Vector(1, 0, 1), + points[2] - Vector(1, 0, 1), + points[2], + ), + ] + guides = [ + Line(profiles[0] @ 0, profiles[1] @ 0), + Line(profiles[0] @ 1, profiles[1] @ 1), + ] + gordon_surface = Face.make_gordon_surface(profiles, guides, tolerance=tolerance) + point_at_uv_against_expected(u=0.0, v=0.5, expected_point=guides[0] @ 0.5) + point_at_uv_against_expected(u=1.0, v=0.5, expected_point=guides[1] @ 0.5) + + profiles = [ + Edge.make_ellipse(10, 6), + Edge.make_ellipse(8, 7).translate((1, 2, 10)), + ] + guides = [ + Line(profiles[0] @ 0, profiles[1] @ 0), + Line(profiles[0] @ 0.5, profiles[1] @ 0.5), + ] + gordon_surface = Face.make_gordon_surface(profiles, guides, tolerance=tolerance) + point_at_uv_against_expected(u=0.0, v=0.5, expected_point=guides[0] @ 0.5) + point_at_uv_against_expected(u=1.0, v=0.5, expected_point=guides[0] @ 0.5) + def test_make_surface(self): corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] net_exterior = Wire( From f67cc12c34610d1b7c676f6af3c44a891ecaafe4 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 6 Oct 2025 13:42:46 -0400 Subject: [PATCH 444/518] Adding Airfoil 1D object --- docs/assets/example_airfoil.svg | 8 ++ docs/cheat_sheet.rst | 1 + docs/objects.rst | 8 ++ src/build123d/__init__.py | 1 + src/build123d/objects_curve.py | 127 +++++++++++++++++++++++++++++++- src/build123d/topology/one_d.py | 13 +++- 6 files changed, 153 insertions(+), 5 deletions(-) create mode 100644 docs/assets/example_airfoil.svg diff --git a/docs/assets/example_airfoil.svg b/docs/assets/example_airfoil.svg new file mode 100644 index 0000000..47e2fbe --- /dev/null +++ b/docs/assets/example_airfoil.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/docs/cheat_sheet.rst b/docs/cheat_sheet.rst index d46ccf8..8bd0d86 100644 --- a/docs/cheat_sheet.rst +++ b/docs/cheat_sheet.rst @@ -15,6 +15,7 @@ Cheat Sheet .. grid-item-card:: 1D - BuildLine + | :class:`~objects_curve.Airfoil` | :class:`~objects_curve.ArcArcTangentArc` | :class:`~objects_curve.ArcArcTangentLine` | :class:`~objects_curve.Bezier` diff --git a/docs/objects.rst b/docs/objects.rst index 0cff926..26c1fe8 100644 --- a/docs/objects.rst +++ b/docs/objects.rst @@ -76,6 +76,13 @@ The following objects all can be used in BuildLine contexts. Note that .. grid:: 3 + .. grid-item-card:: :class:`~objects_curve.Airfoil` + + .. image:: assets/example_airfoil.svg + + +++ + Airfoil described by 4 digit NACA profile + .. grid-item-card:: :class:`~objects_curve.Bezier` .. image:: assets/bezier_curve_example.svg @@ -228,6 +235,7 @@ Reference .. py:module:: objects_curve .. autoclass:: BaseLineObject +.. autoclass:: Airfoil .. autoclass:: Bezier .. autoclass:: BlendCurve .. autoclass:: CenterArc diff --git a/src/build123d/__init__.py b/src/build123d/__init__.py index 6d52b40..2dcf0b0 100644 --- a/src/build123d/__init__.py +++ b/src/build123d/__init__.py @@ -81,6 +81,7 @@ __all__ = [ "BuildSketch", # 1D Curve Objects "BaseLineObject", + "Airfoil", "Bezier", "BlendCurve", "CenterArc", diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index e697145..8850cdc 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -29,11 +29,13 @@ license: from __future__ import annotations import copy as copy_module +import numpy as np +import sympy # type: ignore from collections.abc import Iterable from itertools import product from math import copysign, cos, radians, sin, sqrt from scipy.optimize import minimize -import sympy # type: ignore +from typing import overload, Literal from build123d.build_common import WorkplaneList, flatten_sequence, validate_inputs from build123d.build_enums import ( @@ -100,6 +102,129 @@ class BaseEdgeObject(Edge): super().__init__(curve.wrapped) +class Airfoil(BaseLineObject): + """ + Create an airfoil described by a 4-digit (or fractional) NACA airfoil + (e.g. '2412' or '2213.323'). + + The NACA four-digit wing sections define the airfoil_code by: + - First digit describing maximum camber as percentage of the chord. + - Second digit describing the distance of maximum camber from the airfoil leading edge + in tenths of the chord. + - Last two digits describing maximum thickness of the airfoil as percent of the chord. + + Args: + airfoil_code : str + The NACA 4-digit (or fractional) airfoil code (e.g. '2213.323'). + n_points : int + Number of points per upper/lower surface. + finite_te : bool + If True, enforces a finite trailing edge (default False). + mode (Mode, optional): combination mode. Defaults to Mode.ADD + + """ + + _applies_to = [BuildLine._tag] + + @staticmethod + def parse_naca4(value: str | float) -> tuple[float, float, float]: + """ + Parse NACA 4-digit (or fractional) airfoil code into parameters. + """ + s = str(value).replace("NACA", "").strip() + if "." in s: + int_part, frac_part = s.split(".", 1) + m = int(int_part[0]) / 100 + p = int(int_part[1]) / 10 + t = float(f"{int(int_part[2:]):02}.{frac_part}") / 100 + else: + m = int(s[0]) / 100 + p = int(s[1]) / 10 + t = int(s[2:]) / 100 + return m, p, t + + def __init__( + self, + airfoil_code: str, + n_points: int = 50, + finite_te: bool = False, + mode: Mode = Mode.ADD, + ): + + # Airfoil thickness distribution equation: + # + # yₜ=5t[0.2969√x-0.1260x-0.3516x²+0.2843x³-0.1015x⁴] + # + # where: + # - x is the distance along the chord (0 at the leading edge, 1 at the trailing edge), + # - t is the maximum thickness as a fraction of the chord (e.g. 0.12 for a NACA 2412), + # - yₜ gives the half-thickness at each chordwise location. + + context: BuildLine | None = BuildLine._get_context(self) + validate_inputs(context, self) + + m, p, t = Airfoil.parse_naca4(airfoil_code) + + # Cosine-spaced x values for better nose resolution + beta = np.linspace(0.0, np.pi, n_points) + x = (1 - np.cos(beta)) / 2 + + # Thickness distribution + a0, a1, a2, a3 = 0.2969, -0.1260, -0.3516, 0.2843 + a4 = -0.1015 if finite_te else -0.1036 + yt = 5 * t * (a0 * np.sqrt(x) + a1 * x + a2 * x**2 + a3 * x**3 + a4 * x**4) + + # Camber line and slope + if m == 0 or p == 0 or p == 1: + yc = np.zeros_like(x) + dyc_dx = np.zeros_like(x) + else: + yc = np.empty_like(x) + dyc_dx = np.empty_like(x) + mask = x < p + yc[mask] = m / p**2 * (2 * p * x[mask] - x[mask] ** 2) + yc[~mask] = ( + m / (1 - p) ** 2 * ((1 - 2 * p) + 2 * p * x[~mask] - x[~mask] ** 2) + ) + dyc_dx[mask] = 2 * m / p**2 * (p - x[mask]) + dyc_dx[~mask] = 2 * m / (1 - p) ** 2 * (p - x[~mask]) + + theta = np.arctan(dyc_dx) + self._camber_points = [Vector(xi, yi) for xi, yi in zip(x, yc)] + + # Upper and lower surfaces + xu = x - yt * np.sin(theta) + yu = yc + yt * np.cos(theta) + xl = x + yt * np.sin(theta) + yl = yc - yt * np.cos(theta) + + upper_pnts = [Vector(x, y) for x, y in zip(xu, yu)] + lower_pnts = [Vector(x, y) for x, y in zip(xl, yl)] + unique_points: list[ + Vector | tuple[float, float] | tuple[float, float, float] + ] = list(dict.fromkeys(upper_pnts[::-1] + lower_pnts)) + surface = Edge.make_spline(unique_points, periodic=not finite_te) # type: ignore[arg-type] + if finite_te: + trailing_edge = Edge.make_line(surface @ 0, surface @ 1) + airfoil_profile = Wire([surface, trailing_edge]) + else: + airfoil_profile = Wire([surface]) + + super().__init__(airfoil_profile, mode=mode) + + # Store metadata + self.code: str = airfoil_code #: NACA code string (e.g. "2412") + self.max_camber: float = m #: Maximum camber as fraction of chord + self.camber_pos: float = p #: Chordwise position of max camber (0–1) + self.thickness: float = t #: Maximum thickness as fraction of chord + self.finite_te: bool = finite_te #: If True, trailing edge is finite + + @property + def camber_line(self) -> Edge: + """Camber line of the airfoil as an Edge.""" + return Edge.make_spline(self._camber_points) # type: ignore[arg-type] + + class Bezier(BaseEdgeObject): """Line Object: Bezier Curve diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 31baf33..04ddb3c 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -792,6 +792,8 @@ class Mixin1D(Shape): case Edge() as obj, Plane() as plane: # Find any edge / plane intersection points & edges # Find point intersections + if obj.wrapped is None: + continue geom_line = BRep_Tool.Curve_s( obj.wrapped, obj.param_at(0), obj.param_at(1) ) @@ -818,10 +820,13 @@ class Mixin1D(Shape): vts = common_set.vertices() eds = common_set.edges() if vts and eds: - filtered_vts = ShapeList([ - v for v in vts - if all(v.distance_to(e) > TOLERANCE for e in eds) - ]) + filtered_vts = ShapeList( + [ + v + for v in vts + if all(v.distance_to(e) > TOLERANCE for e in eds) + ] + ) common_set = filtered_vts + eds else: return None From c4ccfb141f5f4a1bc430f30a3b5dd927b189869a Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 6 Oct 2025 13:46:23 -0400 Subject: [PATCH 445/518] Adding missing test --- tests/test_airfoil.py | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 tests/test_airfoil.py diff --git a/tests/test_airfoil.py b/tests/test_airfoil.py new file mode 100644 index 0000000..21c2e06 --- /dev/null +++ b/tests/test_airfoil.py @@ -0,0 +1,106 @@ +import pytest +import numpy as np +from build123d import Airfoil, Vector, Edge, Wire + + +# --- parse_naca4 tests ------------------------------------------------------ + + +@pytest.mark.parametrize( + "code, expected", + [ + ("2412", (0.02, 0.4, 0.12)), # standard NACA 2412 + ("0012", (0.0, 0.0, 0.12)), # symmetric section + ("2213.323", (0.02, 0.2, 0.13323)), # fractional thickness + ("NACA2412", (0.02, 0.4, 0.12)), # with prefix + ], +) +def test_parse_naca4_variants(code, expected): + m, p, t = Airfoil.parse_naca4(code) + np.testing.assert_allclose([m, p, t], expected, rtol=1e-6) + + +# --- basic construction tests ----------------------------------------------- + + +def test_airfoil_basic_construction(): + airfoil = Airfoil("2412", n_points=40) + assert isinstance(airfoil, Airfoil) + assert isinstance(airfoil.camber_line, Edge) + assert isinstance(airfoil._camber_points, list) + assert all(isinstance(p, Vector) for p in airfoil._camber_points) + + # Check metadata + assert airfoil.code == "2412" + assert pytest.approx(airfoil.max_camber, rel=1e-6) == 0.02 + assert pytest.approx(airfoil.camber_pos, rel=1e-6) == 0.4 + assert pytest.approx(airfoil.thickness, rel=1e-6) == 0.12 + assert airfoil.finite_te is False + + +def test_airfoil_finite_te_profile(): + """Finite trailing edge version should have a line closing the profile.""" + airfoil = Airfoil("2412", finite_te=True, n_points=40) + assert isinstance(airfoil, Wire) + assert airfoil.finite_te + assert len(list(airfoil.edges())) == 2 + + +def test_airfoil_infinite_te_profile(): + """Infinite trailing edge (periodic spline).""" + airfoil = Airfoil("2412", finite_te=False, n_points=40) + assert isinstance(airfoil, Wire) + # Should contain a single closed Edge + assert len(airfoil.edges()) == 1 + assert airfoil.edges()[0].is_closed + + +# --- geometric / numerical validity ----------------------------------------- + + +def test_camber_line_geometry_monotonic(): + """Camber x coordinates should increase monotonically along the chord.""" + af = Airfoil("2412", n_points=80) + x_coords = [p.X for p in af._camber_points] + assert np.all(np.diff(x_coords) >= 0) + + +def test_airfoil_chord_limits(): + """Airfoil should be bounded between x=0 and x=1.""" + af = Airfoil("2412", n_points=100) + all_points = af._camber_points + xs = np.array([p.X for p in all_points]) + assert xs.min() >= -1e-9 + assert xs.max() <= 1.0 + 1e-9 + + +def test_airfoil_thickness_scaling(): + """Check that airfoil thickness scales linearly with NACA last two digits.""" + af1 = Airfoil("0010", n_points=120) + af2 = Airfoil("0020", n_points=120) + + # Extract main surface edge (for finite_te=False it's just one edge) + edge1 = af1.edges()[0] + edge2 = af2.edges()[0] + + # Sample many points along each edge + n = 500 + ys1 = [(edge1 @ u).Y for u in np.linspace(0.0, 1.0, n)] + ys2 = [(edge2 @ u).Y for u in np.linspace(0.0, 1.0, n)] + + # Total height (max - min) + h1 = max(ys1) - min(ys1) + h2 = max(ys2) - min(ys2) + + # For symmetric NACA 00xx, thickness is proportional to 't' + assert (h1 / h2) == pytest.approx(0.5, rel=0.05) + + +def test_camber_line_is_centered(): + """Mean of upper and lower surfaces should approximate camber line.""" + af = Airfoil("2412", n_points=50) + # Extract central camber Y near mid-chord + mid_index = len(af._camber_points) // 2 + mid_point = af._camber_points[mid_index] + # Camber line should be roughly symmetric around y=0 for small m + assert abs(mid_point.Y) < 0.05 From 32c1322370d0d8cf1bb6bf9ae5d38e8dcdc0e8f7 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 9 Oct 2025 11:37:24 -0400 Subject: [PATCH 446/518] 99% coverage on constrained lines --- src/build123d/topology/constrained_lines.py | 45 ++-- .../test_direct_api/test_constrained_lines.py | 201 ++++++++++++++++++ 2 files changed, 234 insertions(+), 12 deletions(-) create mode 100644 tests/test_direct_api/test_constrained_lines.py diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 12329da..58e8b0f 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -29,7 +29,7 @@ license: from __future__ import annotations -from math import atan2, cos, sin +from math import atan2, cos, isnan, sin from typing import overload, TYPE_CHECKING, Callable, TypeVar from typing import cast as tcast @@ -42,11 +42,12 @@ from OCP.Geom2d import ( Geom2d_CartesianPoint, Geom2d_Circle, Geom2d_Curve, + Geom2d_Line, Geom2d_Point, Geom2d_TrimmedCurve, ) from OCP.Geom2dAdaptor import Geom2dAdaptor_Curve -from OCP.Geom2dAPI import Geom2dAPI_ProjectPointOnCurve +from OCP.Geom2dAPI import Geom2dAPI_ProjectPointOnCurve, Geom2dAPI_InterCurveCurve from OCP.Geom2dGcc import ( Geom2dGcc_Circ2d2TanOn, Geom2dGcc_Circ2d2TanRad, @@ -724,7 +725,7 @@ def _make_2tan_lines( object_one, obj1_qual = tangency1 else: object_one, obj1_qual = tangency1, Tangency.UNQUALIFIED - q1, _, _, _, _ = _as_gcc_arg(object_one, obj1_qual) + q1, c1, _, _, _ = _as_gcc_arg(object_one, obj1_qual) if isinstance(tangency2, Vector): pnt_2d = gp_Pnt2d(tangency2.X, tangency2.Y) @@ -734,7 +735,7 @@ def _make_2tan_lines( object_two, obj2_qual = tangency2 else: object_two, obj2_qual = tangency2, Tangency.UNQUALIFIED - q2, _, _, _, _ = _as_gcc_arg(object_two, obj2_qual) + q2, c2, _, _, _ = _as_gcc_arg(object_two, obj2_qual) gcc = Geom2dGcc_Lin2d2Tan(q1, q2, TOLERANCE) if not gcc.IsDone() or gcc.NbSolutions() == 0: @@ -742,13 +743,25 @@ def _make_2tan_lines( out_edges: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): - # Two tangency points - p1, p2 = gp_Pnt2d(), gp_Pnt2d() - gcc.Tangency1(i, p1) - gcc.Tangency2(i, p2) - contacts = [p1, p2] + lin2d = Geom2d_Line(gcc.ThisSolution(i)) - out_edges.append(_edge_from_line(*contacts)) + # Two tangency points - Note Tangency1/Tangency2 can use different + # indices for the same line + inter_cc = Geom2dAPI_InterCurveCurve(lin2d, c1) + pt1 = inter_cc.Point(1) # There will always be one tangent intersection + + if isinstance(tangency2, Vector): + pt2 = gp_Pnt2d(tangency2.X, tangency2.Y) + else: + inter_cc = Geom2dAPI_InterCurveCurve(lin2d, c2) + pt2 = inter_cc.Point(1) + + # Skip degenerate lines + separation = pt1.Distance(pt2) + if isnan(separation) or separation < TOLERANCE: + continue + + out_edges.append(_edge_from_line(pt1, pt2)) return ShapeList([edge_factory(e) for e in out_edges]) @@ -769,6 +782,10 @@ def _make_tan_oriented_lines( object_one, obj1_qual = tangency else: object_one, obj1_qual = tangency, Tangency.UNQUALIFIED + + if abs(abs(reference.direction.Z) - 1) < TOLERANCE: + raise ValueError("reference Axis can't be perpendicular to Plane.XY") + q_curve, _, _, _, _ = _as_gcc_arg(object_one, obj1_qual) # reference axis direction (2D angle in radians) @@ -783,9 +800,8 @@ def _make_tan_oriented_lines( # Reference axis as gp_Lin2d ref_lin = _gp_lin2d_from_axis(reference) + # Note that is seems impossible for Geom2dGcc_Lin2dTanObl to provide no solutions gcc = Geom2dGcc_Lin2dTanObl(q_curve, ref_lin, TOLERANCE, angle) - if not gcc.IsDone() or gcc.NbSolutions() == 0: - raise RuntimeError("Unable to find tangent line for given orientation") out: list[TopoDS_Edge] = [] for i in range(1, gcc.NbSolutions() + 1): @@ -802,6 +818,11 @@ def _make_tan_oriented_lines( continue p_isect = inter.Point(1).Value() + # Skip degenerate lines + separation = p_tan.Distance(p_isect) + if isnan(separation) or separation < TOLERANCE: + continue + out.append(_edge_from_line(p_tan, p_isect)) return ShapeList([edge_factory(e) for e in out]) diff --git a/tests/test_direct_api/test_constrained_lines.py b/tests/test_direct_api/test_constrained_lines.py new file mode 100644 index 0000000..d74bf90 --- /dev/null +++ b/tests/test_direct_api/test_constrained_lines.py @@ -0,0 +1,201 @@ +""" +build123d tests + +name: test_constrained_lines.py +by: Gumyr +date: October 8, 2025 + +desc: + This python module contains tests for the build123d project. + +license: + + Copyright 2025 Gumyr + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +""" + +import math +import pytest +from OCP.gp import gp_Pnt2d, gp_Dir2d, gp_Lin2d +from build123d import Edge, Axis, Vector, Tangency, Plane +from build123d.topology.constrained_lines import ( + _make_2tan_lines, + _make_tan_oriented_lines, + _edge_from_line, +) +from build123d.geometry import TOLERANCE + + +@pytest.fixture +def unit_circle() -> Edge: + """A simple unit circle centered at the origin on XY.""" + return Edge.make_circle(1.0, Plane.XY) + + +# --------------------------------------------------------------------------- +# utility tests +# --------------------------------------------------------------------------- + + +def test_edge_from_line(): + line = _edge_from_line(gp_Pnt2d(0, 0), gp_Pnt2d(1, 0)) + assert Edge(line).length == 1 + + with pytest.raises(RuntimeError) as excinfo: + _edge_from_line(gp_Pnt2d(0, 0), gp_Pnt2d(0, 0)) + assert "Failed to build edge from line contacts" in str(excinfo.value) + + +# --------------------------------------------------------------------------- +# _make_2tan_lines tests +# --------------------------------------------------------------------------- + + +def test_two_circles_tangents(unit_circle): + """Tangent lines between two separated circles should yield four results.""" + c1 = unit_circle + c2 = unit_circle.translate((3, 0, 0)) # displaced along X + lines = _make_2tan_lines(c1, c2, edge_factory=Edge) + # There should be 4 external/internal tangents + assert len(lines) in (4, 2) + for ln in lines: + assert isinstance(ln, Edge) + # Tangent lines should not intersect the circle interior + dmin = c1.distance_to(ln) + assert dmin >= -1e-6 + + +def test_two_constrained_circles_tangents1(unit_circle): + """Tangent lines between two separated circles should yield four results.""" + c1 = unit_circle + c2 = unit_circle.translate((3, 0, 0)) # displaced along X + lines = _make_2tan_lines((c1, Tangency.ENCLOSING), c2, edge_factory=Edge) + # There should be 2 external/internal tangents + assert len(lines) == 2 + for ln in lines: + assert isinstance(ln, Edge) + # Tangent lines should not intersect the circle interior + dmin = c1.distance_to(ln) + assert dmin >= -1e-6 + + +def test_two_constrained_circles_tangents2(unit_circle): + """Tangent lines between two separated circles should yield four results.""" + c1 = unit_circle + c2 = unit_circle.translate((3, 0, 0)) # displaced along X + lines = _make_2tan_lines( + (c1, Tangency.ENCLOSING), (c2, Tangency.ENCLOSING), edge_factory=Edge + ) + # There should be 1 external/external tangents + assert len(lines) == 1 + for ln in lines: + assert isinstance(ln, Edge) + # Tangent lines should not intersect the circle interior + dmin = c1.distance_to(ln) + assert dmin >= -1e-6 + + +def test_curve_and_point_tangent(unit_circle): + """A line tangent to a circle and passing through a point should exist.""" + pt = Vector(2.0, 0.0) + lines = _make_2tan_lines(unit_circle, pt, edge_factory=Edge) + assert len(lines) == 2 + for ln in lines: + # The line must pass through the given point (approximately) + dist_to_point = ln.distance_to(pt) + assert math.isclose(dist_to_point, 0.0, abs_tol=1e-6) + # It should also touch the circle at exactly one point + dist_to_circle = unit_circle.distance_to(ln) + assert math.isclose(dist_to_circle, 0.0, abs_tol=TOLERANCE) + + +def test_invalid_tangent_raises(unit_circle): + """Non-intersecting degenerate input result in no output.""" + lines = _make_2tan_lines(unit_circle, unit_circle, edge_factory=Edge) + assert len(lines) == 0 + + with pytest.raises(RuntimeError) as excinfo: + _make_2tan_lines(unit_circle, Vector(0, 0), edge_factory=Edge) + assert "Unable to find common tangent line(s)" in str(excinfo.value) + + +# --------------------------------------------------------------------------- +# _make_tan_oriented_lines tests +# --------------------------------------------------------------------------- + + +@pytest.mark.parametrize("angle_deg", [math.radians(30), -math.radians(30)]) +def test_oriented_tangents_with_x_axis(unit_circle, angle_deg): + """Lines tangent to a circle at ±30° from the X-axis.""" + lines = _make_tan_oriented_lines(unit_circle, Axis.X, angle_deg, edge_factory=Edge) + assert all(isinstance(e, Edge) for e in lines) + # The tangent lines should all intersect the X axis (red line) + for ln in lines: + p = ln.position_at(0.5) + assert abs(p.Z) < 1e-9 + + lines = _make_tan_oriented_lines(unit_circle, Axis.X, 0, edge_factory=Edge) + assert len(lines) == 0 + + lines = _make_tan_oriented_lines( + unit_circle, Axis((0, -2), (1, 0)), 0, edge_factory=Edge + ) + assert len(lines) == 0 + + +def test_oriented_tangents_with_y_axis(unit_circle): + """Lines tangent to a circle and 30° from Y-axis should exist.""" + angle = math.radians(30) + lines = _make_tan_oriented_lines(unit_circle, Axis.Y, angle, edge_factory=Edge) + assert len(lines) >= 1 + # They should roughly touch the circle (tangent distance ≈ 0) + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + + +def test_oriented_constrained_tangents_with_y_axis(unit_circle): + angle = math.radians(30) + lines = _make_tan_oriented_lines( + (unit_circle, Tangency.ENCLOSING), Axis.Y, angle, edge_factory=Edge + ) + assert len(lines) == 1 + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + + +def test_invalid_oriented_tangent_raises(unit_circle): + """Non-intersecting degenerate input result in no output.""" + + with pytest.raises(ValueError) as excinfo: + _make_tan_oriented_lines(unit_circle, Axis.Z, 1, edge_factory=Edge) + assert "reference Axis can't be perpendicular to Plane.XY" in str(excinfo.value) + + with pytest.raises(ValueError) as excinfo: + _make_tan_oriented_lines( + unit_circle, Axis((1, 2, 3), (0, 0, -1)), 1, edge_factory=Edge + ) + assert "reference Axis can't be perpendicular to Plane.XY" in str(excinfo.value) + + +def test_invalid_oriented_tangent(unit_circle): + lines = _make_tan_oriented_lines( + unit_circle, Axis((1, 0), (0, 1)), 0, edge_factory=Edge + ) + assert len(lines) == 0 + + lines = _make_tan_oriented_lines( + unit_circle.translate((0, 1 + 1e-7)), Axis.X, 0, edge_factory=Edge + ) + assert len(lines) == 0 From 198dab0ab41508e55b64423eed881294db2e63bb Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Sat, 11 Oct 2025 17:04:46 -0400 Subject: [PATCH 447/518] fix: gradient error in gordon surface intersect modified: pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c90ec65..03e3803 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ dependencies = [ "ipython >= 8.0.0, < 10", "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", - "ocp_gordon >= 0.1.13", + "ocp_gordon >= 0.1.14", "trianglesolver", "sympy", "scipy", From 02d7be83b14e2bbf9b16d6855ced86e8554bfba6 Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Mon, 13 Oct 2025 11:19:21 -0400 Subject: [PATCH 448/518] feat: allow a single point to be used as either a profile or a guide modified: pyproject.toml modified: src/build123d/topology/two_d.py modified: tests/test_direct_api/test_face.py --- pyproject.toml | 2 +- src/build123d/topology/two_d.py | 75 +++++++++++++++++++++++------- tests/test_direct_api/test_face.py | 32 +++++++++++-- 3 files changed, 87 insertions(+), 22 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 03e3803..a25bde4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ dependencies = [ "ipython >= 8.0.0, < 10", "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", - "ocp_gordon >= 0.1.14", + "ocp_gordon >= 0.1.15", "trianglesolver", "sympy", "scipy", diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 0cd9dc8..50f5aad 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -83,11 +83,12 @@ from OCP.BRepTools import BRepTools, BRepTools_ReShape from OCP.gce import gce_MakeLin from OCP.Geom import ( Geom_BezierSurface, + Geom_BSplineCurve, Geom_RectangularTrimmedSurface, Geom_Surface, Geom_TrimmedCurve, ) -from OCP.GeomAbs import GeomAbs_C0, GeomAbs_G1, GeomAbs_G2, GeomAbs_CurveType +from OCP.GeomAbs import GeomAbs_C0, GeomAbs_CurveType, GeomAbs_G1, GeomAbs_G2 from OCP.GeomAPI import ( GeomAPI_ExtremaCurveCurve, GeomAPI_PointsToBSplineSurface, @@ -104,13 +105,17 @@ from OCP.Standard import ( Standard_NoSuchObject, ) from OCP.StdFail import StdFail_NotDone -from OCP.TColgp import TColgp_HArray2OfPnt -from OCP.TColStd import TColStd_HArray2OfReal +from OCP.TColgp import TColgp_Array1OfPnt, TColgp_HArray2OfPnt +from OCP.TColStd import ( + TColStd_Array1OfInteger, + TColStd_Array1OfReal, + TColStd_HArray2OfReal, +) from OCP.TopExp import TopExp from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Shell, TopoDS_Solid from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape -from typing_extensions import Self from ocp_gordon import interpolate_curve_network +from typing_extensions import Self from build123d.build_enums import ( CenterOf, @@ -922,32 +927,66 @@ class Face(Mixin2D, Shape[TopoDS_Face]): @classmethod def make_gordon_surface( cls, - profiles: Iterable[Edge], - guides: Iterable[Edge], + profiles: Iterable[VectorLike | Edge], + guides: Iterable[VectorLike | Edge], tolerance: float = 3e-4, ) -> Face: """ - Creates a Gordon surface from a network of profile and guide curves. + Constructs a Gordon surface from a network of profile and guide curves. + + Profiles and guides may consist of points or curves, but at least one + profile and one guide must be a non-point curve. Args: - profiles (Iterable[Edge]): Edges representing profile curves. - guides (Iterable[Edge]): Edges representing guide curves. - tolerance (float, optional): Tolerance for surface creation and + profiles (Iterable[VectorLike | Edge]): Profiles defined as points or edges. + guides (Iterable[VectorLike | Edge]): Guides defined as points or edges. + tolerance (float, optional): Tolerance used for surface construction and intersection calculations. Raises: - ValueError: Input edge cannot be empty + ValueError: If the input profiles or guides are empty. Returns: Face: the interpolated Gordon surface """ - def to_geom_curve(edge: Edge): - if edge.wrapped is None: - raise ValueError("input edge cannot be empty") + def create_zero_length_bspline_curve( + point: gp_Pnt, degree: int = 1 + ) -> Geom_BSplineCurve: + """ + Helper to create a simple linear B-spline curve. + """ + control_points = TColgp_Array1OfPnt(1, 2) + control_points.SetValue(1, point) + control_points.SetValue(2, point) - adaptor = BRepAdaptor_Curve(edge.wrapped) - curve = BRep_Tool.Curve_s(edge.wrapped, 0, 1) + knots = TColStd_Array1OfReal(1, 2) + knots.SetValue(1, 0.0) + knots.SetValue(2, 1.0) + + multiplicities = TColStd_Array1OfInteger(1, 2) + multiplicities.SetValue(1, degree + 1) + multiplicities.SetValue(2, degree + 1) + + curve = Geom_BSplineCurve(control_points, knots, multiplicities, degree) + return curve + + def to_geom_curve(shape: VectorLike | Edge): + if isinstance(shape, (Vector, tuple, Sequence)): + _shape = Vector(shape) + if _shape.wrapped is None: + raise ValueError("input VectorLike cannot be empty") + + single_point_curve = create_zero_length_bspline_curve( + gp_Pnt(_shape.wrapped.XYZ()) + ) + return single_point_curve + + if shape.wrapped is None: + raise ValueError("input Edge cannot be empty") + + adaptor = BRepAdaptor_Curve(shape.wrapped) + curve = BRep_Tool.Curve_s(shape.wrapped, 0, 1) if not ( (adaptor.IsPeriodic() and adaptor.IsClosed()) or adaptor.GetType() == GeomAbs_CurveType.GeomAbs_BSplineCurve @@ -958,8 +997,8 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ) return curve - ocp_profiles = [to_geom_curve(edge) for edge in profiles] - ocp_guides = [to_geom_curve(edge) for edge in guides] + ocp_profiles = [to_geom_curve(shape) for shape in profiles] + ocp_guides = [to_geom_curve(shape) for shape in guides] gordon_bspline_surface = interpolate_curve_network( ocp_profiles, ocp_guides, tolerance=tolerance diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 043c22c..518e53b 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -31,9 +31,11 @@ import os import platform import random import unittest +from unittest.mock import PropertyMock, patch -from unittest.mock import patch, PropertyMock from OCP.Geom import Geom_RectangularTrimmedSurface +from OCP.GeomAPI import GeomAPI_ExtremaCurveCurve + from build123d.build_common import Locations, PolarLocations from build123d.build_enums import Align, CenterOf, ContinuityLevel, GeomType from build123d.build_line import BuildLine @@ -57,7 +59,6 @@ from build123d.operations_generic import fillet, offset from build123d.operations_part import extrude from build123d.operations_sketch import make_face from build123d.topology import Edge, Face, Shell, Solid, Wire -from OCP.GeomAPI import GeomAPI_ExtremaCurveCurve class TestFace(unittest.TestCase): @@ -448,7 +449,7 @@ class TestFace(unittest.TestCase): profiles, guides, tolerance=tolerance ) - def test_make_gordon_surface_edge_types(self): + def test_make_gordon_surface_input_types(self): tolerance = 3e-4 def point_at_uv_against_expected(u: float, v: float, expected_point: Vector): @@ -538,6 +539,30 @@ class TestFace(unittest.TestCase): point_at_uv_against_expected(u=0.0, v=0.5, expected_point=guides[0] @ 0.5) point_at_uv_against_expected(u=1.0, v=0.5, expected_point=guides[0] @ 0.5) + profiles = [ + points[0], + ThreePointArc( + points[1], (points[1] + points[3]) / 2 + Vector(0, 0, 2), points[3] + ), + points[2], + ] + guides = [ + Spline( + points[0], + profiles[1] @ 0, + points[2], + ), + Spline( + points[0], + profiles[1] @ 1, + points[2], + ), + ] + gordon_surface = Face.make_gordon_surface(profiles, guides, tolerance=tolerance) + point_at_uv_against_expected(u=0.0, v=1.0, expected_point=guides[0] @ 1) + point_at_uv_against_expected(u=1.0, v=1.0, expected_point=guides[1] @ 1) + point_at_uv_against_expected(u=1.0, v=0.0, expected_point=points[0]) + def test_make_surface(self): corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] net_exterior = Wire( @@ -1232,3 +1257,4 @@ class TestAxesOfSymmetrySplitNone(unittest.TestCase): if __name__ == "__main__": unittest.main() + unittest.main() From acfe5fde8a3fe2b2fb6c8008613aa19ae054f4f5 Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Mon, 13 Oct 2025 11:44:02 -0400 Subject: [PATCH 449/518] fix: no need to check wrapped for Vector class modified: src/build123d/topology/two_d.py --- src/build123d/topology/two_d.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 50f5aad..d094ac4 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -974,9 +974,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): def to_geom_curve(shape: VectorLike | Edge): if isinstance(shape, (Vector, tuple, Sequence)): _shape = Vector(shape) - if _shape.wrapped is None: - raise ValueError("input VectorLike cannot be empty") - single_point_curve = create_zero_length_bspline_curve( gp_Pnt(_shape.wrapped.XYZ()) ) From bd03fcbdb4f1ac69f519eb2b0fc4d69f2506af70 Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Mon, 13 Oct 2025 11:53:37 -0400 Subject: [PATCH 450/518] fix: remove minor artifact modified: tests/test_direct_api/test_face.py --- tests/test_direct_api/test_face.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 518e53b..79d3685 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -1257,4 +1257,3 @@ class TestAxesOfSymmetrySplitNone(unittest.TestCase): if __name__ == "__main__": unittest.main() - unittest.main() From b0974555057e1cb3284ab9f22c2db4773572a55e Mon Sep 17 00:00:00 2001 From: Fan Gong Date: Thu, 16 Oct 2025 22:25:14 -0400 Subject: [PATCH 451/518] fix: single point only allowed at start and end modified: pyproject.toml modified: src/build123d/topology/two_d.py modified: tests/test_direct_api/test_face.py --- pyproject.toml | 4 ++-- src/build123d/topology/two_d.py | 14 ++++++++------ tests/test_direct_api/test_face.py | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a25bde4..fdb8bc0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ keywords = [ "brep", "cad", "cadquery", - "opencscade", + "opencascade", "python", ] license = {text = "Apache-2.0"} @@ -44,7 +44,7 @@ dependencies = [ "ipython >= 8.0.0, < 10", "lib3mf >= 2.4.1", "ocpsvg >= 0.5, < 0.6", - "ocp_gordon >= 0.1.15", + "ocp_gordon >= 0.1.17", "trianglesolver", "sympy", "scipy", diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index d094ac4..8b8f264 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -934,8 +934,13 @@ class Face(Mixin2D, Shape[TopoDS_Face]): """ Constructs a Gordon surface from a network of profile and guide curves. - Profiles and guides may consist of points or curves, but at least one - profile and one guide must be a non-point curve. + Requirements: + 1. Profiles and guides may be defined as points or curves. + 2. Only the first or last profile or guide may be a point. + 3. At least one profile and one guide must be a non-point curve. + 4. Each profile must intersect with every guide. + 5. Both ends of every profile must lie on a guide. + 6. Both ends of every guide must lie on a profile. Args: profiles (Iterable[VectorLike | Edge]): Profiles defined as points or edges. @@ -944,7 +949,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): intersection calculations. Raises: - ValueError: If the input profiles or guides are empty. + ValueError: input Edge cannot be empty. Returns: Face: the interpolated Gordon surface @@ -953,9 +958,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): def create_zero_length_bspline_curve( point: gp_Pnt, degree: int = 1 ) -> Geom_BSplineCurve: - """ - Helper to create a simple linear B-spline curve. - """ control_points = TColgp_Array1OfPnt(1, 2) control_points.SetValue(1, point) control_points.SetValue(2, point) diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index 79d3685..f8619c5 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -563,6 +563,28 @@ class TestFace(unittest.TestCase): point_at_uv_against_expected(u=1.0, v=1.0, expected_point=guides[1] @ 1) point_at_uv_against_expected(u=1.0, v=0.0, expected_point=points[0]) + profiles = [ + Line(points[0], points[1]), + (points[0] + points[2]) / 2, + Line(points[3], points[2]), + ] + guides = [ + Spline( + profiles[0] @ 0, + profiles[1], + profiles[2] @ 0, + ), + Spline( + profiles[0] @ 1, + profiles[1], + profiles[2] @ 1, + ), + ] + with self.assertRaises(ValueError): + gordon_surface = Face.make_gordon_surface( + profiles, guides, tolerance=tolerance + ) + def test_make_surface(self): corners = [Vector(x, y) for x in [-50.5, 50.5] for y in [-24.5, 24.5]] net_exterior = Wire( From 13685139563df1eec0528e0ca5844acae456a3ef Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 17 Oct 2025 11:15:08 -0400 Subject: [PATCH 452/518] make_constrained_lines working --- src/build123d/topology/constrained_lines.py | 12 +--- src/build123d/topology/one_d.py | 51 +++++++------- .../test_direct_api/test_constrained_lines.py | 66 +++++++++++++++++++ 3 files changed, 98 insertions(+), 31 deletions(-) diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 58e8b0f..9c316b6 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -119,22 +119,16 @@ def _edge_to_qualified_2d( """Convert a TopoDS_Edge into 2d curve & extract properties""" # 1) Underlying curve + range (also retrieve location to be safe) - loc = edge.Location() hcurve3d = BRep_Tool.Curve_s(edge, float(), float()) first, last = BRep_Tool.Range_s(edge) - # 2) Apply location if the edge is positioned by a TopLoc_Location - if not loc.IsIdentity(): - trsf = loc.Transformation() - hcurve3d = tcast(Geom_Curve, hcurve3d.Transformed(trsf)) - - # 3) Convert to 2D on Plane.XY (Z-up frame at origin) + # 2) Convert to 2D on Plane.XY (Z-up frame at origin) hcurve2d = GeomAPI.To2d_s(hcurve3d, _pln_xy) # -> Handle_Geom2d_Curve - # 4) Wrap in an adaptor using the same parametric range + # 3) Wrap in an adaptor using the same parametric range adapt2d = Geom2dAdaptor_Curve(hcurve2d, first, last) - # 5) Create the qualified curve (unqualified is fine here) + # 4) Create the qualified curve (unqualified is fine here) qcurve = Geom2dGcc_QualifiedCurve(adapt2d, position_constaint.value) return qcurve, hcurve2d, first, last, adapt2d diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 8eeb2d7..744a9ed 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -1969,15 +1969,15 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_lines( cls, - tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge, - tangency_two: tuple[Axis | Edge, Tangency] | Axis | Edge, + tangency_one: tuple[Edge, Tangency] | Axis | Edge, + tangency_two: tuple[Edge, Tangency] | Axis | Edge, ) -> ShapeList[Edge]: """ Create all planar line(s) on the XY plane tangent to two provided curves. Args: tangency_one, tangency_two - (tuple[Axis | Edge, Tangency] | Axis | Edge): + (tuple[Edge, Tangency] | Axis | Edge): Geometric entities to be contacted/touched by the line(s). Returns: @@ -1988,7 +1988,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_lines( cls, - tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge, + tangency_one: tuple[Edge, Tangency] | Edge, tangency_two: Vector, ) -> ShapeList[Edge]: """ @@ -1997,7 +1997,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Args: tangency_one - (tuple[Axis | Edge, Tangency] | Axis | Edge): + (tuple[Edge, Tangency] | Edge): Geometric entity to be contacted/touched by the line(s). tangency_two (Vector): Fixed point through which the line(s) must pass. @@ -2010,11 +2010,11 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): @classmethod def make_constrained_lines( cls, - tangency_one: tuple[Axis | Edge, Tangency] | Axis | Edge, + tangency_one: tuple[Edge, Tangency] | Edge, tangency_two: Axis, *, angle: float | None = None, - direction: Vector | None = None, + direction: VectorLike | None = None, ) -> ShapeList[Edge]: """ Create all planar line(s) on the XY plane tangent to one curve and passing @@ -2025,7 +2025,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangency_two (Axis): axis that angle will be measured against angle : float, optional Line orientation in degrees (measured CCW from the X-axis). - direction : Vector, optional + direction : VectorLike, optional Direction vector for the line (only X and Y components are used). Note: one of angle or direction must be provided @@ -2051,6 +2051,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): angle = kwargs.pop("angle", None) direction = kwargs.pop("direction", None) + direction = Vector(direction) if direction is not None else None is_ref = angle is not None or direction is not None # Handle unexpected kwargs @@ -2072,13 +2073,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): elif isinstance(tangency_arg, Edge): tangencies.append(tangency_arg) continue - if isinstance(tangency_arg, tuple): - if isinstance(tangency_arg[0], Axis): - tangencies.append((Edge(tangency_arg[0]), tangency_arg[1])) - continue - elif isinstance(tangency_arg[0], Edge): - tangencies.append(tangency_arg) - continue + if isinstance(tangency_arg, tuple) and isinstance(tangency_arg[0], Edge): + tangencies.append(tangency_arg) + continue # Fallback: treat as a point try: tangencies.append(Vector(tangency_arg)) @@ -2089,16 +2086,23 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): tangencies = sorted(tangencies, key=lambda x: isinstance(x, (Axis, Vector))) # --- decide problem kind --- - if isinstance(tangencies[1], Axis): - assert isinstance( - tangencies[0], Edge - ), "Internal error - 1st tangency must be Edge" + if angle is not None or direction is not None: + if isinstance(tangencies[0], tuple): + assert isinstance( + tangencies[0][0], Edge + ), "Internal error - 1st tangency must be Edge" + else: + assert isinstance( + tangencies[0], Edge + ), "Internal error - 1st tangency must be Edge" if angle is not None: ang_rad = radians(angle) - elif direction is not None: - ang_rad = atan2(direction.Y, direction.X) else: - raise ValueError("Specify exactly one of 'angle' or 'direction'") + assert direction is not None + ang_rad = atan2(direction.Y, direction.X) + assert isinstance( + tangencies[1], Axis + ), "Internal error - 2nd tangency must be an Axis" return _make_tan_oriented_lines( tangencies[0], tangencies[1], ang_rad, edge_factory=cls ) @@ -2106,6 +2110,9 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): assert not isinstance( tangencies[0], (Axis, Vector) ), "Internal error - 1st tangency can't be an Axis | Vector" + assert not isinstance( + tangencies[1], Axis + ), "Internal error - 2nd tangency can't be an Axis" return _make_2tan_lines(tangencies[0], tangencies[1], edge_factory=cls) diff --git a/tests/test_direct_api/test_constrained_lines.py b/tests/test_direct_api/test_constrained_lines.py index d74bf90..dc32dff 100644 --- a/tests/test_direct_api/test_constrained_lines.py +++ b/tests/test_direct_api/test_constrained_lines.py @@ -199,3 +199,69 @@ def test_invalid_oriented_tangent(unit_circle): unit_circle.translate((0, 1 + 1e-7)), Axis.X, 0, edge_factory=Edge ) assert len(lines) == 0 + + +def test_make_constrained_lines0(unit_circle): + lines = Edge.make_constrained_lines(unit_circle, unit_circle.translate((3, 0, 0))) + assert len(lines) == 4 + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + + +def test_make_constrained_lines1(unit_circle): + lines = Edge.make_constrained_lines(unit_circle, (3, 0)) + assert len(lines) == 2 + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + + +def test_make_constrained_lines3(unit_circle): + lines = Edge.make_constrained_lines(unit_circle, Axis.X, angle=30) + assert len(lines) == 2 + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + assert abs((ln @ 1).Y) < 1e-6 + + +def test_make_constrained_lines4(unit_circle): + lines = Edge.make_constrained_lines(unit_circle, Axis.Y, angle=30) + assert len(lines) == 2 + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + assert abs((ln @ 1).X) < 1e-6 + + +def test_make_constrained_lines5(unit_circle): + lines = Edge.make_constrained_lines( + (unit_circle, Tangency.ENCLOSING), Axis.Y, angle=30 + ) + assert len(lines) == 1 + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + + +def test_make_constrained_lines6(unit_circle): + lines = Edge.make_constrained_lines( + (unit_circle, Tangency.ENCLOSING), Axis.Y, direction=(1, 1) + ) + assert len(lines) == 1 + for ln in lines: + assert unit_circle.distance_to(ln) < 1e-6 + + +def test_make_constrained_lines_raises(unit_circle): + with pytest.raises(TypeError) as excinfo: + Edge.make_constrained_lines(unit_circle, Axis.Z, ref_angle=1) + assert "Unexpected argument(s): ref_angle" in str(excinfo.value) + + with pytest.raises(TypeError) as excinfo: + Edge.make_constrained_lines(unit_circle) + assert "Provide exactly 2 tangency targets." in str(excinfo.value) + + with pytest.raises(RuntimeError) as excinfo: + Edge.make_constrained_lines(Axis.X, Axis.Y) + assert "Unable to find common tangent line(s)" in str(excinfo.value) + + with pytest.raises(TypeError) as excinfo: + Edge.make_constrained_lines(unit_circle, ("three", 0)) + assert "Invalid tangency:" in str(excinfo.value) From 99da8912df93adfca65b91a180d160aa1bc7c024 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 17 Oct 2025 11:45:11 -0400 Subject: [PATCH 453/518] Add 2d and 3d intersection tests --- tests/test_direct_api/test_intersection.py | 131 +++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index 6eebc41..6262a23 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -152,6 +152,7 @@ def test_shape_0d(obj, target, expected): run_test(obj, target, expected) +# 1d Shapes ed1 = Line((0, 0), (5, 0)).edge() ed2 = Line((0, -1), (5, 1)).edge() ed3 = Line((0, 0, 5), (5, 0, 5)).edge() @@ -220,6 +221,136 @@ def test_shape_1d(obj, target, expected): run_test(obj, target, expected) +# 2d Shapes +fc1 = Rectangle(5, 5).face() +fc2 = Pos(Z=5) * Rectangle(5, 5).face() +fc3 = Rot(Y=90) * Rectangle(5, 5).face() +fc4 = Rot(Z=45) * Rectangle(5, 5).face() +fc5 = Pos(2.5, 2.5, 2.5) * Rot(0, 90) * Rectangle(5, 5).face() +fc6 = Pos(2.5, 2.5) * Rot(0, 90, 45, Extrinsic.XYZ) * Rectangle(5, 5).face() +fc7 = (Rot(90) * Cylinder(2, 4)).faces().filter_by(GeomType.CYLINDER)[0] + +fc11 = Rectangle(4, 4).face() +fc22 = sweep(Rot(90) * CenterArc((0, 0), 2, 0, 180), Line((0, 2), (0, -2))) +sh1 = Shell([Pos(-4) * fc11, fc22]) +sh2 = Pos(Z=1) * sh1 +sh3 = Shell([Pos(-4) * fc11, fc22, Pos(2, 0, -2) * Rot(0, 90) * fc11]) +sh4 = Shell([Pos(-4) * fc11, fc22, Pos(4) * fc11]) +sh5 = Pos(Z=1) * Shell([Pos(-2, 0, -2) * Rot(0, -90) * fc11, fc22, Pos(2, 0, -2) * Rot(0, 90) * fc11]) + +shape_2d_matrix = [ + Case(fc1, vl2, None, "non-coincident", None), + Case(fc1, vl1, [Vertex], "coincident", None), + + Case(fc1, lc2, None, "non-coincident", None), + Case(fc1, lc1, [Vertex], "coincident", None), + + Case(fc2, ax1, None, "parallel/skew", None), + Case(fc3, ax1, [Vertex], "intersecting", None), + Case(fc1, ax1, [Edge], "collinear", None), + # Case(fc7, ax1, [Vertex, Vertex], "multi intersect", None), + + Case(fc1, pl3, None, "parallel/skew", None), + Case(fc1, pl1, [Edge], "intersecting", None), + Case(fc1, pl2, [Face], "collinear", None), + Case(fc7, pl1, [Edge, Edge], "multi intersect", None), + + Case(fc1, vt2, None, "non-coincident", None), + Case(fc1, vt1, [Vertex], "coincident", None), + + Case(fc1, ed3, None, "parallel/skew", None), + Case(Pos(1) * fc3, ed1, [Vertex], "intersecting", None), + Case(fc1, ed1, [Edge], "collinear", None), + Case(Pos(1.1) * fc3, ed4, [Vertex, Vertex], "multi intersect", None), + + Case(fc1, wi6, None, "parallel/skew", None), + Case(Pos(1) * fc3, wi4, [Vertex], "intersecting", None), + Case(fc1, wi1, [Edge, Edge], "2 collinear", None), + Case(Rot(90) * fc4, wi5, [Vertex, Vertex], "multi intersect", None), + Case(Rot(90) * fc4, wi2, [Vertex, Edge], "intersect + collinear", None), + + Case(fc1, fc2, None, "parallel/skew", None), + Case(fc1, fc3, [Edge], "intersecting", None), + Case(fc1, fc4, [Face], "coplanar", None), + Case(fc1, fc5, [Edge], "intersecting edge", None), + Case(fc1, fc6, [Vertex], "intersecting vertex", None), + Case(fc1, fc7, [Edge, Edge], "multi-intersecting", None), + Case(fc7, Pos(Y=2) * fc7, [Face], "cyl intersecting", None), + + Case(sh2, fc1, None, "parallel/skew", None), + Case(Pos(Z=1) * sh3, fc1, [Edge], "intersecting", None), + Case(sh1, fc1, [Face, Edge], "coplanar + intersecting", None), + Case(sh4, fc1, [Face, Face], "2 coplanar", None), + Case(sh5, fc1, [Edge, Edge], "2 intersecting", None), + + # Case(sh5, fc1, [Edge], "multi to_intersect, intersecting", None), +] + +@pytest.mark.parametrize("obj, target, expected", make_params(shape_2d_matrix)) +def test_shape_2d(obj, target, expected): + run_test(obj, target, expected) + +# 3d Shapes +sl1 = Box(2, 2, 2).solid() +sl2 = Pos(Z=5) * Box(2, 2, 2).solid() +sl3 = Cylinder(2, 1).solid() - Cylinder(1.5, 1).solid() + +wi7 = Wire([l1 := sl3.faces().sort_by(Axis.Z)[-1].edge().trim(.3, .4), + l2 := l1.trim(2, 3), + RadiusArc(l1 @ 1, l2 @ 0, 1, short_sagitta=False) + ]) + +shape_3d_matrix = [ + Case(sl2, vl1, None, "non-coincident", None), + Case(Pos(2) * sl1, vl1, [Vertex], "contained", None), + Case(Pos(1, 1, -1) * sl1, vl1, [Vertex], "coincident", None), + + Case(sl2, lc1, None, "non-coincident", None), + Case(Pos(2) * sl1, lc1, [Vertex], "contained", None), + Case(Pos(1, 1, -1) * sl1, lc1, [Vertex], "coincident", None), + + Case(sl2, ax1, None, "non-coincident", None), + Case(sl1, ax1, [Edge], "intersecting", None), + Case(Pos(1, 1, 1) * sl1, ax2, [Edge], "coincident", None), + + Case(sl1, pl3, None, "non-coincident", None), + Case(sl1, pl2, [Face], "intersecting", None), + + Case(sl2, vt1, None, "non-coincident", None), + Case(Pos(2) * sl1, vt1, [Vertex], "contained", None), + Case(Pos(1, 1, -1) * sl1, vt1, [Vertex], "coincident", None), + + Case(sl1, ed3, None, "non-coincident", None), + Case(sl1, ed1, [Edge], "intersecting", None), + Case(sl1, Pos(0, 1, 1) * ed1, [Edge], "edge collinear", "BRepAlgoAPI_Common and _Section both return edge"), + Case(sl1, Pos(1, 1, 1) * ed1, [Vertex], "corner coincident", None), + Case(Pos(2.1, 1) * sl1, ed4, [Edge, Edge], "multi-intersect", None), + + Case(Pos(2, .5, -1) * sl1, wi6, None, "non-coincident", None), + Case(Pos(2, .5, 1) * sl1, wi6, [Edge, Edge], "multi-intersecting", None), + Case(sl3, wi7, [Edge, Edge], "multi-coincident, is_equal check", None), + + Case(sl2, fc1, None, "non-coincident", None), + Case(sl1, fc1, [Face], "intersecting", None), + Case(Pos(3.5, 0, 1) * sl1, fc1, [Edge], "edge collinear", None), + Case(Pos(3.5, 3.5) * sl1, fc1, [Vertex], "corner coincident", None), + Case(Pos(.9) * sl1, fc7, [Face, Face], "multi-intersecting", None), + + Case(sl2, sh1, None, "non-coincident", None), + Case(Pos(-2) * sl1, sh1, [Face, Face], "multi-intersecting", None), + + Case(sl1, sl2, None, "non-coincident", None), + Case(sl1, Pos(1, 1, 1) * sl1, [Solid], "intersecting", None), + Case(sl1, Pos(2, 2, 1) * sl1, [Edge], "edge collinear", None), + Case(sl1, Pos(2, 2, 2) * sl1, [Vertex], "corner coincident", None), + Case(sl1, Pos(.45) * sl3, [Solid, Solid], "multi-intersect", None), +] + +@pytest.mark.parametrize("obj, target, expected", make_params(shape_3d_matrix)) +def test_shape_3d(obj, target, expected): + run_test(obj, target, expected) + + # FreeCAD issue example c1 = CenterArc((0, 0), 10, 0, 360).edge() c2 = CenterArc((19, 0), 10, 0, 360).edge() From 283767f69de8d5139e28ca73c112b67d2197befd Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 19 Oct 2025 11:29:21 -0400 Subject: [PATCH 454/518] Cached color lookups --- src/build123d/importers.py | 70 ++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/src/build123d/importers.py b/src/build123d/importers.py index 55d1d42..d53628a 100644 --- a/src/build123d/importers.py +++ b/src/build123d/importers.py @@ -38,8 +38,10 @@ from pathlib import Path from typing import Literal, Optional, TextIO, Union import warnings +from OCP.Bnd import Bnd_Box from OCP.BRep import BRep_Builder -from OCP.BRepGProp import BRepGProp +from OCP.BRepBndLib import BRepBndLib +from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepTools import BRepTools from OCP.GProp import GProp_GProps from OCP.Quantity import Quantity_ColorRGBA @@ -145,37 +147,42 @@ def import_step(filename: PathLike | str | bytes) -> Compound: clean_name = "".join(ch for ch in name if unicodedata.category(ch)[0] != "C") return clean_name.translate(str.maketrans(" .()", "____")) - def get_color(shape: TopoDS_Shape) -> Quantity_ColorRGBA: + def get_shape_color_from_cache(obj: TopoDS_Shape) -> Quantity_ColorRGBA | None: + """Get the color of a shape from a cache""" + key = obj.TShape().__hash__() + if key in _color_cache: + return _color_cache[key] + + col = Quantity_ColorRGBA() + has_color = ( + color_tool.GetColor(obj, XCAFDoc_ColorCurv, col) + or color_tool.GetColor(obj, XCAFDoc_ColorGen, col) + or color_tool.GetColor(obj, XCAFDoc_ColorSurf, col) + ) + _color_cache[key] = col if has_color else None + return _color_cache[key] + + def get_color(shape: TopoDS_Shape) -> Quantity_ColorRGBA | None: """Get the color - take that of the largest Face if multiple""" + shape_color = get_shape_color_from_cache(shape) + if shape_color is not None: + return shape_color - def get_col(obj: TopoDS_Shape) -> Quantity_ColorRGBA: - col = Quantity_ColorRGBA() - if ( - color_tool.GetColor(obj, XCAFDoc_ColorCurv, col) - or color_tool.GetColor(obj, XCAFDoc_ColorGen, col) - or color_tool.GetColor(obj, XCAFDoc_ColorSurf, col) - ): - return col - - shape_color = get_col(shape) - - colors = {} - face_explorer = TopExp_Explorer(shape, TopAbs_FACE) - while face_explorer.More(): - current_face = face_explorer.Current() - properties = GProp_GProps() - BRepGProp.SurfaceProperties_s(current_face, properties) - area = properties.Mass() - color = get_col(current_face) - if color is not None: - colors[area] = color - face_explorer.Next() - - # If there are multiple colors, return the one from the largest face - if colors: - shape_color = sorted(colors.items())[-1][1] - - return shape_color + max_extent = -1.0 + winner = None + exp = TopExp_Explorer(shape, TopAbs_FACE) + while exp.More(): + face = exp.Current() + col = get_shape_color_from_cache(face) + if col is not None: + box = Bnd_Box() + BRepBndLib.Add_s(face, box) + extent = box.SquareExtent() + if extent > max_extent: + max_extent = extent + winner = col + exp.Next() + return winner def build_assembly(parent_tdf_label: TDF_Label | None = None) -> list[Shape]: """Recursively extract object into an assembly""" @@ -211,6 +218,9 @@ def import_step(filename: PathLike | str | bytes) -> Compound: if not os.path.exists(filename): raise FileNotFoundError(filename) + # Retrieving color info is expensive so cache the lookups + _color_cache: dict[int, Quantity_ColorRGBA | None] = {} + fmt = TCollection_ExtendedString("XCAF") doc = TDocStd_Document(fmt) shape_tool = XCAFDoc_DocumentTool.ShapeTool_s(doc.Main()) From 4a32cedcd2fbae2583a439f34a372e739eb7344a Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 19 Oct 2025 15:31:47 -0400 Subject: [PATCH 455/518] Updating surface modeling docs --- docs/_static/spitfire_wing.glb | Bin 0 -> 12476 bytes docs/assets/surface_modeling/heart_token.png | Bin 0 -> 27335 bytes .../assets/surface_modeling/spitfire_wing.png | Bin 0 -> 45374 bytes .../spitfire_wing_profiles_guides.svg | 11 ++ .../token_half_surface.png | Bin .../token_heart_perimeter.png | Bin .../token_heart_solid.png | Bin .../{ => surface_modeling}/token_sides.png | Bin docs/heart_token.py | 68 +++++++ docs/spitfire_wing_gordon.py | 77 ++++++++ docs/tutorial_surface_heart_token.rst | 125 ++++++++++++ docs/tutorial_surface_modeling.rst | 181 ++++-------------- examples/tea_cup.py | 12 +- 13 files changed, 327 insertions(+), 147 deletions(-) create mode 100644 docs/_static/spitfire_wing.glb create mode 100644 docs/assets/surface_modeling/heart_token.png create mode 100644 docs/assets/surface_modeling/spitfire_wing.png create mode 100644 docs/assets/surface_modeling/spitfire_wing_profiles_guides.svg rename docs/assets/{ => surface_modeling}/token_half_surface.png (100%) rename docs/assets/{ => surface_modeling}/token_heart_perimeter.png (100%) rename docs/assets/{ => surface_modeling}/token_heart_solid.png (100%) rename docs/assets/{ => surface_modeling}/token_sides.png (100%) create mode 100644 docs/heart_token.py create mode 100644 docs/spitfire_wing_gordon.py create mode 100644 docs/tutorial_surface_heart_token.rst diff --git a/docs/_static/spitfire_wing.glb b/docs/_static/spitfire_wing.glb new file mode 100644 index 0000000000000000000000000000000000000000..93c275b4dc50962012f1e3c0d0ee3c816d71d491 GIT binary patch literal 12476 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 literal 0 HcmV?d00001 diff --git a/docs/assets/surface_modeling/heart_token.png b/docs/assets/surface_modeling/heart_token.png new file mode 100644 index 0000000000000000000000000000000000000000..24cfeb78261372c3e2815720f21a880bed5104f7 GIT binary patch literal 27335 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 literal 0 HcmV?d00001 diff --git a/docs/assets/surface_modeling/spitfire_wing.png b/docs/assets/surface_modeling/spitfire_wing.png new file mode 100644 index 0000000000000000000000000000000000000000..10924261ecb9f5d3e79aa22a3a12bbdd1e3d2d15 GIT binary patch literal 45374 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

    yn_?pft7a-#=MUUG1+Ba6xMKqmYypLQnIT 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 X=)L;wtlTID1_lOCS3j3^P6 + + + + + + + + + + \ No newline at end of file diff --git a/docs/assets/token_half_surface.png b/docs/assets/surface_modeling/token_half_surface.png similarity index 100% rename from docs/assets/token_half_surface.png rename to docs/assets/surface_modeling/token_half_surface.png diff --git a/docs/assets/token_heart_perimeter.png b/docs/assets/surface_modeling/token_heart_perimeter.png similarity index 100% rename from docs/assets/token_heart_perimeter.png rename to docs/assets/surface_modeling/token_heart_perimeter.png diff --git a/docs/assets/token_heart_solid.png b/docs/assets/surface_modeling/token_heart_solid.png similarity index 100% rename from docs/assets/token_heart_solid.png rename to docs/assets/surface_modeling/token_heart_solid.png diff --git a/docs/assets/token_sides.png b/docs/assets/surface_modeling/token_sides.png similarity index 100% rename from docs/assets/token_sides.png rename to docs/assets/surface_modeling/token_sides.png diff --git a/docs/heart_token.py b/docs/heart_token.py new file mode 100644 index 0000000..da11e68 --- /dev/null +++ b/docs/heart_token.py @@ -0,0 +1,68 @@ +# [Code] +from build123d import * +from ocp_vscode import show + +# Create the edges of one half the heart surface +l1 = JernArc((0, 0), (1, 1.4), 40, -17) +l2 = JernArc(l1 @ 1, l1 % 1, 4.5, 175) +l3 = IntersectingLine(l2 @ 1, l2 % 1, other=Edge.make_line((0, 0), (0, 20))) +l4 = ThreePointArc(l3 @ 1, (0, 0, 1.5) + (l3 @ 1 + l1 @ 0) / 2, l1 @ 0) +heart_half = Wire([l1, l2, l3, l4]) +# [SurfaceEdges] + +# Create a point elevated off the center +surface_pnt = l2.arc_center + (0, 0, 1.5) +# [SurfacePoint] + +# Create the surface from the edges and point +top_right_surface = Pos(Z=0.5) * -Face.make_surface(heart_half, [surface_pnt]) +# [Surface] + +# Use the mirror method to create the other top and bottom surfaces +top_left_surface = top_right_surface.mirror(Plane.YZ) +bottom_right_surface = top_right_surface.mirror(Plane.XY) +bottom_left_surface = -top_left_surface.mirror(Plane.XY) +# [Surfaces] + +# Create the left and right sides +left_wire = Wire([l3, l2, l1]) +left_side = Pos(Z=-0.5) * Shell.extrude(left_wire, (0, 0, 1)) +right_side = left_side.mirror(Plane.YZ) +# [Sides] + +# Put all of the faces together into a Shell/Solid +heart = Solid( + Shell( + [ + top_right_surface, + top_left_surface, + bottom_right_surface, + bottom_left_surface, + left_side, + right_side, + ] + ) +) +# [Solid] + +# Build a frame around the heart +with BuildPart() as heart_token: + with BuildSketch() as outline: + with BuildLine(): + add(l1) + add(l2) + add(l3) + Line(l3 @ 1, l1 @ 0) + make_face() + mirror(about=Plane.YZ) + center = outline.sketch + offset(amount=2, kind=Kind.INTERSECTION) + add(center, mode=Mode.SUBTRACT) + extrude(amount=2, both=True) + add(heart) + +heart_token.part.color = "Red" + +show(heart_token) +# [End] +# export_gltf(heart_token.part, "heart_token.glb", binary=True) diff --git a/docs/spitfire_wing_gordon.py b/docs/spitfire_wing_gordon.py new file mode 100644 index 0000000..8b41a0c --- /dev/null +++ b/docs/spitfire_wing_gordon.py @@ -0,0 +1,77 @@ +""" +Supermarine Spitfire Wing +""" + +# [Code] + +from build123d import * +from ocp_vscode import show + +wing_span = 36 * FT + 10 * IN +wing_leading = 2.5 * FT +wing_trailing = wing_span / 4 - wing_leading +wing_leading_fraction = wing_leading / (wing_leading + wing_trailing) +wing_tip_section = wing_span / 2 - 1 * IN # distance from root to last section + +# Create leading and trailing edges +leading_edge = EllipticalCenterArc( + (0, 0), wing_span / 2, wing_leading, start_angle=270, end_angle=360 +) +trailing_edge = EllipticalCenterArc( + (0, 0), wing_span / 2, wing_trailing, start_angle=0, end_angle=90 +) + +# [AirfoilSizes] +# Calculate the airfoil sizes from the leading/trailing edges +airfoil_sizes = [] +for i in [0, 1]: + tip_axis = Axis(i * (wing_tip_section, 0, 0), (0, 1, 0)) + leading_pnt = leading_edge.intersect(tip_axis)[0] + trailing_pnt = trailing_edge.intersect(tip_axis)[0] + airfoil_sizes.append(trailing_pnt.Y - leading_pnt.Y) + +# [Airfoils] +# Create the root and tip airfoils - note that they are different NACA profiles +airfoil_root = Plane.YZ * scale( + Airfoil("2213").translate((-wing_leading_fraction, 0, 0)), airfoil_sizes[0] +) +airfoil_tip = ( + Plane.YZ + * Pos(Z=wing_tip_section) + * scale(Airfoil("2205").translate((-wing_leading_fraction, 0, 0)), airfoil_sizes[1]) +) + +# [Profiles] +# Create the Gordon surface profiles and guides +profiles = airfoil_root.edges() + airfoil_tip.edges() +profiles.append(leading_edge @ 1) # wing tip +guides = [leading_edge, trailing_edge] +# Create the wing surface as a Gordon Surface +wing_surface = -Face.make_gordon_surface(profiles, guides) +# Create the root of the wing +wing_root = -Face(Wire(wing_surface.edges().filter_by(Edge.is_closed))) + +# [Solid] +# Create the wing Solid +wing = Solid(Shell([wing_surface, wing_root])) +wing.color = 0x99A3B9 # Azure Blue + +show(wing) +# [End] +# Documentation artifact generation +# wing_control_edges = Curve( +# [airfoil_root, airfoil_tip, Vertex(leading_edge @ 1), leading_edge, trailing_edge] +# ) +# visible, _ = wing_control_edges.project_to_viewport((50 * FT, -50 * FT, 50 * FT)) +# max_dimension = max(*Compound(children=visible).bounding_box().size) +# svg = ExportSVG(scale=100 / max_dimension) +# svg.add_shape(visible) +# svg.write("assets/surface_modeling/spitfire_wing_profiles_guides.svg") + +# export_gltf( +# wing, +# "assets/surface_modeling/spitfire_wing.glb", +# binary=True, +# linear_deflection=0.1, +# angular_deflection=1, +# ) diff --git a/docs/tutorial_surface_heart_token.rst b/docs/tutorial_surface_heart_token.rst new file mode 100644 index 0000000..2c45f62 --- /dev/null +++ b/docs/tutorial_surface_heart_token.rst @@ -0,0 +1,125 @@ +################################## +Tutorial: Heart Token (Basics) +################################## + +This hands‑on tutorial introduces the fundamentals of surface modeling by building +a heart‑shaped token from a small set of non‑planar faces. We’ll create +non‑planar surfaces, mirror them, add side faces, and assemble a closed shell +into a solid. + +As described in the `topology_` section, a BREP model consists of vertices, edges, faces, +and other elements that define the boundary of an object. When creating objects with +non-planar faces, it is often more convenient to explicitly create the boundary faces of +the object. To illustrate this process, we will create the following game token: + +.. raw:: html + + + + +Useful :class:`~topology.Face` creation methods include +:meth:`~topology.Face.make_surface`, :meth:`~topology.Face.make_bezier_surface`, +and :meth:`~topology.Face.make_surface_from_array_of_points`. See the +:doc:`surface_modeling` overview for the full list. + +In this case, we'll use the ``make_surface`` method, providing it with the edges that define +the perimeter of the surface and a central point on that surface. + +To create the perimeter, we'll define the perimeter edges. Since the heart is +symmetric, we'll only create half of its surface here: + +.. literalinclude:: heart_token.py + :start-after: [Code] + :end-before: [SurfaceEdges] + +Note that ``l4`` is not in the same plane as the other lines; it defines the center line +of the heart and archs up off ``Plane.XY``. + +.. image:: ./assets/surface_modeling/token_heart_perimeter.png + :align: center + :alt: token perimeter + +In preparation for creating the surface, we'll define a point on the surface: + +.. literalinclude:: heart_token.py + :start-after: [SurfaceEdges] + :end-before: [SurfacePoint] + +We will then use this point to create a non-planar ``Face``: + +.. literalinclude:: heart_token.py + :start-after: [SurfacePoint] + :end-before: [Surface] + +.. image:: ./assets/surface_modeling/token_half_surface.png + :align: center + :alt: token perimeter + +Note that the surface was raised up by 0.5 using an Algebra expression with Pos. Also, +note that the ``-`` in front of ``Face`` simply flips the face normal so that the colored +side is up, which isn't necessary but helps with viewing. + +Now that one half of the top of the heart has been created, the remainder of the top +and bottom can be created by mirroring: + +.. literalinclude:: heart_token.py + :start-after: [Surface] + :end-before: [Surfaces] + +The sides of the heart are going to be created by extruding the outside of the perimeter +as follows: + +.. literalinclude:: heart_token.py + :start-after: [Surfaces] + :end-before: [Sides] + +.. image:: ./assets/surface_modeling/token_sides.png + :align: center + :alt: token sides + +With the top, bottom, and sides, the complete boundary of the object is defined. We can +now put them together, first into a :class:`~topology.Shell` and then into a +:class:`~topology.Solid`: + +.. literalinclude:: heart_token.py + :start-after: [Sides] + :end-before: [Solid] + +.. image:: ./assets/surface_modeling/token_heart_solid.png + :align: center + :alt: token heart solid + +.. note:: + When creating a Solid from a Shell, the Shell must be "water-tight," meaning it + should have no holes. For objects with complex Edges, it's best practice to reuse + Edges in adjoining Faces whenever possible to avoid slight mismatches that can + create openings. + +Finally, we'll create the frame around the heart as a simple extrusion of a planar +shape defined by the perimeter of the heart and merge all of the components together: + +.. literalinclude:: heart_token.py + :start-after: [Solid] + :end-before: [End] + +Note that an additional planar line is used to close ``l1`` and ``l3`` so a ``Face`` +can be created. The :func:`~operations_generic.offset` function defines the outside of +the frame as a constant distance from the heart itself. + +Summary +------- + +In this tutorial, we've explored surface modeling techniques to create a non-planar +heart-shaped object using build123d. By utilizing methods from the :class:`~topology.Face` +class, such as :meth:`~topology.Face.make_surface`, we constructed the perimeter and +central point of the surface. We then assembled the complete boundary of the object +by creating the top, bottom, and sides, and combined them into a :class:`~topology.Shell` +and eventually a :class:`~topology.Solid`. Finally, we added a frame around the heart +using the :func:`~operations_generic.offset` function to maintain a constant distance +from the heart. + +Next steps +---------- + +Continue to :doc:`tutorial_heart_token` for an advanced example using +:meth:`~topology.Face.make_gordon_surface` to create a Supermarine Spitfire wing. diff --git a/docs/tutorial_surface_modeling.rst b/docs/tutorial_surface_modeling.rst index 08ed253..4d8fca0 100644 --- a/docs/tutorial_surface_modeling.rst +++ b/docs/tutorial_surface_modeling.rst @@ -1,156 +1,55 @@ -################ +################# Surface Modeling -################ +################# -Surface modeling is employed to create objects with non-planar surfaces that can't be -generated using functions like :func:`~operations_part.extrude`, -:func:`~operations_generic.sweep`, or :func:`~operations_part.revolve`. Since there are no -specific builders designed to assist with the creation of non-planar surfaces or objects, -the following should be considered a more advanced technique. -As described in the `topology_` section, a BREP model consists of vertices, edges, faces, -and other elements that define the boundary of an object. When creating objects with -non-planar faces, it is often more convenient to explicitly create the boundary faces of -the object. To illustrate this process, we will create the following game token: +Surface modeling refers to the direct creation and manipulation of the skin of a 3D +object—its bounding faces—rather than starting from volumetric primitives or solid +operations. -.. raw:: html +Instead of defining a shape by extruding or revolving a 2D profile to fill a volume, +surface modeling focuses on building the individual curved or planar faces that together +define the outer boundary of a part. This approach allows for precise control of complex +freeform geometry such as aerodynamic surfaces, boat hulls, or organic transitions that +cannot easily be expressed with simple parametric solids. - - +In build123d, as in other CAD kernels based on BREP (Boundary Representation) modeling, +all solids are ultimately defined by their boundaries: a hierarchy of faces, edges, and +vertices. Each face represents a finite patch of a geometric surface (plane, cylinder, +Bézier patch, etc.) bounded by one or more edge loops or wires. When adjacent faces share +edges consistently and close into a continuous boundary, they form a manifold +:class:`~topology.Shell`—the watertight surface of a volume. If this shell is properly +oriented and encloses a finite region of space, the model becomes a solid. -There are several methods of the :class:`~topology.Face` class that can be used to create -non-planar surfaces: +Surface modeling therefore operates at the most fundamental level of BREP construction. +Rather than relying on higher-level modeling operations to implicitly generate faces, +it allows you to construct and connect those faces explicitly. This provides a path to +build geometry that blends analytical and freeform shapes seamlessly, with full control +over continuity, tangency, and curvature across boundaries. -* :meth:`~topology.Face.make_bezier_surface`, -* :meth:`~topology.Face.make_surface`, and -* :meth:`~topology.Face.make_surface_from_array_of_points`. +This section provides: +- A concise overview of surface‑building tools in build123d +- Hands‑on tutorials, from fundamentals to advanced techniques like Gordon surfaces -In this case, we'll use the ``make_surface`` method, providing it with the edges that define -the perimeter of the surface and a central point on that surface. +.. rubric:: Available surface methods -To create the perimeter, we'll use a ``BuildLine`` instance as follows. Since the heart is -symmetric, we'll only create half of its surface here: +Methods on :class:`~topology.Face` for creating non‑planar surfaces: -.. code-block:: python - - with BuildLine() as heart_half: - l1 = JernArc((0, 0), (1, 1.4), 40, -17) - l2 = JernArc(l1 @ 1, l1 % 1, 4.5, 175) - l3 = IntersectingLine(l2 @ 1, l2 % 1, other=Edge.make_line((0, 0), (0, 20))) - l4 = ThreePointArc(l3 @ 1, Vector(0, 0, 1.5) + (l3 @ 1 + l1 @ 0) / 2, l1 @ 0) - -Note that ``l4`` is not in the same plane as the other lines; it defines the center line -of the heart and archs up off ``Plane.XY``. - -.. image:: ./assets/token_heart_perimeter.png - :align: center - :alt: token perimeter - -In preparation for creating the surface, we'll define a point on the surface: - -.. code-block:: python - - surface_pnt = l2.edge().arc_center + Vector(0, 0, 1.5) - -We will then use this point to create a non-planar ``Face``: - -.. code-block:: python - - top_right_surface = -Face.make_surface(heart_half.wire(), [surface_pnt]).locate( - Pos(Z=0.5) - ) - -.. image:: ./assets/token_half_surface.png - :align: center - :alt: token perimeter - -Note that the surface was raised up by 0.5 using the locate method. Also, note that -the ``-`` in front of ``Face`` simply flips the face normal so that the colored side -is up, which isn't necessary but helps with viewing. - -Now that one half of the top of the heart has been created, the remainder of the top -and bottom can be created by mirroring: - -.. code-block:: python - - top_left_surface = top_right_surface.mirror(Plane.YZ) - bottom_right_surface = top_right_surface.mirror(Plane.XY) - bottom_left_surface = -top_left_surface.mirror(Plane.XY) - -The sides of the heart are going to be created by extruding the outside of the perimeter -as follows: - -.. code-block:: python - - left_wire = Wire([l3.edge(), l2.edge(), l1.edge()]) - left_side = Face.extrude(left_wire, (0, 0, 1)).locate(Pos(Z=-0.5)) - right_side = left_side.mirror(Plane.YZ) - -.. image:: ./assets/token_sides.png - :align: center - :alt: token sides - -With the top, bottom, and sides, the complete boundary of the object is defined. We can -now put them together, first into a :class:`~topology.Shell` and then into a -:class:`~topology.Solid`: - -.. code-block:: python - - heart = Solid( - Shell( - [ - top_right_surface, - top_left_surface, - bottom_right_surface, - bottom_left_surface, - left_side, - right_side, - ] - ) - ) - -.. image:: ./assets/token_heart_solid.png - :align: center - :alt: token heart solid +* :meth:`~topology.Face.make_bezier_surface` +* :meth:`~topology.Face.make_gordon_surface` +* :meth:`~topology.Face.make_surface` +* :meth:`~topology.Face.make_surface_from_array_of_points` +* :meth:`~topology.Face.make_surface_from_curves` +* :meth:`~topology.Face.make_surface_patch` .. note:: - When creating a Solid from a Shell, the Shell must be "water-tight," meaning it - should have no holes. For objects with complex Edges, it's best practice to reuse - Edges in adjoining Faces whenever possible to avoid slight mismatches that can - create openings. + Surface modeling is an advanced technique. Robust results usually come from + reusing the same :class:`~topology.Edge` objects across adjacent faces and + ensuring the final :class:`~topology.Shell` is *water‑tight* or *manifold* (no gaps). -Finally, we'll create the frame around the heart as a simple extrusion of a planar -shape defined by the perimeter of the heart and merge all of the components together: +.. toctree:: + :maxdepth: 1 - .. code-block:: python + tutorial_surface_heart_token.rst + tutorial_spitfire_wing_gordon.rst - with BuildPart() as heart_token: - with BuildSketch() as outline: - with BuildLine(): - add(l1) - add(l2) - add(l3) - Line(l3 @ 1, l1 @ 0) - make_face() - mirror(about=Plane.YZ) - center = outline.sketch - offset(amount=2, kind=Kind.INTERSECTION) - add(center, mode=Mode.SUBTRACT) - extrude(amount=2, both=True) - add(heart) - -Note that an additional planar line is used to close ``l1`` and ``l3`` so a ``Face`` -can be created. The :func:`~operations_generic.offset` function defines the outside of -the frame as a constant distance from the heart itself. - -Summary -------- - -In this tutorial, we've explored surface modeling techniques to create a non-planar -heart-shaped object using build123d. By utilizing methods from the :class:`~topology.Face` -class, such as :meth:`~topology.Face.make_surface`, we constructed the perimeter and -central point of the surface. We then assembled the complete boundary of the object -by creating the top, bottom, and sides, and combined them into a :class:`~topology.Shell` -and eventually a :class:`~topology.Solid`. Finally, we added a frame around the heart -using the :func:`~operations_generic.offset` function to maintain a constant distance -from the heart. \ No newline at end of file diff --git a/examples/tea_cup.py b/examples/tea_cup.py index 866ee1f..8bc8ed6 100644 --- a/examples/tea_cup.py +++ b/examples/tea_cup.py @@ -4,19 +4,19 @@ name: tea_cup.py by: Gumyr date: March 27th 2023 -desc: This example demonstrates the creation a tea cup, which serves as an example of +desc: This example demonstrates the creation a tea cup, which serves as an example of constructing complex, non-flat geometrical shapes programmatically. The tea cup model involves several CAD techniques, such as: - - Revolve Operations: There is 1 occurrence of a revolve operation. This is used - to create the main body of the tea cup by revolving a profile around an axis, + - Revolve Operations: There is 1 occurrence of a revolve operation. This is used + to create the main body of the tea cup by revolving a profile around an axis, a common technique for generating symmetrical objects like cups. - Sweep Operations: There are 2 occurrences of sweep operations. The handle are created by sweeping a profile along a path to generate non-planar surfaces. - Offset/Shell Operations: the bowl of the cup is hollowed out with the offset - operation leaving the top open. - - Fillet Operations: There is 1 occurrence of a fillet operation which is used to - round the edges for aesthetic improvement and to mimic real-world objects more + operation leaving the top open. + - Fillet Operations: There is 1 occurrence of a fillet operation which is used to + round the edges for aesthetic improvement and to mimic real-world objects more closely. license: From d66e22655ea9908d9d39fc15784667d669ed20e5 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sun, 19 Oct 2025 15:37:32 -0400 Subject: [PATCH 456/518] Adding missing spitfile file --- docs/tutorial_spitfire_wing_gordon.rst | 106 +++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 docs/tutorial_spitfire_wing_gordon.rst diff --git a/docs/tutorial_spitfire_wing_gordon.rst b/docs/tutorial_spitfire_wing_gordon.rst new file mode 100644 index 0000000..716f862 --- /dev/null +++ b/docs/tutorial_spitfire_wing_gordon.rst @@ -0,0 +1,106 @@ +############################################# +Tutorial: Spitfire Wing with Gordon Surface +############################################# + +In this advanced tutorial we construct a Supermarine Spitfire wing as a +:meth:`~topology.Face.make_gordon_surface`—a powerful technique for surfacing +from intersecting *profiles* and *guides*. A Gordon surface blends a grid of +curves into a smooth, coherent surface as long as the profiles and guides +intersect consistently. + +.. note:: + Gordon surfaces work best when *each profile intersects each guide exactly + once*, producing a well‑formed curve network. + +Overview +======== + +We will: + +1. Define overall wing dimensions and elliptic leading/trailing edge guide curves +2. Sample the guides to size the root and tip airfoils (different NACA profiles) +3. Build the Gordon surface from the airfoil *profiles* and wing‑edge *guides* +4. Close the root with a planar face and build the final :class:`~topology.Solid` + +.. raw:: html + + + + +Step 1 — Dimensions and guide curves +==================================== + +We model a single wing (half‑span), with an elliptic leading and trailing edge. +These two edges act as the *guides* for the Gordon surface. + +.. literalinclude:: spitfire_wing_gordon.py + :start-after: [Code] + :end-before: [AirfoilSizes] + + +Step 2 — Root and tip airfoil sizing +==================================== + +We intersect the guides with planes normal to the span to size the airfoil sections. +The resulting chord lengths define uniform scales for each airfoil curve. + +.. literalinclude:: spitfire_wing_gordon.py + :start-after: [AirfoilSizes] + :end-before: [Airfoils] + +Step 3 — Build airfoil profiles (root and tip) +============================================== + +We place two different NACA airfoils on :data:`Plane.YZ`—with the airfoil origins +shifted so the leading edge fraction is aligned—then scale to the chord lengths +from Step 2. + +.. literalinclude:: spitfire_wing_gordon.py + :start-after: [Airfoils] + :end-before: [Profiles] + + +Step 4 — Gordon surface construction +==================================== + +A Gordon surface needs *profiles* and *guides*. Here the airfoil edges are the +profiles; the elliptic edges are the guides. We also add the wing tip section +so the profile grid closes at the tip. + +.. literalinclude:: spitfire_wing_gordon.py + :start-after: [Profiles] + :end-before: [Solid] + +.. image:: ./assets/surface_modeling/spitfire_wing_profiles_guides.svg + :align: center + :alt: Elliptic leading/trailing guides + + +Step 5 — Cap the root and create the solid +========================================== + +We extract the closed root edge loop, make a planar cap, and form a solid shell. + +.. literalinclude:: spitfire_wing_gordon.py + :start-after: [Solid] + :end-before: [End] + +.. image:: ./assets/surface_modeling/spitfire_wing.png + :align: center + :alt: Final wing solid + +Tips for robust Gordon surfaces +------------------------------- + +- Ensure each profile intersects each guide once and only once +- Keep the curve network coherent (no duplicated or missing intersections) +- When possible, reuse the same :class:`~topology.Edge` objects across adjacent faces + +Complete listing +================ + +For convenience, here is the full script in one block: + +.. literalinclude:: spitfire_wing_gordon.py + :start-after: [Code] + :end-before: [End] From c7bf48c80c88320f9160534339740377e280a402 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Mon, 20 Oct 2025 17:59:19 -0400 Subject: [PATCH 457/518] Add intersect methods to Mixin2D and Mixin3D These methods are very similar using a branching structure to pick intersection method. --- src/build123d/topology/three_d.py | 131 ++++++++++++++++++++++++++++-- src/build123d/topology/two_d.py | 119 ++++++++++++++++++++++++++- 2 files changed, 243 insertions(+), 7 deletions(-) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index e4131ce..0331317 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -56,13 +56,13 @@ from __future__ import annotations import platform import warnings +from collections.abc import Iterable, Sequence from math import radians, cos, tan -from typing import Union, TYPE_CHECKING - -from collections.abc import Iterable +from typing import TYPE_CHECKING +from typing_extensions import Self import OCP.TopAbs as ta -from OCP.BRepAlgoAPI import BRepAlgoAPI_Cut +from OCP.BRepAlgoAPI import BRepAlgoAPI_Common, BRepAlgoAPI_Cut, BRepAlgoAPI_Section from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeSolid from OCP.BRepClass3d import BRepClass3d_SolidClassifier from OCP.BRepFeat import BRepFeat_MakeDPrism @@ -95,6 +95,7 @@ from OCP.gp import gp_Ax2, gp_Pnt from build123d.build_enums import CenterOf, GeomType, Kind, Transition, Until from build123d.geometry import ( DEG2RAD, + TOLERANCE, Axis, BoundBox, Color, @@ -104,7 +105,6 @@ from build123d.geometry import ( Vector, VectorLike, ) -from typing_extensions import Self from .one_d import Edge, Wire, Mixin1D from .shape_core import Shape, ShapeList, Joint, downcast, shapetype @@ -420,6 +420,127 @@ class Mixin3D(Shape): return return_value + def intersect( + self, *to_intersect: Shape | Vector | Location | Axis | Plane + ) -> None | ShapeList[Vertex | Edge | Face | Shape]: + """Intersect Solid with Shape or geometry object + + Args: + to_intersect (Shape | Vector | Location | Axis | Plane): objects to intersect + + Returns: + ShapeList[Vertex | Edge | Face | Solid] | None: ShapeList of vertices, edges, + faces, and/or solids. + """ + + def to_vector(objs: Iterable) -> ShapeList: + return ShapeList([Vector(v) if isinstance(v, Vertex) else v for v in objs]) + + def to_vertex(objs: Iterable) -> ShapeList: + return ShapeList([Vertex(v) if isinstance(v, Vector) else v for v in objs]) + + def bool_op( + args: Sequence, + tools: Sequence, + operation: BRepAlgoAPI_Common | BRepAlgoAPI_Section, + ) -> ShapeList | None: + # Wrap Shape._bool_op for corrected output + intersections = args[0]._bool_op(args, tools, operation) + if isinstance(intersections, ShapeList): + return intersections or None + if (isinstance(intersections, Shape) and not intersections.is_null): + return ShapeList([intersections]) + return None + + def filter_shapes_by_order(shapes: ShapeList, orders: list) -> ShapeList: + # Remove lower order shapes from list which *appear* to be part of + # a higher order shape using a lazy distance check + # (sufficient for vertices, may be an issue for higher orders) + order_groups = [] + for order in orders: + order_groups.append( + ShapeList([s for s in shapes if isinstance(s, order)]) + ) + + filtered_shapes = order_groups[-1] + for i in range(len(order_groups) - 1): + los = order_groups[i] + his: list = sum(order_groups[i + 1 :], []) + filtered_shapes.extend( + ShapeList( + lo + for lo in los + if all(lo.distance_to(hi) > TOLERANCE for hi in his) + ) + ) + + return filtered_shapes + + common_set: ShapeList[Vertex | Edge | Face] = ShapeList(self.solids()) + target: ShapeList | Shape + for other in to_intersect: + # Conform target type + # Vertices need to be Vector for set() + match other: + case Axis(): + target = Edge(other) + case Plane(): + target = Face.make_plane(other) + case Vector(): + target = Vertex(other) + case Location(): + target = Vertex(other.position) + case _ if issubclass(type(other), Shape): + target = other + case _: + raise ValueError(f"Unsupported type to_intersect: {type(other)}") + + # Find common matches + common: list[Vector | Edge | Face] = [] + result: ShapeList | Shape | None + for obj in common_set: + match (obj, target): + case (Vertex(), Vertex()): + result = obj.intersect(target) + + case (Edge(), Edge() | Wire()): + result = obj.intersect(target) + + case _ if issubclass(type(target), Shape): + if isinstance(target, Wire): + targets = target.edges() + elif isinstance(target, Shell): + targets = target.faces() + else: + targets = ShapeList([target]) + + result = ShapeList() + for t in targets: + if ( + not isinstance(obj, Edge) and not isinstance(t, (Edge)) + ) or (isinstance(obj, Solid) or isinstance(t, Solid)): + # Face + Edge combinations may produce an intersection + # with Common but always with Section. + # No easy way to deduplicate + # Many Solid + Edge combinations need Common + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (t,), operation) or []) + operation = BRepAlgoAPI_Section() + result.extend(bool_op((obj,), (t,), operation) or []) + + if result: + common.extend(to_vector(result)) + + if common: + common_set = to_vertex(set(common)) + common_set = filter_shapes_by_order( + common_set, [Vertex, Edge, Face, Solid] + ) + else: + return None + + return ShapeList(common_set) + def is_inside(self, point: VectorLike, tolerance: float = 1.0e-6) -> bool: """Returns whether or not the point is inside a solid or compound object within the specified tolerance. diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 306c5b8..0195c30 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -64,9 +64,8 @@ from typing import TYPE_CHECKING, Any, TypeVar, overload import OCP.TopAbs as ta from OCP.BRep import BRep_Builder, BRep_Tool -from OCP.BRepAdaptor import BRepAdaptor_Surface from OCP.BRepAlgo import BRepAlgo -from OCP.BRepAlgoAPI import BRepAlgoAPI_Common +from OCP.BRepAlgoAPI import BRepAlgoAPI_Common, BRepAlgoAPI_Section from OCP.BRepBuilderAPI import ( BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeFace, @@ -267,6 +266,122 @@ class Mixin2D(ABC, Shape): return result + def intersect( + self, *to_intersect: Shape | Vector | Location | Axis | Plane + ) -> None | ShapeList[Vertex | Edge | Face]: + """Intersect Face with Shape or geometry object + + Args: + to_intersect (Shape | Vector | Location | Axis | Plane): objects to intersect + + Returns: + ShapeList[Vertex | Edge | Face] | None: ShapeList of vertices, edges, and/or + faces. + """ + + def to_vector(objs: Iterable) -> ShapeList: + return ShapeList([Vector(v) if isinstance(v, Vertex) else v for v in objs]) + + def to_vertex(objs: Iterable) -> ShapeList: + return ShapeList([Vertex(v) if isinstance(v, Vector) else v for v in objs]) + + def bool_op( + args: Sequence, + tools: Sequence, + operation: BRepAlgoAPI_Section | BRepAlgoAPI_Common, + ) -> ShapeList | None: + # Wrap Shape._bool_op for corrected output + intersections = args[0]._bool_op(args, tools, operation) + if isinstance(intersections, ShapeList): + return intersections or None + if isinstance(intersections, Shape) and not intersections.is_null: + return ShapeList([intersections]) + return None + + def filter_shapes_by_order(shapes: ShapeList, orders: list) -> ShapeList: + # Remove lower order shapes from list which *appear* to be part of + # a higher order shape using a lazy distance check + # (sufficient for vertices, may be an issue for higher orders) + order_groups = [] + for order in orders: + order_groups.append( + ShapeList([s for s in shapes if isinstance(s, order)]) + ) + + filtered_shapes = order_groups[-1] + for i in range(len(order_groups) - 1): + los = order_groups[i] + his: list = sum(order_groups[i + 1 :], []) + filtered_shapes.extend( + ShapeList( + lo + for lo in los + if all(lo.distance_to(hi) > TOLERANCE for hi in his) + ) + ) + + return filtered_shapes + + common_set: ShapeList[Vertex | Edge | Face] = ShapeList(self.faces()) + target: ShapeList | Shape + for other in to_intersect: + # Conform target type + # Vertices need to be Vector for set() + match other: + case Axis(): + target = Edge(other) + case Plane(): + target = Face.make_plane(other) + case Vector(): + target = Vertex(other) + case Location(): + target = Vertex(other.position) + case _ if issubclass(type(other), Shape): + target = other + case _: + raise ValueError(f"Unsupported type to_intersect: {type(other)}") + + # Find common matches + common: list[Vector | Edge | Face] = [] + result: ShapeList | Shape | None + for obj in common_set: + match (obj, target): + case (Vertex(), Vertex()): + result = obj.intersect(target) + + case (Edge(), Edge() | Wire()): + result = obj.intersect(target) + + case _ if issubclass(type(target), Shape): + if isinstance(target, Wire): + targets = target.edges() + elif isinstance(target, Shell): + targets = target.faces() + else: + targets = ShapeList([target]) + + result = ShapeList() + for t in targets: + if not isinstance(obj, Edge) and not isinstance(t, (Edge)): + # Face + Edge combinations may produce an intersection + # with Common but always with Section. + # No easy way to deduplicate + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (t,), operation) or []) + operation = BRepAlgoAPI_Section() + result.extend(bool_op((obj,), (t,), operation) or []) + + if result: + common.extend(to_vector(result)) + + if common: + common_set = to_vertex(set(common)) + common_set = filter_shapes_by_order(common_set, [Vertex, Edge, Face]) + else: + return None + + return ShapeList(common_set) + @abstractmethod def location_at(self, *args: Any, **kwargs: Any) -> Location: """A location from a face or shell""" From 453f676882f612d0b81a0b870128b5e02af74721 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 20 Oct 2025 18:50:14 -0400 Subject: [PATCH 458/518] Adding points to trim --- src/build123d/topology/one_d.py | 77 ++++++++++++++++++++++-------- tests/test_direct_api/test_edge.py | 25 ++++++++-- tests/test_direct_api/test_wire.py | 6 ++- 3 files changed, 83 insertions(+), 25 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 744a9ed..25b817a 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -358,6 +358,21 @@ class Mixin1D(Shape): """Unused - only here because Mixin1D is a subclass of Shape""" return NotImplemented + # ---- Static Methods ---- + + @staticmethod + def _to_param(edge_wire: Mixin1D, value: float | VectorLike, name: str) -> float: + """Convert a float or VectorLike into a curve parameter.""" + if isinstance(value, (int, float)): + return float(value) + try: + point = Vector(value) + except TypeError as exc: + raise TypeError( + f"{name} must be a float or VectorLike, not {value!r}" + ) from exc + return edge_wire.param_at_point(point) + # ---- Instance Methods ---- def __add__( @@ -2972,24 +2987,43 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): ) return Wire([self]) - def trim(self, start: float, end: float) -> Edge: + def trim(self, start: float | VectorLike, end: float | VectorLike) -> Edge: + """_summary_ + + Args: + start (float | VectorLike): _description_ + end (float | VectorLike): _description_ + + Raises: + TypeError: _description_ + ValueError: _description_ + + Returns: + Edge: _description_ + """ """trim Create a new edge by keeping only the section between start and end. Args: - start (float): 0.0 <= start < 1.0 - end (float): 0.0 < end <= 1.0 + start (float | VectorLike): 0.0 <= start < 1.0 or point on edge + end (float | VectorLike): 0.0 < end <= 1.0 or point on edge Raises: - ValueError: start >= end + TypeError: invalid input, must be float or VectorLike ValueError: can't trim empty edge Returns: Edge: trimmed edge """ - if start >= end: - raise ValueError(f"start ({start}) must be less than end ({end})") + + start_u = Mixin1D._to_param(self, start, "start") + end_u = Mixin1D._to_param(self, end, "end") + + start_u, end_u = sorted([start_u, end_u]) + + # if start_u >= end_u: + # raise ValueError(f"start ({start_u}) must be less than end ({end_u})") if self.wrapped is None: raise ValueError("Can't trim empty edge") @@ -3000,8 +3034,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): new_curve = BRep_Tool.Curve_s( self_copy.wrapped, self.param_at(0), self.param_at(1) ) - parm_start = self.param_at(start) - parm_end = self.param_at(end) + parm_start = self.param_at(start_u) + parm_end = self.param_at(end_u) trimmed_curve = Geom_TrimmedCurve( new_curve, parm_start, @@ -3010,14 +3044,14 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): new_edge = BRepBuilderAPI_MakeEdge(trimmed_curve).Edge() return Edge(new_edge) - def trim_to_length(self, start: float, length: float) -> Edge: + def trim_to_length(self, start: float | VectorLike, length: float) -> Edge: """trim_to_length Create a new edge starting at the given normalized parameter of a given length. Args: - start (float): 0.0 <= start < 1.0 + start (float | VectorLike): 0.0 <= start < 1.0 or point on edge length (float): target length Raise: @@ -3029,6 +3063,8 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): if self.wrapped is None: raise ValueError("Can't trim empty edge") + start_u = Mixin1D._to_param(self, start, "start") + self_copy = copy.deepcopy(self) assert self_copy.wrapped is not None @@ -3040,7 +3076,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): adaptor_curve = GeomAdaptor_Curve(new_curve) # Find the parameter corresponding to the desired length - parm_start = self.param_at(start) + parm_start = self.param_at(start_u) abscissa_point = GCPnts_AbscissaPoint(adaptor_curve, length, parm_start) # Get the parameter at the desired length @@ -3550,7 +3586,6 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): return Wire.make_polygon(corners_world, close=True) # ---- Static Methods ---- - @staticmethod def order_chamfer_edges( reference_edge: Edge | None, edges: tuple[Edge, Edge] @@ -4066,29 +4101,31 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): ) return self - def trim(self: Wire, start: float, end: float) -> Wire: + def trim(self: Wire, start: float | VectorLike, end: float | VectorLike) -> Wire: """Trim a wire between [start, end] normalized over total length. Args: - start (float): normalized start position (0.0 to <1.0) - end (float): normalized end position (>0.0 to 1.0) + start (float | VectorLike): normalized start position (0.0 to <1.0) or point + end (float | VectorLike): normalized end position (>0.0 to 1.0) or point Returns: Wire: trimmed Wire """ - if start >= end: - raise ValueError("start must be less than end") + start_u = Mixin1D._to_param(self, start, "start") + end_u = Mixin1D._to_param(self, end, "end") + + start_u, end_u = sorted([start_u, end_u]) # Extract the edges in order ordered_edges = self.edges().sort_by(self) # If this is really just an edge, skip the complexity of a Wire if len(ordered_edges) == 1: - return Wire([ordered_edges[0].trim(start, end)]) + return Wire([ordered_edges[0].trim(start_u, end_u)]) total_length = self.length - start_len = start * total_length - end_len = end * total_length + start_len = start_u * total_length + end_len = end_u * total_length trimmed_edges = [] cur_length = 0.0 diff --git a/tests/test_direct_api/test_edge.py b/tests/test_direct_api/test_edge.py index fb60a7d..6f06f68 100644 --- a/tests/test_direct_api/test_edge.py +++ b/tests/test_direct_api/test_edge.py @@ -37,7 +37,7 @@ from build123d.geometry import Axis, Plane, Vector from build123d.objects_curve import CenterArc, EllipticalCenterArc from build123d.objects_sketch import Circle, Rectangle, RegularPolygon from build123d.operations_generic import sweep -from build123d.topology import Edge, Face, Wire +from build123d.topology import Edge, Face, Wire, Vertex from OCP.GeomProjLib import GeomProjLib @@ -183,8 +183,23 @@ class TestEdge(unittest.TestCase): line = Edge.make_line((-2, 0), (2, 0)) self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(0), (-1, 0, 0), 5) self.assertAlmostEqual(line.trim(0.25, 0.75).position_at(1), (1, 0, 0), 5) - with self.assertRaises(ValueError): - line.trim(0.75, 0.25) + + l1 = CenterArc((0, 0), 1, 0, 180) + l2 = l1.trim(0, l1 @ 0.5) + self.assertAlmostEqual(l2 @ 0, (1, 0, 0), 5) + self.assertAlmostEqual(l2 @ 1, (0, 1, 0), 5) + + l3 = l1.trim((1, 0), (0, 1)) + self.assertAlmostEqual(l3 @ 0, (1, 0, 0), 5) + self.assertAlmostEqual(l3 @ 1, (0, 1, 0), 5) + + l4 = l1.trim(0.5, (-1, 0)) + self.assertAlmostEqual(l4 @ 0, (0, 1, 0), 5) + self.assertAlmostEqual(l4 @ 1, (-1, 0, 0), 5) + + l5 = l1.trim(0.5, Vertex(-1, 0)) + self.assertAlmostEqual(l5 @ 0, (0, 1, 0), 5) + self.assertAlmostEqual(l5 @ 1, (-1, 0, 0), 5) line.wrapped = None with self.assertRaises(ValueError): @@ -213,6 +228,10 @@ class TestEdge(unittest.TestCase): e4_trim = Edge(a4).trim_to_length(0.5, 2) self.assertAlmostEqual(e4_trim.length, 2, 5) + e5 = e1.trim_to_length((5, 5), 1) + self.assertAlmostEqual(e5 @ 0, (5, 5), 5) + self.assertAlmostEqual(e5.length, 1, 5) + e1.wrapped = None with self.assertRaises(ValueError): e1.trim_to_length(0.1, 2) diff --git a/tests/test_direct_api/test_wire.py b/tests/test_direct_api/test_wire.py index cbb9449..bbfb6fc 100644 --- a/tests/test_direct_api/test_wire.py +++ b/tests/test_direct_api/test_wire.py @@ -155,8 +155,10 @@ class TestWire(unittest.TestCase): t4 = o.trim(0.5, 0.75) self.assertAlmostEqual(t4.length, o.length * 0.25, 5) - with self.assertRaises(ValueError): - o.trim(0.75, 0.25) + w0 = Polyline((0, 0), (0, 1), (1, 1), (1, 0)) + w2 = w0.trim(0, (0.5, 1)) + self.assertAlmostEqual(w2 @ 1, (0.5, 1), 5) + spline = Spline( (0, 0, 0), (0, 10, 0), From 5d485ee705acf3315757bd4cec553d5eec458d30 Mon Sep 17 00:00:00 2001 From: snoyer Date: Tue, 21 Oct 2025 08:12:29 +0400 Subject: [PATCH 459/518] use `_wrapped: TOPODS | None` member and `wrapped: TOPODS` property --- src/build123d/topology/composite.py | 6 +- src/build123d/topology/one_d.py | 57 ++++++++------- src/build123d/topology/shape_core.py | 102 +++++++++++++++------------ src/build123d/topology/two_d.py | 14 ++-- 4 files changed, 96 insertions(+), 83 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 823eece..a34fa23 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -455,7 +455,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): will be a Wire, otherwise a Shape. """ if self._dim == 1: - curve = Curve() if self.wrapped is None else Curve(self.wrapped) + curve = Curve() if self._wrapped is None else Curve(self.wrapped) sum1d: Edge | Wire | ShapeList[Edge] = curve + other if isinstance(sum1d, ShapeList): result1d: Curve | Wire = Curve(sum1d) @@ -517,7 +517,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): Check if empty. """ - return TopoDS_Iterator(self.wrapped).More() + return self._wrapped is not None and TopoDS_Iterator(self.wrapped).More() def __iter__(self) -> Iterator[Shape]: """ @@ -602,7 +602,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): def compounds(self) -> ShapeList[Compound]: """compounds - all the compounds in this Shape""" - if self.wrapped is None: + if self._wrapped is None: return ShapeList() if isinstance(self.wrapped, TopoDS_Compound): # pylint: disable=not-an-iterable diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 25b817a..c149f1e 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -263,14 +263,14 @@ class Mixin1D(Shape): @property def is_closed(self) -> bool: """Are the start and end points equal?""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't determine if empty Edge or Wire is closed") return BRep_Tool.IsClosed_s(self.wrapped) @property def is_forward(self) -> bool: """Does the Edge/Wire loop forward or reverse""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't determine direction of empty Edge or Wire") return self.wrapped.Orientation() == TopAbs_Orientation.TopAbs_FORWARD @@ -388,8 +388,7 @@ class Mixin1D(Shape): shape # for o in (other if isinstance(other, (list, tuple)) else [other]) for o in ([other] if isinstance(other, Shape) else other) - if o is not None - for shape in get_top_level_topods_shapes(o.wrapped) + for shape in get_top_level_topods_shapes(o.wrapped if o else None) ] # If there is nothing to add return the original object if not topods_summands: @@ -404,7 +403,7 @@ class Mixin1D(Shape): ) summand_edges = [e for summand in summands for e in summand.edges()] - if self.wrapped is None: # an empty object + if self._wrapped is None: # an empty object if len(summands) == 1: sum_shape: Edge | Wire | ShapeList[Edge] = summands[0] else: @@ -452,7 +451,7 @@ class Mixin1D(Shape): Returns: Vector: center """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't find center of empty edge/wire") if center_of == CenterOf.GEOMETRY: @@ -578,7 +577,7 @@ class Mixin1D(Shape): >>> show(my_wire, Curve(comb)) """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't create curvature_comb for empty curve") pln = self.common_plane() if pln is None or not isclose(abs(pln.z_dir.Z), 1.0, abs_tol=TOLERANCE): @@ -991,7 +990,7 @@ class Mixin1D(Shape): Returns: """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't find normal of empty edge/wire") curve = self.geom_adaptor() @@ -1225,7 +1224,7 @@ class Mixin1D(Shape): Returns: """ - if self.wrapped is None or face.wrapped is None: + if self._wrapped is None or face.wrapped is None: raise ValueError("Can't project an empty Edge or Wire onto empty Face") bldr = BRepProj_Projection( @@ -1297,7 +1296,7 @@ class Mixin1D(Shape): return edges - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't project empty edge/wire") # Setup the projector @@ -1400,7 +1399,7 @@ class Mixin1D(Shape): - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is either a `Self` or `list[Self]`, or `None` if no corresponding part is found. """ - if self.wrapped is None or tool.wrapped is None: + if self._wrapped is None or tool.wrapped is None: raise ValueError("Can't split an empty edge/wire/tool") shape_list = TopTools_ListOfShape() @@ -2538,7 +2537,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): extension_factor: float = 0.1, ): """Helper method to slightly extend an edge that is bound to a surface""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't extend empty spline") if self.geom_type != GeomType.BSPLINE: raise TypeError("_extend_spline only works with splines") @@ -2595,7 +2594,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Returns: ShapeList[Vector]: list of intersection points """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't find intersections of empty edge") # Convert an Axis into an edge at least as large as self and Axis start point @@ -2723,7 +2722,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): def geom_adaptor(self) -> BRepAdaptor_Curve: """Return the Geom Curve from this Edge""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't find adaptor for empty edge") return BRepAdaptor_Curve(self.wrapped) @@ -2811,7 +2810,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): float: Normalized parameter in [0.0, 1.0] corresponding to the point's closest location on the edge. """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't find param on empty edge") pnt = Vector(point) @@ -2945,7 +2944,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Returns: Edge: reversed """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("An empty edge can't be reversed") assert isinstance(self.wrapped, TopoDS_Edge) @@ -3025,7 +3024,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): # if start_u >= end_u: # raise ValueError(f"start ({start_u}) must be less than end ({end_u})") - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't trim empty edge") self_copy = copy.deepcopy(self) @@ -3060,7 +3059,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): Returns: Edge: trimmed edge """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't trim empty edge") start_u = Mixin1D._to_param(self, start, "start") @@ -3623,7 +3622,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: Wire: chamfered wire """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't chamfer empty wire") reference_edge = edge @@ -3695,7 +3694,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: Wire: filleted wire """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't fillet an empty wire") # Create a face to fillet @@ -3723,7 +3722,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: Wire: fixed wire """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't fix an empty edge") sf_w = ShapeFix_Wireframe(self.wrapped) @@ -3735,7 +3734,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): def geom_adaptor(self) -> BRepAdaptor_CompCurve: """Return the Geom Comp Curve for this Wire""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't get geom adaptor of empty wire") return BRepAdaptor_CompCurve(self.wrapped) @@ -3779,7 +3778,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): float: Normalized parameter in [0.0, 1.0] representing the relative position of the projected point along the wire. """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't find point on empty wire") point_on_curve = Vector(point) @@ -3932,7 +3931,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): """ # pylint: disable=too-many-branches - if self.wrapped is None or target_object.wrapped is None: + if self._wrapped is None or target_object.wrapped is None: raise ValueError("Can't project empty Wires or to empty Shapes") if direction is not None and center is None: @@ -4021,7 +4020,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): Returns: Wire: stitched wires """ - if self.wrapped is None or other.wrapped is None: + if self._wrapped is None or other.wrapped is None: raise ValueError("Can't stitch empty wires") wire_builder = BRepBuilderAPI_MakeWire() @@ -4065,7 +4064,7 @@ class Wire(Mixin1D, Shape[TopoDS_Wire]): """ # Build a single Geom_BSplineCurve from the wire, in *topological order* builder = GeomConvert_CompCurveToBSplineCurve() - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't convert an empty wire") wire_explorer = BRepTools_WireExplorer(self.wrapped) @@ -4217,9 +4216,9 @@ def topo_explore_connected_edges( parent = parent if parent is not None else edge.topo_parent if parent is None: raise ValueError("edge has no valid parent") - given_topods_edge = edge.wrapped - if given_topods_edge is None: + if not edge: raise ValueError("edge is empty") + given_topods_edge = edge.wrapped connected_edges = set() # Find all the TopoDS_Edges for this Shape @@ -4262,7 +4261,7 @@ def topo_explore_connected_faces( ) -> list[TopoDS_Face]: """Given an edge extracted from a Shape, return the topods_faces connected to it""" - if edge.wrapped is None: + if not edge: raise ValueError("Can't explore from an empty edge") parent = parent if parent is not None else edge.topo_parent diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 6402c3e..6a270e8 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -287,7 +287,7 @@ class Shape(NodeMixin, Generic[TOPODS]): color: ColorLike | None = None, parent: Compound | None = None, ): - self.wrapped: TOPODS | None = ( + self._wrapped: TOPODS | None = ( tcast(Optional[TOPODS], downcast(obj)) if obj is not None else None ) self.for_construction = False @@ -304,6 +304,18 @@ class Shape(NodeMixin, Generic[TOPODS]): # pylint: disable=too-many-instance-attributes, too-many-public-methods + @property + def wrapped(self): + assert self._wrapped + return self._wrapped + + @wrapped.setter + def wrapped(self, shape: TOPODS): + self._wrapped = shape + + def __bool__(self): + return self._wrapped is not None + @property @abstractmethod def _dim(self) -> int | None: @@ -312,7 +324,7 @@ class Shape(NodeMixin, Generic[TOPODS]): @property def area(self) -> float: """area -the surface area of all faces in this Shape""" - if self.wrapped is None: + if self._wrapped is None: return 0.0 properties = GProp_GProps() BRepGProp.SurfaceProperties_s(self.wrapped, properties) @@ -351,7 +363,7 @@ class Shape(NodeMixin, Generic[TOPODS]): GeomType: The geometry type of the shape """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot determine geometry type of an empty shape") shape: TopAbs_ShapeEnum = shapetype(self.wrapped) @@ -380,7 +392,7 @@ class Shape(NodeMixin, Generic[TOPODS]): bool: is the shape manifold or water tight """ # Extract one or more (if a Compound) shape from self - if self.wrapped is None: + if self._wrapped is None: return False shape_stack = get_top_level_topods_shapes(self.wrapped) @@ -431,12 +443,12 @@ class Shape(NodeMixin, Generic[TOPODS]): underlying shape with the potential to be given a location and an orientation. """ - return self.wrapped is None or self.wrapped.IsNull() + return self._wrapped is None or self.wrapped.IsNull() @property def is_planar_face(self) -> bool: """Is the shape a planar face even though its geom_type may not be PLANE""" - if self.wrapped is None or not isinstance(self.wrapped, TopoDS_Face): + if self._wrapped is None or not isinstance(self.wrapped, TopoDS_Face): return False surface = BRep_Tool.Surface_s(self.wrapped) is_face_planar = GeomLib_IsPlanarSurface(surface, TOLERANCE) @@ -448,7 +460,7 @@ class Shape(NodeMixin, Generic[TOPODS]): subshapes. See the OCCT docs on BRepCheck_Analyzer::IsValid for a full description of what is checked. """ - if self.wrapped is None: + if self._wrapped is None: return True chk = BRepCheck_Analyzer(self.wrapped) chk.SetParallel(True) @@ -474,7 +486,7 @@ class Shape(NodeMixin, Generic[TOPODS]): @property def location(self) -> Location: """Get this Shape's Location""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't find the location of an empty shape") return Location(self.wrapped.Location()) @@ -518,7 +530,7 @@ class Shape(NodeMixin, Generic[TOPODS]): - It is commonly used in structural analysis, mechanical simulations, and physics-based motion calculations. """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't calculate matrix for empty shape") properties = GProp_GProps() BRepGProp.VolumeProperties_s(self.wrapped, properties) @@ -546,7 +558,7 @@ class Shape(NodeMixin, Generic[TOPODS]): @property def position(self) -> Vector: """Get the position component of this Shape's Location""" - if self.wrapped is None or self.location is None: + if self._wrapped is None or self.location is None: raise ValueError("Can't find the position of an empty shape") return self.location.position @@ -575,7 +587,7 @@ class Shape(NodeMixin, Generic[TOPODS]): (Vector(0, 1, 0), 1000.0), (Vector(0, 0, 1), 300.0)] """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't calculate properties for empty shape") properties = GProp_GProps() @@ -615,7 +627,7 @@ class Shape(NodeMixin, Generic[TOPODS]): (150.0, 200.0, 50.0) """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't calculate moments for empty shape") properties = GProp_GProps() @@ -859,7 +871,7 @@ class Shape(NodeMixin, Generic[TOPODS]): if not all(summand._dim == addend_dim for summand in summands): raise ValueError("Only shapes with the same dimension can be added") - if self.wrapped is None: # an empty object + if self._wrapped is None: # an empty object if len(summands) == 1: sum_shape = summands[0] else: @@ -876,7 +888,7 @@ class Shape(NodeMixin, Generic[TOPODS]): """intersect shape with self operator &""" others = other if isinstance(other, (list, tuple)) else [other] - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): + if not self or (isinstance(other, Shape) and not other): raise ValueError("Cannot intersect shape with empty compound") new_shape = self.intersect(*others) @@ -948,7 +960,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def __hash__(self) -> int: """Return hash code""" - if self.wrapped is None: + if self._wrapped is None: return 0 return hash(self.wrapped) @@ -966,7 +978,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def __sub__(self, other: None | Shape | Iterable[Shape]) -> Self | ShapeList[Self]: """cut shape from self operator -""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot subtract shape from empty compound") # Convert `other` to list of base objects and filter out None values @@ -1014,7 +1026,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: BoundBox: A box sized to contain this Shape """ - if self.wrapped is None: + if self._wrapped is None: return BoundBox(Bnd_Box()) tolerance = TOLERANCE if tolerance is None else tolerance return BoundBox.from_topo_ds(self.wrapped, tolerance=tolerance, optimal=optimal) @@ -1033,7 +1045,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: Original object with extraneous internal edges removed """ - if self.wrapped is None: + if self._wrapped is None: return self upgrader = ShapeUpgrade_UnifySameDomain(self.wrapped, True, True, True) upgrader.AllowInternalEdges(False) @@ -1112,7 +1124,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self.wrapped is None or other.wrapped is None: + if self._wrapped is None or other.wrapped is None: raise ValueError("Cannot calculate distance to or from an empty shape") return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() @@ -1125,7 +1137,9 @@ class Shape(NodeMixin, Generic[TOPODS]): self, other: Shape | VectorLike ) -> tuple[float, Vector, Vector]: """Minimal distance between two shapes and the points on each shape""" - if self.wrapped is None or (isinstance(other, Shape) and other.wrapped is None): + if self._wrapped is None or ( + isinstance(other, Shape) and other.wrapped is None + ): raise ValueError("Cannot calculate distance to or from an empty shape") if isinstance(other, Shape): @@ -1155,7 +1169,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot calculate distance to or from an empty shape") dist_calc = BRepExtrema_DistShapeShape() @@ -1181,7 +1195,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: """Return all of the TopoDS sub entities of the given type""" - if self.wrapped is None: + if self._wrapped is None: return [] return _topods_entities(self.wrapped, topo_type) @@ -1209,7 +1223,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: list[Face]: A list of intersected faces sorted by distance from axis.position """ - if self.wrapped is None: + if self._wrapped is None: return ShapeList() line = gce_MakeLin(axis.wrapped).Value() @@ -1239,7 +1253,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def fix(self) -> Self: """fix - try to fix shape if not valid""" - if self.wrapped is None: + if self._wrapped is None: return self if not self.is_valid: shape_copy: Shape = copy.deepcopy(self, None) @@ -1281,7 +1295,7 @@ class Shape(NodeMixin, Generic[TOPODS]): # self, child_type: Shapes, parent_type: Shapes # ) -> Dict[Shape, list[Shape]]: # """This function is very slow on M1 macs and is currently unused""" - # if self.wrapped is None: + # if self._wrapped is None: # return {} # res = TopTools_IndexedDataMapOfShapeListOfShape() @@ -1319,7 +1333,7 @@ class Shape(NodeMixin, Generic[TOPODS]): (e.g., edges, vertices) and other compounds, the method returns a list of only the simple shapes directly contained at the top level. """ - if self.wrapped is None: + if self._wrapped is None: return ShapeList() return ShapeList( self.__class__.cast(s) for s in get_top_level_topods_shapes(self.wrapped) @@ -1401,7 +1415,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self.wrapped is None or other.wrapped is None: + if self._wrapped is None or other.wrapped is None: return False return self.wrapped.IsEqual(other.wrapped) @@ -1416,7 +1430,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self.wrapped is None or other.wrapped is None: + if self._wrapped is None or other.wrapped is None: return False return self.wrapped.IsSame(other.wrapped) @@ -1429,7 +1443,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot locate an empty shape") if loc.wrapped is None: raise ValueError("Cannot locate a shape at an empty location") @@ -1448,7 +1462,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: copy of Shape at location """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot locate an empty shape") if loc.wrapped is None: raise ValueError("Cannot locate a shape at an empty location") @@ -1466,7 +1480,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot mesh an empty shape") if not BRepTools.Triangulation_s(self.wrapped, tolerance): @@ -1487,7 +1501,7 @@ class Shape(NodeMixin, Generic[TOPODS]): if not mirror_plane: mirror_plane = Plane.XY - if self.wrapped is None: + if self._wrapped is None: return self transformation = gp_Trsf() transformation.SetMirror( @@ -1505,7 +1519,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot move an empty shape") if loc.wrapped is None: raise ValueError("Cannot move a shape at an empty location") @@ -1525,7 +1539,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: copy of Shape moved to relative location """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot move an empty shape") if loc.wrapped is None: raise ValueError("Cannot move a shape at an empty location") @@ -1539,7 +1553,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: OrientedBoundBox: A box oriented and sized to contain this Shape """ - if self.wrapped is None: + if self._wrapped is None: return OrientedBoundBox(Bnd_OBB()) return OrientedBoundBox(self) @@ -1641,7 +1655,7 @@ class Shape(NodeMixin, Generic[TOPODS]): - The radius of gyration is computed based on the shape’s mass properties. - It is useful for evaluating structural stability and rotational behavior. """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't calculate radius of gyration for empty shape") properties = GProp_GProps() @@ -1660,7 +1674,7 @@ class Shape(NodeMixin, Generic[TOPODS]): DeprecationWarning, stacklevel=2, ) - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot relocate an empty shape") if loc.wrapped is None: raise ValueError("Cannot relocate a shape at an empty location") @@ -1855,7 +1869,7 @@ class Shape(NodeMixin, Generic[TOPODS]): "keep must be one of Keep.INSIDE, Keep.OUTSIDE, or Keep.BOTH" ) - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot split an empty shape") # Process the perimeter @@ -1900,7 +1914,7 @@ class Shape(NodeMixin, Generic[TOPODS]): self, tolerance: float, angular_tolerance: float = 0.1 ) -> tuple[list[Vector], list[tuple[int, int, int]]]: """General triangulated approximation""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot tessellate an empty shape") self.mesh(tolerance, angular_tolerance) @@ -1962,7 +1976,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Self: Approximated shape """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot approximate an empty shape") params = ShapeCustom_RestrictionParameters() @@ -1999,7 +2013,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: a copy of the object, but with geometry transformed """ - if self.wrapped is None: + if self._wrapped is None: return self new_shape = copy.deepcopy(self, None) transformed = downcast( @@ -2022,7 +2036,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: copy of transformed shape with all objects keeping their type """ - if self.wrapped is None: + if self._wrapped is None: return self new_shape = copy.deepcopy(self, None) transformed = downcast( @@ -2095,7 +2109,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: Shape: copy of transformed Shape """ - if self.wrapped is None: + if self._wrapped is None: return self shape_copy: Shape = copy.deepcopy(self, None) transformed_shape = BRepBuilderAPI_Transform( @@ -2200,7 +2214,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: tuple[ShapeList[Vertex], ShapeList[Edge]]: section results """ - if self.wrapped is None or other.wrapped is None: + if self._wrapped is None or other.wrapped is None: return (ShapeList(), ShapeList()) section = BRepAlgoAPI_Section(self.wrapped, other.wrapped) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 8b8f264..c6102a7 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -213,7 +213,7 @@ class Mixin2D(ABC, Shape): def __neg__(self) -> Self: """Reverse normal operator -""" - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Invalid Shape") new_surface = copy.deepcopy(self) new_surface.wrapped = downcast(self.wrapped.Complemented()) @@ -244,7 +244,7 @@ class Mixin2D(ABC, Shape): Returns: list[tuple[Vector, Vector]]: Point and normal of intersection """ - if self.wrapped is None: + if self._wrapped is None: return [] intersection_line = gce_MakeLin(other.wrapped).Value() @@ -350,7 +350,7 @@ class Mixin2D(ABC, Shape): world_point, world_point - target_object_center ) - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't wrap around an empty face") # Initial setup @@ -545,7 +545,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): float: The total surface area, including the area of holes. Returns 0.0 if the face is empty. """ - if self.wrapped is None: + if self._wrapped is None: return 0.0 return self.without_holes().area @@ -605,7 +605,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ValueError: If the face or its underlying representation is empty. ValueError: If the face is not planar. """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Can't determine axes_of_symmetry of empty face") if not self.is_planar_face: @@ -1940,7 +1940,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): DeprecationWarning, stacklevel=2, ) - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot approximate an empty shape") return self.__class__.cast(BRepAlgo.ConvertFace_s(self.wrapped, tolerance)) @@ -1953,7 +1953,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): Returns: Face: A new Face instance identical to the original but without any holes. """ - if self.wrapped is None: + if self._wrapped is None: raise ValueError("Cannot remove holes from an empty face") if not (inner_wires := self.inner_wires()): From 0013b9fa872e3806e533ee31d8115812d8a65911 Mon Sep 17 00:00:00 2001 From: snoyer Date: Tue, 21 Oct 2025 08:28:24 +0400 Subject: [PATCH 460/518] fix Mixins generic types --- src/build123d/topology/composite.py | 2 +- src/build123d/topology/one_d.py | 7 ++++--- src/build123d/topology/three_d.py | 6 +++--- src/build123d/topology/two_d.py | 7 ++++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index a34fa23..4faeb36 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -130,7 +130,7 @@ from .utils import ( from .zero_d import Vertex -class Compound(Mixin3D, Shape[TopoDS_Compound]): +class Compound(Mixin3D[TopoDS_Compound]): """A Compound in build123d is a topological entity representing a collection of geometric shapes grouped together within a single structure. It serves as a container for organizing diverse shapes like edges, faces, or solids. This diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index c149f1e..8e9939f 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -217,6 +217,7 @@ from build123d.geometry import ( ) from .shape_core import ( + TOPODS, Shape, ShapeList, SkipClean, @@ -250,7 +251,7 @@ if TYPE_CHECKING: # pragma: no cover from .two_d import Face, Shell # pylint: disable=R0801 -class Mixin1D(Shape): +class Mixin1D(Shape[TOPODS]): """Methods to add to the Edge and Wire classes""" # ---- Properties ---- @@ -1565,7 +1566,7 @@ class Mixin1D(Shape): return Shape.get_shape_list(self, "Wire") -class Edge(Mixin1D, Shape[TopoDS_Edge]): +class Edge(Mixin1D[TopoDS_Edge]): """An Edge in build123d is a fundamental element in the topological data structure representing a one-dimensional geometric entity within a 3D model. It encapsulates information about a curve, which could be a line, arc, or other parametrically @@ -3088,7 +3089,7 @@ class Edge(Mixin1D, Shape[TopoDS_Edge]): return Edge(new_edge) -class Wire(Mixin1D, Shape[TopoDS_Wire]): +class Wire(Mixin1D[TopoDS_Wire]): """A Wire in build123d is a topological entity representing a connected sequence of edges forming a continuous curve or path in 3D space. Wires are essential components in modeling complex objects, defining boundaries for surfaces or diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index e4131ce..ed3ba34 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -107,7 +107,7 @@ from build123d.geometry import ( from typing_extensions import Self from .one_d import Edge, Wire, Mixin1D -from .shape_core import Shape, ShapeList, Joint, downcast, shapetype +from .shape_core import TOPODS, Shape, ShapeList, Joint, downcast, shapetype from .two_d import sort_wires_by_build_order, Mixin2D, Face, Shell from .utils import ( _extrude_topods_shape, @@ -122,7 +122,7 @@ if TYPE_CHECKING: # pragma: no cover from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 -class Mixin3D(Shape): +class Mixin3D(Shape[TOPODS]): """Additional methods to add to 3D Shape classes""" project_to_viewport = Mixin1D.project_to_viewport @@ -590,7 +590,7 @@ class Mixin3D(Shape): return Shape.get_shape_list(self, "Solid") -class Solid(Mixin3D, Shape[TopoDS_Solid]): +class Solid(Mixin3D[TopoDS_Solid]): """A Solid in build123d represents a three-dimensional solid geometry in a topological structure. A solid is a closed and bounded volume, enclosing a region in 3D space. It comprises faces, edges, and vertices connected in a diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index c6102a7..65cee95 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -139,6 +139,7 @@ from build123d.geometry import ( from .one_d import Edge, Mixin1D, Wire from .shape_core import ( + TOPODS, Shape, ShapeList, SkipClean, @@ -165,7 +166,7 @@ if TYPE_CHECKING: # pragma: no cover T = TypeVar("T", Edge, Wire, "Face") -class Mixin2D(ABC, Shape): +class Mixin2D(ABC, Shape[TOPODS]): """Additional methods to add to Face and Shell class""" project_to_viewport = Mixin1D.project_to_viewport @@ -434,7 +435,7 @@ class Mixin2D(ABC, Shape): return projected_edge -class Face(Mixin2D, Shape[TopoDS_Face]): +class Face(Mixin2D[TopoDS_Face]): """A Face in build123d represents a 3D bounded surface within the topological data structure. It encapsulates geometric information, defining a face of a 3D shape. These faces are integral components of complex structures, such as solids and @@ -2327,7 +2328,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): return wrapped_wire -class Shell(Mixin2D, Shape[TopoDS_Shell]): +class Shell(Mixin2D[TopoDS_Shell]): """A Shell is a fundamental component in build123d's topological data structure representing a connected set of faces forming a closed surface in 3D space. As part of a geometric model, it defines a watertight enclosure, commonly encountered From a6d8f9bdc16a18d9ca82491db194f2b1bbc71386 Mon Sep 17 00:00:00 2001 From: snoyer Date: Tue, 21 Oct 2025 10:15:47 +0400 Subject: [PATCH 461/518] refactor `.wrapped is None` usages --- src/build123d/exporters.py | 6 +- src/build123d/mesher.py | 2 +- src/build123d/operations_generic.py | 4 +- src/build123d/topology/composite.py | 2 +- src/build123d/topology/constrained_lines.py | 2 +- src/build123d/topology/one_d.py | 16 ++--- src/build123d/topology/shape_core.py | 65 ++++++++++----------- src/build123d/topology/two_d.py | 14 ++--- src/build123d/vtk_tools.py | 2 +- 9 files changed, 56 insertions(+), 57 deletions(-) diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 49339ee..a229fa2 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -758,7 +758,7 @@ class ExportDXF(Export2D): ) # need to apply the transform on the geometry level - if edge.wrapped is None or edge.location is None: + if not edge or edge.location is None: raise ValueError(f"Edge is empty {edge}.") t = edge.location.wrapped.Transformation() spline.Transform(t) @@ -1345,7 +1345,7 @@ class ExportSVG(Export2D): u2 = adaptor.LastParameter() # Apply the shape location to the geometry. - if edge.wrapped is None or edge.location is None: + if not edge or edge.location is None: raise ValueError(f"Edge is empty {edge}.") t = edge.location.wrapped.Transformation() spline.Transform(t) @@ -1411,7 +1411,7 @@ class ExportSVG(Export2D): } def _edge_segments(self, edge: Edge, reverse: bool) -> list[PathSegment]: - if edge.wrapped is None: + if not edge: raise ValueError(f"Edge is empty {edge}.") edge_reversed = edge.wrapped.Orientation() == TopAbs_Orientation.TopAbs_REVERSED geom_type = edge.geom_type diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index 5fb9a54..5433848 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -295,7 +295,7 @@ class Mesher: ocp_mesh_vertices.append(pnt) # Store the triangles from the triangulated faces - if facet.wrapped is None: + if not facet: continue facet_reversed = facet.wrapped.Orientation() == ta.TopAbs_REVERSED order = [1, 3, 2] if facet_reversed else [1, 2, 3] diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 69d75cc..2a2f007 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -365,7 +365,7 @@ def chamfer( if target._dim == 1: if isinstance(target, BaseLineObject): - if target.wrapped is None: + if not target: target = Wire([]) # empty wire else: target = Wire(target.wrapped) @@ -465,7 +465,7 @@ def fillet( if target._dim == 1: if isinstance(target, BaseLineObject): - if target.wrapped is None: + if not target: target = Wire([]) # empty wire else: target = Wire(target.wrapped) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 4faeb36..4e42b60 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -534,7 +534,7 @@ class Compound(Mixin3D[TopoDS_Compound]): def __len__(self) -> int: """Return the number of subshapes""" count = 0 - if self.wrapped is not None: + if self._wrapped is not None: for _ in self: count += 1 return count diff --git a/src/build123d/topology/constrained_lines.py b/src/build123d/topology/constrained_lines.py index 9c316b6..4e53ddb 100644 --- a/src/build123d/topology/constrained_lines.py +++ b/src/build123d/topology/constrained_lines.py @@ -174,7 +174,7 @@ def _as_gcc_arg(obj: Edge | Vector, constaint: Tangency) -> tuple[ - Edge -> (QualifiedCurve, h2d, first, last, True) - Vector -> (CartesianPoint, None, None, None, False) """ - if obj.wrapped is None: + if not obj: raise TypeError("Can't create a qualified curve from empty edge") if isinstance(obj.wrapped, TopoDS_Edge): diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 8e9939f..c12880f 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -809,7 +809,7 @@ class Mixin1D(Shape[TOPODS]): case Edge() as obj, Plane() as plane: # Find any edge / plane intersection points & edges # Find point intersections - if obj.wrapped is None: + if not obj: continue geom_line = BRep_Tool.Curve_s( obj.wrapped, obj.param_at(0), obj.param_at(1) @@ -1225,7 +1225,7 @@ class Mixin1D(Shape[TOPODS]): Returns: """ - if self._wrapped is None or face.wrapped is None: + if self._wrapped is None or not face: raise ValueError("Can't project an empty Edge or Wire onto empty Face") bldr = BRepProj_Projection( @@ -1400,7 +1400,7 @@ class Mixin1D(Shape[TOPODS]): - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is either a `Self` or `list[Self]`, or `None` if no corresponding part is found. """ - if self._wrapped is None or tool.wrapped is None: + if self._wrapped is None or not tool: raise ValueError("Can't split an empty edge/wire/tool") shape_list = TopTools_ListOfShape() @@ -1647,7 +1647,7 @@ class Edge(Mixin1D[TopoDS_Edge]): Returns: Edge: extruded shape """ - if obj.wrapped is None: + if not obj: raise ValueError("Can't extrude empty vertex") return Edge(TopoDS.Edge_s(_extrude_topods_shape(obj.wrapped, direction))) @@ -3638,7 +3638,7 @@ class Wire(Mixin1D[TopoDS_Wire]): ) for v in vertices: - if v.wrapped is None: + if not v: continue edge_list = vertex_edge_map.FindFromKey(v.wrapped) @@ -3932,7 +3932,7 @@ class Wire(Mixin1D[TopoDS_Wire]): """ # pylint: disable=too-many-branches - if self._wrapped is None or target_object.wrapped is None: + if self._wrapped is None or not target_object: raise ValueError("Can't project empty Wires or to empty Shapes") if direction is not None and center is None: @@ -4021,7 +4021,7 @@ class Wire(Mixin1D[TopoDS_Wire]): Returns: Wire: stitched wires """ - if self._wrapped is None or other.wrapped is None: + if self._wrapped is None or not other: raise ValueError("Can't stitch empty wires") wire_builder = BRepBuilderAPI_MakeWire() @@ -4266,7 +4266,7 @@ def topo_explore_connected_faces( raise ValueError("Can't explore from an empty edge") parent = parent if parent is not None else edge.topo_parent - if parent is None or parent.wrapped is None: + if not parent: raise ValueError("edge has no valid parent") # make a edge --> faces mapping diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 6a270e8..1e18261 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -797,7 +797,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if obj.wrapped is None: + if not obj: return 0.0 properties = GProp_GProps() @@ -817,7 +817,7 @@ class Shape(NodeMixin, Generic[TOPODS]): ], ) -> ShapeList: """Helper to extract entities of a specific type from a shape.""" - if shape.wrapped is None: + if not shape: return ShapeList() shape_list = ShapeList( [shape.__class__.cast(i) for i in shape.entities(entity_type)] @@ -1124,7 +1124,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self._wrapped is None or other.wrapped is None: + if self._wrapped is None or not other: raise ValueError("Cannot calculate distance to or from an empty shape") return BRepExtrema_DistShapeShape(self.wrapped, other.wrapped).Value() @@ -1137,9 +1137,7 @@ class Shape(NodeMixin, Generic[TOPODS]): self, other: Shape | VectorLike ) -> tuple[float, Vector, Vector]: """Minimal distance between two shapes and the points on each shape""" - if self._wrapped is None or ( - isinstance(other, Shape) and other.wrapped is None - ): + if self._wrapped is None or (isinstance(other, Shape) and not other): raise ValueError("Cannot calculate distance to or from an empty shape") if isinstance(other, Shape): @@ -1176,7 +1174,7 @@ class Shape(NodeMixin, Generic[TOPODS]): dist_calc.LoadS1(self.wrapped) for other_shape in others: - if other_shape.wrapped is None: + if not other_shape: raise ValueError("Cannot calculate distance to or from an empty shape") dist_calc.LoadS2(other_shape.wrapped) dist_calc.Perform() @@ -1415,7 +1413,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self._wrapped is None or other.wrapped is None: + if self._wrapped is None or not other: return False return self.wrapped.IsEqual(other.wrapped) @@ -1430,7 +1428,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: """ - if self._wrapped is None or other.wrapped is None: + if self._wrapped is None or not other: return False return self.wrapped.IsSame(other.wrapped) @@ -1877,7 +1875,7 @@ class Shape(NodeMixin, Generic[TOPODS]): raise ValueError("perimeter must be a closed Wire or Edge") perimeter_edges = TopTools_SequenceOfShape() for perimeter_edge in perimeter.edges(): - if perimeter_edge.wrapped is None: + if not perimeter_edge: continue perimeter_edges.Append(perimeter_edge.wrapped) @@ -1885,7 +1883,7 @@ class Shape(NodeMixin, Generic[TOPODS]): lefts: list[Shell] = [] rights: list[Shell] = [] for target_shell in self.shells(): - if target_shell.wrapped is None: + if not target_shell: continue constructor = BRepFeat_SplitShape(target_shell.wrapped) constructor.Add(perimeter_edges) @@ -2214,7 +2212,7 @@ class Shape(NodeMixin, Generic[TOPODS]): Returns: tuple[ShapeList[Vertex], ShapeList[Edge]]: section results """ - if self._wrapped is None or other.wrapped is None: + if self._wrapped is None or not other: return (ShapeList(), ShapeList()) section = BRepAlgoAPI_Section(self.wrapped, other.wrapped) @@ -2715,15 +2713,16 @@ class ShapeList(list[T]): tol_digits, ) - elif hasattr(group_by, "wrapped"): - if group_by.wrapped is None: - raise ValueError("Cannot group by an empty object") + elif not group_by: + raise ValueError("Cannot group by an empty object") - if isinstance(group_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): + elif hasattr(group_by, "wrapped") and isinstance( + group_by.wrapped, (TopoDS_Edge, TopoDS_Wire) + ): - def key_f(obj): - pnt1, _pnt2 = group_by.closest_points(obj.center()) - return round(group_by.param_at_point(pnt1), tol_digits) + def key_f(obj): + pnt1, _pnt2 = group_by.closest_points(obj.center()) + return round(group_by.param_at_point(pnt1), tol_digits) elif isinstance(group_by, SortBy): if group_by == SortBy.LENGTH: @@ -2829,22 +2828,22 @@ class ShapeList(list[T]): ).position.Z, reverse=reverse, ) - elif hasattr(sort_by, "wrapped"): - if sort_by.wrapped is None: - raise ValueError("Cannot sort by an empty object") + elif not sort_by: + raise ValueError("Cannot sort by an empty object") + elif hasattr(sort_by, "wrapped") and isinstance( + sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire) + ): - if isinstance(sort_by.wrapped, (TopoDS_Edge, TopoDS_Wire)): + def u_of_closest_center(obj) -> float: + """u-value of closest point between object center and sort_by""" + assert not isinstance(sort_by, SortBy) + pnt1, _pnt2 = sort_by.closest_points(obj.center()) + return sort_by.param_at_point(pnt1) - def u_of_closest_center(obj) -> float: - """u-value of closest point between object center and sort_by""" - assert not isinstance(sort_by, SortBy) - pnt1, _pnt2 = sort_by.closest_points(obj.center()) - return sort_by.param_at_point(pnt1) - - # pylint: disable=unnecessary-lambda - objects = sorted( - self, key=lambda o: u_of_closest_center(o), reverse=reverse - ) + # pylint: disable=unnecessary-lambda + objects = sorted( + self, key=lambda o: u_of_closest_center(o), reverse=reverse + ) elif isinstance(sort_by, SortBy): if sort_by == SortBy.LENGTH: diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 65cee95..8c340a5 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -412,7 +412,7 @@ class Mixin2D(ABC, Shape[TOPODS]): raise RuntimeError( f"Length error of {length_error:.6f} exceeds tolerance {tolerance}" ) - if wrapped_edge.wrapped is None or not wrapped_edge.is_valid: + if not wrapped_edge or not wrapped_edge.is_valid: raise RuntimeError("Wrapped edge is invalid") if not snap_to_face: @@ -872,7 +872,7 @@ class Face(Mixin2D[TopoDS_Face]): Returns: Face: extruded shape """ - if obj.wrapped is None: + if not obj: raise ValueError("Can't extrude empty object") return Face(TopoDS.Face_s(_extrude_topods_shape(obj.wrapped, direction))) @@ -982,7 +982,7 @@ class Face(Mixin2D[TopoDS_Face]): ) return single_point_curve - if shape.wrapped is None: + if not shape: raise ValueError("input Edge cannot be empty") adaptor = BRepAdaptor_Curve(shape.wrapped) @@ -1105,7 +1105,7 @@ class Face(Mixin2D[TopoDS_Face]): raise ValueError("exterior must be a Wire or list of Edges") for edge in outside_edges: - if edge.wrapped is None: + if not edge: raise ValueError("exterior contains empty edges") surface.Add(edge.wrapped, GeomAbs_C0) @@ -1136,7 +1136,7 @@ class Face(Mixin2D[TopoDS_Face]): if interior_wires: makeface_object = BRepBuilderAPI_MakeFace(surface_face.wrapped) for wire in interior_wires: - if wire.wrapped is None: + if not wire: raise ValueError("interior_wires contain an empty wire") makeface_object.Add(wire.wrapped) try: @@ -1330,7 +1330,7 @@ class Face(Mixin2D[TopoDS_Face]): ) from err result = result.fix() - if not result.is_valid or result.wrapped is None: + if not result.is_valid or not result: raise RuntimeError("Non planar face is invalid") return result @@ -2360,7 +2360,7 @@ class Shell(Mixin2D[TopoDS_Shell]): obj = obj_list[0] if isinstance(obj, Face): - if obj.wrapped is None: + if not obj.wrapped: raise ValueError(f"Can't create a Shell from empty Face") builder = BRep_Builder() shell = TopoDS_Shell() diff --git a/src/build123d/vtk_tools.py b/src/build123d/vtk_tools.py index 9d22185..a4af54a 100644 --- a/src/build123d/vtk_tools.py +++ b/src/build123d/vtk_tools.py @@ -80,7 +80,7 @@ def to_vtk_poly_data( if not HAS_VTK: warnings.warn("VTK not supported", stacklevel=2) - if obj.wrapped is None: + if not obj: raise ValueError("Cannot convert an empty shape") vtk_shape = IVtkOCC_Shape(obj.wrapped) From 6ce4a31355825233181cca478735133b138afa97 Mon Sep 17 00:00:00 2001 From: snoyer Date: Tue, 21 Oct 2025 10:31:41 +0400 Subject: [PATCH 462/518] appease mypy --- src/build123d/topology/three_d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index ed3ba34..143e257 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -1269,7 +1269,7 @@ class Solid(Mixin3D[TopoDS_Solid]): outer_wire = section inner_wires = inner_wires if inner_wires else [] - shapes = [] + shapes: list[Mixin3D[TopoDS_Shape]] = [] for wire in [outer_wire] + inner_wires: builder = BRepOffsetAPI_MakePipeShell(Wire(path).wrapped) From 96ce15a1e101848bc39da0ba2786e251f06ddc0b Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 21 Oct 2025 09:49:24 -0500 Subject: [PATCH 463/518] .readthedocs.yaml -> fix tab title version on dev version builds --- .readthedocs.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 9925d2f..44248cf 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,6 +10,10 @@ build: python: "3.10" apt_packages: - graphviz + jobs: + post_checkout: + # necessary to ensure that the development builds get a correct version tag + - git fetch --unshallow || true # Build from the docs/ directory with Sphinx sphinx: @@ -21,8 +25,3 @@ python: path: . extra_requirements: - docs - -# Explicitly set the version of Python and its requirements -# python: -# install: -# - requirements: docs/requirements.txt From fb324adced38ca8aeb6808845aaecd16c034d7f0 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 21 Oct 2025 12:57:03 -0400 Subject: [PATCH 464/518] Add 2d and 3d multi to_intersect cases, exception cases --- tests/test_direct_api/test_intersection.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index 6262a23..696fa10 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -248,7 +248,6 @@ shape_2d_matrix = [ Case(fc2, ax1, None, "parallel/skew", None), Case(fc3, ax1, [Vertex], "intersecting", None), Case(fc1, ax1, [Edge], "collinear", None), - # Case(fc7, ax1, [Vertex, Vertex], "multi intersect", None), Case(fc1, pl3, None, "parallel/skew", None), Case(fc1, pl1, [Edge], "intersecting", None), @@ -283,7 +282,9 @@ shape_2d_matrix = [ Case(sh4, fc1, [Face, Face], "2 coplanar", None), Case(sh5, fc1, [Edge, Edge], "2 intersecting", None), - # Case(sh5, fc1, [Edge], "multi to_intersect, intersecting", None), + Case(fc1, [fc4, Pos(2, 2) * fc1], [Face], "multi to_intersect, intersecting", None), + Case(fc1, [ed1, Pos(2.5, 2.5) * fc1], [Edge], "multi to_intersect, intersecting", None), + Case(fc7, [wi5, fc1], [Vertex], "multi to_intersect, intersecting", None), ] @pytest.mark.parametrize("obj, target, expected", make_params(shape_2d_matrix)) @@ -344,6 +345,9 @@ shape_3d_matrix = [ Case(sl1, Pos(2, 2, 1) * sl1, [Edge], "edge collinear", None), Case(sl1, Pos(2, 2, 2) * sl1, [Vertex], "corner coincident", None), Case(sl1, Pos(.45) * sl3, [Solid, Solid], "multi-intersect", None), + + Case(Pos(1.5, 1.5) * sl1, [sl3, Pos(.5, .5) * sl1], [Solid], "multi to_intersect, intersecting", None), + Case(Pos(1.5, 1.5) * sl1, [sl3, Pos(Z=.5) * fc1], [Face], "multi to_intersect, intersecting", None), ] @pytest.mark.parametrize("obj, target, expected", make_params(shape_3d_matrix)) @@ -410,6 +414,8 @@ def test_issues(obj, target, expected): exception_matrix = [ Case(vt1, Color(), None, "Unsupported type", None), Case(ed1, Color(), None, "Unsupported type", None), + Case(fc1, Color(), None, "Unsupported type", None), + Case(sl1, Color(), None, "Unsupported type", None), ] @pytest.mark.skip From 9a6c382ced3df76f2f12dea14f5e81fa78ee9f64 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 21 Oct 2025 13:31:14 -0400 Subject: [PATCH 465/518] Replace Face.make_plane() with Face(Plane) to match Edge(Axis) --- src/build123d/topology/two_d.py | 20 ++++++++------------ tests/test_direct_api/test_face.py | 4 ++-- tests/test_direct_api/test_shape.py | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 8b8f264..7c89746 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -449,7 +449,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): @overload def __init__( self, - obj: TopoDS_Face, + obj: TopoDS_Face | Plane, label: str = "", color: Color | None = None, parent: Compound | None = None, @@ -457,7 +457,7 @@ class Face(Mixin2D, Shape[TopoDS_Face]): """Build a Face from an OCCT TopoDS_Shape/TopoDS_Face Args: - obj (TopoDS_Shape, optional): OCCT Face. + obj (TopoDS_Shape | Plane, optional): OCCT Face or Plane. label (str, optional): Defaults to ''. color (Color, optional): Defaults to None. parent (Compound, optional): assembly parent. Defaults to None. @@ -487,7 +487,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): if args: l_a = len(args) - if isinstance(args[0], TopoDS_Shape): + if isinstance(args[0], Plane): + obj = args[0] + elif isinstance(args[0], TopoDS_Shape): obj, label, color, parent = args[:4] + (None,) * (4 - l_a) elif isinstance(args[0], Wire): outer_wire, inner_wires, label, color, parent = args[:5] + (None,) * ( @@ -516,6 +518,9 @@ class Face(Mixin2D, Shape[TopoDS_Face]): color = kwargs.get("color", color) parent = kwargs.get("parent", parent) + if isinstance(obj, Plane): + obj = BRepBuilderAPI_MakeFace(obj.wrapped).Face() + if outer_wire is not None: inner_topods_wires = ( [w.wrapped for w in inner_wires] if inner_wires is not None else [] @@ -1009,15 +1014,6 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ).Face() ) - @classmethod - def make_plane( - cls, - plane: Plane = Plane.XY, - ) -> Face: - """Create a unlimited size Face aligned with plane""" - pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() - return cls(pln_shape) - @classmethod def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: """make_rect diff --git a/tests/test_direct_api/test_face.py b/tests/test_direct_api/test_face.py index f8619c5..2b71763 100644 --- a/tests/test_direct_api/test_face.py +++ b/tests/test_direct_api/test_face.py @@ -130,8 +130,8 @@ class TestFace(unittest.TestCase): distance=1, distance2=2, vertices=[vertex], edge=other_edge ) - def test_make_rect(self): - test_face = Face.make_plane() + def test_plane_as_face(self): + test_face = Face(Plane.XY) self.assertAlmostEqual(test_face.normal_at(), (0, 0, 1), 5) def test_length_width(self): diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 2c0bb3c..4f69dbf 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -475,7 +475,7 @@ class TestShape(unittest.TestCase): self.assertAlmostEqual(Vector(verts[0]), (1, 2, 0), 5) self.assertListEqual(edges, []) - verts, edges = Vertex(1, 2, 0)._ocp_section(Face.make_plane(Plane.XY)) + verts, edges = Vertex(1, 2, 0)._ocp_section(Face(Plane.XY)) self.assertAlmostEqual(Vector(verts[0]), (1, 2, 0), 5) self.assertListEqual(edges, []) @@ -493,7 +493,7 @@ class TestShape(unittest.TestCase): self.assertEqual(len(edges1), 1) self.assertAlmostEqual(edges1[0].length, 20, 5) - vertices2, edges2 = cylinder._ocp_section(Face.make_plane(pln)) + vertices2, edges2 = cylinder._ocp_section(Face(pln)) self.assertEqual(len(vertices2), 1) self.assertEqual(len(edges2), 1) self.assertAlmostEqual(Vector(vertices2[0]), (5, 0, 0), 5) From 89dedd0888504a0d1344eb1f3785e60255c807c5 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 21 Oct 2025 14:03:22 -0400 Subject: [PATCH 466/518] Add lexer to surface tuts --- docs/tutorial_spitfire_wing_gordon.rst | 6 +++ docs/tutorial_surface_heart_token.rst | 53 +++++++++++++++----------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/docs/tutorial_spitfire_wing_gordon.rst b/docs/tutorial_spitfire_wing_gordon.rst index 716f862..18dd1f2 100644 --- a/docs/tutorial_spitfire_wing_gordon.rst +++ b/docs/tutorial_spitfire_wing_gordon.rst @@ -34,6 +34,7 @@ We model a single wing (half‑span), with an elliptic leading and trailing edge These two edges act as the *guides* for the Gordon surface. .. literalinclude:: spitfire_wing_gordon.py + :language: build123d :start-after: [Code] :end-before: [AirfoilSizes] @@ -45,6 +46,7 @@ We intersect the guides with planes normal to the span to size the airfoil secti The resulting chord lengths define uniform scales for each airfoil curve. .. literalinclude:: spitfire_wing_gordon.py + :language: build123d :start-after: [AirfoilSizes] :end-before: [Airfoils] @@ -56,6 +58,7 @@ shifted so the leading edge fraction is aligned—then scale to the chord length from Step 2. .. literalinclude:: spitfire_wing_gordon.py + :language: build123d :start-after: [Airfoils] :end-before: [Profiles] @@ -68,6 +71,7 @@ profiles; the elliptic edges are the guides. We also add the wing tip section so the profile grid closes at the tip. .. literalinclude:: spitfire_wing_gordon.py + :language: build123d :start-after: [Profiles] :end-before: [Solid] @@ -82,6 +86,7 @@ Step 5 — Cap the root and create the solid We extract the closed root edge loop, make a planar cap, and form a solid shell. .. literalinclude:: spitfire_wing_gordon.py + :language: build123d :start-after: [Solid] :end-before: [End] @@ -102,5 +107,6 @@ Complete listing For convenience, here is the full script in one block: .. literalinclude:: spitfire_wing_gordon.py + :language: build123d :start-after: [Code] :end-before: [End] diff --git a/docs/tutorial_surface_heart_token.rst b/docs/tutorial_surface_heart_token.rst index 2c45f62..ac819ad 100644 --- a/docs/tutorial_surface_heart_token.rst +++ b/docs/tutorial_surface_heart_token.rst @@ -7,9 +7,9 @@ a heart‑shaped token from a small set of non‑planar faces. We’ll create non‑planar surfaces, mirror them, add side faces, and assemble a closed shell into a solid. -As described in the `topology_` section, a BREP model consists of vertices, edges, faces, -and other elements that define the boundary of an object. When creating objects with -non-planar faces, it is often more convenient to explicitly create the boundary faces of +As described in the `topology_` section, a BREP model consists of vertices, edges, faces, +and other elements that define the boundary of an object. When creating objects with +non-planar faces, it is often more convenient to explicitly create the boundary faces of the object. To illustrate this process, we will create the following game token: .. raw:: html @@ -22,13 +22,14 @@ Useful :class:`~topology.Face` creation methods include and :meth:`~topology.Face.make_surface_from_array_of_points`. See the :doc:`surface_modeling` overview for the full list. -In this case, we'll use the ``make_surface`` method, providing it with the edges that define +In this case, we'll use the ``make_surface`` method, providing it with the edges that define the perimeter of the surface and a central point on that surface. -To create the perimeter, we'll define the perimeter edges. Since the heart is +To create the perimeter, we'll define the perimeter edges. Since the heart is symmetric, we'll only create half of its surface here: .. literalinclude:: heart_token.py + :language: build123d :start-after: [Code] :end-before: [SurfaceEdges] @@ -42,12 +43,14 @@ of the heart and archs up off ``Plane.XY``. In preparation for creating the surface, we'll define a point on the surface: .. literalinclude:: heart_token.py + :language: build123d :start-after: [SurfaceEdges] :end-before: [SurfacePoint] We will then use this point to create a non-planar ``Face``: .. literalinclude:: heart_token.py + :language: build123d :start-after: [SurfacePoint] :end-before: [Surface] @@ -55,21 +58,23 @@ We will then use this point to create a non-planar ``Face``: :align: center :alt: token perimeter -Note that the surface was raised up by 0.5 using an Algebra expression with Pos. Also, -note that the ``-`` in front of ``Face`` simply flips the face normal so that the colored +Note that the surface was raised up by 0.5 using an Algebra expression with Pos. Also, +note that the ``-`` in front of ``Face`` simply flips the face normal so that the colored side is up, which isn't necessary but helps with viewing. -Now that one half of the top of the heart has been created, the remainder of the top +Now that one half of the top of the heart has been created, the remainder of the top and bottom can be created by mirroring: .. literalinclude:: heart_token.py + :language: build123d :start-after: [Surface] :end-before: [Surfaces] -The sides of the heart are going to be created by extruding the outside of the perimeter +The sides of the heart are going to be created by extruding the outside of the perimeter as follows: .. literalinclude:: heart_token.py + :language: build123d :start-after: [Surfaces] :end-before: [Sides] @@ -77,11 +82,12 @@ as follows: :align: center :alt: token sides -With the top, bottom, and sides, the complete boundary of the object is defined. We can -now put them together, first into a :class:`~topology.Shell` and then into a +With the top, bottom, and sides, the complete boundary of the object is defined. We can +now put them together, first into a :class:`~topology.Shell` and then into a :class:`~topology.Solid`: .. literalinclude:: heart_token.py + :language: build123d :start-after: [Sides] :end-before: [Solid] @@ -90,32 +96,33 @@ now put them together, first into a :class:`~topology.Shell` and then into a :alt: token heart solid .. note:: - When creating a Solid from a Shell, the Shell must be "water-tight," meaning it - should have no holes. For objects with complex Edges, it's best practice to reuse - Edges in adjoining Faces whenever possible to avoid slight mismatches that can + When creating a Solid from a Shell, the Shell must be "water-tight," meaning it + should have no holes. For objects with complex Edges, it's best practice to reuse + Edges in adjoining Faces whenever possible to avoid slight mismatches that can create openings. -Finally, we'll create the frame around the heart as a simple extrusion of a planar +Finally, we'll create the frame around the heart as a simple extrusion of a planar shape defined by the perimeter of the heart and merge all of the components together: .. literalinclude:: heart_token.py + :language: build123d :start-after: [Solid] :end-before: [End] -Note that an additional planar line is used to close ``l1`` and ``l3`` so a ``Face`` -can be created. The :func:`~operations_generic.offset` function defines the outside of +Note that an additional planar line is used to close ``l1`` and ``l3`` so a ``Face`` +can be created. The :func:`~operations_generic.offset` function defines the outside of the frame as a constant distance from the heart itself. Summary ------- -In this tutorial, we've explored surface modeling techniques to create a non-planar +In this tutorial, we've explored surface modeling techniques to create a non-planar heart-shaped object using build123d. By utilizing methods from the :class:`~topology.Face` -class, such as :meth:`~topology.Face.make_surface`, we constructed the perimeter and -central point of the surface. We then assembled the complete boundary of the object -by creating the top, bottom, and sides, and combined them into a :class:`~topology.Shell` -and eventually a :class:`~topology.Solid`. Finally, we added a frame around the heart -using the :func:`~operations_generic.offset` function to maintain a constant distance +class, such as :meth:`~topology.Face.make_surface`, we constructed the perimeter and +central point of the surface. We then assembled the complete boundary of the object +by creating the top, bottom, and sides, and combined them into a :class:`~topology.Shell` +and eventually a :class:`~topology.Solid`. Finally, we added a frame around the heart +using the :func:`~operations_generic.offset` function to maintain a constant distance from the heart. Next steps From a649fab27cb7b0cfef8f731dfe153ed4c21b9db8 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 23 Oct 2025 13:50:50 -0400 Subject: [PATCH 467/518] Improving attribution --- NOTICE | 15 +++++++++++++++ README.md | 16 ++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 NOTICE diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..2082252 --- /dev/null +++ b/NOTICE @@ -0,0 +1,15 @@ +build123d +Copyright (c) 2022–2025 The build123d Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + +------------------------------------------------------------------------------- + +This project was originally derived from portions of the CadQuery codebase +(https://github.com/CadQuery/cadquery) but has since been extensively +refactored and restructured into an independent system. +CadQuery is licensed under the Apache License, Version 2.0. diff --git a/README.md b/README.md index 818210d..8b17f25 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,17 @@ [![DOI](https://zenodo.org/badge/510925389.svg)](https://doi.org/10.5281/zenodo.14872322) -Build123d is a python-based, parametric, [boundary representation (BREP)][BREP] modeling framework for 2D and 3D CAD. It's built on the [Open Cascade] geometric kernel and allows for the creation of complex models using a simple and intuitive python syntax. Build123d can be used to create models for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to a wide variety of popular CAD tools such as [FreeCAD] and SolidWorks. +Build123d is a Python-based, parametric [boundary representation (BREP)][BREP] modeling framework for 2D and 3D CAD. Built on the [Open Cascade] geometric kernel, it provides a clean, fully Pythonic interface for creating precise models suitable for 3D printing, CNC machining, laser cutting, and other manufacturing processes. Models can be exported to popular CAD tools such as [FreeCAD] and SolidWorks. -Build123d could be considered as an evolution of [CadQuery] where the somewhat restrictive Fluent API (method chaining) is replaced with stateful context managers - e.g. `with` blocks - thus enabling the full python toolbox: for loops, references to objects, object sorting and filtering, etc. +Designed for modern, maintainable CAD-as-code, build123d combines clear architecture with expressive, algebraic modeling. It offers: +- Minimal or no internal state depending on mode, +- Explicit 1D, 2D, and 3D geometry classes with well-defined operations, +- Extensibility through subclassing and functional composition—no monkey patching, +- Standards-compliant code (PEP 8, mypy, pylint) with rich pylance type hints, +- Deep Python integration—selectors as lists, locations as iterables, and natural conversions (Solid(shell), tuple(Vector)), +- Operator-driven modeling (obj += sub_obj, Plane.XZ * Pos(X=5) * Rectangle(1, 1)) for algebraic, readable, and composable design logic. + +The result is a framework that feels native to Python while providing the full power of OpenCascade geometry underneath. The documentation for **build123d** can be found at [readthedocs](https://build123d.readthedocs.io/en/latest/index.html). @@ -62,6 +70,10 @@ python3 -m pip install -e . Further installation instructions are available (e.g. Poetry) see the [installation section on readthedocs](https://build123d.readthedocs.io/en/latest/installation.html). +Attribution: + +Build123d was originally derived from portions of the [CadQuery] codebase but has since been extensively refactored and restructured into an independent system. + [BREP]: https://en.wikipedia.org/wiki/Boundary_representation [CadQuery]: https://cadquery.readthedocs.io/en/latest/index.html [FreeCAD]: https://www.freecad.org/ From 70310ddd4afff0196f33ccc32f4cea81fbb6c7c9 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 23 Oct 2025 14:34:11 -0400 Subject: [PATCH 468/518] Shortened and removed CQ reference --- docs/index.rst | 78 +++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 0af6014..8c0c70e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -29,68 +29,54 @@ :align: center :alt: build123d logo -Build123d is a python-based, parametric, boundary representation (BREP) modeling -framework for 2D and 3D CAD. It's built on the Open Cascade geometric kernel and -allows for the creation of complex models using a simple and intuitive python -syntax. Build123d can be used to create models for 3D printing, CNC machining, -laser cutting, and other manufacturing processes. Models can be exported to a -wide variety of popular CAD tools such as FreeCAD and SolidWorks. - -Build123d could be considered as an evolution of -`CadQuery `_ where the -somewhat restrictive Fluent API (method chaining) is replaced with stateful -context managers - i.e. `with` blocks - thus enabling the full python toolbox: -for loops, references to objects, object sorting and filtering, etc. - -Note that this documentation is available in -`pdf `_ and -`epub `_ formats -for reference while offline. - ######## -Overview +About ######## -build123d uses the standard python context manager - i.e. the ``with`` statement often used when -working with files - as a builder of the object under construction. Once the object is complete -it can be extracted from the builders and used in other ways: for example exported as a STEP -file or used in an Assembly. There are three builders available: +Build123d is a Python-based, parametric (BREP) modeling framework for 2D and 3D CAD. +Built on the Open Cascade geometric kernel, it provides a clean, fully Pythonic interface +for creating precise models suitable for 3D printing, CNC machining, laser cutting, and +other manufacturing processes. Models can be exported to popular CAD tools such as FreeCAD +and SolidWorks. -* **BuildLine**: a builder of one dimensional objects - those with the property - of length but not of area or volume - typically used - to create complex lines used in sketches or paths. -* **BuildSketch**: a builder of planar two dimensional objects - those with the property - of area but not of volume - typically used to create 2D drawings that are extruded into 3D parts. -* **BuildPart**: a builder of three dimensional objects - those with the property of volume - - used to create individual parts. +Designed for modern, maintainable CAD-as-code, build123d combines clear architecture with +expressive, algebraic modeling. It offers: -The three builders work together in a hierarchy as follows: +* Minimal or no internal state depending on mode +* Explicit 1D, 2D, and 3D geometry classes with well-defined operations +* Extensibility through subclassing and functional composition—no monkey patching +* Standards-compliant code (PEP 8, mypy, pylint) with rich pylance type hints +* Deep Python integration—selectors as lists, locations as iterables, and natural + conversions (``Solid(shell)``, ``tuple(Vector)``) +* Operator-driven modeling (``obj += sub_obj``, ``Plane.XZ * Pos(X=5) * Rectangle(1, 1)``) + for algebraic, readable, and composable design logic -.. code-block:: python +The result is a framework that feels native to Python while providing the full power of +OpenCascade geometry underneath. - with BuildPart() as my_part: - ... - with BuildSketch() as my_sketch: - ... - with BuildLine() as my_line: - ... - ... - ... -where ``my_line`` will be added to ``my_sketch`` once the line is complete and ``my_sketch`` will be -added to ``my_part`` once the sketch is complete. +With build123d, intricate parametric models can be created in just a few lines of readable +Python code—as demonstrated by the tea cup example below. -As an example, consider the design of a tea cup: +.. dropdown:: Teacup Example -.. literalinclude:: ../examples/tea_cup.py - :start-after: [Code] - :end-before: [End] + .. literalinclude:: ../examples/tea_cup.py + :start-after: [Code] + :end-before: [End] .. raw:: html +.. note:: + + + This documentation is available in + `pdf `_ and + `epub `_ formats + for reference while offline. + .. note:: There is a `Discord `_ server (shared with CadQuery) where From 696e99c8891745f54c509c28383b6e3ee6c9b88d Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 24 Oct 2025 18:34:11 -0400 Subject: [PATCH 469/518] Improving Face creation - fix inner Wires --- src/build123d/topology/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index c1bbb1e..dbccc80 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -263,7 +263,10 @@ def _make_topods_face_from_wires( for inner_wire in inner_wires: if not BRep_Tool.IsClosed_s(inner_wire): raise ValueError("Cannot build face(s): inner wire is not closed") - face_builder.Add(inner_wire) + sf_s = ShapeFix_Shape(inner_wire) + sf_s.Perform() + fixed_inner_wire = TopoDS.Wire_s(sf_s.Shape()) + face_builder.Add(fixed_inner_wire) face_builder.Build() From cfd45465854b0c750b65e57f96236ef010de321e Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 24 Oct 2025 22:36:56 -0400 Subject: [PATCH 470/518] Add Compound tests --- tests/test_direct_api/test_intersection.py | 58 +++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index 696fa10..bdee46b 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -323,7 +323,7 @@ shape_3d_matrix = [ Case(sl1, ed3, None, "non-coincident", None), Case(sl1, ed1, [Edge], "intersecting", None), - Case(sl1, Pos(0, 1, 1) * ed1, [Edge], "edge collinear", "BRepAlgoAPI_Common and _Section both return edge"), + Case(sl1, Pos(0, 1, 1) * ed1, [Edge], "edge collinear", "duplicate edges, BRepAlgoAPI_Common and _Section both return edge"), Case(sl1, Pos(1, 1, 1) * ed1, [Vertex], "corner coincident", None), Case(Pos(2.1, 1) * sl1, ed4, [Edge, Edge], "multi-intersect", None), @@ -354,6 +354,61 @@ shape_3d_matrix = [ def test_shape_3d(obj, target, expected): run_test(obj, target, expected) +# Compound Shapes +cp1 = Compound() + GridLocations(5, 0, 2, 1) * Vertex() +cp2 = Compound() + GridLocations(5, 0, 2, 1) * Line((0, -1), (0, 1)) +cp3 = Compound() + GridLocations(5, 0, 2, 1) * Rectangle(2, 2) +cp4 = Compound() + GridLocations(5, 0, 2, 1) * Box(2, 2, 2) + +cv1 = Curve() + [ed1, ed2, ed3] +sk1 = Sketch() + [fc1, fc2, fc3] +pt1 = Part() + [sl1, sl2, sl3] + + +shape_compound_matrix = [ + Case(cp1, vl1, None, "non-coincident", None), + Case(Pos(-.5) * cp1, vl1, [Vertex], "intersecting", None), + + Case(cp2, lc1, None, "non-coincident", None), + Case(Pos(-.5) * cp2, lc1, [Vertex], "intersecting", None), + + Case(Pos(Z=1) * cp3, ax1, None, "non-coincident", None), + Case(cp3, ax1, [Edge, Edge], "intersecting", None), + + Case(Pos(Z=3) * cp4, pl2, None, "non-coincident", None), + Case(cp4, pl2, [Face, Face], "intersecting", None), + + Case(cp1, vt1, None, "non-coincident", None), + Case(Pos(-.5) * cp1, vt1, [Vertex], "intersecting", None), + + Case(Pos(Z=1) * cp2, ed1, None, "non-coincident", None), + Case(cp2, ed1, [Vertex], "intersecting", None), + + Case(Pos(Z=1) * cp3, fc1, None, "non-coincident", None), + Case(cp3, fc1, [Face, Face], "intersecting", None), + + Case(Pos(Z=5) * cp4, sl1, None, "non-coincident", None), + Case(Pos(2) * cp4, sl1, [Solid], "intersecting", None), + + Case(cp1, Pos(Z=1) * cp1, None, "non-coincident", None), + Case(cp1, cp2, [Vertex, Vertex], "intersecting", None), + Case(cp2, cp3, [Edge, Edge], "intersecting", None), + Case(cp3, cp4, [Face, Face], "intersecting", None), + + Case(cp1, Compound(children=cp1.get_type(Vertex)), [Vertex, Vertex], "mixed child type", None), + Case(cp4, Compound(children=cp3.get_type(Face)), [Face, Face], "mixed child type", None), + + Case(cp2, [cp3, cp4], [Edge, Edge], "multi to_intersect, intersecting", None), + + Case(cv1, cp3, [Edge, Edge], "intersecting", "duplicate edges, BRepAlgoAPI_Common and _Section both return edge"), + Case(sk1, cp3, [Face, Face], "intersecting", None), + Case(pt1, cp3, [Face, Face], "intersecting", None), + +] + +@pytest.mark.parametrize("obj, target, expected", make_params(shape_compound_matrix)) +def test_shape_compound(obj, target, expected): + run_test(obj, target, expected) # FreeCAD issue example c1 = CenterArc((0, 0), 10, 0, 360).edge() @@ -416,6 +471,7 @@ exception_matrix = [ Case(ed1, Color(), None, "Unsupported type", None), Case(fc1, Color(), None, "Unsupported type", None), Case(sl1, Color(), None, "Unsupported type", None), + Case(cp1, Color(), None, "Unsupported type", None), ] @pytest.mark.skip From a7b554001f9db3d124fe44cec8a8a163a7f3e622 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 24 Oct 2025 22:37:28 -0400 Subject: [PATCH 471/518] Add intersect method to Compound, similar to 2d and 3d --- src/build123d/topology/composite.py | 157 +++++++++++++++++++++++++++- src/build123d/topology/three_d.py | 11 +- src/build123d/topology/two_d.py | 5 +- 3 files changed, 163 insertions(+), 10 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 823eece..b5964a9 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -58,13 +58,12 @@ import copy import os import sys import warnings -from itertools import combinations -from typing import Type, Union - from collections.abc import Iterable, Iterator, Sequence +from itertools import combinations +from typing_extensions import Self import OCP.TopAbs as ta -from OCP.BRepAlgoAPI import BRepAlgoAPI_Fuse +from OCP.BRepAlgoAPI import BRepAlgoAPI_Common, BRepAlgoAPI_Fuse, BRepAlgoAPI_Section from OCP.Font import ( Font_FA_Bold, Font_FA_BoldItalic, @@ -107,7 +106,6 @@ from build123d.geometry import ( VectorLike, logger, ) -from typing_extensions import Self from .one_d import Edge, Wire, Mixin1D from .shape_core import ( @@ -711,6 +709,155 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): return results + def intersect( + self, *to_intersect: Shape | Vector | Location | Axis | Plane + ) -> None | ShapeList[Vertex | Edge | Face | Solid]: + """Intersect Compound with Shape or geometry object + + Args: + to_intersect (Shape | Vector | Location | Axis | Plane): objects to intersect + + Returns: + ShapeList[Vertex | Edge | Face | Solid] | None: ShapeList of vertices, edges, + faces, and/or solids. + """ + + def to_vector(objs: Iterable) -> ShapeList: + return ShapeList([Vector(v) if isinstance(v, Vertex) else v for v in objs]) + + def to_vertex(objs: Iterable) -> ShapeList: + return ShapeList([Vertex(v) if isinstance(v, Vector) else v for v in objs]) + + def bool_op( + args: Sequence, + tools: Sequence, + operation: BRepAlgoAPI_Common | BRepAlgoAPI_Section, + ) -> ShapeList | None: + # Wrap Shape._bool_op for corrected output + intersections = args[0]._bool_op(args, tools, operation) + if isinstance(intersections, ShapeList): + return intersections or None + if isinstance(intersections, Shape) and not intersections.is_null: + return ShapeList([intersections]) + return None + + def expand_compound(compound: Compound) -> ShapeList: + shapes = ShapeList(compound.children) + for shape_type in [Vertex, Edge, Wire, Face, Shell, Solid]: + new = compound.get_type(shape_type) + if shape_type == Wire: + new = [edge for new_shape in new for edge in new_shape.edges()] + elif shape_type == Shell: + new = [face for new_shape in new for face in new_shape.faces()] + shapes.extend(new) + return shapes + + def filter_shapes_by_order(shapes: ShapeList, orders: list) -> ShapeList: + # Remove lower order shapes from list which *appear* to be part of + # a higher order shape using a lazy distance check + # (sufficient for vertices, may be an issue for higher orders) + order_groups = [] + for order in orders: + order_groups.append( + ShapeList([s for s in shapes if isinstance(s, order)]) + ) + + filtered_shapes = order_groups[-1] + for i in range(len(order_groups) - 1): + los = order_groups[i] + his: list = sum(order_groups[i + 1 :], []) + filtered_shapes.extend( + ShapeList( + lo + for lo in los + if all(lo.distance_to(hi) > TOLERANCE for hi in his) + ) + ) + + return filtered_shapes + + common_set: ShapeList[Vertex | Edge | Face | Solid] = expand_compound(self) + target: ShapeList | Shape + for other in to_intersect: + # Conform target type + # Vertices need to be Vector for set() + match other: + case Axis(): + target = Edge(other) + case Plane(): + target = Face.make_plane(other) + case Vector(): + target = Vertex(other) + case Location(): + target = Vertex(other.position) + case Compound(): + target = expand_compound(other) + case _ if issubclass(type(other), Shape): + target = other + case _: + raise ValueError(f"Unsupported type to_intersect: {type(other)}") + + # Find common matches + common: list[Vector | Edge | Face] = [] + result: ShapeList | Shape | None + for obj in common_set: + match (obj, target): + case (Vertex(), Vertex()): + result = obj.intersect(target) + + case (Edge(), Edge() | Wire()): + result = obj.intersect(target) + + case (_, ShapeList()): + result = ShapeList() + for t in target: + if ( + not isinstance(obj, Edge) and not isinstance(t, (Edge)) + ) or (isinstance(obj, Solid) or isinstance(t, Solid)): + # Face + Edge combinations may produce an intersection + # with Common but always with Section. + # No easy way to deduplicate + # Many Solid + Edge combinations need Common + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (t,), operation) or []) + operation = BRepAlgoAPI_Section() + result.extend(bool_op((obj,), (t,), operation) or []) + + case _ if issubclass(type(target), Shape): + if isinstance(target, Wire): + targets = target.edges() + elif isinstance(target, Shell): + targets = target.faces() + else: + targets = ShapeList([target]) + + result = ShapeList() + for t in targets: + if ( + not isinstance(obj, Edge) and not isinstance(t, (Edge)) + ) or (isinstance(obj, Solid) or isinstance(t, Solid)): + # Face + Edge combinations may produce an intersection + # with Common but always with Section. + # No easy way to deduplicate + # Many Solid + Edge combinations need Common + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (t,), operation) or []) + operation = BRepAlgoAPI_Section() + result.extend(bool_op((obj,), (t,), operation) or []) + + if result: + common.extend(to_vector(result)) + + if common: + common_set = to_vertex(set(common)) + common_set = filter_shapes_by_order( + common_set, [Vertex, Edge, Face, Solid] + ) + else: + return None + + return ShapeList(common_set) + def unwrap(self, fully: bool = True) -> Self | Shape: """Strip unnecessary Compound wrappers diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 0331317..9e22ce5 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -422,7 +422,7 @@ class Mixin3D(Shape): def intersect( self, *to_intersect: Shape | Vector | Location | Axis | Plane - ) -> None | ShapeList[Vertex | Edge | Face | Shape]: + ) -> None | ShapeList[Vertex | Edge | Face | Solid]: """Intersect Solid with Shape or geometry object Args: @@ -448,7 +448,7 @@ class Mixin3D(Shape): intersections = args[0]._bool_op(args, tools, operation) if isinstance(intersections, ShapeList): return intersections or None - if (isinstance(intersections, Shape) and not intersections.is_null): + if isinstance(intersections, Shape) and not intersections.is_null: return ShapeList([intersections]) return None @@ -476,7 +476,7 @@ class Mixin3D(Shape): return filtered_shapes - common_set: ShapeList[Vertex | Edge | Face] = ShapeList(self.solids()) + common_set: ShapeList[Vertex | Edge | Face | Solid] = ShapeList(self.solids()) target: ShapeList | Shape for other in to_intersect: # Conform target type @@ -506,7 +506,7 @@ class Mixin3D(Shape): case (Edge(), Edge() | Wire()): result = obj.intersect(target) - case _ if issubclass(type(target), Shape): + case (_, Vertex() | Edge() | Wire() | Face() | Shell() | Solid()): if isinstance(target, Wire): targets = target.edges() elif isinstance(target, Shell): @@ -528,6 +528,9 @@ class Mixin3D(Shape): operation = BRepAlgoAPI_Section() result.extend(bool_op((obj,), (t,), operation) or []) + case _ if issubclass(type(target), Shape): + result = target.intersect(obj) + if result: common.extend(to_vector(result)) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 0195c30..2a96f15 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -352,7 +352,7 @@ class Mixin2D(ABC, Shape): case (Edge(), Edge() | Wire()): result = obj.intersect(target) - case _ if issubclass(type(target), Shape): + case (_, Vertex() | Edge() | Wire() | Face() | Shell()): if isinstance(target, Wire): targets = target.edges() elif isinstance(target, Shell): @@ -371,6 +371,9 @@ class Mixin2D(ABC, Shape): operation = BRepAlgoAPI_Section() result.extend(bool_op((obj,), (t,), operation) or []) + case _ if issubclass(type(target), Shape): + result = target.intersect(obj) + if result: common.extend(to_vector(result)) From c13ef47cef35de0a593051658e7d1f00831dbbb8 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 28 Oct 2025 23:33:29 -0400 Subject: [PATCH 472/518] Correct ex26 by revolving 180 and removing mirror which creates invalid shape --- examples/extrude.py | 3 +-- examples/extrude_algebra.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/extrude.py b/examples/extrude.py index fd30edb..e2f645a 100644 --- a/examples/extrude.py +++ b/examples/extrude.py @@ -68,8 +68,7 @@ with BuildPart() as ex26: with BuildSketch() as ex26_sk: with Locations((0, rev)): Circle(rad) - revolve(axis=Axis.X, revolution_arc=90) - mirror(about=Plane.XZ) + revolve(axis=Axis.X, revolution_arc=180) with BuildSketch() as ex26_sk2: Rectangle(rad, rev) ex26_target = ex26.part diff --git a/examples/extrude_algebra.py b/examples/extrude_algebra.py index e5340bb..6f3d6a6 100644 --- a/examples/extrude_algebra.py +++ b/examples/extrude_algebra.py @@ -26,8 +26,8 @@ rad, rev = 3, 25 # Extrude last circle = Pos(0, rev) * Circle(rad) -ex26_target = revolve(circle, Axis.X, revolution_arc=90) -ex26_target = ex26_target + mirror(ex26_target, Plane.XZ) +ex26_target = revolve(circle, Axis.X, revolution_arc=180) +ex26_target = ex26_target rect = Rectangle(rad, rev) From 315605f485071340dce0bfa857d91d1639111e9c Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 28 Oct 2025 23:45:29 -0400 Subject: [PATCH 473/518] Correct area/volume calculations from intersect with new return type of ShapeList --- src/build123d/drafting.py | 4 ++-- src/build123d/topology/composite.py | 6 +----- src/build123d/topology/two_d.py | 6 ++---- tests/test_direct_api/test_oriented_bound_box.py | 6 ++++-- tests/test_direct_api/test_shape.py | 5 +++-- tests/test_direct_api/test_solid.py | 8 ++++++-- tests/test_drafting.py | 3 ++- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/build123d/drafting.py b/src/build123d/drafting.py index 07a5193..415d33e 100644 --- a/src/build123d/drafting.py +++ b/src/build123d/drafting.py @@ -453,7 +453,7 @@ class DimensionLine(BaseSketchObject): if self_intersection is None: self_intersection_area = 0.0 else: - self_intersection_area = self_intersection.area + self_intersection_area = sum(f.area for f in self_intersection.faces()) d_line += placed_label bbox_size = d_line.bounding_box().diagonal @@ -467,7 +467,7 @@ class DimensionLine(BaseSketchObject): if line_intersection is None: common_area = 0.0 else: - common_area = line_intersection.area + common_area = sum(f.area for f in line_intersection.faces()) common_area += self_intersection_area score = (d_line.area - 10 * common_area) / bbox_size d_lines[d_line] = score diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index b5964a9..0849e69 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -649,11 +649,7 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): children[child_index_pair[1]] ) if obj_intersection is not None: - common_volume = ( - 0.0 - if isinstance(obj_intersection, list) - else obj_intersection.volume - ) + common_volume = sum(s.volume for s in obj_intersection.solids()) if common_volume > tolerance: return ( True, diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 2a96f15..621062b 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -778,15 +778,13 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ).sort_by(Axis(cog, cross_dir)) bottom_area = sum(f.area for f in bottom_list) - intersect_area = 0.0 for flipped_face, bottom_face in zip(top_flipped_list, bottom_list): intersection = flipped_face.intersect(bottom_face) - if intersection is None or isinstance(intersection, list): + if intersection is None: intersect_area = -1.0 break else: - assert isinstance(intersection, Face) - intersect_area += intersection.area + intersect_area = sum(f.area for f in intersection.faces()) if intersect_area == -1.0: continue diff --git a/tests/test_direct_api/test_oriented_bound_box.py b/tests/test_direct_api/test_oriented_bound_box.py index bcdb566..a083f7b 100644 --- a/tests/test_direct_api/test_oriented_bound_box.py +++ b/tests/test_direct_api/test_oriented_bound_box.py @@ -229,13 +229,15 @@ class TestOrientedBoundBox(unittest.TestCase): obb = OrientedBoundBox(rect) corners = obb.corners poly = Polygon(*corners, align=None) - self.assertAlmostEqual(rect.intersect(poly).area, rect.area, 5) + area = sum(f.area for f in rect.intersect(poly).faces()) + self.assertAlmostEqual(area, rect.area, 5) for face in Box(1, 2, 3).faces(): obb = OrientedBoundBox(face) corners = obb.corners poly = Polygon(*corners, align=None) - self.assertAlmostEqual(face.intersect(poly).area, face.area, 5) + area = sum(f.area for f in face.intersect(poly).faces()) + self.assertAlmostEqual(area, face.area, 5) def test_line_corners(self): """ diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index 2c0bb3c..a394d9e 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -299,7 +299,8 @@ class TestShape(unittest.TestCase): predicted_location = Location(offset) * Rotation(*rotation) located_shape = Solid.make_box(1, 1, 1).locate(predicted_location) intersect = shape.intersect(located_shape) - self.assertAlmostEqual(intersect.volume, 1, 5) + volume = sum(s.volume for s in intersect.solids()) + self.assertAlmostEqual(volume, 1, 5) def test_position_and_orientation(self): box = Solid.make_box(1, 1, 1).locate(Location((1, 2, 3), (10, 20, 30))) @@ -588,7 +589,7 @@ class TestShape(unittest.TestCase): empty.distance_to_with_closest_points(Vector(1, 1, 1)) with self.assertRaises(ValueError): empty.distance_to(Vector(1, 1, 1)) - with self.assertRaises(ValueError): + with self.assertRaises(AttributeError): box.intersect(empty_loc) self.assertEqual(empty._ocp_section(Vertex(1, 1, 1)), ([], [])) self.assertEqual(empty.faces_intersected_by_axis(Axis.Z), ShapeList()) diff --git a/tests/test_direct_api/test_solid.py b/tests/test_direct_api/test_solid.py index a0fa0f3..75fad74 100644 --- a/tests/test_direct_api/test_solid.py +++ b/tests/test_direct_api/test_solid.py @@ -153,7 +153,9 @@ class TestSolid(unittest.TestCase): self.assertAlmostEqual(twist.volume, 1, 5) top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) bottom = twist.faces().sort_by(Axis.Z)[0] - self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) + intersect = top.translate((0, 0, -1)).intersect(bottom) + area = sum(f.area for f in intersect.faces()) + self.assertAlmostEqual(area, 1, 5) # Wire base = Wire.make_rect(1, 1) twist = Solid.extrude_linear_with_rotation( @@ -162,7 +164,9 @@ class TestSolid(unittest.TestCase): self.assertAlmostEqual(twist.volume, 1, 5) top = twist.faces().sort_by(Axis.Z)[-1].rotate(Axis.Z, 45) bottom = twist.faces().sort_by(Axis.Z)[0] - self.assertAlmostEqual(top.translate((0, 0, -1)).intersect(bottom).area, 1, 5) + intersect = top.translate((0, 0, -1)).intersect(bottom) + area = sum(f.area for f in intersect.faces()) + self.assertAlmostEqual(area, 1, 5) def test_make_loft(self): loft = Solid.make_loft( diff --git a/tests/test_drafting.py b/tests/test_drafting.py index 1bb97ab..2f1b301 100644 --- a/tests/test_drafting.py +++ b/tests/test_drafting.py @@ -231,7 +231,8 @@ class DimensionLineTestCase(unittest.TestCase): ], draft=metric, ) - self.assertGreater(hole.intersect(d_line).area, 0) + area = sum(f.area for f in hole.intersect(d_line).faces()) + self.assertGreater(area, 0) def test_outside_arrows(self): d_line = DimensionLine([(0, 0, 0), (15, 0, 0)], draft=metric) From 069b691964100117888b35fb940016f681af7743 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 28 Oct 2025 23:56:29 -0400 Subject: [PATCH 474/518] Conform Shape.intersect to None | ShapeList --- src/build123d/topology/shape_core.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 6402c3e..d366ead 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -1327,7 +1327,7 @@ class Shape(NodeMixin, Generic[TOPODS]): def intersect( self, *to_intersect: Shape | Vector | Location | Axis | Plane - ) -> None | Self | ShapeList[Self]: + ) -> None | ShapeList[Self]: """Intersection of the arguments and this shape Args: @@ -1335,8 +1335,8 @@ class Shape(NodeMixin, Generic[TOPODS]): intersect with Returns: - Self | ShapeList[Self]: Resulting object may be of a different class than self - or a ShapeList if multiple non-Compound object created + None | ShapeList[Self]: Resulting ShapeList may contain different class + than self """ def _to_vertex(vec: Vector) -> Vertex: @@ -1380,15 +1380,12 @@ class Shape(NodeMixin, Generic[TOPODS]): # Find the shape intersections intersect_op = BRepAlgoAPI_Common() - shape_intersections = self._bool_op((self,), objs, intersect_op) - if isinstance(shape_intersections, ShapeList) and not shape_intersections: - return None - if ( - not isinstance(shape_intersections, ShapeList) - and shape_intersections.is_null - ): - return None - return shape_intersections + intersections = self._bool_op((self,), objs, intersect_op) + if isinstance(intersections, ShapeList): + return intersections or None + if isinstance(intersections, Shape) and not intersections.is_null: + return ShapeList([intersections]) + return None def is_equal(self, other: Shape) -> bool: """Returns True if two shapes are equal, i.e. if they share the same From 5d7b0983791ca9484661439034ed5b74d6642194 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 29 Oct 2025 00:16:02 -0400 Subject: [PATCH 475/518] Correct mode == Mode.INTERSECT to iterate intersections instead of pass all in to_intersect Shape.intersect(A, B) through BRepAlgoAPI_Common appears to treat tool as a single object such that intersection is Shape ^ (A + B). The updated intersect methods treat this intersection as Shape ^ A ^ B. The intersections in this change need to be interated to accomadate. --- src/build123d/build_common.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index e5edde3..abfa4a0 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -466,7 +466,13 @@ class Builder(ABC, Generic[ShapeT]): elif mode == Mode.INTERSECT: if self._obj is None: raise RuntimeError("Nothing to intersect with") - combined = self._obj.intersect(*typed[self._shape]) + intersections: ShapeList[Shape] = ShapeList() + for target in typed[self._shape]: + result = self._obj.intersect(target) + if result is None: + continue + intersections.extend(result) + combined = self._sub_class(intersections) elif mode == Mode.REPLACE: combined = self._sub_class(list(typed[self._shape])) From 37135745193e89502e07fbb871bc8f180af4d421 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 29 Oct 2025 13:02:31 -0400 Subject: [PATCH 476/518] Remove xfail notes from issue tests --- tests/test_direct_api/test_intersection.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index bdee46b..daad2bf 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -453,11 +453,11 @@ w1 = Wire.make_circle(0.5) f1 = Face(Wire.make_circle(0.5)) issues_matrix = [ - Case(t, t, [Face, Face], "issue #1015", "Returns Compound"), - Case(l, s, [Edge], "issue #945", "Edge.intersect only takes 1D"), - Case(a, b, [Edge], "issue #918", "Returns empty Compound"), - Case(e1, w1, [Vertex, Vertex], "issue #697"), - Case(e1, f1, [Edge], "issue #697", "Edge.intersect only takes 1D"), + Case(t, t, [Face, Face], "issue #1015", None), + Case(l, s, [Edge], "issue #945", None), + Case(a, b, [Edge], "issue #918", None), + Case(e1, w1, [Vertex, Vertex], "issue #697", None), + Case(e1, f1, [Edge], "issue #697", None), ] @pytest.mark.parametrize("obj, target, expected", make_params(issues_matrix)) From 44faaae5a7ba1de7bb8467a2f94dac9cd2799896 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 5 Nov 2025 13:25:27 -0600 Subject: [PATCH 477/518] README.md -> use an absolute image link to fix logo on pypi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b17f25..cb7c309 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

    - build123d logo + build123d logo

    [![Documentation Status](https://readthedocs.org/projects/build123d/badge/?version=latest)](https://build123d.readthedocs.io/en/latest/?badge=latest) From 27567a10efe5d233acdac749d0582409e76800b5 Mon Sep 17 00:00:00 2001 From: snoyer Date: Fri, 7 Nov 2025 21:29:06 +0400 Subject: [PATCH 478/518] fix typo --- src/build123d/topology/two_d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 8c340a5..a41e249 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -2360,7 +2360,7 @@ class Shell(Mixin2D[TopoDS_Shell]): obj = obj_list[0] if isinstance(obj, Face): - if not obj.wrapped: + if not obj: raise ValueError(f"Can't create a Shell from empty Face") builder = BRep_Builder() shell = TopoDS_Shell() From 3bea4d32284b791cddff5ef4ee106b680eab22c2 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 7 Nov 2025 16:11:33 -0500 Subject: [PATCH 479/518] Re-add make_plane with depreciation warning --- src/build123d/topology/two_d.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 7c89746..82c09de 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -1014,6 +1014,21 @@ class Face(Mixin2D, Shape[TopoDS_Face]): ).Face() ) + @classmethod + def make_plane( + cls, + plane: Plane = Plane.XY, + ) -> Face: + """Create a unlimited size Face aligned with plane""" + warnings.warn( + "The 'make_plane' method is deprecated and will be removed in a future version.", + DeprecationWarning, + stacklevel=2, + ) + + pln_shape = BRepBuilderAPI_MakeFace(plane.wrapped).Face() + return cls(pln_shape) + @classmethod def make_rect(cls, width: float, height: float, plane: Plane = Plane.XY) -> Face: """make_rect From 513c50530c9ca5ebcae5034f3c4ec305b4c36ea9 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 8 Nov 2025 10:13:03 -0500 Subject: [PATCH 480/518] Added support for Face/cone properties: enhanced axis_of_rotation added semi_angle --- src/build123d/topology/two_d.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 8b8f264..d8517ef 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -60,6 +60,7 @@ import sys import warnings from abc import ABC, abstractmethod from collections.abc import Iterable, Sequence +from math import degrees from typing import TYPE_CHECKING, Any, TypeVar, overload import OCP.TopAbs as ta @@ -556,6 +557,11 @@ class Face(Mixin2D, Shape[TopoDS_Face]): if type(self.geom_adaptor()) == Geom_RectangularTrimmedSurface: return None + if self.geom_type == GeomType.CONE: + return Axis( + self.geom_adaptor().Cone().Axis() # type:ignore[attr-defined] + ) + if self.geom_type == GeomType.CYLINDER: return Axis( self.geom_adaptor().Cylinder().Axis() # type:ignore[attr-defined] @@ -837,6 +843,17 @@ class Face(Mixin2D, Shape[TopoDS_Face]): else: return None + @property + def semi_angle(self) -> None | float: + """Return the semi angle of a cone, otherwise None""" + if ( + self.geom_type == GeomType.CONE + and type(self.geom_adaptor()) != Geom_RectangularTrimmedSurface + ): + return degrees(self.geom_adaptor().SemiAngle()) # type:ignore[attr-defined] + else: + return None + @property def volume(self) -> float: """volume - the volume of this Face, which is always zero""" From 5d84002aa5211ace05a39b4891df052a5a180a83 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 12 Nov 2025 10:37:45 -0500 Subject: [PATCH 481/518] Add Color support for RGBA hex string --- src/build123d/geometry.py | 32 ++++++++++++++++++++++++----- tests/test_direct_api/test_color.py | 30 +++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index e4c0eeb..5952389 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1160,8 +1160,8 @@ class Color: Args: color_like (ColorLike): - name, ex: "red", - name + alpha, ex: ("red", 0.5), + name, ex: "red" or "#ff0000", + name + alpha, ex: ("red", 0.5) or "#ff000080", rgb, ex: (1., 0., 0.), rgb + alpha, ex: (1., 0., 0., 0.5), hex, ex: 0xff0000, @@ -1172,7 +1172,7 @@ class Color: @overload def __init__(self, name: str, alpha: float = 1.0): - """Color from name + """Color from name or hexadecimal string `CSS3 Color Names ` @@ -1180,8 +1180,10 @@ class Color: `OCCT Color Names `_ + Hexadecimal string may be RGB or RGBA format with leading "#" + Args: - name (str): color, e.g. "blue" + name (str): color, e.g. "blue" or "#0000ff"" alpha (float, optional): 0.0 <= alpha <= 1.0. Defaults to 1.0 """ @@ -1237,6 +1239,27 @@ class Color: return case str(): name, alpha = fill_defaults(args, (name, alpha)) + name = name.strip() + if "#" in name: + # extract alpha from hex string + hex_a = format(int(alpha * 255), "x") + if len(name) == 5: + hex_a = name[4] * 2 + name = name[:4] + elif len(name) == 9: + hex_a = name[7:9] + name = name[:7] + elif len(name) not in [4, 5, 7, 9]: + raise ValueError( + f'"{name}" is not a valid hexadecimal color value.' + ) + try: + if hex_a: + alpha = int(hex_a, 16) / 0xFF + except ValueError as ex: + raise ValueError( + f"Invald alpha hex string: {hex_a}" + ) from ex case int(): color_code, alpha = fill_defaults(args, (color_code, alpha)) case float(): @@ -1340,7 +1363,6 @@ class Color: @staticmethod def _rgb_from_str(name: str) -> tuple: - name = name.strip() if "#" not in name: try: # Use css3 color names by default diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py index 62c26bf..aab9254 100644 --- a/tests/test_direct_api/test_color.py +++ b/tests/test_direct_api/test_color.py @@ -137,6 +137,18 @@ class TestColor(unittest.TestCase): " #ff0000 ", ("#ff0000",), ("#ff0000", 1), + "#ff0000ff", + " #ff0000ff ", + ("#ff0000ff",), + ("#ff0000ff", .6), + "#f00", + " #f00 ", + ("#f00",), + ("#f00", 1), + "#f00f", + " #f00f ", + ("#f00f",), + ("#f00f", .6), 0xff0000, (0xff0000), (0xff0000, 0xff), @@ -164,6 +176,9 @@ class TestColor(unittest.TestCase): Quantity_ColorRGBA(1, 0, 0, 0.6), ("red", 0.6), ("#ff0000", 0.6), + ("#ff000099"), + ("#f00", 0.6), + ("#f009"), (0xff0000, 153), (1., 0., 0., 0.6) ] @@ -177,6 +192,21 @@ class TestColor(unittest.TestCase): with self.assertRaises(ValueError): Color("build123d") + with self.assertRaises(ValueError): + Color("#ff") + + with self.assertRaises(ValueError): + Color("#ffg") + + with self.assertRaises(ValueError): + Color("#fffff") + + with self.assertRaises(ValueError): + Color("#fffg") + + with self.assertRaises(ValueError): + Color("#fff00gg") + def test_bad_color_type(self): with self.assertRaises(TypeError): Color(dict({"name": "red", "alpha": 1})) From cc34b5a743f5983825988b9e28c46568b4aacd86 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 12 Nov 2025 12:18:30 -0500 Subject: [PATCH 482/518] Convert to pytest with parameterization and test ids --- tests/test_direct_api/test_color.py | 317 ++++++++++++---------------- 1 file changed, 140 insertions(+), 177 deletions(-) diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py index aab9254..4fa91fe 100644 --- a/tests/test_direct_api/test_color.py +++ b/tests/test_direct_api/test_color.py @@ -27,198 +27,161 @@ license: """ import copy -import unittest import numpy as np -from build123d.geometry import Color +import pytest + from OCP.Quantity import Quantity_ColorRGBA +from build123d.geometry import Color -class TestColor(unittest.TestCase): - # name + alpha overload - def test_name1(self): - c = Color("blue") - np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) +# Overloads +@pytest.mark.parametrize("color, expected", [ + pytest.param(Color("blue"), (0, 0, 1, 1), id="name"), + pytest.param(Color("blue", alpha=0.5), (0, 0, 1, 0.5), id="name + kw alpha"), + pytest.param(Color("blue", 0.5), (0, 0, 1, 0.5), id="name + alpha"), +]) +def test_overload_name(color, expected): + np.testing.assert_allclose(tuple(color), expected, 1e-5) - def test_name2(self): - c = Color("blue", alpha=0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) +@pytest.mark.parametrize("color, expected", [ + pytest.param(Color(0.0, 1.0, 0.0), (0, 1, 0, 1), id="rgb"), + pytest.param(Color(1.0, 1.0, 0.0, 0.5), (1, 1, 0, 0.5), id="rgba"), + pytest.param(Color(1.0, 1.0, 0.0, alpha=0.5), (1, 1, 0, 0.5), id="rgb + kw alpha"), + pytest.param(Color(red=0.1, green=0.2, blue=0.3, alpha=0.5), (0.1, 0.2, 0.3, 0.5), id="kw rgba"), +]) +def test_overload_rgba(color, expected): + np.testing.assert_allclose(tuple(color), expected, 1e-5) - def test_name3(self): - c = Color("blue", 0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) +@pytest.mark.parametrize("color, expected", [ + pytest.param(Color(0x996692), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), id="color_code"), + pytest.param(Color(0x006692, 0x80), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), id="color_code + alpha"), + pytest.param(Color(0x006692, alpha=0x80), (0, 102 / 255, 146 / 255, 128 / 255), id="color_code + kw alpha"), + pytest.param(Color(color_code=0x996692, alpha=0xCC), (153 / 255, 102 / 255, 146 / 255, 204 / 255), id="kw color_code + alpha"), +]) +def test_overload_hex(color, expected): + np.testing.assert_allclose(tuple(color), expected, 1e-5) - # red + green + blue + alpha overload - def test_rgb0(self): - c = Color(0.0, 1.0, 0.0) - np.testing.assert_allclose(tuple(c), (0, 1, 0, 1), 1e-5) +@pytest.mark.parametrize("color, expected", [ + pytest.param(Color((0.1,)), (0.1, 1.0, 1.0, 1.0), id="tuple r"), + pytest.param(Color((0.1, 0.2)), (0.1, 0.2, 1.0, 1.0), id="tuple rg"), + pytest.param(Color((0.1, 0.2, 0.3)), (0.1, 0.2, 0.3, 1.0), id="tuple rgb"), + pytest.param(Color((0.1, 0.2, 0.3, 0.4)), (0.1, 0.2, 0.3, 0.4), id="tuple rbga"), + pytest.param(Color((0.1, 0.2, 0.3, 0.4)), (0.1, 0.2, 0.3, 0.4), id="kw tuple"), +]) +def test_overload_tuple(color, expected): + np.testing.assert_allclose(tuple(color), expected, 1e-5) - def test_rgba1(self): - c = Color(1.0, 1.0, 0.0, 0.5) - self.assertEqual(c.wrapped.GetRGB().Red(), 1.0) - self.assertEqual(c.wrapped.GetRGB().Green(), 1.0) - self.assertEqual(c.wrapped.GetRGB().Blue(), 0.0) - self.assertEqual(c.wrapped.Alpha(), 0.5) +# ColorLikes +@pytest.mark.parametrize("color_like", [ + pytest.param(Quantity_ColorRGBA(1, 0, 0, 1), id="Quantity_ColorRGBA"), + pytest.param("red", id="name str"), + pytest.param("red ", id="name str whitespace"), + pytest.param(("red",), id="tuple name str"), + pytest.param(("red", 1), id="tuple name str + alpha"), + pytest.param("#ff0000", id="hex str rgb 24bit"), + pytest.param(" #ff0000 ", id="hex str rgb 24bit whitespace"), + pytest.param(("#ff0000",), id="tuple hex str rgb 24bit"), + pytest.param(("#ff0000", 1), id="tuple hex str rgb 24bit + alpha"), + pytest.param("#ff0000ff", id="hex str rgba 24bit"), + pytest.param(" #ff0000ff ", id="hex str rgba 24bit whitespace"), + pytest.param(("#ff0000ff",), id="tuple hex str rgba 24bit"), + pytest.param(("#ff0000ff", .6), id="tuple hex str rgba 24bit + alpha (not used)"), + pytest.param("#f00", id="hex str rgb 12bit"), + pytest.param(" #f00 ", id="hex str rgb 12bit whitespace"), + pytest.param(("#f00",), id="tuple hex str rgb 12bit"), + pytest.param(("#f00", 1), id="tuple hex str rgb 12bit + alpha"), + pytest.param("#f00f", id="hex str rgba 12bit"), + pytest.param(" #f00f ", id="hex str rgba 12bit whitespace"), + pytest.param(("#f00f",), id="tuple hex str rgba 12bit"), + pytest.param(("#f00f", .6), id="tuple hex str rgba 12bit + alpha (not used)"), + pytest.param(0xff0000, id="hex int"), + pytest.param((0xff0000), id="tuple hex int"), + pytest.param((0xff0000, 0xff), id="tuple hex int + alpha"), + pytest.param((1, 0, 0), id="tuple rgb int"), + pytest.param((1, 0, 0, 1), id="tuple rgba int"), + pytest.param((1., 0., 0.), id="tuple rgb float"), + pytest.param((1., 0., 0., 1.), id="tuple rgba float"), +]) +def test_color_likes(color_like): + expected = (1, 0, 0, 1) + np.testing.assert_allclose(tuple(Color(color_like)), expected, 1e-5) + np.testing.assert_allclose(tuple(Color(color_like=color_like)), expected, 1e-5) - def test_rgba2(self): - c = Color(1.0, 1.0, 0.0, alpha=0.5) - np.testing.assert_allclose(tuple(c), (1, 1, 0, 0.5), 1e-5) +@pytest.mark.parametrize("color_like, expected", [ + pytest.param(Color(), (1, 1, 1, 1), id="empty Color()"), + pytest.param(1., (1, 1, 1, 1), id="r float"), + pytest.param((1.,), (1, 1, 1, 1), id="tuple r float"), + pytest.param((1., 0.), (1, 0, 1, 1), id="tuple rg float"), +]) +def test_color_likes_incomplete(color_like, expected): + np.testing.assert_allclose(tuple(Color(color_like)), expected, 1e-5) + np.testing.assert_allclose(tuple(Color(color_like=color_like)), expected, 1e-5) - def test_rgba3(self): - c = Color(red=0.1, green=0.2, blue=0.3, alpha=0.5) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.5), 1e-5) +@pytest.mark.parametrize("color_like", [ + pytest.param(Quantity_ColorRGBA(1, 0, 0, 0.6), id="Quantity_ColorRGBA"), + pytest.param(("red", 0.6), id="tuple name str + alpha"), + pytest.param(("#ff0000", 0.6), id="tuple hex str rgb 24bit + alpha"), + pytest.param(("#ff000099"), id="tuple hex str rgba 24bit"), + pytest.param(("#f00", 0.6), id="tuple hex str rgb 12bit + alpha"), + pytest.param(("#f009"), id="tuple hex str rgba 12bit"), + pytest.param((0xff0000, 153), id="tuple hex int + alpha int"), + pytest.param((1., 0., 0., 0.6), id="tuple rbga float"), +]) +def test_color_likes_alpha(color_like): + expected = (1, 0, 0, 0.6) + np.testing.assert_allclose(tuple(Color(color_like)), expected, 1e-5) + np.testing.assert_allclose(tuple(Color(color_like=color_like)), expected, 1e-5) - # hex (int) + alpha overload - def test_hex(self): - c = Color(0x996692) - np.testing.assert_allclose( - tuple(c), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), 5 - ) +# Exceptions +@pytest.mark.parametrize("name", [ + pytest.param("build123d", id="invalid color name"), + pytest.param("#ffg", id="invalid rgb 12bit"), + pytest.param("#fffg", id="invalid rgba 12bit"), + pytest.param("#fffgg", id="invalid rgb 24bit"), + pytest.param("#fff00gg", id="invalid rgba 24bit"), + pytest.param("#ff", id="short rgb 12bit"), + pytest.param("#fffff", id="short rgb 24bit"), + pytest.param("#fffffff", id="short rgba 24bit"), + pytest.param("#fffffffff", id="long rgba 24bit"), +]) +def test_exceptions_color_name(name): + with pytest.raises(Exception): + Color(name) - c = Color(0x006692, 0x80) - np.testing.assert_allclose( - tuple(c), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), 5 - ) +@pytest.mark.parametrize("color_type", [ + pytest.param((dict({"name": "red", "alpha": 1},)), id="dict arg"), + pytest.param(("red", "blue"), id="str + str"), + pytest.param((1., "blue"), id="float + str order"), + pytest.param((1, "blue"), id="int + str order"), +]) +def test_exceptions_color_type(color_type): + with pytest.raises(Exception): + Color(*color_type) - c = Color(0x006692, alpha=0x80) - np.testing.assert_allclose(tuple(c), (0, 102 / 255, 146 / 255, 128 / 255), 1e-5) +# Methods +def test_rgba_wrapped(): + c = Color(1.0, 1.0, 0.0, 0.5) + assert c.wrapped.GetRGB().Red() == 1.0 + assert c.wrapped.GetRGB().Green() == 1.0 + assert c.wrapped.GetRGB().Blue() == 0.0 + assert c.wrapped.Alpha() == 0.5 - c = Color(color_code=0x996692, alpha=0xCC) - np.testing.assert_allclose( - tuple(c), (153 / 255, 102 / 255, 146 / 255, 204 / 255), 5 - ) +def test_to_tuple(): + c = Color("blue", alpha=0.5) + np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), rtol=1e-5) - c = Color(0.0, 0.0, 1.0, 1.0) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) +def test_copy(): + c = Color(0.1, 0.2, 0.3, alpha=0.4) + c_copy = copy.copy(c) + np.testing.assert_allclose(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), rtol=1e-5) - c = Color(0, 0, 1, 1) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 1), 1e-5) +def test_str_repr_is(): + c = Color(1, 0, 0) + assert str(c) == "Color: (1.0, 0.0, 0.0, 1.0) is 'RED'" + assert repr(c) == "Color(1.0, 0.0, 0.0, 1.0)" - # Methods - def test_to_tuple(self): - c = Color("blue", alpha=0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), 1e-5) - - def test_copy(self): - c = Color(0.1, 0.2, 0.3, alpha=0.4) - c_copy = copy.copy(c) - np.testing.assert_allclose(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), 1e-5) - - def test_str_repr(self): - c = Color(1, 0, 0) - self.assertEqual(str(c), "Color: (1.0, 0.0, 0.0, 1.0) is 'RED'") - self.assertEqual(repr(c), "Color(1.0, 0.0, 0.0, 1.0)") - - c = Color(1, .5, 0) - self.assertEqual(str(c), "Color: (1.0, 0.5, 0.0, 1.0) near 'DARKGOLDENROD1'") - self.assertEqual(repr(c), "Color(1.0, 0.5, 0.0, 1.0)") - - def test_tuple(self): - c = Color((0.1,)) - np.testing.assert_allclose(tuple(c), (0.1, 1.0, 1.0, 1.0), 1e-5) - c = Color((0.1, 0.2)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 1.0, 1.0), 1e-5) - c = Color((0.1, 0.2, 0.3)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 1.0), 1e-5) - c = Color((0.1, 0.2, 0.3, 0.4)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) - c = Color(color_like=(0.1, 0.2, 0.3, 0.4)) - np.testing.assert_allclose(tuple(c), (0.1, 0.2, 0.3, 0.4), 1e-5) - - # color_like overload - def test_color_like(self): - red_color_likes = [ - Quantity_ColorRGBA(1, 0, 0, 1), - "red", - "red ", - ("red",), - ("red", 1), - "#ff0000", - " #ff0000 ", - ("#ff0000",), - ("#ff0000", 1), - "#ff0000ff", - " #ff0000ff ", - ("#ff0000ff",), - ("#ff0000ff", .6), - "#f00", - " #f00 ", - ("#f00",), - ("#f00", 1), - "#f00f", - " #f00f ", - ("#f00f",), - ("#f00f", .6), - 0xff0000, - (0xff0000), - (0xff0000, 0xff), - (1, 0, 0), - (1, 0, 0, 1), - (1., 0., 0.), - (1., 0., 0., 1.) - ] - expected = (1, 0, 0, 1) - for cl in red_color_likes: - np.testing.assert_allclose(tuple(Color(cl)), expected, 1e-5) - np.testing.assert_allclose(tuple(Color(color_like=cl)), expected, 1e-5) - - incomplete_color_likes = [ - (Color(), (1, 1, 1, 1)), - (1., (1, 1, 1, 1)), - ((1.,), (1, 1, 1, 1)), - ((1., 0.), (1, 0, 1, 1)), - ] - for cl, expected in incomplete_color_likes: - np.testing.assert_allclose(tuple(Color(cl)), expected, 1e-5) - np.testing.assert_allclose(tuple(Color(color_like=cl)), expected, 1e-5) - - alpha_color_likes = [ - Quantity_ColorRGBA(1, 0, 0, 0.6), - ("red", 0.6), - ("#ff0000", 0.6), - ("#ff000099"), - ("#f00", 0.6), - ("#f009"), - (0xff0000, 153), - (1., 0., 0., 0.6) - ] - expected = (1, 0, 0, 0.6) - for cl in alpha_color_likes: - np.testing.assert_allclose(tuple(Color(cl)), expected, 1e-5) - np.testing.assert_allclose(tuple(Color(color_like=cl)), expected, 1e-5) - - # Exceptions - def test_bad_color_name(self): - with self.assertRaises(ValueError): - Color("build123d") - - with self.assertRaises(ValueError): - Color("#ff") - - with self.assertRaises(ValueError): - Color("#ffg") - - with self.assertRaises(ValueError): - Color("#fffff") - - with self.assertRaises(ValueError): - Color("#fffg") - - with self.assertRaises(ValueError): - Color("#fff00gg") - - def test_bad_color_type(self): - with self.assertRaises(TypeError): - Color(dict({"name": "red", "alpha": 1})) - - with self.assertRaises(TypeError): - Color("red", "blue") - - with self.assertRaises(TypeError): - Color(1., "blue") - - with self.assertRaises(TypeError): - Color(1, "blue") - -if __name__ == "__main__": - unittest.main() +def test_str_repr_near(): + c = Color(1, 0.5, 0) + assert str(c) == "Color: (1.0, 0.5, 0.0, 1.0) near 'DARKGOLDENROD1'" + assert repr(c) == "Color(1.0, 0.5, 0.0, 1.0)" From 083cb1611cd4db739bd1b2e8239cfca074fd8399 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Wed, 12 Nov 2025 12:29:48 -0500 Subject: [PATCH 483/518] Remove depreciated Color.to_tuple --- src/build123d/geometry.py | 10 ---------- tests/test_direct_api/test_color.py | 4 ---- 2 files changed, 14 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 5952389..e17d049 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -1319,16 +1319,6 @@ class Color: self.iter_index += 1 return value - def to_tuple(self): - """Value as tuple""" - warnings.warn( - "to_tuple is deprecated and will be removed in a future version. " - "Use 'tuple(Color)' instead.", - DeprecationWarning, - stacklevel=2, - ) - return tuple(self) - def __copy__(self) -> Color: """Return copy of self""" return Color(*tuple(self)) diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py index 4fa91fe..650f5c9 100644 --- a/tests/test_direct_api/test_color.py +++ b/tests/test_direct_api/test_color.py @@ -167,10 +167,6 @@ def test_rgba_wrapped(): assert c.wrapped.GetRGB().Blue() == 0.0 assert c.wrapped.Alpha() == 0.5 -def test_to_tuple(): - c = Color("blue", alpha=0.5) - np.testing.assert_allclose(tuple(c), (0, 0, 1, 0.5), rtol=1e-5) - def test_copy(): c = Color(0.1, 0.2, 0.3, alpha=0.4) c_copy = copy.copy(c) From 20854b3d4d3a3f6e4ecd35c4415807d4a106cf8a Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Wed, 12 Nov 2025 15:40:23 -0600 Subject: [PATCH 484/518] pyproject.toml -> pin to pytest==8.4.2 per pytest-dev/pytest-xdist/issues/1273 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fdb8bc0..22f6440 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ development = [ "black", "mypy", "pylint", - "pytest", + "pytest==8.4.2", # TODO: unpin on resolution of pytest-dev/pytest-xdist/issues/1273 "pytest-benchmark", "pytest-cov", "pytest-xdist", From 3877fd58762dba9a835f38eb5287841e3c071d4a Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 14 Nov 2025 12:58:46 -0500 Subject: [PATCH 485/518] Ignore orderless Shapes in _bool_op --- src/build123d/topology/shape_core.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index d366ead..3940276 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -2123,7 +2123,11 @@ class Shape(NodeMixin, Generic[TOPODS]): args = list(args) tools = list(tools) # Find the highest order class from all the inputs Solid > Vertex - order_dict = {type(s): type(s).order for s in [self] + args + tools} + order_dict = { + type(s): type(s).order + for s in [self] + args + tools + if hasattr(type(s), "order") + } highest_order = sorted(order_dict.items(), key=lambda item: item[1])[-1] # The base of the operation From 68f6ef2125e03aa34fe205b46c739afaeff1a363 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 14 Nov 2025 13:26:17 -0500 Subject: [PATCH 486/518] Convert intersect to use _bool_op and split Wire after intersect --- src/build123d/topology/one_d.py | 172 +++++++++------------ tests/test_direct_api/test_intersection.py | 4 +- 2 files changed, 78 insertions(+), 98 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 25b817a..b0a59c3 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -52,12 +52,11 @@ license: from __future__ import annotations import copy -import numpy as np import warnings -from collections.abc import Iterable +from collections.abc import Iterable, Sequence from itertools import combinations from math import atan2, ceil, copysign, cos, floor, inf, isclose, pi, radians -from typing import TYPE_CHECKING, Literal, TypeAlias, overload +from typing import TYPE_CHECKING, Literal, overload from typing import cast as tcast import numpy as np @@ -729,122 +728,103 @@ class Mixin1D(Shape): def to_vertex(objs: Iterable) -> ShapeList: return ShapeList([Vertex(v) if isinstance(v, Vector) else v for v in objs]) - common_set: ShapeList[Vertex | Edge] = ShapeList(self.edges()) - target: ShapeList | Shape | Plane + def bool_op( + args: Sequence, + tools: Sequence, + operation: BRepAlgoAPI_Section | BRepAlgoAPI_Common, + ) -> ShapeList: + # Wrap Shape._bool_op for corrected output + intersections: Shape | ShapeList = Shape()._bool_op(args, tools, operation) + if isinstance(intersections, ShapeList): + return intersections or ShapeList() + if isinstance(intersections, Shape) and not intersections.is_null: + return ShapeList([intersections]) + return ShapeList() + + def filter_shapes_by_order(shapes: ShapeList, orders: list) -> ShapeList: + # Remove lower order shapes from list which *appear* to be part of + # a higher order shape using a lazy distance check + # (sufficient for vertices, may be an issue for higher orders) + order_groups = [] + for order in orders: + order_groups.append( + ShapeList([s for s in shapes if isinstance(s, order)]) + ) + + filtered_shapes = order_groups[-1] + for i in range(len(order_groups) - 1): + los = order_groups[i] + his: list = sum(order_groups[i + 1 :], []) + filtered_shapes.extend( + ShapeList( + lo + for lo in los + if all(lo.distance_to(hi) > TOLERANCE for hi in his) + ) + ) + + return filtered_shapes + + common_set: ShapeList[Vertex | Edge | Wire] = ShapeList([self]) + target: Shape | Plane for other in to_intersect: # Conform target type - # Vertices need to be Vector for set() match other: case Axis(): - target = ShapeList([Edge(other)]) + # BRepAlgoAPI_Section seems happier if Edge isnt infinite + bbox = self.bounding_box() + dist = self.distance_to(other.position) + dist = dist if dist >= 1 else 1 + target = Edge.make_line( + other.position - other.direction * bbox.diagonal * dist, + other.position + other.direction * bbox.diagonal * dist, + ) case Plane(): target = other case Vector(): target = Vertex(other) case Location(): target = Vertex(other.position) - case Edge(): - target = ShapeList([other]) - case Wire(): - target = ShapeList(other.edges()) case _ if issubclass(type(other), Shape): target = other case _: raise ValueError(f"Unsupported type to_intersect: {type(other)}") # Find common matches - common: list[Vector | Edge] = [] - result: ShapeList | Shape | None + common: list[Vertex | Edge | Wire] = [] + result: ShapeList | None for obj in common_set: match (obj, target): - case obj, Shape() as target: - # Find Shape with Edge/Wire - if isinstance(target, Vertex): - result = Shape.intersect(obj, target) - else: - result = target.intersect(obj) + case (_, Plane()): + target = Shape(BRepBuilderAPI_MakeFace(other.wrapped).Face()) + operation = BRepAlgoAPI_Section() + result = bool_op((obj,), (target,), operation) + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (target,), operation)) - if result: - if not isinstance(result, list): - result = ShapeList([result]) - common.extend(to_vector(result)) + case (_, Vertex() | Edge() | Wire()): + operation = BRepAlgoAPI_Section() + section = bool_op((obj,), (target,), operation) + result = section + if not section: + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (target,), operation)) - case Vertex() as obj, target: - if not isinstance(target, ShapeList): - target = ShapeList([target]) + case _ if issubclass(type(target), Shape): + result = target.intersect(obj) - for tar in target: - if isinstance(tar, Edge): - result = Shape.intersect(obj, tar) - else: - result = obj.intersect(tar) - - if result: - if not isinstance(result, list): - result = ShapeList([result]) - common.extend(to_vector(result)) - - case Edge() as obj, ShapeList() as targets: - # Find any edge / edge intersection points - for tar in targets: - # Find crossing points - try: - intersection_points = obj.find_intersection_points(tar) - common.extend(intersection_points) - except ValueError: - pass - - # Find common end points - obj_end_points = set(Vector(v) for v in obj.vertices()) - tar_end_points = set(Vector(v) for v in tar.vertices()) - points = set.intersection(obj_end_points, tar_end_points) - common.extend(points) - - # Find Edge/Edge overlaps - result = obj._bool_op( - (obj,), targets, BRepAlgoAPI_Common() - ).edges() - common.extend(result if isinstance(result, list) else [result]) - - case Edge() as obj, Plane() as plane: - # Find any edge / plane intersection points & edges - # Find point intersections - if obj.wrapped is None: - continue - geom_line = BRep_Tool.Curve_s( - obj.wrapped, obj.param_at(0), obj.param_at(1) - ) - geom_plane = Geom_Plane(plane.local_coord_system) - intersection_calculator = GeomAPI_IntCS(geom_line, geom_plane) - plane_intersection_points: list[Vector] = [] - if intersection_calculator.IsDone(): - plane_intersection_points = [ - Vector(intersection_calculator.Point(i + 1)) - for i in range(intersection_calculator.NbPoints()) - ] - common.extend(plane_intersection_points) - - # Find edge intersections - if all( - plane.contains(v) - for v in obj.positions(i / 7 for i in range(8)) - ): # is a 2D edge - common.append(obj) + if result: + common.extend(result) if common: - common_set = to_vertex(set(common)) - # Remove Vertex intersections coincident to Edge intersections - vts = common_set.vertices() - eds = common_set.edges() - if vts and eds: - filtered_vts = ShapeList( - [ - v - for v in vts - if all(v.distance_to(e) > TOLERANCE for e in eds) - ] - ) - common_set = filtered_vts + eds + common_set = ShapeList() + for shape in common: + if isinstance(shape, Wire): + common_set.extend(shape.edges()) + else: + common_set.append(shape) + common_set = to_vertex(set(to_vector(common_set))) + common_set = filter_shapes_by_order(common_set, [Vertex, Edge]) else: return None diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index daad2bf..3a67415 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -296,7 +296,7 @@ sl1 = Box(2, 2, 2).solid() sl2 = Pos(Z=5) * Box(2, 2, 2).solid() sl3 = Cylinder(2, 1).solid() - Cylinder(1.5, 1).solid() -wi7 = Wire([l1 := sl3.faces().sort_by(Axis.Z)[-1].edge().trim(.3, .4), +wi7 = Wire([l1 := sl3.faces().sort_by(Axis.Z)[-1].edges()[0].trim(.3, .4), l2 := l1.trim(2, 3), RadiusArc(l1 @ 1, l2 @ 0, 1, short_sagitta=False) ]) @@ -430,7 +430,7 @@ freecad_matrix = [ Case(vert, e1, [Vertex], "vertical, ellipse, tangent", None), Case(horz, e1, [Vertex], "horizontal, ellipse, tangent", None), - Case(c1, c2, [Vertex, Vertex], "circle, skew, intersect", "Should return 2 Vertices"), + Case(c1, c2, [Vertex, Vertex], "circle, skew, intersect", None), Case(c1, horz, [Vertex], "circle, horiz, tangent", None), Case(c2, horz, [Vertex], "circle, horiz, tangent", None), Case(c1, vert, [Vertex], "circle, vert, tangent", None), From c384df21c7755d5bdaa58890704dce6c0d19c8f2 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 14 Nov 2025 13:31:40 -0500 Subject: [PATCH 487/518] Intersect: dissolve Wire, Shell after intersection, no need to process 0d, 1d separately --- src/build123d/topology/composite.py | 113 +++++++++++++--------------- src/build123d/topology/three_d.py | 76 +++++++++---------- src/build123d/topology/two_d.py | 71 ++++++++--------- 3 files changed, 127 insertions(+), 133 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 0849e69..3e0b4b3 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -728,24 +728,19 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): args: Sequence, tools: Sequence, operation: BRepAlgoAPI_Common | BRepAlgoAPI_Section, - ) -> ShapeList | None: + ) -> ShapeList: # Wrap Shape._bool_op for corrected output - intersections = args[0]._bool_op(args, tools, operation) + intersections: Shape | ShapeList = Shape()._bool_op(args, tools, operation) if isinstance(intersections, ShapeList): - return intersections or None + return intersections if isinstance(intersections, Shape) and not intersections.is_null: return ShapeList([intersections]) - return None + return ShapeList() def expand_compound(compound: Compound) -> ShapeList: shapes = ShapeList(compound.children) for shape_type in [Vertex, Edge, Wire, Face, Shell, Solid]: - new = compound.get_type(shape_type) - if shape_type == Wire: - new = [edge for new_shape in new for edge in new_shape.edges()] - elif shape_type == Shell: - new = [face for new_shape in new for face in new_shape.faces()] - shapes.extend(new) + shapes.extend(compound.get_type(shape_type)) return shapes def filter_shapes_by_order(shapes: ShapeList, orders: list) -> ShapeList: @@ -772,14 +767,20 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): return filtered_shapes - common_set: ShapeList[Vertex | Edge | Face | Solid] = expand_compound(self) + common_set: ShapeList[Shape] = expand_compound(self) target: ShapeList | Shape for other in to_intersect: # Conform target type - # Vertices need to be Vector for set() match other: case Axis(): - target = Edge(other) + # BRepAlgoAPI_Section seems happier if Edge isnt infinite + bbox = self.bounding_box() + dist = self.distance_to(other.position) + dist = dist if dist >= 1 else 1 + target = Edge.make_line( + other.position - other.direction * bbox.diagonal * dist, + other.position + other.direction * bbox.diagonal * dist, + ) case Plane(): target = Face.make_plane(other) case Vector(): @@ -794,58 +795,50 @@ class Compound(Mixin3D, Shape[TopoDS_Compound]): raise ValueError(f"Unsupported type to_intersect: {type(other)}") # Find common matches - common: list[Vector | Edge | Face] = [] - result: ShapeList | Shape | None + common: list[Vertex | Edge | Wire | Face | Shell | Solid] = [] + result: ShapeList for obj in common_set: - match (obj, target): - case (Vertex(), Vertex()): - result = obj.intersect(target) - - case (Edge(), Edge() | Wire()): - result = obj.intersect(target) - - case (_, ShapeList()): - result = ShapeList() - for t in target: - if ( - not isinstance(obj, Edge) and not isinstance(t, (Edge)) - ) or (isinstance(obj, Solid) or isinstance(t, Solid)): - # Face + Edge combinations may produce an intersection - # with Common but always with Section. - # No easy way to deduplicate - # Many Solid + Edge combinations need Common - operation = BRepAlgoAPI_Common() - result.extend(bool_op((obj,), (t,), operation) or []) - operation = BRepAlgoAPI_Section() - result.extend(bool_op((obj,), (t,), operation) or []) - - case _ if issubclass(type(target), Shape): - if isinstance(target, Wire): - targets = target.edges() - elif isinstance(target, Shell): - targets = target.faces() - else: - targets = ShapeList([target]) - - result = ShapeList() - for t in targets: - if ( - not isinstance(obj, Edge) and not isinstance(t, (Edge)) - ) or (isinstance(obj, Solid) or isinstance(t, Solid)): - # Face + Edge combinations may produce an intersection - # with Common but always with Section. - # No easy way to deduplicate - # Many Solid + Edge combinations need Common - operation = BRepAlgoAPI_Common() - result.extend(bool_op((obj,), (t,), operation) or []) - operation = BRepAlgoAPI_Section() - result.extend(bool_op((obj,), (t,), operation) or []) + if isinstance(target, Shape): + target = ShapeList([target]) + result = ShapeList() + for t in target: + operation = BRepAlgoAPI_Section() + result.extend(bool_op((obj,), (t,), operation)) + if ( + not isinstance(obj, Edge | Wire) + and not isinstance(t, Edge | Wire) + ) or ( + isinstance(obj, Solid | Compound) + or isinstance(t, Solid | Compound) + ): + # Face + Edge combinations may produce an intersection + # with Common but always with Section. + # No easy way to deduplicate + # Many Solid + Edge combinations need Common + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (t,), operation)) if result: - common.extend(to_vector(result)) + common.extend(result) + expanded: ShapeList = ShapeList() if common: - common_set = to_vertex(set(common)) + for shape in common: + if isinstance(shape, Compound): + expanded.extend(expand_compound(shape)) + else: + expanded.append(shape) + + if expanded: + common_set = ShapeList() + for shape in expanded: + if isinstance(shape, Wire): + common_set.extend(shape.edges()) + elif isinstance(shape, Shell): + common_set.extend(shape.faces()) + else: + common_set.append(shape) + common_set = to_vertex(set(to_vector(common_set))) common_set = filter_shapes_by_order( common_set, [Vertex, Edge, Face, Solid] ) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 9e22ce5..16379fb 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -443,14 +443,14 @@ class Mixin3D(Shape): args: Sequence, tools: Sequence, operation: BRepAlgoAPI_Common | BRepAlgoAPI_Section, - ) -> ShapeList | None: + ) -> ShapeList: # Wrap Shape._bool_op for corrected output - intersections = args[0]._bool_op(args, tools, operation) + intersections: Shape | ShapeList = Shape()._bool_op(args, tools, operation) if isinstance(intersections, ShapeList): - return intersections or None + return intersections or ShapeList() if isinstance(intersections, Shape) and not intersections.is_null: return ShapeList([intersections]) - return None + return ShapeList() def filter_shapes_by_order(shapes: ShapeList, orders: list) -> ShapeList: # Remove lower order shapes from list which *appear* to be part of @@ -476,14 +476,20 @@ class Mixin3D(Shape): return filtered_shapes - common_set: ShapeList[Vertex | Edge | Face | Solid] = ShapeList(self.solids()) - target: ShapeList | Shape + common_set: ShapeList[Vertex | Edge | Face | Solid] = ShapeList([self]) + target: Shape for other in to_intersect: # Conform target type - # Vertices need to be Vector for set() match other: case Axis(): - target = Edge(other) + # BRepAlgoAPI_Section seems happier if Edge isnt infinite + bbox = self.bounding_box() + dist = self.distance_to(other.position) + dist = dist if dist >= 1 else 1 + target = Edge.make_line( + other.position - other.direction * bbox.diagonal * dist, + other.position + other.direction * bbox.diagonal * dist, + ) case Plane(): target = Face.make_plane(other) case Vector(): @@ -496,46 +502,40 @@ class Mixin3D(Shape): raise ValueError(f"Unsupported type to_intersect: {type(other)}") # Find common matches - common: list[Vector | Edge | Face] = [] - result: ShapeList | Shape | None + common: list[Vertex | Edge | Wire | Face | Shell | Solid] = [] + result: ShapeList | None for obj in common_set: match (obj, target): - case (Vertex(), Vertex()): - result = obj.intersect(target) - - case (Edge(), Edge() | Wire()): - result = obj.intersect(target) - case (_, Vertex() | Edge() | Wire() | Face() | Shell() | Solid()): - if isinstance(target, Wire): - targets = target.edges() - elif isinstance(target, Shell): - targets = target.faces() - else: - targets = ShapeList([target]) - - result = ShapeList() - for t in targets: - if ( - not isinstance(obj, Edge) and not isinstance(t, (Edge)) - ) or (isinstance(obj, Solid) or isinstance(t, Solid)): - # Face + Edge combinations may produce an intersection - # with Common but always with Section. - # No easy way to deduplicate - # Many Solid + Edge combinations need Common - operation = BRepAlgoAPI_Common() - result.extend(bool_op((obj,), (t,), operation) or []) - operation = BRepAlgoAPI_Section() - result.extend(bool_op((obj,), (t,), operation) or []) + operation = BRepAlgoAPI_Section() + result = bool_op((obj,), (target,), operation) + if ( + not isinstance(obj, Edge | Wire) + and not isinstance(target, (Edge | Wire)) + ) or (isinstance(obj, Solid) or isinstance(target, Solid)): + # Face + Edge combinations may produce an intersection + # with Common but always with Section. + # No easy way to deduplicate + # Many Solid + Edge combinations need Common + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (target,), operation)) case _ if issubclass(type(target), Shape): result = target.intersect(obj) if result: - common.extend(to_vector(result)) + common.extend(result) if common: - common_set = to_vertex(set(common)) + common_set = ShapeList() + for shape in common: + if isinstance(shape, Wire): + common_set.extend(shape.edges()) + elif isinstance(shape, Shell): + common_set.extend(shape.faces()) + else: + common_set.append(shape) + common_set = to_vertex(set(to_vector(common_set))) common_set = filter_shapes_by_order( common_set, [Vertex, Edge, Face, Solid] ) diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 862184b..2519c82 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -301,14 +301,14 @@ class Mixin2D(ABC, Shape): args: Sequence, tools: Sequence, operation: BRepAlgoAPI_Section | BRepAlgoAPI_Common, - ) -> ShapeList | None: + ) -> ShapeList: # Wrap Shape._bool_op for corrected output - intersections = args[0]._bool_op(args, tools, operation) + intersections: Shape | ShapeList = Shape()._bool_op(args, tools, operation) if isinstance(intersections, ShapeList): - return intersections or None + return intersections or ShapeList() if isinstance(intersections, Shape) and not intersections.is_null: return ShapeList([intersections]) - return None + return ShapeList() def filter_shapes_by_order(shapes: ShapeList, orders: list) -> ShapeList: # Remove lower order shapes from list which *appear* to be part of @@ -334,14 +334,20 @@ class Mixin2D(ABC, Shape): return filtered_shapes - common_set: ShapeList[Vertex | Edge | Face] = ShapeList(self.faces()) - target: ShapeList | Shape + common_set: ShapeList[Vertex | Edge | Face | Shell] = ShapeList([self]) + target: Shape for other in to_intersect: # Conform target type - # Vertices need to be Vector for set() match other: case Axis(): - target = Edge(other) + # BRepAlgoAPI_Section seems happier if Edge isnt infinite + bbox = self.bounding_box() + dist = self.distance_to(other.position) + dist = dist if dist >= 1 else 1 + target = Edge.make_line( + other.position - other.direction * bbox.diagonal * dist, + other.position + other.direction * bbox.diagonal * dist, + ) case Plane(): target = Face.make_plane(other) case Vector(): @@ -354,43 +360,38 @@ class Mixin2D(ABC, Shape): raise ValueError(f"Unsupported type to_intersect: {type(other)}") # Find common matches - common: list[Vector | Edge | Face] = [] - result: ShapeList | Shape | None + common: list[Vertex | Edge | Wire | Face | Shell] = [] + result: ShapeList | None for obj in common_set: match (obj, target): - case (Vertex(), Vertex()): - result = obj.intersect(target) - - case (Edge(), Edge() | Wire()): - result = obj.intersect(target) - case (_, Vertex() | Edge() | Wire() | Face() | Shell()): - if isinstance(target, Wire): - targets = target.edges() - elif isinstance(target, Shell): - targets = target.faces() - else: - targets = ShapeList([target]) - - result = ShapeList() - for t in targets: - if not isinstance(obj, Edge) and not isinstance(t, (Edge)): - # Face + Edge combinations may produce an intersection - # with Common but always with Section. - # No easy way to deduplicate - operation = BRepAlgoAPI_Common() - result.extend(bool_op((obj,), (t,), operation) or []) - operation = BRepAlgoAPI_Section() - result.extend(bool_op((obj,), (t,), operation) or []) + operation = BRepAlgoAPI_Section() + result = bool_op((obj,), (target,), operation) + if not isinstance(obj, Edge | Wire) and not isinstance( + target, (Edge | Wire) + ): + # Face + Edge combinations may produce an intersection + # with Common but always with Section. + # No easy way to deduplicate + operation = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (target,), operation)) case _ if issubclass(type(target), Shape): result = target.intersect(obj) if result: - common.extend(to_vector(result)) + common.extend(result) if common: - common_set = to_vertex(set(common)) + common_set = ShapeList() + for shape in common: + if isinstance(shape, Wire): + common_set.extend(shape.edges()) + elif isinstance(shape, Shell): + common_set.extend(shape.faces()) + else: + common_set.append(shape) + common_set = to_vertex(set(to_vector(common_set))) common_set = filter_shapes_by_order(common_set, [Vertex, Edge, Face]) else: return None From 5523a2184c27a7936294d312d86f4535f08d05d5 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 14 Nov 2025 14:40:58 -0500 Subject: [PATCH 488/518] Revert mode == Mode.INTERSECT iteration. pass Compound instead --- src/build123d/build_common.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py index abfa4a0..d14b556 100644 --- a/src/build123d/build_common.py +++ b/src/build123d/build_common.py @@ -466,13 +466,7 @@ class Builder(ABC, Generic[ShapeT]): elif mode == Mode.INTERSECT: if self._obj is None: raise RuntimeError("Nothing to intersect with") - intersections: ShapeList[Shape] = ShapeList() - for target in typed[self._shape]: - result = self._obj.intersect(target) - if result is None: - continue - intersections.extend(result) - combined = self._sub_class(intersections) + combined = self._obj.intersect(Compound(typed[self._shape])) elif mode == Mode.REPLACE: combined = self._sub_class(list(typed[self._shape])) From 5f67a1932afc03f425bd4e8231e80b4c439d2a42 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 14 Nov 2025 17:30:55 -0500 Subject: [PATCH 489/518] Update for dev merge to Compound and Face(Plane) --- src/build123d/topology/composite.py | 2 +- src/build123d/topology/three_d.py | 2 +- src/build123d/topology/two_d.py | 2 +- tests/test_direct_api/test_intersection.py | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index be136b2..14c67b4 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -782,7 +782,7 @@ class Compound(Mixin3D[TopoDS_Compound]): other.position + other.direction * bbox.diagonal * dist, ) case Plane(): - target = Face.make_plane(other) + target = Face(other) case Vector(): target = Vertex(other) case Location(): diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 80a8239..279f46f 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -491,7 +491,7 @@ class Mixin3D(Shape[TOPODS]): other.position + other.direction * bbox.diagonal * dist, ) case Plane(): - target = Face.make_plane(other) + target = Face(other) case Vector(): target = Vertex(other) case Location(): diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 37f51f0..450fa10 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -350,7 +350,7 @@ class Mixin2D(ABC, Shape[TOPODS]): other.position + other.direction * bbox.diagonal * dist, ) case Plane(): - target = Face.make_plane(other) + target = Face(other) case Vector(): target = Vertex(other) case Location(): diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index 3a67415..758fd6f 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -355,10 +355,10 @@ def test_shape_3d(obj, target, expected): run_test(obj, target, expected) # Compound Shapes -cp1 = Compound() + GridLocations(5, 0, 2, 1) * Vertex() -cp2 = Compound() + GridLocations(5, 0, 2, 1) * Line((0, -1), (0, 1)) -cp3 = Compound() + GridLocations(5, 0, 2, 1) * Rectangle(2, 2) -cp4 = Compound() + GridLocations(5, 0, 2, 1) * Box(2, 2, 2) +cp1 = Compound(GridLocations(5, 0, 2, 1) * Vertex()) +cp2 = Compound(GridLocations(5, 0, 2, 1) * Line((0, -1), (0, 1))) +cp3 = Compound(GridLocations(5, 0, 2, 1) * Rectangle(2, 2)) +cp4 = Compound(GridLocations(5, 0, 2, 1) * Box(2, 2, 2)) cv1 = Curve() + [ed1, ed2, ed3] sk1 = Sketch() + [fc1, fc2, fc3] From 173c7b08e22f961265377b595c49fa9ca7920c3a Mon Sep 17 00:00:00 2001 From: x0pherl Date: Thu, 30 Oct 2025 21:08:26 -0400 Subject: [PATCH 490/518] added support for passing an iterable of radii to FilletPolyline. --- src/build123d/objects_curve.py | 22 +++++++++++++---- tests/test_build_line.py | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 262f9cf..6fbfbf6 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -793,7 +793,7 @@ class FilletPolyline(BaseLineObject): Args: pts (VectorLike | Iterable[VectorLike]): sequence of two or more points - radius (float): fillet radius + radius (float | Iterable[float]): radius to fillet at each vertex or a single value for all vertices close (bool, optional): close end points with extra Edge and corner fillets. Defaults to False mode (Mode, optional): combination mode. Defaults to Mode.ADD @@ -808,7 +808,7 @@ class FilletPolyline(BaseLineObject): def __init__( self, *pts: VectorLike | Iterable[VectorLike], - radius: float, + radius: float | Iterable[float], close: bool = False, mode: Mode = Mode.ADD, ): @@ -819,7 +819,16 @@ class FilletPolyline(BaseLineObject): if len(points) < 2: raise ValueError("FilletPolyline requires two or more pts") - if radius <= 0: + + if isinstance(radius, (int, float)): + radius_list = [radius] * len(points) # Single radius for all points + else: + radius_list = list(radius) + if len(radius_list) != len(points): + raise ValueError( + f"radius list length ({len(radius_list)}) must match points ({len(points)})" + ) + if any(r <= 0 for r in radius_list): raise ValueError("radius must be positive") lines_pts = WorkplaneList.localize(*points) @@ -852,12 +861,14 @@ class FilletPolyline(BaseLineObject): # For each corner vertex create a new fillet Edge fillets = [] - for vertex, edges in vertex_to_edges.items(): + for i, (vertex, edges) in enumerate(vertex_to_edges.items()): if len(edges) != 2: continue other_vertices = {ve for e in edges for ve in e.vertices() if ve != vertex} third_edge = Edge.make_line(*[v for v in other_vertices]) - fillet_face = Face(Wire(edges + [third_edge])).fillet_2d(radius, [vertex]) + fillet_face = Face(Wire(edges + [third_edge])).fillet_2d( + radius_list[i], [vertex] + ) fillets.append(fillet_face.edges().filter_by(GeomType.CIRCLE)[0]) # Create the Edges that join the fillets @@ -1597,6 +1608,7 @@ class ArcArcTangentLine(BaseEdgeObject): Defaults to Keep.INSIDE mode (Mode, optional): combination mode. Defaults to Mode.ADD """ + warnings.warn( "The 'ArcArcTangentLine' object is deprecated and will be removed in a future version.", DeprecationWarning, diff --git a/tests/test_build_line.py b/tests/test_build_line.py index 01c2fbe..7b5858f 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -183,6 +183,49 @@ class BuildLineTests(unittest.TestCase): self.assertEqual(len(p.edges().filter_by(GeomType.CIRCLE)), 2) self.assertEqual(len(p.edges().filter_by(GeomType.LINE)), 3) + with self.assertRaises(ValueError): + p = FilletPolyline( + (0, 0), + (10, 0), + (10, 10), + (0, 10), + radius=(1, 2, 3, 0), + close=True, + ) + + with self.assertRaises(ValueError): + p = FilletPolyline( + (0, 0), + (10, 0), + (10, 10), + (0, 10), + radius=-1, + close=True, + ) + + with self.assertRaises(ValueError): + p = FilletPolyline( + (0, 0), + (10, 0), + (10, 10), + (0, 10), + radius=(1, 2), + close=True, + ) + + with BuildLine(Plane.YZ): + p = FilletPolyline( + (0, 0), + (10, 0), + (10, 10), + (0, 10), + radius=(1, 2, 3, 4), + close=True, + ) + self.assertEqual(len(p.edges()), 8) + self.assertEqual(len(p.edges().filter_by(GeomType.CIRCLE)), 4) + self.assertEqual(len(p.edges().filter_by(GeomType.LINE)), 4) + with BuildLine(Plane.YZ): p = FilletPolyline( (0, 0, 0), (0, 0, 10), (10, 2, 10), (10, 0, 0), radius=2, close=True From e92255cefcda727304e2022655773813aa728db3 Mon Sep 17 00:00:00 2001 From: x0pherl Date: Fri, 31 Oct 2025 23:18:54 -0400 Subject: [PATCH 491/518] updated to handle polygons without closed lines --- src/build123d/objects_curve.py | 11 ++++++----- tests/test_build_line.py | 10 ++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 6fbfbf6..71d788b 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -824,12 +824,13 @@ class FilletPolyline(BaseLineObject): radius_list = [radius] * len(points) # Single radius for all points else: radius_list = list(radius) - if len(radius_list) != len(points): + if len(radius_list) != len(points) - int(not close) * 2: raise ValueError( - f"radius list length ({len(radius_list)}) must match points ({len(points)})" + f"radius list length ({len(radius_list)}) must match angle count ({ len(points) - int(not close) * 2})" ) - if any(r <= 0 for r in radius_list): - raise ValueError("radius must be positive") + for r in radius_list: + if r <= 0: + raise ValueError(f"radius {r} must be positive") lines_pts = WorkplaneList.localize(*points) @@ -867,7 +868,7 @@ class FilletPolyline(BaseLineObject): other_vertices = {ve for e in edges for ve in e.vertices() if ve != vertex} third_edge = Edge.make_line(*[v for v in other_vertices]) fillet_face = Face(Wire(edges + [third_edge])).fillet_2d( - radius_list[i], [vertex] + radius_list[i - int(not close)], [vertex] ) fillets.append(fillet_face.edges().filter_by(GeomType.CIRCLE)[0]) diff --git a/tests/test_build_line.py b/tests/test_build_line.py index 7b5858f..be4cd8d 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -193,6 +193,16 @@ class BuildLineTests(unittest.TestCase): close=True, ) + with self.assertRaises(ValueError): + p = FilletPolyline( + (0, 0), + (10, 0), + (10, 10), + (0, 10), + radius=(1, 2, 3, 4), + close=False, + ) + with self.assertRaises(ValueError): p = FilletPolyline( (0, 0), From dc90a4b15a291b2584bd4917f9bd71eef7889769 Mon Sep 17 00:00:00 2001 From: Alex Verschoot Date: Sun, 16 Nov 2025 15:48:30 +0100 Subject: [PATCH 492/518] Changed the FilletPolyLine to be compatible with 0-radius fillets, where it should behave like a normal Polyline --- src/build123d/objects_curve.py | 109 ++++++++++++++++++++++++--------- 1 file changed, 80 insertions(+), 29 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 71d788b..61731bd 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -787,20 +787,22 @@ class Helix(BaseEdgeObject): class FilletPolyline(BaseLineObject): """Line Object: Fillet Polyline - Create a sequence of straight lines defined by successive points that are filleted to a given radius. Args: pts (VectorLike | Iterable[VectorLike]): sequence of two or more points - radius (float | Iterable[float]): radius to fillet at each vertex or a single value for all vertices + radius (float | Iterable[float]): radius to fillet at each vertex or a single value for all vertices. + A radius of 0 will create a sharp corner (vertex without fillet). + close (bool, optional): close end points with extra Edge and corner fillets. Defaults to False + mode (Mode, optional): combination mode. Defaults to Mode.ADD Raises: ValueError: Two or more points not provided - ValueError: radius must be positive + ValueError: radius must be non-negative """ _applies_to = [BuildLine._tag] @@ -812,9 +814,9 @@ class FilletPolyline(BaseLineObject): close: bool = False, mode: Mode = Mode.ADD, ): + context: BuildLine | None = BuildLine._get_context(self) validate_inputs(context, self) - points = flatten_sequence(*pts) if len(points) < 2: @@ -822,30 +824,35 @@ class FilletPolyline(BaseLineObject): if isinstance(radius, (int, float)): radius_list = [radius] * len(points) # Single radius for all points + else: radius_list = list(radius) if len(radius_list) != len(points) - int(not close) * 2: raise ValueError( f"radius list length ({len(radius_list)}) must match angle count ({ len(points) - int(not close) * 2})" ) + for r in radius_list: - if r <= 0: - raise ValueError(f"radius {r} must be positive") + if r < 0: + raise ValueError(f"radius {r} must be non-negative") lines_pts = WorkplaneList.localize(*points) - # Create the polyline + new_edges = [ Edge.make_line(lines_pts[i], lines_pts[i + 1]) for i in range(len(lines_pts) - 1) ] + if close and (new_edges[0] @ 0 - new_edges[-1] @ 1).length > 1e-5: new_edges.append(Edge.make_line(new_edges[-1] @ 1, new_edges[0] @ 0)) + wire_of_lines = Wire(new_edges) # Create a list of vertices from wire_of_lines in the same order as # the original points so the resulting fillet edges are ordered ordered_vertices = [] + for pnts in lines_pts: distance = { v: (Vector(pnts) - Vector(*v)).length for v in wire_of_lines.vertices() @@ -853,46 +860,90 @@ class FilletPolyline(BaseLineObject): ordered_vertices.append(sorted(distance.items(), key=lambda x: x[1])[0][0]) # Fillet the corners - # Create a map of vertices to edges containing that vertex vertex_to_edges = { v: [e for e in wire_of_lines.edges() if v in e.vertices()] for v in ordered_vertices } - # For each corner vertex create a new fillet Edge + # For each corner vertex create a new fillet Edge (or keep as vertex if radius is 0) fillets = [] + for i, (vertex, edges) in enumerate(vertex_to_edges.items()): if len(edges) != 2: continue - other_vertices = {ve for e in edges for ve in e.vertices() if ve != vertex} - third_edge = Edge.make_line(*[v for v in other_vertices]) - fillet_face = Face(Wire(edges + [third_edge])).fillet_2d( - radius_list[i - int(not close)], [vertex] - ) - fillets.append(fillet_face.edges().filter_by(GeomType.CIRCLE)[0]) + current_radius = radius_list[i - int(not close)] + + if current_radius == 0: + # For 0 radius, store the vertex as a marker for a sharp corner + fillets.append(None) + + else: + other_vertices = {ve for e in edges for ve in e.vertices() if ve != vertex} + third_edge = Edge.make_line(*[v for v in other_vertices]) + fillet_face = Face(Wire(edges + [third_edge])).fillet_2d( + current_radius, [vertex] + ) + fillets.append(fillet_face.edges().filter_by(GeomType.CIRCLE)[0]) # Create the Edges that join the fillets if close: - interior_edges = [ - Edge.make_line(fillets[i - 1] @ 1, fillets[i] @ 0) - for i in range(len(fillets)) - ] - end_edges = [] - else: - interior_edges = [ - Edge.make_line(fillets[i] @ 1, f @ 0) for i, f in enumerate(fillets[1:]) - ] - end_edges = [ - Edge.make_line(wire_of_lines @ 0, fillets[0] @ 0), - Edge.make_line(fillets[-1] @ 1, wire_of_lines @ 1), - ] + interior_edges = [] - new_wire = Wire(end_edges + interior_edges + fillets) + for i in range(len(fillets)): + prev_idx = i - 1 + curr_idx = i + # Determine start and end points + if fillets[prev_idx] is None: + start_pt = ordered_vertices[prev_idx] + else: + start_pt = fillets[prev_idx] @ 1 + + if fillets[curr_idx] is None: + end_pt = ordered_vertices[curr_idx] + else: + end_pt = fillets[curr_idx] @ 0 + interior_edges.append(Edge.make_line(start_pt, end_pt)) + + end_edges = [] + + else: + interior_edges = [] + for i in range(len(fillets) - 1): + curr_idx = i + next_idx = i + 1 + # Determine start and end points + if fillets[curr_idx] is None: + start_pt = ordered_vertices[curr_idx + 1] # +1 because first vertex has no fillet + else: + start_pt = fillets[curr_idx] @ 1 + + if fillets[next_idx] is None: + end_pt = ordered_vertices[next_idx + 1] + else: + end_pt = fillets[next_idx] @ 0 + interior_edges.append(Edge.make_line(start_pt, end_pt)) + + # Handle end edges + if fillets[0] is None: + start_edge = Edge.make_line(wire_of_lines @ 0, ordered_vertices[1]) + else: + start_edge = Edge.make_line(wire_of_lines @ 0, fillets[0] @ 0) + + if fillets[-1] is None: + end_edge = Edge.make_line(ordered_vertices[-2], wire_of_lines @ 1) + else: + end_edge = Edge.make_line(fillets[-1] @ 1, wire_of_lines @ 1) + end_edges = [start_edge, end_edge] + + # Filter out None values from fillets (these are 0-radius corners) + actual_fillets = [f for f in fillets if f is not None] + new_wire = Wire(end_edges + interior_edges + actual_fillets) super().__init__(new_wire, mode=mode) + class JernArc(BaseEdgeObject): """Line Object: Jern Arc From c7034202f31b909703a2b310aa4ff2886df6cdee Mon Sep 17 00:00:00 2001 From: Alex Verschoot Date: Sun, 16 Nov 2025 16:15:13 +0100 Subject: [PATCH 493/518] Changed the tests to not expect a valueorrer when having a 0 radius, but add two assertEquals so the number of Circles and Lines should be correct --- tests/test_build_line.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_build_line.py b/tests/test_build_line.py index be4cd8d..16f89ce 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -183,7 +183,7 @@ class BuildLineTests(unittest.TestCase): self.assertEqual(len(p.edges().filter_by(GeomType.CIRCLE)), 2) self.assertEqual(len(p.edges().filter_by(GeomType.LINE)), 3) - with self.assertRaises(ValueError): + with BuildLine(Plane.YZ): p = FilletPolyline( (0, 0), (10, 0), @@ -192,6 +192,9 @@ class BuildLineTests(unittest.TestCase): radius=(1, 2, 3, 0), close=True, ) + self.assertEqual(len(p.edges().filter_by(GeomType.CIRCLE)), 3) + self.assertEqual(len(p.edges().filter_by(GeomType.LINE)), 4) + with self.assertRaises(ValueError): p = FilletPolyline( From 1095f3ee4c02debba2f7473e9938dfcb50b63449 Mon Sep 17 00:00:00 2001 From: x0pherl Date: Fri, 7 Nov 2025 21:40:11 -0500 Subject: [PATCH 494/518] changes to make development more friendly on MacOS --- .gitignore | 3 +++ CONTRIBUTING.md | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ed011f3..a79817d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ venv.bak/ # Profiling debris. prof/ + +# MacOS cruft +.DS_Store diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c1344c3..78f6540 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,8 +3,8 @@ tests, ensure they build and pass, and ensure that `pylint` and `mypy` are happy with your code. - Install `pip` following their [documentation](https://pip.pypa.io/en/stable/installation/). -- Install development dependencies: `pip install -e .[development]` -- Install docs dependencies: `pip install -e .[docs]` +- Install development dependencies: `pip install -e ".[development]"` +- Install docs dependencies: `pip install -e ".[docs]"` - Install `build123d` in editable mode from current dir: `pip install -e .` - Run tests with: `python -m pytest -n auto` - Build docs with: `cd docs && make html` From d329cf109484ccbb96872b311d4779d949c813bb Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 17 Nov 2025 10:09:54 -0600 Subject: [PATCH 495/518] initial changes to support BytesIO --- src/build123d/exporters3d.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index 749e331..505d4aa 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -182,7 +182,7 @@ def export_brep( def export_gltf( to_export: Shape, - file_path: PathLike | str | bytes, + file_path: PathLike | str | bytes | BytesIO, unit: Unit = Unit.MM, binary: bool = False, linear_deflection: float = 0.001, @@ -198,7 +198,7 @@ def export_gltf( Args: to_export (Shape): object or assembly - file_path (Union[PathLike, str, bytes]): glTF file path + file_path (Union[PathLike, str, bytes, BytesIO]): glTF file path unit (Unit, optional): shape units. Defaults to Unit.MM. binary (bool, optional): output format. Defaults to False. linear_deflection (float, optional): A linear deflection setting which limits @@ -234,9 +234,12 @@ def export_gltf( # Create the XCAF document doc: TDocStd_Document = _create_xde(to_export, unit) + if not isinstance(file_path, BytesIO): + file_path = fsdecode(file_path) + # Write the glTF file writer = RWGltf_CafWriter( - theFile=TCollection_AsciiString(fsdecode(file_path)), theIsBinary=binary + theFile=TCollection_AsciiString(file_path, theIsBinary=binary ) writer.SetParallel(True) index_map = TColStd_IndexedDataMapOfStringString() @@ -262,7 +265,7 @@ def export_gltf( def export_step( to_export: Shape, - file_path: PathLike | str | bytes, + file_path: PathLike | str | bytes | BytesIO, unit: Unit = Unit.MM, write_pcurves: bool = True, precision_mode: PrecisionMode = PrecisionMode.AVERAGE, @@ -277,7 +280,7 @@ def export_step( Args: to_export (Shape): object or assembly - file_path (Union[PathLike, str, bytes]): step file path + file_path (Union[PathLike, str, bytes, BytesIO]): step file path unit (Unit, optional): shape units. Defaults to Unit.MM. write_pcurves (bool, optional): write parametric curves to the STEP file. Defaults to True. @@ -326,7 +329,10 @@ def export_step( Interface_Static.SetIVal_s("write.precision.mode", precision_mode.value) writer.Transfer(doc, STEPControl_StepModelType.STEPControl_AsIs) - status = writer.Write(fspath(file_path)) == IFSelect_ReturnStatus.IFSelect_RetDone + if not isinstance(file_path, BytesIO): + file_path = fspath(file_path) + + status = writer.Write(file_path) == IFSelect_ReturnStatus.IFSelect_RetDone if not status: raise RuntimeError("Failed to write STEP file") @@ -335,7 +341,7 @@ def export_step( def export_stl( to_export: Shape, - file_path: PathLike | str | bytes, + file_path: PathLike | str | bytes | BytesIO, tolerance: float = 1e-3, angular_tolerance: float = 0.1, ascii_format: bool = False, @@ -346,7 +352,7 @@ def export_stl( Args: to_export (Shape): object or assembly - file_path (str): The path and file name to write the STL output to. + file_path (Union[PathLike, str, bytes, BytesIO]): The path and file name to write the STL output to. tolerance (float, optional): A linear deflection setting which limits the distance between a curve and its tessellation. Setting this value too low will result in large meshes that can consume computing resources. Setting the value too high can @@ -369,6 +375,7 @@ def export_stl( writer.ASCIIMode = ascii_format - file_path = str(file_path) + if not isinstance(file_path, BytesIO): + file_path = fsdecode(file_path) return writer.Write(to_export.wrapped, file_path) From 7f4e92f0bf21f7d08725c376de99d25644ac58c2 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Mon, 17 Nov 2025 22:05:45 -0600 Subject: [PATCH 496/518] enable BytesIO in STEP, STL and 3MF (via lib3mf/Mesher). Add necessary tests --- src/build123d/exporters.py | 20 +++++++++++++++----- src/build123d/exporters3d.py | 26 +++++++++++--------------- src/build123d/mesher.py | 29 ++++++++++++++++++----------- tests/test_exporters.py | 14 +++++++++++++- tests/test_exporters3d.py | 5 +++-- tests/test_mesher.py | 9 +++++++++ 6 files changed, 69 insertions(+), 34 deletions(-) diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index a229fa2..687e2f1 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -34,6 +34,7 @@ import math import xml.etree.ElementTree as ET from copy import copy from enum import Enum, auto +from io import BytesIO from os import PathLike, fsdecode from typing import Any, TypeAlias from warnings import warn @@ -636,13 +637,13 @@ class ExportDXF(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def write(self, file_name: PathLike | str | bytes): + def write(self, file_name: PathLike | str | bytes | BytesIO): """write Writes the DXF data to the specified file name. Args: - file_name (PathLike | str | bytes): The file name (including path) where + file_name (PathLike | str | bytes | BytesIO): The file name (including path) where the DXF data will be written. """ # Reset the main CAD viewport of the model space to the @@ -650,7 +651,12 @@ class ExportDXF(Export2D): # https://github.com/gumyr/build123d/issues/382 tracks # exposing viewport control to the user. zoom.extents(self._modelspace) - self._document.saveas(fsdecode(file_name)) + + if not isinstance(file_name, BytesIO): + file_name = fsdecode(file_name) + self._document.saveas(file_name) + else: + self._document.write(file_name, fmt="bin") # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1497,13 +1503,13 @@ class ExportSVG(Export2D): # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - def write(self, path: PathLike | str | bytes): + def write(self, path: PathLike | str | bytes | BytesIO): """write Writes the SVG data to the specified file path. Args: - path (PathLike | str | bytes): The file path where the SVG data will be written. + path (PathLike | str | bytes | BytesIO): The file path where the SVG data will be written. """ # pylint: disable=too-many-locals bb = self._bounds @@ -1549,5 +1555,9 @@ class ExportSVG(Export2D): xml = ET.ElementTree(svg) ET.indent(xml, " ") + + if not isinstance(path, BytesIO): + path = fsdecode(path) + # xml.write(path, encoding="utf-8", xml_declaration=True, default_namespace=False) xml.write(path, encoding="utf-8", xml_declaration=True, default_namespace=None) diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index 505d4aa..759464a 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -182,7 +182,7 @@ def export_brep( def export_gltf( to_export: Shape, - file_path: PathLike | str | bytes | BytesIO, + file_path: PathLike | str | bytes, unit: Unit = Unit.MM, binary: bool = False, linear_deflection: float = 0.001, @@ -198,7 +198,7 @@ def export_gltf( Args: to_export (Shape): object or assembly - file_path (Union[PathLike, str, bytes, BytesIO]): glTF file path + file_path (Union[PathLike, str, bytes]): glTF file path unit (Unit, optional): shape units. Defaults to Unit.MM. binary (bool, optional): output format. Defaults to False. linear_deflection (float, optional): A linear deflection setting which limits @@ -234,12 +234,9 @@ def export_gltf( # Create the XCAF document doc: TDocStd_Document = _create_xde(to_export, unit) - if not isinstance(file_path, BytesIO): - file_path = fsdecode(file_path) - # Write the glTF file writer = RWGltf_CafWriter( - theFile=TCollection_AsciiString(file_path, theIsBinary=binary + theFile=TCollection_AsciiString(fsdecode(file_path)), theIsBinary=binary ) writer.SetParallel(True) index_map = TColStd_IndexedDataMapOfStringString() @@ -330,9 +327,12 @@ def export_step( writer.Transfer(doc, STEPControl_StepModelType.STEPControl_AsIs) if not isinstance(file_path, BytesIO): - file_path = fspath(file_path) + status = ( + writer.Write(fspath(file_path)) == IFSelect_ReturnStatus.IFSelect_RetDone + ) + else: + status = writer.WriteStream(file_path) == IFSelect_ReturnStatus.IFSelect_RetDone - status = writer.Write(file_path) == IFSelect_ReturnStatus.IFSelect_RetDone if not status: raise RuntimeError("Failed to write STEP file") @@ -341,7 +341,7 @@ def export_step( def export_stl( to_export: Shape, - file_path: PathLike | str | bytes | BytesIO, + file_path: PathLike | str | bytes, tolerance: float = 1e-3, angular_tolerance: float = 0.1, ascii_format: bool = False, @@ -352,7 +352,7 @@ def export_stl( Args: to_export (Shape): object or assembly - file_path (Union[PathLike, str, bytes, BytesIO]): The path and file name to write the STL output to. + file_path (Union[PathLike, str, bytes]): The path and file name to write the STL output to. tolerance (float, optional): A linear deflection setting which limits the distance between a curve and its tessellation. Setting this value too low will result in large meshes that can consume computing resources. Setting the value too high can @@ -374,8 +374,4 @@ def export_stl( writer = StlAPI_Writer() writer.ASCIIMode = ascii_format - - if not isinstance(file_path, BytesIO): - file_path = fsdecode(file_path) - - return writer.Write(to_export.wrapped, file_path) + return writer.Write(to_export.wrapped, fsdecode(file_path)) diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index 5433848..8c4ce42 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -83,6 +83,7 @@ license: # pylint: disable=no-name-in-module, import-error import copy as copy_module import ctypes +from io import BytesIO import math import os import sys @@ -312,12 +313,12 @@ class Mesher: # Round off the vertices to avoid vertices within tolerance being # considered as different vertices digits = -int(round(math.log(TOLERANCE, 10), 1)) - + # Create vertex to index mapping directly vertex_to_idx = {} next_idx = 0 vert_table = {} - + # First pass - create mapping for i, (x, y, z) in enumerate(ocp_mesh_vertices): key = (round(x, digits), round(y, digits), round(z, digits)) @@ -325,17 +326,16 @@ class Mesher: vertex_to_idx[key] = next_idx next_idx += 1 vert_table[i] = vertex_to_idx[key] - + # Create vertices array in one shot vertices_3mf = [ - Lib3MF.Position((ctypes.c_float * 3)(*v)) - for v in vertex_to_idx.keys() + Lib3MF.Position((ctypes.c_float * 3)(*v)) for v in vertex_to_idx.keys() ] - + # Pre-allocate triangles array and process in bulk c_uint3 = ctypes.c_uint * 3 triangles_3mf = [] - + # Process triangles in bulk for tri in triangles: # Map indices directly without list comprehension @@ -343,11 +343,13 @@ class Mesher: mapped_a = vert_table[a] mapped_b = vert_table[b] mapped_c = vert_table[c] - + # Quick degenerate check without set creation if mapped_a != mapped_b and mapped_b != mapped_c and mapped_c != mapped_a: - triangles_3mf.append(Lib3MF.Triangle(c_uint3(mapped_a, mapped_b, mapped_c))) - + triangles_3mf.append( + Lib3MF.Triangle(c_uint3(mapped_a, mapped_b, mapped_c)) + ) + return (vertices_3mf, triangles_3mf) def _add_color(self, b3d_shape: Shape, mesh_3mf: Lib3MF.MeshObject): @@ -540,7 +542,7 @@ class Mesher: """write Args: - file_name Union[Pathlike, str, bytes]: file path + file_name Union[Pathlike, str, bytes, BytesIO]: file path Raises: ValueError: Unknown file format - must be 3mf or stl @@ -551,3 +553,8 @@ class Mesher: raise ValueError(f"Unknown file format {output_file_extension}") writer = self.model.QueryWriter(output_file_extension[1:]) writer.WriteToFile(file_name) + + def write_stream(self, stream: BytesIO, file_type: str): + writer = self.model.QueryWriter(file_type) + result = bytes(writer.WriteToBuffer()) + stream.write(result) diff --git a/tests/test_exporters.py b/tests/test_exporters.py index f95a92e..11c63da 100644 --- a/tests/test_exporters.py +++ b/tests/test_exporters.py @@ -1,3 +1,4 @@ +from io import BytesIO from os import fsdecode, fsencode from typing import Union, Iterable import math @@ -194,7 +195,9 @@ class ExportersTestCase(unittest.TestCase): @pytest.mark.parametrize( - "format", (Path, fsencode, fsdecode), ids=["path", "bytes", "str"] + "format", + (Path, fsencode, fsdecode), + ids=["path", "bytes", "str"], ) @pytest.mark.parametrize("Exporter", (ExportSVG, ExportDXF)) def test_pathlike_exporters(tmp_path, format, Exporter): @@ -205,5 +208,14 @@ def test_pathlike_exporters(tmp_path, format, Exporter): exporter.write(path) +@pytest.mark.parametrize("Exporter", (ExportSVG, ExportDXF)) +def test_exporters_in_memory(Exporter): + buffer = BytesIO() + sketch = ExportersTestCase.create_test_sketch() + exporter = Exporter() + exporter.add_shape(sketch) + exporter.write(buffer) + + if __name__ == "__main__": unittest.main() diff --git a/tests/test_exporters3d.py b/tests/test_exporters3d.py index 644ac3e..bf1c1bd 100644 --- a/tests/test_exporters3d.py +++ b/tests/test_exporters3d.py @@ -206,10 +206,11 @@ def test_pathlike_exporters(tmp_path, format, exporter): exporter(box, path) -def test_export_brep_in_memory(): +@pytest.mark.parametrize("exporter", (export_step, export_brep)) +def test_exporters_in_memory(exporter): buffer = io.BytesIO() box = Box(1, 1, 1).locate(Pos(-1, -2, -3)) - export_brep(box, buffer) + exporter(box, buffer) if __name__ == "__main__": diff --git a/tests/test_mesher.py b/tests/test_mesher.py index 0be4ccb..59b7214 100644 --- a/tests/test_mesher.py +++ b/tests/test_mesher.py @@ -1,4 +1,5 @@ import unittest, uuid +from io import BytesIO from packaging.specifiers import SpecifierSet from pathlib import Path from os import fsdecode, fsencode @@ -237,5 +238,13 @@ def test_pathlike_mesher(tmp_path, format): importer.read(path) +@pytest.mark.parametrize("file_type", ("3mf", "stl")) +def test_in_memory_mesher(file_type): + stream = BytesIO() + exporter = Mesher() + exporter.add_shape(Solid.make_box(1, 1, 1)) + exporter.write_stream(stream, file_type) + + if __name__ == "__main__": unittest.main() From f144ca5aa89d1df5be325befcd5d45d946d1ca8d Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Tue, 18 Nov 2025 10:34:21 -0500 Subject: [PATCH 497/518] Fix tutorial links --- docs/tutorial_surface_heart_token.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial_surface_heart_token.rst b/docs/tutorial_surface_heart_token.rst index ac819ad..9931108 100644 --- a/docs/tutorial_surface_heart_token.rst +++ b/docs/tutorial_surface_heart_token.rst @@ -20,7 +20,7 @@ the object. To illustrate this process, we will create the following game token: Useful :class:`~topology.Face` creation methods include :meth:`~topology.Face.make_surface`, :meth:`~topology.Face.make_bezier_surface`, and :meth:`~topology.Face.make_surface_from_array_of_points`. See the -:doc:`surface_modeling` overview for the full list. +:doc:`tutorial_surface_modeling` overview for the full list. In this case, we'll use the ``make_surface`` method, providing it with the edges that define the perimeter of the surface and a central point on that surface. @@ -128,5 +128,5 @@ from the heart. Next steps ---------- -Continue to :doc:`tutorial_heart_token` for an advanced example using +Continue to :doc:`tutorial_spitfire_wing_gordon` for an advanced example using :meth:`~topology.Face.make_gordon_surface` to create a Supermarine Spitfire wing. From 4507d78fff514b10dffce751d099d462dff11e75 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 19 Nov 2025 10:01:58 -0500 Subject: [PATCH 498/518] Added Color.categorical_set that generates a creates a list of visually distinct colors --- src/build123d/geometry.py | 71 ++++++- tests/test_direct_api/test_color.py | 314 ++++++++++++++++++++-------- 2 files changed, 296 insertions(+), 89 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index e17d049..ff8f264 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -34,6 +34,7 @@ from __future__ import annotations # other pylint warning to temp remove: # too-many-arguments, too-many-locals, too-many-public-methods, # too-many-statements, too-many-instance-attributes, too-many-branches +import colorsys import copy as copy_module import itertools import json @@ -1180,7 +1181,7 @@ class Color: `OCCT Color Names `_ - Hexadecimal string may be RGB or RGBA format with leading "#" + Hexadecimal string may be RGB or RGBA format with leading "#" Args: name (str): color, e.g. "blue" or "#0000ff"" @@ -1345,6 +1346,74 @@ class Color: """Color repr""" return f"Color{str(tuple(self))}" + @classmethod + def categorical_set( + cls, + color_count: int, + starting_hue: ColorLike | float = 0.0, + alpha: float | Iterable[float] = 1.0, + ) -> list[Color]: + """Generate a palette of evenly spaced colors. + + Creates a list of visually distinct colors suitable for representing + discrete categories (such as different parts, assemblies, or data + series). Colors are evenly spaced around the hue circle and share + consistent lightness and saturation levels, resulting in balanced + perceptual contrast across all hues. + + Produces palettes similar in appearance to the **Tableau 10** and **D3 + Category10** color sets—both widely recognized standards in data + visualization for their clarity and accessibility. These values have + been empirically chosen to maintain consistent perceived brightness + across hues while avoiding overly vivid or dark colors. + + Args: + color_count (int): Number of colors to generate. + starting_hue (ColorLike | float): Either a Color-like object or + a hue value in the range [0.0, 1.0] that defines the starting color. + alpha (float | Iterable[float]): Alpha value(s) for the colors. Can be a + single float or an iterable of length `color_count`. + + Returns: + list[Color]: List of generated colors. + + Raises: + ValueError: If starting_hue is out of range or alpha length mismatch. + """ + + # --- Determine starting hue --- + if isinstance(starting_hue, float): + if not (0.0 <= starting_hue <= 1.0): + raise ValueError("Starting hue must be within range 0.0–1.0") + elif isinstance(starting_hue, int): + if starting_hue < 0: + raise ValueError("Starting color integer must be non-negative") + rgb = tuple(Color(starting_hue))[:3] + starting_hue = colorsys.rgb_to_hls(*rgb)[0] + else: + raise TypeError( + "Starting hue must be a float in [0,1] or an integer color literal" + ) + + # --- Normalize alpha values --- + if isinstance(alpha, (float, int)): + alphas = [float(alpha)] * color_count + else: + alphas = list(alpha) + if len(alphas) != color_count: + raise ValueError("Number of alpha values must match color_count") + + # --- Generate color list --- + hues = np.linspace( + starting_hue, starting_hue + 1.0, color_count, endpoint=False + ) + colors = [ + cls(*colorsys.hls_to_rgb(h % 1.0, 0.55, 0.9), a) + for h, a in zip(hues, alphas) + ] + + return colors + @staticmethod def _rgb_from_int(triplet: int) -> tuple[float, float, float]: red, remainder = divmod(triplet, 256**2) diff --git a/tests/test_direct_api/test_color.py b/tests/test_direct_api/test_color.py index 650f5c9..9e50a8a 100644 --- a/tests/test_direct_api/test_color.py +++ b/tests/test_direct_api/test_color.py @@ -26,8 +26,9 @@ license: """ +import colorsys import copy - +import math import numpy as np import pytest @@ -36,129 +37,196 @@ from build123d.geometry import Color # Overloads -@pytest.mark.parametrize("color, expected", [ - pytest.param(Color("blue"), (0, 0, 1, 1), id="name"), - pytest.param(Color("blue", alpha=0.5), (0, 0, 1, 0.5), id="name + kw alpha"), - pytest.param(Color("blue", 0.5), (0, 0, 1, 0.5), id="name + alpha"), -]) +@pytest.mark.parametrize( + "color, expected", + [ + pytest.param(Color("blue"), (0, 0, 1, 1), id="name"), + pytest.param(Color("blue", alpha=0.5), (0, 0, 1, 0.5), id="name + kw alpha"), + pytest.param(Color("blue", 0.5), (0, 0, 1, 0.5), id="name + alpha"), + ], +) def test_overload_name(color, expected): np.testing.assert_allclose(tuple(color), expected, 1e-5) -@pytest.mark.parametrize("color, expected", [ - pytest.param(Color(0.0, 1.0, 0.0), (0, 1, 0, 1), id="rgb"), - pytest.param(Color(1.0, 1.0, 0.0, 0.5), (1, 1, 0, 0.5), id="rgba"), - pytest.param(Color(1.0, 1.0, 0.0, alpha=0.5), (1, 1, 0, 0.5), id="rgb + kw alpha"), - pytest.param(Color(red=0.1, green=0.2, blue=0.3, alpha=0.5), (0.1, 0.2, 0.3, 0.5), id="kw rgba"), -]) + +@pytest.mark.parametrize( + "color, expected", + [ + pytest.param(Color(0.0, 1.0, 0.0), (0, 1, 0, 1), id="rgb"), + pytest.param(Color(1.0, 1.0, 0.0, 0.5), (1, 1, 0, 0.5), id="rgba"), + pytest.param( + Color(1.0, 1.0, 0.0, alpha=0.5), (1, 1, 0, 0.5), id="rgb + kw alpha" + ), + pytest.param( + Color(red=0.1, green=0.2, blue=0.3, alpha=0.5), + (0.1, 0.2, 0.3, 0.5), + id="kw rgba", + ), + ], +) def test_overload_rgba(color, expected): np.testing.assert_allclose(tuple(color), expected, 1e-5) -@pytest.mark.parametrize("color, expected", [ - pytest.param(Color(0x996692), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), id="color_code"), - pytest.param(Color(0x006692, 0x80), (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), id="color_code + alpha"), - pytest.param(Color(0x006692, alpha=0x80), (0, 102 / 255, 146 / 255, 128 / 255), id="color_code + kw alpha"), - pytest.param(Color(color_code=0x996692, alpha=0xCC), (153 / 255, 102 / 255, 146 / 255, 204 / 255), id="kw color_code + alpha"), -]) + +@pytest.mark.parametrize( + "color, expected", + [ + pytest.param( + Color(0x996692), (0x99 / 0xFF, 0x66 / 0xFF, 0x92 / 0xFF, 1), id="color_code" + ), + pytest.param( + Color(0x006692, 0x80), + (0, 0x66 / 0xFF, 0x92 / 0xFF, 0x80 / 0xFF), + id="color_code + alpha", + ), + pytest.param( + Color(0x006692, alpha=0x80), + (0, 102 / 255, 146 / 255, 128 / 255), + id="color_code + kw alpha", + ), + pytest.param( + Color(color_code=0x996692, alpha=0xCC), + (153 / 255, 102 / 255, 146 / 255, 204 / 255), + id="kw color_code + alpha", + ), + ], +) def test_overload_hex(color, expected): np.testing.assert_allclose(tuple(color), expected, 1e-5) -@pytest.mark.parametrize("color, expected", [ - pytest.param(Color((0.1,)), (0.1, 1.0, 1.0, 1.0), id="tuple r"), - pytest.param(Color((0.1, 0.2)), (0.1, 0.2, 1.0, 1.0), id="tuple rg"), - pytest.param(Color((0.1, 0.2, 0.3)), (0.1, 0.2, 0.3, 1.0), id="tuple rgb"), - pytest.param(Color((0.1, 0.2, 0.3, 0.4)), (0.1, 0.2, 0.3, 0.4), id="tuple rbga"), - pytest.param(Color((0.1, 0.2, 0.3, 0.4)), (0.1, 0.2, 0.3, 0.4), id="kw tuple"), -]) + +@pytest.mark.parametrize( + "color, expected", + [ + pytest.param(Color((0.1,)), (0.1, 1.0, 1.0, 1.0), id="tuple r"), + pytest.param(Color((0.1, 0.2)), (0.1, 0.2, 1.0, 1.0), id="tuple rg"), + pytest.param(Color((0.1, 0.2, 0.3)), (0.1, 0.2, 0.3, 1.0), id="tuple rgb"), + pytest.param( + Color((0.1, 0.2, 0.3, 0.4)), (0.1, 0.2, 0.3, 0.4), id="tuple rbga" + ), + pytest.param(Color((0.1, 0.2, 0.3, 0.4)), (0.1, 0.2, 0.3, 0.4), id="kw tuple"), + ], +) def test_overload_tuple(color, expected): np.testing.assert_allclose(tuple(color), expected, 1e-5) + # ColorLikes -@pytest.mark.parametrize("color_like", [ - pytest.param(Quantity_ColorRGBA(1, 0, 0, 1), id="Quantity_ColorRGBA"), - pytest.param("red", id="name str"), - pytest.param("red ", id="name str whitespace"), - pytest.param(("red",), id="tuple name str"), - pytest.param(("red", 1), id="tuple name str + alpha"), - pytest.param("#ff0000", id="hex str rgb 24bit"), - pytest.param(" #ff0000 ", id="hex str rgb 24bit whitespace"), - pytest.param(("#ff0000",), id="tuple hex str rgb 24bit"), - pytest.param(("#ff0000", 1), id="tuple hex str rgb 24bit + alpha"), - pytest.param("#ff0000ff", id="hex str rgba 24bit"), - pytest.param(" #ff0000ff ", id="hex str rgba 24bit whitespace"), - pytest.param(("#ff0000ff",), id="tuple hex str rgba 24bit"), - pytest.param(("#ff0000ff", .6), id="tuple hex str rgba 24bit + alpha (not used)"), - pytest.param("#f00", id="hex str rgb 12bit"), - pytest.param(" #f00 ", id="hex str rgb 12bit whitespace"), - pytest.param(("#f00",), id="tuple hex str rgb 12bit"), - pytest.param(("#f00", 1), id="tuple hex str rgb 12bit + alpha"), - pytest.param("#f00f", id="hex str rgba 12bit"), - pytest.param(" #f00f ", id="hex str rgba 12bit whitespace"), - pytest.param(("#f00f",), id="tuple hex str rgba 12bit"), - pytest.param(("#f00f", .6), id="tuple hex str rgba 12bit + alpha (not used)"), - pytest.param(0xff0000, id="hex int"), - pytest.param((0xff0000), id="tuple hex int"), - pytest.param((0xff0000, 0xff), id="tuple hex int + alpha"), - pytest.param((1, 0, 0), id="tuple rgb int"), - pytest.param((1, 0, 0, 1), id="tuple rgba int"), - pytest.param((1., 0., 0.), id="tuple rgb float"), - pytest.param((1., 0., 0., 1.), id="tuple rgba float"), -]) +@pytest.mark.parametrize( + "color_like", + [ + pytest.param(Quantity_ColorRGBA(1, 0, 0, 1), id="Quantity_ColorRGBA"), + pytest.param("red", id="name str"), + pytest.param("red ", id="name str whitespace"), + pytest.param(("red",), id="tuple name str"), + pytest.param(("red", 1), id="tuple name str + alpha"), + pytest.param("#ff0000", id="hex str rgb 24bit"), + pytest.param(" #ff0000 ", id="hex str rgb 24bit whitespace"), + pytest.param(("#ff0000",), id="tuple hex str rgb 24bit"), + pytest.param(("#ff0000", 1), id="tuple hex str rgb 24bit + alpha"), + pytest.param("#ff0000ff", id="hex str rgba 24bit"), + pytest.param(" #ff0000ff ", id="hex str rgba 24bit whitespace"), + pytest.param(("#ff0000ff",), id="tuple hex str rgba 24bit"), + pytest.param( + ("#ff0000ff", 0.6), id="tuple hex str rgba 24bit + alpha (not used)" + ), + pytest.param("#f00", id="hex str rgb 12bit"), + pytest.param(" #f00 ", id="hex str rgb 12bit whitespace"), + pytest.param(("#f00",), id="tuple hex str rgb 12bit"), + pytest.param(("#f00", 1), id="tuple hex str rgb 12bit + alpha"), + pytest.param("#f00f", id="hex str rgba 12bit"), + pytest.param(" #f00f ", id="hex str rgba 12bit whitespace"), + pytest.param(("#f00f",), id="tuple hex str rgba 12bit"), + pytest.param(("#f00f", 0.6), id="tuple hex str rgba 12bit + alpha (not used)"), + pytest.param(0xFF0000, id="hex int"), + pytest.param((0xFF0000), id="tuple hex int"), + pytest.param((0xFF0000, 0xFF), id="tuple hex int + alpha"), + pytest.param((1, 0, 0), id="tuple rgb int"), + pytest.param((1, 0, 0, 1), id="tuple rgba int"), + pytest.param((1.0, 0.0, 0.0), id="tuple rgb float"), + pytest.param((1.0, 0.0, 0.0, 1.0), id="tuple rgba float"), + ], +) def test_color_likes(color_like): expected = (1, 0, 0, 1) np.testing.assert_allclose(tuple(Color(color_like)), expected, 1e-5) np.testing.assert_allclose(tuple(Color(color_like=color_like)), expected, 1e-5) -@pytest.mark.parametrize("color_like, expected", [ - pytest.param(Color(), (1, 1, 1, 1), id="empty Color()"), - pytest.param(1., (1, 1, 1, 1), id="r float"), - pytest.param((1.,), (1, 1, 1, 1), id="tuple r float"), - pytest.param((1., 0.), (1, 0, 1, 1), id="tuple rg float"), -]) + +@pytest.mark.parametrize( + "color_like, expected", + [ + pytest.param(Color(), (1, 1, 1, 1), id="empty Color()"), + pytest.param(1.0, (1, 1, 1, 1), id="r float"), + pytest.param((1.0,), (1, 1, 1, 1), id="tuple r float"), + pytest.param((1.0, 0.0), (1, 0, 1, 1), id="tuple rg float"), + ], +) def test_color_likes_incomplete(color_like, expected): np.testing.assert_allclose(tuple(Color(color_like)), expected, 1e-5) np.testing.assert_allclose(tuple(Color(color_like=color_like)), expected, 1e-5) -@pytest.mark.parametrize("color_like", [ - pytest.param(Quantity_ColorRGBA(1, 0, 0, 0.6), id="Quantity_ColorRGBA"), - pytest.param(("red", 0.6), id="tuple name str + alpha"), - pytest.param(("#ff0000", 0.6), id="tuple hex str rgb 24bit + alpha"), - pytest.param(("#ff000099"), id="tuple hex str rgba 24bit"), - pytest.param(("#f00", 0.6), id="tuple hex str rgb 12bit + alpha"), - pytest.param(("#f009"), id="tuple hex str rgba 12bit"), - pytest.param((0xff0000, 153), id="tuple hex int + alpha int"), - pytest.param((1., 0., 0., 0.6), id="tuple rbga float"), -]) + +@pytest.mark.parametrize( + "color_like", + [ + pytest.param(Quantity_ColorRGBA(1, 0, 0, 0.6), id="Quantity_ColorRGBA"), + pytest.param(("red", 0.6), id="tuple name str + alpha"), + pytest.param(("#ff0000", 0.6), id="tuple hex str rgb 24bit + alpha"), + pytest.param(("#ff000099"), id="tuple hex str rgba 24bit"), + pytest.param(("#f00", 0.6), id="tuple hex str rgb 12bit + alpha"), + pytest.param(("#f009"), id="tuple hex str rgba 12bit"), + pytest.param((0xFF0000, 153), id="tuple hex int + alpha int"), + pytest.param((1.0, 0.0, 0.0, 0.6), id="tuple rbga float"), + ], +) def test_color_likes_alpha(color_like): expected = (1, 0, 0, 0.6) np.testing.assert_allclose(tuple(Color(color_like)), expected, 1e-5) np.testing.assert_allclose(tuple(Color(color_like=color_like)), expected, 1e-5) + # Exceptions -@pytest.mark.parametrize("name", [ - pytest.param("build123d", id="invalid color name"), - pytest.param("#ffg", id="invalid rgb 12bit"), - pytest.param("#fffg", id="invalid rgba 12bit"), - pytest.param("#fffgg", id="invalid rgb 24bit"), - pytest.param("#fff00gg", id="invalid rgba 24bit"), - pytest.param("#ff", id="short rgb 12bit"), - pytest.param("#fffff", id="short rgb 24bit"), - pytest.param("#fffffff", id="short rgba 24bit"), - pytest.param("#fffffffff", id="long rgba 24bit"), -]) +@pytest.mark.parametrize( + "name", + [ + pytest.param("build123d", id="invalid color name"), + pytest.param("#ffg", id="invalid rgb 12bit"), + pytest.param("#fffg", id="invalid rgba 12bit"), + pytest.param("#fffgg", id="invalid rgb 24bit"), + pytest.param("#fff00gg", id="invalid rgba 24bit"), + pytest.param("#ff", id="short rgb 12bit"), + pytest.param("#fffff", id="short rgb 24bit"), + pytest.param("#fffffff", id="short rgba 24bit"), + pytest.param("#fffffffff", id="long rgba 24bit"), + ], +) def test_exceptions_color_name(name): with pytest.raises(Exception): Color(name) -@pytest.mark.parametrize("color_type", [ - pytest.param((dict({"name": "red", "alpha": 1},)), id="dict arg"), - pytest.param(("red", "blue"), id="str + str"), - pytest.param((1., "blue"), id="float + str order"), - pytest.param((1, "blue"), id="int + str order"), -]) + +@pytest.mark.parametrize( + "color_type", + [ + pytest.param( + ( + dict( + {"name": "red", "alpha": 1}, + ) + ), + id="dict arg", + ), + pytest.param(("red", "blue"), id="str + str"), + pytest.param((1.0, "blue"), id="float + str order"), + pytest.param((1, "blue"), id="int + str order"), + ], +) def test_exceptions_color_type(color_type): with pytest.raises(Exception): Color(*color_type) + # Methods def test_rgba_wrapped(): c = Color(1.0, 1.0, 0.0, 0.5) @@ -167,17 +235,87 @@ def test_rgba_wrapped(): assert c.wrapped.GetRGB().Blue() == 0.0 assert c.wrapped.Alpha() == 0.5 + def test_copy(): c = Color(0.1, 0.2, 0.3, alpha=0.4) c_copy = copy.copy(c) np.testing.assert_allclose(tuple(c_copy), (0.1, 0.2, 0.3, 0.4), rtol=1e-5) + def test_str_repr_is(): c = Color(1, 0, 0) assert str(c) == "Color: (1.0, 0.0, 0.0, 1.0) is 'RED'" assert repr(c) == "Color(1.0, 0.0, 0.0, 1.0)" + def test_str_repr_near(): c = Color(1, 0.5, 0) assert str(c) == "Color: (1.0, 0.5, 0.0, 1.0) near 'DARKGOLDENROD1'" assert repr(c) == "Color(1.0, 0.5, 0.0, 1.0)" + + +class TestColorCategoricalSet: + def test_returns_expected_number_of_colors(self): + colors = Color.categorical_set(5) + assert len(colors) == 5 + assert all(isinstance(c, Color) for c in colors) + + def test_colors_are_evenly_spaced_in_hue(self): + count = 8 + colors = Color.categorical_set(count) + hues = [colorsys.rgb_to_hls(*tuple(c)[:3])[0] for c in colors] + diffs = [(hues[(i + 1) % count] - hues[i]) % 1.0 for i in range(count)] + avg_diff = sum(diffs) / len(diffs) + assert all(math.isclose(d, avg_diff, rel_tol=1e-2) for d in diffs) + + def test_starting_hue_as_float(self): + (r, g, b, _) = tuple(Color.categorical_set(1, starting_hue=0.25)[0]) + h = colorsys.rgb_to_hls(r, g, b)[0] + assert math.isclose(h, 0.25, rel_tol=0.05) + + def test_starting_hue_as_int_hex(self): + # Blue (0x0000FF) should be valid and return a Color + c = Color.categorical_set(1, starting_hue=0x0000FF)[0] + assert isinstance(c, Color) + + def test_starting_hue_invalid_type(self): + with pytest.raises(TypeError): + Color.categorical_set(3, starting_hue="invalid") + + def test_starting_hue_out_of_range(self): + with pytest.raises(ValueError): + Color.categorical_set(3, starting_hue=1.5) + with pytest.raises(ValueError): + Color.categorical_set(3, starting_hue=-0.1) + + def test_starting_hue_negative_int(self): + with pytest.raises(ValueError): + Color.categorical_set(3, starting_hue=-1) + + def test_constant_alpha_applied(self): + colors = Color.categorical_set(3, alpha=0.7) + for c in colors: + (_, _, _, a) = tuple(c) + assert math.isclose(a, 0.7, rel_tol=1e-6) + + def test_iterable_alpha_applied(self): + alphas = (0.1, 0.5, 0.9) + colors = Color.categorical_set(3, alpha=alphas) + for a, c in zip(alphas, colors): + (_, _, _, returned_alpha) = tuple(c) + assert math.isclose(a, returned_alpha, rel_tol=1e-6) + + def test_iterable_alpha_length_mismatch(self): + with pytest.raises(ValueError): + Color.categorical_set(4, alpha=[0.5, 0.7]) + + def test_hues_wrap_around(self): + colors = Color.categorical_set(10, starting_hue=0.95) + hues = [colorsys.rgb_to_hls(*tuple(c)[:3])[0] for c in colors] + assert all(0.0 <= h <= 1.0 for h in hues) + + def test_alpha_defaults_to_one(self): + colors = Color.categorical_set(4) + for c in colors: + (_, _, _, a) = tuple(c) + assert math.isclose(a, 1.0, rel_tol=1e-6) From a00cecbc380eadd8fd1dd29df1c31ea8d976234d Mon Sep 17 00:00:00 2001 From: Luke H-W Date: Thu, 20 Nov 2025 02:36:46 +1030 Subject: [PATCH 499/518] Fix Example 14 header in introductory_examples.rst Header had "1." instead of "14." --- docs/introductory_examples.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/introductory_examples.rst b/docs/introductory_examples.rst index a887bb9..610fb6b 100644 --- a/docs/introductory_examples.rst +++ b/docs/introductory_examples.rst @@ -443,7 +443,7 @@ Counter-sink and counter-bore holes are useful for creating recessed areas for f .. _ex 14: -1. Position on a line with '\@', '\%' and introduce Sweep +14. Position on a line with '\@', '\%' and introduce Sweep ------------------------------------------------------------ build123d includes a feature for finding the position along a line segment. This @@ -1121,3 +1121,4 @@ with ``Until.NEXT`` or ``Until.LAST``. :language: build123d :start-after: [Ex. 36] :end-before: [Ex. 36] + From a5e95fe72f1cbe8c4661e63e114a926ada0e5663 Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 20 Nov 2025 11:15:12 -0500 Subject: [PATCH 500/518] Enhanced make_face so faces can have holes. Added BoundBox.measure --- src/build123d/geometry.py | 12 +++++++++++- src/build123d/operations_sketch.py | 26 ++++++++++++++++--------- tests/test_build_sketch.py | 11 +++++++++++ tests/test_direct_api/test_bound_box.py | 3 +++ 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index ff8f264..3e3807f 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -41,7 +41,7 @@ import json import logging import warnings from collections.abc import Callable, Iterable, Sequence -from math import degrees, isclose, log10, pi, radians +from math import degrees, isclose, log10, pi, radians, prod from typing import TYPE_CHECKING, Any, TypeAlias, overload import numpy as np @@ -1001,6 +1001,16 @@ class BoundBox: self.max = Vector(x_max, y_max, z_max) #: location of maximum corner self.size = Vector(x_max - x_min, y_max - y_min, z_max - z_min) #: overall size + @property + def measure(self) -> float: + """Return the overall Lebesgue measure of the bounding box. + + - For 1D objects: length + - For 2D objects: area + - For 3D objects: volume + """ + return prod([x for x in self.size if x > TOLERANCE]) + @property def diagonal(self) -> float: """body diagonal length (i.e. object maximum size)""" diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index 6cdf780..e05a542 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -44,6 +44,7 @@ from build123d.topology import ( Sketch, topo_explore_connected_edges, topo_explore_common_vertex, + edges_to_wires, ) from build123d.geometry import Plane, Vector, TOLERANCE from build123d.build_common import flatten_sequence, validate_inputs @@ -200,26 +201,33 @@ def make_face( ) -> Sketch: """Sketch Operation: make_face - Create a face from the given perimeter edges. + Create a face from the given edges. Args: - edges (Edge): sequence of perimeter edges. Defaults to all - sketch pending edges. + edges (Edge): sequence of edges. Defaults to all sketch pending edges. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ context: BuildSketch | None = BuildSketch._get_context("make_face") if edges is not None: - outer_edges = flatten_sequence(edges) + raw_edges = flatten_sequence(edges) elif context is not None: - outer_edges = context.pending_edges + raw_edges = context.pending_edges else: raise ValueError("No objects to create a face") - if not outer_edges: - raise ValueError("No objects to create a hull") - validate_inputs(context, "make_face", outer_edges) + if not raw_edges: + raise ValueError("No objects to create a face") + validate_inputs(context, "make_face", raw_edges) - pending_face = Face(Wire.combine(outer_edges)[0]) + wires = list( + edges_to_wires(raw_edges).sort_by( + lambda w: w.bounding_box().measure, reverse=True + ) + ) + if len(wires) > 1: + pending_face = Face(wires[0], wires[1:]) + else: + pending_face = Face(wires[0]) if pending_face.normal_at().Z < 0: # flip up-side-down faces pending_face = -pending_face diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index c00a504..3909733 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -168,6 +168,17 @@ class TestUpSideDown(unittest.TestCase): sketch = make_face(wire.edges()) self.assertTrue(sketch.faces()[0].normal_at().Z > 0) + def test_make_face_with_holes(self): + with BuildSketch() as skt: + with BuildLine() as perimeter: + CenterArc((0, 0), 3, 0, 360) + with BuildLine() as hole1: + Polyline((-1, 1), (1, 1), (1, 2), (-1, 2), (-1, 1)) + with BuildLine() as hole2: + Airfoil("4020") + make_face() + self.assertEqual(len(skt.face().inner_wires()), 2) + class TestBuildSketchExceptions(unittest.TestCase): """Test exception handling""" diff --git a/tests/test_direct_api/test_bound_box.py b/tests/test_direct_api/test_bound_box.py index de4ebee..26e4ddf 100644 --- a/tests/test_direct_api/test_bound_box.py +++ b/tests/test_direct_api/test_bound_box.py @@ -43,6 +43,7 @@ class TestBoundBox(unittest.TestCase): # OCC uses some approximations self.assertAlmostEqual(bb1.size.X, 1.0, 1) + self.assertAlmostEqual(bb1.measure, 1.0, 5) # Test adding to an existing bounding box v0 = Vertex(0, 0, 0) @@ -50,6 +51,7 @@ class TestBoundBox(unittest.TestCase): bb3 = bb1.add(bb2) self.assertAlmostEqual(bb3.size, (2, 2, 2), 7) + self.assertAlmostEqual(bb3.measure, 8, 5) bb3 = bb2.add((3, 3, 3)) self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) @@ -61,6 +63,7 @@ class TestBoundBox(unittest.TestCase): bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box()) bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box()) + self.assertAlmostEqual(bb2.measure, 9, 5) # Test that bb2 contains bb1 self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2)) self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1)) From 607efade2711eb17d7cf2edf9a5e66921afeb0bb Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 20 Nov 2025 11:50:15 -0500 Subject: [PATCH 501/518] Revert "Enhanced make_face so faces can have holes. Added BoundBox.measure" This reverts commit a5e95fe72f1cbe8c4661e63e114a926ada0e5663. --- src/build123d/geometry.py | 12 +----------- src/build123d/operations_sketch.py | 26 +++++++++---------------- tests/test_build_sketch.py | 11 ----------- tests/test_direct_api/test_bound_box.py | 3 --- 4 files changed, 10 insertions(+), 42 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index 3e3807f..ff8f264 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -41,7 +41,7 @@ import json import logging import warnings from collections.abc import Callable, Iterable, Sequence -from math import degrees, isclose, log10, pi, radians, prod +from math import degrees, isclose, log10, pi, radians from typing import TYPE_CHECKING, Any, TypeAlias, overload import numpy as np @@ -1001,16 +1001,6 @@ class BoundBox: self.max = Vector(x_max, y_max, z_max) #: location of maximum corner self.size = Vector(x_max - x_min, y_max - y_min, z_max - z_min) #: overall size - @property - def measure(self) -> float: - """Return the overall Lebesgue measure of the bounding box. - - - For 1D objects: length - - For 2D objects: area - - For 3D objects: volume - """ - return prod([x for x in self.size if x > TOLERANCE]) - @property def diagonal(self) -> float: """body diagonal length (i.e. object maximum size)""" diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index e05a542..6cdf780 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -44,7 +44,6 @@ from build123d.topology import ( Sketch, topo_explore_connected_edges, topo_explore_common_vertex, - edges_to_wires, ) from build123d.geometry import Plane, Vector, TOLERANCE from build123d.build_common import flatten_sequence, validate_inputs @@ -201,33 +200,26 @@ def make_face( ) -> Sketch: """Sketch Operation: make_face - Create a face from the given edges. + Create a face from the given perimeter edges. Args: - edges (Edge): sequence of edges. Defaults to all sketch pending edges. + edges (Edge): sequence of perimeter edges. Defaults to all + sketch pending edges. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ context: BuildSketch | None = BuildSketch._get_context("make_face") if edges is not None: - raw_edges = flatten_sequence(edges) + outer_edges = flatten_sequence(edges) elif context is not None: - raw_edges = context.pending_edges + outer_edges = context.pending_edges else: raise ValueError("No objects to create a face") - if not raw_edges: - raise ValueError("No objects to create a face") - validate_inputs(context, "make_face", raw_edges) + if not outer_edges: + raise ValueError("No objects to create a hull") + validate_inputs(context, "make_face", outer_edges) - wires = list( - edges_to_wires(raw_edges).sort_by( - lambda w: w.bounding_box().measure, reverse=True - ) - ) - if len(wires) > 1: - pending_face = Face(wires[0], wires[1:]) - else: - pending_face = Face(wires[0]) + pending_face = Face(Wire.combine(outer_edges)[0]) if pending_face.normal_at().Z < 0: # flip up-side-down faces pending_face = -pending_face diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 3909733..c00a504 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -168,17 +168,6 @@ class TestUpSideDown(unittest.TestCase): sketch = make_face(wire.edges()) self.assertTrue(sketch.faces()[0].normal_at().Z > 0) - def test_make_face_with_holes(self): - with BuildSketch() as skt: - with BuildLine() as perimeter: - CenterArc((0, 0), 3, 0, 360) - with BuildLine() as hole1: - Polyline((-1, 1), (1, 1), (1, 2), (-1, 2), (-1, 1)) - with BuildLine() as hole2: - Airfoil("4020") - make_face() - self.assertEqual(len(skt.face().inner_wires()), 2) - class TestBuildSketchExceptions(unittest.TestCase): """Test exception handling""" diff --git a/tests/test_direct_api/test_bound_box.py b/tests/test_direct_api/test_bound_box.py index 26e4ddf..de4ebee 100644 --- a/tests/test_direct_api/test_bound_box.py +++ b/tests/test_direct_api/test_bound_box.py @@ -43,7 +43,6 @@ class TestBoundBox(unittest.TestCase): # OCC uses some approximations self.assertAlmostEqual(bb1.size.X, 1.0, 1) - self.assertAlmostEqual(bb1.measure, 1.0, 5) # Test adding to an existing bounding box v0 = Vertex(0, 0, 0) @@ -51,7 +50,6 @@ class TestBoundBox(unittest.TestCase): bb3 = bb1.add(bb2) self.assertAlmostEqual(bb3.size, (2, 2, 2), 7) - self.assertAlmostEqual(bb3.measure, 8, 5) bb3 = bb2.add((3, 3, 3)) self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) @@ -63,7 +61,6 @@ class TestBoundBox(unittest.TestCase): bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box()) bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box()) - self.assertAlmostEqual(bb2.measure, 9, 5) # Test that bb2 contains bb1 self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2)) self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1)) From 02a8c07e0afd5f22f55f231effc96ced6890abdd Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 20 Nov 2025 11:51:04 -0500 Subject: [PATCH 502/518] Reapply "Enhanced make_face so faces can have holes. Added BoundBox.measure" This reverts commit 607efade2711eb17d7cf2edf9a5e66921afeb0bb. --- src/build123d/geometry.py | 12 +++++++++++- src/build123d/operations_sketch.py | 26 ++++++++++++++++--------- tests/test_build_sketch.py | 11 +++++++++++ tests/test_direct_api/test_bound_box.py | 3 +++ 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/build123d/geometry.py b/src/build123d/geometry.py index ff8f264..3e3807f 100644 --- a/src/build123d/geometry.py +++ b/src/build123d/geometry.py @@ -41,7 +41,7 @@ import json import logging import warnings from collections.abc import Callable, Iterable, Sequence -from math import degrees, isclose, log10, pi, radians +from math import degrees, isclose, log10, pi, radians, prod from typing import TYPE_CHECKING, Any, TypeAlias, overload import numpy as np @@ -1001,6 +1001,16 @@ class BoundBox: self.max = Vector(x_max, y_max, z_max) #: location of maximum corner self.size = Vector(x_max - x_min, y_max - y_min, z_max - z_min) #: overall size + @property + def measure(self) -> float: + """Return the overall Lebesgue measure of the bounding box. + + - For 1D objects: length + - For 2D objects: area + - For 3D objects: volume + """ + return prod([x for x in self.size if x > TOLERANCE]) + @property def diagonal(self) -> float: """body diagonal length (i.e. object maximum size)""" diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index 6cdf780..e05a542 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -44,6 +44,7 @@ from build123d.topology import ( Sketch, topo_explore_connected_edges, topo_explore_common_vertex, + edges_to_wires, ) from build123d.geometry import Plane, Vector, TOLERANCE from build123d.build_common import flatten_sequence, validate_inputs @@ -200,26 +201,33 @@ def make_face( ) -> Sketch: """Sketch Operation: make_face - Create a face from the given perimeter edges. + Create a face from the given edges. Args: - edges (Edge): sequence of perimeter edges. Defaults to all - sketch pending edges. + edges (Edge): sequence of edges. Defaults to all sketch pending edges. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ context: BuildSketch | None = BuildSketch._get_context("make_face") if edges is not None: - outer_edges = flatten_sequence(edges) + raw_edges = flatten_sequence(edges) elif context is not None: - outer_edges = context.pending_edges + raw_edges = context.pending_edges else: raise ValueError("No objects to create a face") - if not outer_edges: - raise ValueError("No objects to create a hull") - validate_inputs(context, "make_face", outer_edges) + if not raw_edges: + raise ValueError("No objects to create a face") + validate_inputs(context, "make_face", raw_edges) - pending_face = Face(Wire.combine(outer_edges)[0]) + wires = list( + edges_to_wires(raw_edges).sort_by( + lambda w: w.bounding_box().measure, reverse=True + ) + ) + if len(wires) > 1: + pending_face = Face(wires[0], wires[1:]) + else: + pending_face = Face(wires[0]) if pending_face.normal_at().Z < 0: # flip up-side-down faces pending_face = -pending_face diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index c00a504..3909733 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -168,6 +168,17 @@ class TestUpSideDown(unittest.TestCase): sketch = make_face(wire.edges()) self.assertTrue(sketch.faces()[0].normal_at().Z > 0) + def test_make_face_with_holes(self): + with BuildSketch() as skt: + with BuildLine() as perimeter: + CenterArc((0, 0), 3, 0, 360) + with BuildLine() as hole1: + Polyline((-1, 1), (1, 1), (1, 2), (-1, 2), (-1, 1)) + with BuildLine() as hole2: + Airfoil("4020") + make_face() + self.assertEqual(len(skt.face().inner_wires()), 2) + class TestBuildSketchExceptions(unittest.TestCase): """Test exception handling""" diff --git a/tests/test_direct_api/test_bound_box.py b/tests/test_direct_api/test_bound_box.py index de4ebee..26e4ddf 100644 --- a/tests/test_direct_api/test_bound_box.py +++ b/tests/test_direct_api/test_bound_box.py @@ -43,6 +43,7 @@ class TestBoundBox(unittest.TestCase): # OCC uses some approximations self.assertAlmostEqual(bb1.size.X, 1.0, 1) + self.assertAlmostEqual(bb1.measure, 1.0, 5) # Test adding to an existing bounding box v0 = Vertex(0, 0, 0) @@ -50,6 +51,7 @@ class TestBoundBox(unittest.TestCase): bb3 = bb1.add(bb2) self.assertAlmostEqual(bb3.size, (2, 2, 2), 7) + self.assertAlmostEqual(bb3.measure, 8, 5) bb3 = bb2.add((3, 3, 3)) self.assertAlmostEqual(bb3.size, (3, 3, 3), 7) @@ -61,6 +63,7 @@ class TestBoundBox(unittest.TestCase): bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box()) bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box()) bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box()) + self.assertAlmostEqual(bb2.measure, 9, 5) # Test that bb2 contains bb1 self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2)) self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1)) From 26caed754ca70fd0e73baa05fded717f72d2f94c Mon Sep 17 00:00:00 2001 From: gumyr Date: Thu, 20 Nov 2025 13:31:25 -0500 Subject: [PATCH 503/518] Removing make_face changes keeping BoundBox.extent --- src/build123d/operations_sketch.py | 27 +++++++++------------------ tests/test_build_sketch.py | 11 ----------- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/build123d/operations_sketch.py b/src/build123d/operations_sketch.py index e05a542..be5380c 100644 --- a/src/build123d/operations_sketch.py +++ b/src/build123d/operations_sketch.py @@ -43,8 +43,6 @@ from build123d.topology import ( Wire, Sketch, topo_explore_connected_edges, - topo_explore_common_vertex, - edges_to_wires, ) from build123d.geometry import Plane, Vector, TOLERANCE from build123d.build_common import flatten_sequence, validate_inputs @@ -201,33 +199,26 @@ def make_face( ) -> Sketch: """Sketch Operation: make_face - Create a face from the given edges. + Create a face from the given perimeter edges. Args: - edges (Edge): sequence of edges. Defaults to all sketch pending edges. + edges (Edge): sequence of perimeter edges. Defaults to all + sketch pending edges. mode (Mode, optional): combination mode. Defaults to Mode.ADD. """ context: BuildSketch | None = BuildSketch._get_context("make_face") if edges is not None: - raw_edges = flatten_sequence(edges) + outer_edges = flatten_sequence(edges) elif context is not None: - raw_edges = context.pending_edges + outer_edges = context.pending_edges else: raise ValueError("No objects to create a face") - if not raw_edges: - raise ValueError("No objects to create a face") - validate_inputs(context, "make_face", raw_edges) + if not outer_edges: + raise ValueError("No objects to create a hull") + validate_inputs(context, "make_face", outer_edges) - wires = list( - edges_to_wires(raw_edges).sort_by( - lambda w: w.bounding_box().measure, reverse=True - ) - ) - if len(wires) > 1: - pending_face = Face(wires[0], wires[1:]) - else: - pending_face = Face(wires[0]) + pending_face = Face(Wire.combine(outer_edges)[0]) if pending_face.normal_at().Z < 0: # flip up-side-down faces pending_face = -pending_face diff --git a/tests/test_build_sketch.py b/tests/test_build_sketch.py index 3909733..c00a504 100644 --- a/tests/test_build_sketch.py +++ b/tests/test_build_sketch.py @@ -168,17 +168,6 @@ class TestUpSideDown(unittest.TestCase): sketch = make_face(wire.edges()) self.assertTrue(sketch.faces()[0].normal_at().Z > 0) - def test_make_face_with_holes(self): - with BuildSketch() as skt: - with BuildLine() as perimeter: - CenterArc((0, 0), 3, 0, 360) - with BuildLine() as hole1: - Polyline((-1, 1), (1, 1), (1, 2), (-1, 2), (-1, 1)) - with BuildLine() as hole2: - Airfoil("4020") - make_face() - self.assertEqual(len(skt.face().inner_wires()), 2) - class TestBuildSketchExceptions(unittest.TestCase): """Test exception handling""" From 70764bbe08d99d047db1711ea6f4d6e587565cbf Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Thu, 20 Nov 2025 15:28:37 -0600 Subject: [PATCH 504/518] revert spurious docstring change for Mesher.write --- src/build123d/mesher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index 8c4ce42..deed500 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -542,7 +542,7 @@ class Mesher: """write Args: - file_name Union[Pathlike, str, bytes, BytesIO]: file path + file_name Union[Pathlike, str, bytes]: file path Raises: ValueError: Unknown file format - must be 3mf or stl From bc8d01dc7ee21b0d4f6f64a10b8e7eb2ea130735 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 21 Nov 2025 15:09:11 -0500 Subject: [PATCH 505/518] Improve length accuracy Issue #1136, minor typing fixes --- src/build123d/topology/one_d.py | 23 +++++++++++++---------- tests/test_build_line.py | 4 ++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 0964721..27f9b11 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -305,7 +305,9 @@ class Mixin1D(Shape[TOPODS]): @property def length(self) -> float: """Edge or Wire length""" - return GCPnts_AbscissaPoint.Length_s(self.geom_adaptor()) + props = GProp_GProps() + BRepGProp.LinearProperties_s(self.wrapped, props) + return props.Mass() @property def radius(self) -> float: @@ -796,19 +798,20 @@ class Mixin1D(Shape[TOPODS]): for obj in common_set: match (obj, target): case (_, Plane()): + assert isinstance(other.wrapped, gp_Pln) target = Shape(BRepBuilderAPI_MakeFace(other.wrapped).Face()) - operation = BRepAlgoAPI_Section() - result = bool_op((obj,), (target,), operation) - operation = BRepAlgoAPI_Common() - result.extend(bool_op((obj,), (target,), operation)) + operation1 = BRepAlgoAPI_Section() + result = bool_op((obj,), (target,), operation1) + operation2 = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (target,), operation2)) case (_, Vertex() | Edge() | Wire()): - operation = BRepAlgoAPI_Section() - section = bool_op((obj,), (target,), operation) + operation1 = BRepAlgoAPI_Section() + section = bool_op((obj,), (target,), operation1) result = section if not section: - operation = BRepAlgoAPI_Common() - result.extend(bool_op((obj,), (target,), operation)) + operation2 = BRepAlgoAPI_Common() + result.extend(bool_op((obj,), (target,), operation2)) case _ if issubclass(type(target), Shape): result = target.intersect(obj) @@ -2940,7 +2943,7 @@ class Edge(Mixin1D[TopoDS_Edge]): topods_edge = BRepBuilderAPI_MakeEdge(curve.Reversed(), last, first).Edge() reversed_edge.wrapped = topods_edge else: - reversed_edge.wrapped = downcast(self.wrapped.Reversed()) + reversed_edge.wrapped = TopoDS.Edge_s(self.wrapped.Reversed()) return reversed_edge def to_axis(self) -> Axis: diff --git a/tests/test_build_line.py b/tests/test_build_line.py index be4cd8d..ae7364a 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -98,14 +98,14 @@ class BuildLineTests(unittest.TestCase): powerup @ 0, tangents=(screw % 1, powerup % 0), ) - self.assertAlmostEqual(roller_coaster.wires()[0].length, 678.983628932414, 5) + self.assertAlmostEqual(roller_coaster.wires()[0].length, 678.9785865257071, 5) def test_bezier(self): pts = [(0, 0), (20, 20), (40, 0), (0, -40), (-60, 0), (0, 100), (100, 0)] wts = [1.0, 1.0, 2.0, 3.0, 4.0, 2.0, 1.0] with BuildLine() as bz: b1 = Bezier(*pts, weights=wts) - self.assertAlmostEqual(bz.wires()[0].length, 225.86389406824566, 5) + self.assertAlmostEqual(bz.wires()[0].length, 225.98661946375782, 5) self.assertTrue(isinstance(b1, Edge)) def test_double_tangent_arc(self): From 7f6d44249b83bc0506c0ba97b77da83450d2f8a4 Mon Sep 17 00:00:00 2001 From: gumyr Date: Fri, 21 Nov 2025 14:18:48 -0500 Subject: [PATCH 506/518] Added GCPnts_UniformDeflection to positions --- src/build123d/topology/one_d.py | 47 ++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 27f9b11..d416be0 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -90,7 +90,11 @@ from OCP.BRepProj import BRepProj_Projection from OCP.BRepTools import BRepTools, BRepTools_WireExplorer from OCP.GC import GC_MakeArcOfCircle, GC_MakeArcOfEllipse from OCP.GccEnt import GccEnt_unqualified, GccEnt_Position -from OCP.GCPnts import GCPnts_AbscissaPoint +from OCP.GCPnts import ( + GCPnts_AbscissaPoint, + GCPnts_QuasiUniformDeflection, + GCPnts_UniformDeflection, +) from OCP.Geom import ( Geom_BezierCurve, Geom_BSplineCurve, @@ -116,6 +120,9 @@ from OCP.GeomAbs import ( GeomAbs_C0, GeomAbs_C1, GeomAbs_C2, + GeomAbs_C3, + GeomAbs_CN, + GeomAbs_C1, GeomAbs_G1, GeomAbs_G2, GeomAbs_JoinType, @@ -1178,22 +1185,50 @@ class Mixin1D(Shape[TOPODS]): def positions( self, - distances: Iterable[float], + distances: Iterable[float] | None = None, position_mode: PositionMode = PositionMode.PARAMETER, + deflection: float | None = None, ) -> list[Vector]: """Positions along curve Generate positions along the underlying curve Args: - distances (Iterable[float]): distance or parameter values - position_mode (PositionMode, optional): position calculation mode. - Defaults to PositionMode.PARAMETER. + distances (Iterable[float] | None, optional): distance or parameter values. + Defaults to None. + position_mode (PositionMode, optional): position calculation mode only applies + when using distances. Defaults to PositionMode.PARAMETER. + deflection (float | None, optional): maximum deflection between the curve and + the polygon that results from the computed points. Defaults to None. + Returns: list[Vector]: positions along curve """ - return [self.position_at(d, position_mode) for d in distances] + if deflection is not None: + curve: BRepAdaptor_Curve | BRepAdaptor_CompCurve = self.geom_adaptor() + # GCPnts_UniformDeflection provides the best results but is limited + if curve.Continuity() in (GeomAbs_C2, GeomAbs_C3, GeomAbs_CN): + discretizer = GCPnts_UniformDeflection() + else: + discretizer = GCPnts_QuasiUniformDeflection() + + discretizer.Initialize( + curve, + deflection, + curve.FirstParameter(), + curve.LastParameter(), + ) + if not discretizer.IsDone() or discretizer.NbPoints() == 0: + raise RuntimeError("Deflection calculation failed") + return [ + Vector(curve.Value(discretizer.Parameter(i + 1))) + for i in range(discretizer.NbPoints()) + ] + elif distances is not None: + return [self.position_at(d, position_mode) for d in distances] + else: + raise ValueError("Either distances or deflection must be provided") def project( self, face: Face, direction: VectorLike, closest: bool = True From 2d82b2ca5cde5b1ad50e23ac2eb9ededd388f2fe Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 25 Nov 2025 11:27:17 -0500 Subject: [PATCH 507/518] Adding tests for positions with deflection --- src/build123d/topology/one_d.py | 9 +++- tests/test_direct_api/test_mixin1_d.py | 63 +++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index d416be0..231b844 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -373,7 +373,10 @@ class Mixin1D(Shape[TOPODS]): def _to_param(edge_wire: Mixin1D, value: float | VectorLike, name: str) -> float: """Convert a float or VectorLike into a curve parameter.""" if isinstance(value, (int, float)): - return float(value) + if edge_wire.is_forward: + return float(value) + else: + return 1.0 - float(value) try: point = Vector(value) except TypeError as exc: @@ -1209,7 +1212,9 @@ class Mixin1D(Shape[TOPODS]): curve: BRepAdaptor_Curve | BRepAdaptor_CompCurve = self.geom_adaptor() # GCPnts_UniformDeflection provides the best results but is limited if curve.Continuity() in (GeomAbs_C2, GeomAbs_C3, GeomAbs_CN): - discretizer = GCPnts_UniformDeflection() + discretizer: ( + GCPnts_UniformDeflection | GCPnts_QuasiUniformDeflection + ) = GCPnts_UniformDeflection() else: discretizer = GCPnts_QuasiUniformDeflection() diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index 1d7791b..efd4989 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -28,6 +28,7 @@ license: import math import unittest +from unittest.mock import patch from build123d.build_enums import ( CenterOf, @@ -106,13 +107,73 @@ class TestMixin1D(unittest.TestCase): 5, ) - def test_positions(self): + def test_positions_with_distances(self): e = Edge.make_line((0, 0, 0), (1, 1, 1)) distances = [i / 4 for i in range(3)] pts = e.positions(distances) for i, position in enumerate(pts): self.assertAlmostEqual(position, (i / 4, i / 4, i / 4), 5) + def test_positions_deflection_line(self): + """Deflection sampling on a straight line should yield exactly 2 points.""" + e = Edge.make_line((0, 0, 0), (10, 0, 0)) + pts = e.positions(deflection=0.1) + + self.assertEqual(len(pts), 2) + self.assertAlmostEqual(pts[0], (0, 0, 0), 7) + self.assertAlmostEqual(pts[1], (10, 0, 0), 7) + + def test_positions_deflection_circle(self): + """Deflection on a C2 curve (circle) should produce multiple points.""" + radius = 5 + e = Edge.make_circle(radius) + + pts = e.positions(deflection=0.1) + + # Should produce more than just two points + self.assertGreater(len(pts), 2) + + # Endpoints should match curve endpoints + first, last = pts[0], pts[-1] + curve = e.geom_adaptor() + p0 = Vector(curve.Value(curve.FirstParameter())) + p1 = Vector(curve.Value(curve.LastParameter())) + + self.assertAlmostEqual(first, p0, 7) + self.assertAlmostEqual(last, p1, 7) + + def test_positions_deflection_resolution(self): + """Smaller deflection tolerance should produce more points.""" + e = Edge.make_circle(10) + + pts_coarse = e.positions(deflection=0.5) + pts_fine = e.positions(deflection=0.05) + + self.assertGreater(len(pts_fine), len(pts_coarse)) + + def test_positions_deflection_C0_curve(self): + """C0 spline should use QuasiUniformDeflection and still succeed.""" + e = Polyline((0, 0), (1, 2), (2, 0))._to_bspline() # C0 + pts = e.positions(deflection=0.1) + + self.assertGreater(len(pts), 2) + + def test_positions_missing_arguments(self): + e = Edge.make_line((0, 0, 0), (1, 0, 0)) + with self.assertRaises(ValueError): + e.positions() + + def test_positions_deflection_failure(self): + e = Edge.make_circle(1.0) + + with patch("build123d.edge.GCPnts_UniformDeflection") as MockDefl: + instance = MockDefl.return_value + instance.IsDone.return_value = False + instance.NbPoints.return_value = 0 + + with self.assertRaises(RuntimeError): + e.positions(deflection=0.1) + def test_tangent_at(self): self.assertAlmostEqual( Edge.make_circle(1, start_angle=0, end_angle=90).tangent_at(1.0), From 82aa0aa36724aa6b6a437e3eaa7cf2ac7963ae26 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 25 Nov 2025 11:39:39 -0500 Subject: [PATCH 508/518] Updating positions tests --- src/build123d/topology/one_d.py | 5 +---- tests/test_direct_api/test_mixin1_d.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 231b844..f76f6bc 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -373,10 +373,7 @@ class Mixin1D(Shape[TOPODS]): def _to_param(edge_wire: Mixin1D, value: float | VectorLike, name: str) -> float: """Convert a float or VectorLike into a curve parameter.""" if isinstance(value, (int, float)): - if edge_wire.is_forward: - return float(value) - else: - return 1.0 - float(value) + return float(value) try: point = Vector(value) except TypeError as exc: diff --git a/tests/test_direct_api/test_mixin1_d.py b/tests/test_direct_api/test_mixin1_d.py index efd4989..864711b 100644 --- a/tests/test_direct_api/test_mixin1_d.py +++ b/tests/test_direct_api/test_mixin1_d.py @@ -166,7 +166,7 @@ class TestMixin1D(unittest.TestCase): def test_positions_deflection_failure(self): e = Edge.make_circle(1.0) - with patch("build123d.edge.GCPnts_UniformDeflection") as MockDefl: + with patch("build123d.topology.one_d.GCPnts_UniformDeflection") as MockDefl: instance = MockDefl.return_value instance.IsDone.return_value = False instance.NbPoints.return_value = 0 From 0bedc9c9add0f13d990cef1db17b4273f902f403 Mon Sep 17 00:00:00 2001 From: gumyr Date: Sat, 29 Nov 2025 11:43:27 -0500 Subject: [PATCH 509/518] Fixed typing problems and increased coverage to 100% --- src/build123d/objects_curve.py | 39 ++++++++++++++++++++-------------- tests/test_build_line.py | 34 +++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/src/build123d/objects_curve.py b/src/build123d/objects_curve.py index 61731bd..ad2a17a 100644 --- a/src/build123d/objects_curve.py +++ b/src/build123d/objects_curve.py @@ -50,7 +50,7 @@ from build123d.build_enums import ( ) from build123d.build_line import BuildLine from build123d.geometry import Axis, Plane, Vector, VectorLike, TOLERANCE -from build123d.topology import Edge, Face, Wire, Curve +from build123d.topology import Curve, Edge, Face, Vertex, Wire from build123d.topology.shape_core import ShapeList @@ -851,7 +851,7 @@ class FilletPolyline(BaseLineObject): # Create a list of vertices from wire_of_lines in the same order as # the original points so the resulting fillet edges are ordered - ordered_vertices = [] + ordered_vertices: list[Vertex] = [] for pnts in lines_pts: distance = { @@ -867,7 +867,7 @@ class FilletPolyline(BaseLineObject): } # For each corner vertex create a new fillet Edge (or keep as vertex if radius is 0) - fillets = [] + fillets: list[None | Edge] = [] for i, (vertex, edges) in enumerate(vertex_to_edges.items()): if len(edges) != 2: @@ -879,7 +879,9 @@ class FilletPolyline(BaseLineObject): fillets.append(None) else: - other_vertices = {ve for e in edges for ve in e.vertices() if ve != vertex} + other_vertices = { + ve for e in edges for ve in e.vertices() if ve != vertex + } third_edge = Edge.make_line(*[v for v in other_vertices]) fillet_face = Face(Wire(edges + [third_edge])).fillet_2d( current_radius, [vertex] @@ -891,18 +893,20 @@ class FilletPolyline(BaseLineObject): interior_edges = [] for i in range(len(fillets)): + prev_fillet = fillets[i - 1] + curr_fillet = fillets[i] prev_idx = i - 1 curr_idx = i # Determine start and end points - if fillets[prev_idx] is None: - start_pt = ordered_vertices[prev_idx] + if prev_fillet is None: + start_pt: Vertex | Vector = ordered_vertices[prev_idx] else: - start_pt = fillets[prev_idx] @ 1 + start_pt = prev_fillet @ 1 - if fillets[curr_idx] is None: - end_pt = ordered_vertices[curr_idx] + if curr_fillet is None: + end_pt: Vertex | Vector = ordered_vertices[curr_idx] else: - end_pt = fillets[curr_idx] @ 0 + end_pt = curr_fillet @ 0 interior_edges.append(Edge.make_line(start_pt, end_pt)) end_edges = [] @@ -910,18 +914,22 @@ class FilletPolyline(BaseLineObject): else: interior_edges = [] for i in range(len(fillets) - 1): + next_fillet = fillets[i + 1] + curr_fillet = fillets[i] curr_idx = i next_idx = i + 1 # Determine start and end points - if fillets[curr_idx] is None: - start_pt = ordered_vertices[curr_idx + 1] # +1 because first vertex has no fillet + if curr_fillet is None: + start_pt = ordered_vertices[ + curr_idx + 1 + ] # +1 because first vertex has no fillet else: - start_pt = fillets[curr_idx] @ 1 + start_pt = curr_fillet @ 1 - if fillets[next_idx] is None: + if next_fillet is None: end_pt = ordered_vertices[next_idx + 1] else: - end_pt = fillets[next_idx] @ 0 + end_pt = next_fillet @ 0 interior_edges.append(Edge.make_line(start_pt, end_pt)) # Handle end edges @@ -943,7 +951,6 @@ class FilletPolyline(BaseLineObject): super().__init__(new_wire, mode=mode) - class JernArc(BaseEdgeObject): """Line Object: Jern Arc diff --git a/tests/test_build_line.py b/tests/test_build_line.py index 16f89ce..2696432 100644 --- a/tests/test_build_line.py +++ b/tests/test_build_line.py @@ -195,7 +195,6 @@ class BuildLineTests(unittest.TestCase): self.assertEqual(len(p.edges().filter_by(GeomType.CIRCLE)), 3) self.assertEqual(len(p.edges().filter_by(GeomType.LINE)), 4) - with self.assertRaises(ValueError): p = FilletPolyline( (0, 0), @@ -253,6 +252,33 @@ class BuildLineTests(unittest.TestCase): with self.assertRaises(ValueError): FilletPolyline((0, 0), (1, 0), (1, 1), radius=-1) + # test filletpolyline curr_fillet None + # Middle corner radius = 0 → curr_fillet is None + with BuildLine(): + p = FilletPolyline( + (0, 0), + (10, 0), + (10, 10), + (20, 10), + radius=(0, 1), # middle corner is sharp + close=False, + ) + # 1 circular fillet, 3 line fillets + assert len(p.edges().filter_by(GeomType.CIRCLE)) == 1 + + # test filletpolyline next_fillet None: + # Second corner is sharp (radius 0) → next_fillet is None + with BuildLine(): + p = FilletPolyline( + (0, 0), + (10, 0), + (10, 10), + (0, 10), + radius=(1, 0), # next_fillet is None at last interior corner + close=False, + ) + assert len(p.edges()) > 0 + def test_intersecting_line(self): with BuildLine(): l1 = Line((0, 0), (10, 0)) @@ -861,9 +887,9 @@ class BuildLineTests(unittest.TestCase): min_r = 0 if case[2][0] is None else (flip_min * case[0] + case[2][0]) / 2 max_r = 1e6 if case[2][1] is None else (flip_max * case[0] + case[2][1]) / 2 - print(case[1], min_r, max_r, case[0]) - print(min_r + 0.01, min_r * 0.99, max_r - 0.01, max_r + 0.01) - print((case[0] - 1 * (r1 + r2)) / 2) + # print(case[1], min_r, max_r, case[0]) + # print(min_r + 0.01, min_r * 0.99, max_r - 0.01, max_r + 0.01) + # print((case[0] - 1 * (r1 + r2)) / 2) # Greater than min l1 = ArcArcTangentArc(start_arc, end_arc, min_r + 0.01, keep=case[1]) From 2fa0dd22da13e7e238299c6cccac40f6528258a6 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 1 Dec 2025 20:04:48 -0500 Subject: [PATCH 510/518] Refactored Solid.extrude_until, moved split to Shape, fixed misc typing problems --- docs/assets/ttt/ttt-ppp0109.py | 11 +- src/build123d/operations_part.py | 4 +- src/build123d/topology/one_d.py | 140 +---------- src/build123d/topology/shape_core.py | 180 +++++++++++++- src/build123d/topology/three_d.py | 349 +++++++++++++++------------ src/build123d/topology/two_d.py | 3 +- src/build123d/topology/utils.py | 40 --- src/build123d/topology/zero_d.py | 10 +- tests/test_build_part.py | 54 +++++ 9 files changed, 449 insertions(+), 342 deletions(-) diff --git a/docs/assets/ttt/ttt-ppp0109.py b/docs/assets/ttt/ttt-ppp0109.py index b00b0bc..49863af 100644 --- a/docs/assets/ttt/ttt-ppp0109.py +++ b/docs/assets/ttt/ttt-ppp0109.py @@ -47,16 +47,17 @@ with BuildPart() as ppp109: split(bisect_by=Plane.YZ) extrude(amount=6) f = ppp109.faces().filter_by(Axis((0, 0, 0), (-1, 0, 1)))[0] - # extrude(f, until=Until.NEXT) # throws a warning - extrude(f, amount=10) - fillet(ppp109.edge(Select.NEW), 16) + extrude(f, until=Until.NEXT) + fillet(ppp109.edges().filter_by(Axis.Y).sort_by(Axis.Z)[2], 16) + # extrude(f, amount=10) + # fillet(ppp109.edges(Select.NEW), 16) show(ppp109) -got_mass = ppp109.part.volume*densb +got_mass = ppp109.part.volume * densb want_mass = 307.23 tolerance = 1 delta = abs(got_mass - want_mass) print(f"Mass: {got_mass:0.2f} g") -assert delta < tolerance, f'{got_mass=}, {want_mass=}, {delta=}, {tolerance=}' +assert delta < tolerance, f"{got_mass=}, {want_mass=}, {delta=}, {tolerance=}" diff --git a/src/build123d/operations_part.py b/src/build123d/operations_part.py index ee765d0..e3fe8dd 100644 --- a/src/build123d/operations_part.py +++ b/src/build123d/operations_part.py @@ -223,8 +223,8 @@ def extrude( new_solids.append( Solid.extrude_until( - section=face, - target_object=target_object, + face, + target=target_object, direction=plane.z_dir * direction, until=until, ) diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index f48c7bb..2b9a211 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -233,11 +233,11 @@ from .shape_core import ( shapetype, topods_dim, unwrap_topods_compound, + _topods_bool_op, ) from .utils import ( _extrude_topods_shape, _make_topods_face_from_wires, - _topods_bool_op, isclose_b, ) from .zero_d import Vertex, topo_explore_common_vertex @@ -1377,144 +1377,6 @@ class Mixin1D(Shape[TOPODS]): return (visible_edges, hidden_edges) - @overload - def split( - self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] - ) -> Self | list[Self] | None: - """split and keep inside or outside""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.ALL]) -> list[Self]: - """split and return the unordered pieces""" - - @overload - def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ - Self | list[Self] | None, - Self | list[Self] | None, - ]: - """split and keep inside and outside""" - - @overload - def split(self, tool: TrimmingTool) -> Self | list[Self] | None: - """split and keep inside (default)""" - - def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): - """split - - Split this shape by the provided plane or face. - - Args: - surface (Plane | Face): surface to segment shape - keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. - - Returns: - Shape: result of split - Returns: - Self | list[Self] | None, - Tuple[Self | list[Self] | None]: The result of the split operation. - - - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` - if no top is found. - - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` - if no bottom is found. - - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is - either a `Self` or `list[Self]`, or `None` if no corresponding part is found. - """ - if self._wrapped is None or not tool: - raise ValueError("Can't split an empty edge/wire/tool") - - shape_list = TopTools_ListOfShape() - shape_list.Append(self.wrapped) - - # Define the splitting tool - trim_tool = ( - BRepBuilderAPI_MakeFace(tool.wrapped).Face() # gp_Pln to Face - if isinstance(tool, Plane) - else tool.wrapped - ) - tool_list = TopTools_ListOfShape() - tool_list.Append(trim_tool) - - # Create the splitter algorithm - splitter = BRepAlgoAPI_Splitter() - - # Set the shape to be split and the splitting tool (plane face) - splitter.SetArguments(shape_list) - splitter.SetTools(tool_list) - - # Perform the splitting operation - splitter.Build() - - split_result = downcast(splitter.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(split_result, TopoDS_Compound): - split_result = unwrap_topods_compound(split_result, True) - - # For speed the user may just want all the objects which they - # can sort more efficiently then the generic algorithm below - if keep == Keep.ALL: - return ShapeList( - self.__class__.cast(part) - for part in get_top_level_topods_shapes(split_result) - ) - - if not isinstance(tool, Plane): - # Get a TopoDS_Face to work with from the tool - if isinstance(trim_tool, TopoDS_Shell): - face_explorer = TopExp_Explorer(trim_tool, ta.TopAbs_FACE) - tool_face = TopoDS.Face_s(face_explorer.Current()) - else: - tool_face = trim_tool - - # Create a reference point off the +ve side of the tool - surface_gppnt = gp_Pnt() - surface_normal = gp_Vec() - u_min, u_max, v_min, v_max = BRepTools.UVBounds_s(tool_face) - BRepGProp_Face(tool_face).Normal( - (u_min + u_max) / 2, (v_min + v_max) / 2, surface_gppnt, surface_normal - ) - normalized_surface_normal = Vector( - surface_normal.X(), surface_normal.Y(), surface_normal.Z() - ).normalized() - surface_point = Vector(surface_gppnt) - ref_point = surface_point + normalized_surface_normal - - # Create a HalfSpace - Solidish object to determine top/bottom - # Note: BRepPrimAPI_MakeHalfSpace takes either a TopoDS_Shell or TopoDS_Face but the - # mypy expects only a TopoDS_Shell here - half_space_maker = BRepPrimAPI_MakeHalfSpace(trim_tool, ref_point.to_pnt()) - # type: ignore - tool_solid = half_space_maker.Solid() - - tops: list[Shape] = [] - bottoms: list[Shape] = [] - properties = GProp_GProps() - for part in get_top_level_topods_shapes(split_result): - sub_shape = self.__class__.cast(part) - if isinstance(tool, Plane): - is_up = tool.to_local_coords(sub_shape).center().Z >= 0 - else: - # Intersect self and the thickened tool - is_up_obj = _topods_bool_op( - (part,), (tool_solid,), BRepAlgoAPI_Common() - ) - # Check for valid intersections - BRepGProp.LinearProperties_s(is_up_obj, properties) - # Mass represents the total length for linear properties - is_up = properties.Mass() >= TOLERANCE - (tops if is_up else bottoms).append(sub_shape) - - top = None if not tops else tops[0] if len(tops) == 1 else tops - bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms - - if keep == Keep.BOTH: - return (top, bottom) - if keep == Keep.TOP: - return top - if keep == Keep.BOTTOM: - return bottom - return None - def start_point(self) -> Vector: """The start point of this edge diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 1a3d4a8..2760367 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -100,6 +100,7 @@ from OCP.BRepFeat import BRepFeat_SplitShape from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepMesh import BRepMesh_IncrementalMesh +from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace from OCP.BRepTools import BRepTools from OCP.gce import gce_MakeLin from OCP.Geom import Geom_Line @@ -196,7 +197,7 @@ class Shape(NodeMixin, Generic[TOPODS]): ta.TopAbs_COMPSOLID: "CompSolid", } - shape_properties_LUT = { + shape_properties_LUT: dict[TopAbs_ShapeEnum:function] = { ta.TopAbs_VERTEX: None, ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, @@ -1786,6 +1787,144 @@ class Shape(NodeMixin, Generic[TOPODS]): """solids - all the solids in this Shape""" return ShapeList() + @overload + def split( + self, tool: TrimmingTool, keep: Literal[Keep.TOP, Keep.BOTTOM] + ) -> Self | list[Self] | None: + """split and keep inside or outside""" + + @overload + def split(self, tool: TrimmingTool, keep: Literal[Keep.ALL]) -> list[Self]: + """split and return the unordered pieces""" + + @overload + def split(self, tool: TrimmingTool, keep: Literal[Keep.BOTH]) -> tuple[ + Self | list[Self] | None, + Self | list[Self] | None, + ]: + """split and keep inside and outside""" + + @overload + def split(self, tool: TrimmingTool) -> Self | list[Self] | None: + """split and keep inside (default)""" + + def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): + """split + + Split this shape by the provided plane or face. + + Args: + surface (Plane | Face): surface to segment shape + keep (Keep, optional): which object(s) to save. Defaults to Keep.TOP. + + Returns: + Shape: result of split + Returns: + Self | list[Self] | None, + Tuple[Self | list[Self] | None]: The result of the split operation. + + - **Keep.TOP**: Returns the top as a `Self` or `list[Self]`, or `None` + if no top is found. + - **Keep.BOTTOM**: Returns the bottom as a `Self` or `list[Self]`, or `None` + if no bottom is found. + - **Keep.BOTH**: Returns a tuple `(inside, outside)` where each element is + either a `Self` or `list[Self]`, or `None` if no corresponding part is found. + """ + if self._wrapped is None or not tool: + raise ValueError("Can't split an empty edge/wire/tool") + + shape_list = TopTools_ListOfShape() + shape_list.Append(self.wrapped) + + # Define the splitting tool + trim_tool = ( + BRepBuilderAPI_MakeFace(tool.wrapped).Face() # gp_Pln to Face + if isinstance(tool, Plane) + else tool.wrapped + ) + tool_list = TopTools_ListOfShape() + tool_list.Append(trim_tool) + + # Create the splitter algorithm + splitter = BRepAlgoAPI_Splitter() + + # Set the shape to be split and the splitting tool (plane face) + splitter.SetArguments(shape_list) + splitter.SetTools(tool_list) + + # Perform the splitting operation + splitter.Build() + + split_result = downcast(splitter.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(split_result, TopoDS_Compound): + split_result = unwrap_topods_compound(split_result, True) + + # For speed the user may just want all the objects which they + # can sort more efficiently then the generic algorithm below + if keep == Keep.ALL: + return ShapeList( + self.__class__.cast(part) + for part in get_top_level_topods_shapes(split_result) + ) + + if not isinstance(tool, Plane): + # Get a TopoDS_Face to work with from the tool + if isinstance(trim_tool, TopoDS_Shell): + face_explorer = TopExp_Explorer(trim_tool, ta.TopAbs_FACE) + tool_face = TopoDS.Face_s(face_explorer.Current()) + else: + tool_face = trim_tool + + # Create a reference point off the +ve side of the tool + surface_gppnt = gp_Pnt() + surface_normal = gp_Vec() + u_min, u_max, v_min, v_max = BRepTools.UVBounds_s(tool_face) + BRepGProp_Face(tool_face).Normal( + (u_min + u_max) / 2, (v_min + v_max) / 2, surface_gppnt, surface_normal + ) + normalized_surface_normal = Vector( + surface_normal.X(), surface_normal.Y(), surface_normal.Z() + ).normalized() + surface_point = Vector(surface_gppnt) + ref_point = surface_point + normalized_surface_normal + + # Create a HalfSpace - Solidish object to determine top/bottom + # Note: BRepPrimAPI_MakeHalfSpace takes either a TopoDS_Shell or TopoDS_Face but the + # mypy expects only a TopoDS_Shell here + half_space_maker = BRepPrimAPI_MakeHalfSpace(trim_tool, ref_point.to_pnt()) + # type: ignore + tool_solid = half_space_maker.Solid() + + tops: list[Shape] = [] + bottoms: list[Shape] = [] + properties = GProp_GProps() + for part in get_top_level_topods_shapes(split_result): + sub_shape = self.__class__.cast(part) + if isinstance(tool, Plane): + is_up = tool.to_local_coords(sub_shape).center().Z >= 0 + else: + # Intersect self and the thickened tool + is_up_obj = _topods_bool_op( + (part,), (tool_solid,), BRepAlgoAPI_Common() + ) + # Check for valid intersections + BRepGProp.LinearProperties_s(is_up_obj, properties) + # Mass represents the total length for linear properties + is_up = properties.Mass() >= TOLERANCE + (tops if is_up else bottoms).append(sub_shape) + + top = None if not tops else tops[0] if len(tops) == 1 else tops + bottom = None if not bottoms else bottoms[0] if len(bottoms) == 1 else bottoms + + if keep == Keep.BOTH: + return (top, bottom) + if keep == Keep.TOP: + return top + if keep == Keep.BOTTOM: + return bottom + return None + @overload def split_by_perimeter( self, perimeter: Edge | Wire, keep: Literal[Keep.INSIDE, Keep.OUTSIDE] @@ -3011,6 +3150,45 @@ def _sew_topods_faces(faces: Iterable[TopoDS_Face]) -> TopoDS_Shape: return downcast(shell_builder.SewedShape()) +def _topods_bool_op( + args: Iterable[TopoDS_Shape], + tools: Iterable[TopoDS_Shape], + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, +) -> TopoDS_Shape: + """Generic boolean operation for TopoDS_Shapes + + Args: + args: Iterable[TopoDS_Shape]: + tools: Iterable[TopoDS_Shape]: + operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: + + Returns: TopoDS_Shape + + """ + args = list(args) + tools = list(tools) + arg = TopTools_ListOfShape() + for obj in args: + arg.Append(obj) + + tool = TopTools_ListOfShape() + for obj in tools: + tool.Append(obj) + + operation.SetArguments(arg) + operation.SetTools(tool) + + operation.SetRunParallel(True) + operation.Build() + + result = downcast(operation.Shape()) + # Remove unnecessary TopoDS_Compound around single shape + if isinstance(result, TopoDS_Compound): + result = unwrap_topods_compound(result, True) + + return result + + def _topods_entities(shape: TopoDS_Shape, topo_type: Shapes) -> list[TopoDS_Shape]: """Return the TopoDS_Shapes of topo_type from this TopoDS_Shape""" out = {} # using dict to prevent duplicates diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 279f46f..ed0011a 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -54,11 +54,10 @@ license: from __future__ import annotations -import platform -import warnings from collections.abc import Iterable, Sequence from math import radians, cos, tan -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Literal, overload +from typing import cast as tcast from typing_extensions import Self import OCP.TopAbs as ta @@ -86,13 +85,20 @@ from OCP.GProp import GProp_GProps from OCP.GeomAbs import GeomAbs_Intersection, GeomAbs_JoinType from OCP.LocOpe import LocOpe_DPrism from OCP.ShapeFix import ShapeFix_Solid -from OCP.Standard import Standard_Failure +from OCP.Standard import Standard_Failure, Standard_TypeMismatch from OCP.StdFail import StdFail_NotDone -from OCP.TopExp import TopExp +from OCP.TopExp import TopExp, TopExp_Explorer from OCP.TopTools import TopTools_IndexedDataMapOfShapeListOfShape, TopTools_ListOfShape -from OCP.TopoDS import TopoDS, TopoDS_Face, TopoDS_Shape, TopoDS_Solid, TopoDS_Wire +from OCP.TopoDS import ( + TopoDS, + TopoDS_Face, + TopoDS_Shape, + TopoDS_Shell, + TopoDS_Solid, + TopoDS_Wire, +) from OCP.gp import gp_Ax2, gp_Pnt -from build123d.build_enums import CenterOf, GeomType, Kind, Transition, Until +from build123d.build_enums import CenterOf, GeomType, Keep, Kind, Transition, Until from build123d.geometry import ( DEG2RAD, TOLERANCE, @@ -107,7 +113,19 @@ from build123d.geometry import ( ) from .one_d import Edge, Wire, Mixin1D -from .shape_core import TOPODS, Shape, ShapeList, Joint, downcast, shapetype +from .shape_core import ( + TOPODS, + Shape, + ShapeList, + Joint, + TrimmingTool, + downcast, + shapetype, + _sew_topods_faces, + get_top_level_topods_shapes, + unwrap_topods_compound, +) + from .two_d import sort_wires_by_build_order, Mixin2D, Face, Shell from .utils import ( _extrude_topods_shape, @@ -126,7 +144,6 @@ class Mixin3D(Shape[TOPODS]): """Additional methods to add to 3D Shape classes""" project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split find_intersection_points = Mixin2D.find_intersection_points vertices = Mixin1D.vertices @@ -507,7 +524,9 @@ class Mixin3D(Shape[TOPODS]): for obj in common_set: match (obj, target): case (_, Vertex() | Edge() | Wire() | Face() | Shell() | Solid()): - operation = BRepAlgoAPI_Section() + operation: BRepAlgoAPI_Section | BRepAlgoAPI_Common = ( + BRepAlgoAPI_Section() + ) result = bool_op((obj,), (target,), operation) if ( not isinstance(obj, Edge | Wire) @@ -610,8 +629,10 @@ class Mixin3D(Shape[TOPODS]): try: new_shape = self.__class__(fillet_builder.Shape()) if not new_shape.is_valid: - raise fillet_exception - except fillet_exception: + # raise fillet_exception + raise Standard_Failure + # except fillet_exception: + except (Standard_Failure, StdFail_NotDone): return __max_fillet(window_min, window_mid, current_iteration + 1) # These numbers work, are they close enough? - if not try larger window @@ -630,10 +651,10 @@ class Mixin3D(Shape[TOPODS]): # Unfortunately, MacOS doesn't support the StdFail_NotDone exception so platform # specific exceptions are required. - if platform.system() == "Darwin": - fillet_exception = Standard_Failure - else: - fillet_exception = StdFail_NotDone + # if platform.system() == "Darwin": + # fillet_exception = Standard_Failure + # else: + # fillet_exception = StdFail_NotDone max_radius = __max_fillet(0.0, 2 * self.bounding_box().diagonal, 0) @@ -892,7 +913,17 @@ class Solid(Mixin3D[TopoDS_Solid]): inner_comp = _make_topods_compound_from_shapes(inner_solids) # subtract from the outer solid - return Solid(BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape()) + difference = BRepAlgoAPI_Cut(outer_solid, inner_comp).Shape() + + # convert to a TopoDS_Solid - might be wrapped in a TopoDS_Compound + try: + result = TopoDS.Solid_s(difference) + except Standard_TypeMismatch: + result = TopoDS.Solid_s( + unwrap_topods_compound(TopoDS.Compound_s(difference), True) + ) + + return Solid(result) @classmethod def extrude_taper( @@ -933,7 +964,7 @@ class Solid(Mixin3D[TopoDS_Solid]): direction.length / cos(radians(taper)), radians(taper), ) - new_solid = Solid(prism_builder.Shape()) + new_solid = Solid(TopoDS.Solid_s(prism_builder.Shape())) else: # Determine the offset to get the taper offset_amt = -direction.length * tan(radians(taper)) @@ -972,110 +1003,116 @@ class Solid(Mixin3D[TopoDS_Solid]): @classmethod def extrude_until( cls, - section: Face, - target_object: Compound | Solid, + profile: Face, + target: Compound | Solid, direction: VectorLike, until: Until = Until.NEXT, - ) -> Compound | Solid: + ) -> Solid: """extrude_until - Extrude section in provided direction until it encounters either the - NEXT or LAST surface of target_object. Note that the bounding surface - must be larger than the extruded face where they contact. + Extrude `profile` in the provided `direction` until it encounters a + bounding surface on the `target`. The termination surface is chosen + according to the `until` option: + + * ``Until.NEXT`` — Extrude forward until the first intersecting surface. + * ``Until.LAST`` — Extrude forward through all intersections, stopping at + the farthest surface. + * ``Until.PREVIOUS`` — Reverse the extrusion direction and stop at the + first intersecting surface behind the profile. + * ``Until.FIRST`` — Reverse the direction and stop at the farthest + surface behind the profile. + + When ``Until.PREVIOUS`` or ``Until.FIRST`` are used, the extrusion + direction is automatically inverted before execution. + + Note: + The bounding surface on the target must be large enough to + completely cover the extruded profile at the contact region. + Partial overlaps may yield open or invalid solids. Args: - section (Face): Face to extrude - target_object (Union[Compound, Solid]): object to limit extrusion - direction (VectorLike): extrusion direction - until (Until, optional): surface to limit extrusion. Defaults to Until.NEXT. + profile (Face): The face to extrude. + target (Union[Compound, Solid]): The object that limits the extrusion. + direction (VectorLike): Extrusion direction. + until (Until, optional): Surface selection mode controlling which + intersection to stop at. Defaults to ``Until.NEXT``. Raises: - ValueError: provided face does not intersect target_object + ValueError: If the provided profile does not intersect the target. Returns: - Union[Compound, Solid]: extruded Face + Solid: The extruded and limited solid. """ direction = Vector(direction) if until in [Until.PREVIOUS, Until.FIRST]: direction *= -1 until = Until.NEXT if until == Until.PREVIOUS else Until.LAST - max_dimension = find_max_dimension([section, target_object]) - clipping_direction = ( - direction * max_dimension - if until == Until.NEXT - else -direction * max_dimension + # 1: Create extrusion of length the maximum distance between profile and target + max_dimension = find_max_dimension([profile, target]) + extrusion = Solid.extrude(profile, direction * max_dimension) + + # 2: Intersect the extrusion with the target to find the target's modified faces + intersect_op = BRepAlgoAPI_Common(target.wrapped, extrusion.wrapped) + intersect_op.Build() + intersection = intersect_op.Shape() + face_exp = TopExp_Explorer(intersection, ta.TopAbs_FACE) + if not face_exp.More(): + raise ValueError("No intersection: extrusion does not contact target") + + # Find the faces from the intersection that originated on the target + history = intersect_op.History() + modified_target_faces = [] + face_explorer = TopExp_Explorer(target.wrapped, ta.TopAbs_FACE) + while face_explorer.More(): + target_face = TopoDS.Face_s(face_explorer.Current()) + modified_los: TopTools_ListOfShape = history.Modified(target_face) + while not modified_los.IsEmpty(): + modified_face = TopoDS.Face_s(modified_los.First()) + modified_los.RemoveFirst() + modified_target_faces.append(modified_face) + face_explorer.Next() + + # 3: Sew the resulting faces into shells - one for each surface the extrusion + # passes through and sort by distance from the profile + sewed_shape = _sew_topods_faces(modified_target_faces) + + # From the sewed shape extract the shells and single faces + top_level_shapes = get_top_level_topods_shapes(sewed_shape) + modified_target_surfaces: ShapeList[Face | Shell] = ShapeList() + + # For each of the top level Shells and Faces + for top_level_shape in top_level_shapes: + if isinstance(top_level_shape, TopoDS_Face): + modified_target_surfaces.append(Face(top_level_shape)) + elif isinstance(top_level_shape, TopoDS_Shell): + modified_target_surfaces.append(Shell(top_level_shape)) + else: + raise RuntimeError(f"Invalid sewn shape {type(top_level_shape)}") + + modified_target_surfaces = modified_target_surfaces.sort_by( + lambda s: s.distance_to(profile) ) - direction_axis = Axis(section.center(), clipping_direction) - # Create a linear extrusion to start - extrusion = Solid.extrude(section, direction * max_dimension) - - # Project section onto the shape to generate faces that will clip the extrusion - # and exclude the planar faces normal to the direction of extrusion and these - # will have no volume when extruded - faces = [] - for face in section.project_to_shape(target_object, direction): - if isinstance(face, Face): - faces.append(face) - else: - faces += face.faces() - - clip_faces = [ - f - for f in faces - if not (f.is_planar and f.normal_at().dot(direction) == 0.0) + limit = modified_target_surfaces[ + 0 if until in [Until.NEXT, Until.PREVIOUS] else -1 ] - if not clip_faces: - raise ValueError("provided face does not intersect target_object") + keep: Literal[Keep.TOP, Keep.BOTTOM] = ( + Keep.TOP if until in [Until.NEXT, Until.PREVIOUS] else Keep.BOTTOM + ) - # Create the objects that will clip the linear extrusion - clipping_objects = [ - Solid.extrude(f, clipping_direction).fix() for f in clip_faces - ] - clipping_objects = [o for o in clipping_objects if o.volume > 1e-9] + # 4: Split the extrusion by the appropriate shell + clipped_extrusion = extrusion.split(limit, keep=keep) - if until == Until.NEXT: - trimmed_extrusion = extrusion.cut(target_object) - if isinstance(trimmed_extrusion, ShapeList): - closest_extrusion = trimmed_extrusion.sort_by(direction_axis)[0] - else: - closest_extrusion = trimmed_extrusion - for clipping_object in clipping_objects: - # It's possible for clipping faces to self intersect when they are extruded - # thus they could be non manifold which results failed boolean operations - # - so skip these objects - try: - extrusion_shapes = closest_extrusion.cut(clipping_object) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) + # 5: Return the appropriate type + if clipped_extrusion is None: + raise RuntimeError("Extrusion is None") # None isn't an option here + elif isinstance(clipped_extrusion, Solid): + return clipped_extrusion else: - base_part = extrusion.intersect(target_object) - if isinstance(base_part, ShapeList): - extrusion_parts = base_part - elif base_part is None: - extrusion_parts = ShapeList() - else: - extrusion_parts = ShapeList([base_part]) - for clipping_object in clipping_objects: - try: - clipped_extrusion = extrusion.intersect(clipping_object) - if clipped_extrusion is not None: - extrusion_parts.append( - clipped_extrusion.solids().sort_by(direction_axis)[0] - ) - except Exception: - warnings.warn( - "clipping error - extrusion may be incorrect", - stacklevel=2, - ) - extrusion_shapes = Solid.fuse(*extrusion_parts) - - result = extrusion_shapes.solids().sort_by(direction_axis)[0] - - return result + # isinstance(clipped_extrusion, list): + return ShapeList(clipped_extrusion).sort_by( + Axis(profile.center(), direction) + )[0] @classmethod def from_bounding_box(cls, bbox: BoundBox | OrientedBoundBox) -> Solid: @@ -1106,12 +1143,14 @@ class Solid(Mixin3D[TopoDS_Solid]): Solid: Box """ return cls( - BRepPrimAPI_MakeBox( - plane.to_gp_ax2(), - length, - width, - height, - ).Shape() + TopoDS.Solid_s( + BRepPrimAPI_MakeBox( + plane.to_gp_ax2(), + length, + width, + height, + ).Shape() + ) ) @classmethod @@ -1138,13 +1177,15 @@ class Solid(Mixin3D[TopoDS_Solid]): Solid: Full or partial cone """ return cls( - BRepPrimAPI_MakeCone( - plane.to_gp_ax2(), - base_radius, - top_radius, - height, - angle * DEG2RAD, - ).Shape() + TopoDS.Solid_s( + BRepPrimAPI_MakeCone( + plane.to_gp_ax2(), + base_radius, + top_radius, + height, + angle * DEG2RAD, + ).Shape() + ) ) @classmethod @@ -1169,12 +1210,14 @@ class Solid(Mixin3D[TopoDS_Solid]): Solid: Full or partial cylinder """ return cls( - BRepPrimAPI_MakeCylinder( - plane.to_gp_ax2(), - radius, - height, - angle * DEG2RAD, - ).Shape() + TopoDS.Solid_s( + BRepPrimAPI_MakeCylinder( + plane.to_gp_ax2(), + radius, + height, + angle * DEG2RAD, + ).Shape() + ) ) @classmethod @@ -1195,7 +1238,7 @@ class Solid(Mixin3D[TopoDS_Solid]): Returns: Solid: Lofted object """ - return cls(_make_loft(objs, True, ruled)) + return cls(TopoDS.Solid_s(_make_loft(objs, True, ruled))) @classmethod def make_sphere( @@ -1221,13 +1264,15 @@ class Solid(Mixin3D[TopoDS_Solid]): Solid: sphere """ return cls( - BRepPrimAPI_MakeSphere( - plane.to_gp_ax2(), - radius, - angle1 * DEG2RAD, - angle2 * DEG2RAD, - angle3 * DEG2RAD, - ).Shape() + TopoDS.Solid_s( + BRepPrimAPI_MakeSphere( + plane.to_gp_ax2(), + radius, + angle1 * DEG2RAD, + angle2 * DEG2RAD, + angle3 * DEG2RAD, + ).Shape() + ) ) @classmethod @@ -1255,14 +1300,16 @@ class Solid(Mixin3D[TopoDS_Solid]): Solid: Full or partial torus """ return cls( - BRepPrimAPI_MakeTorus( - plane.to_gp_ax2(), - major_radius, - minor_radius, - start_angle * DEG2RAD, - end_angle * DEG2RAD, - major_angle * DEG2RAD, - ).Shape() + TopoDS.Solid_s( + BRepPrimAPI_MakeTorus( + plane.to_gp_ax2(), + major_radius, + minor_radius, + start_angle * DEG2RAD, + end_angle * DEG2RAD, + major_angle * DEG2RAD, + ).Shape() + ) ) @classmethod @@ -1293,16 +1340,18 @@ class Solid(Mixin3D[TopoDS_Solid]): Solid: wedge """ return cls( - BRepPrimAPI_MakeWedge( - plane.to_gp_ax2(), - delta_x, - delta_y, - delta_z, - min_x, - min_z, - max_x, - max_z, - ).Solid() + TopoDS.Solid_s( + BRepPrimAPI_MakeWedge( + plane.to_gp_ax2(), + delta_x, + delta_y, + delta_z, + min_x, + min_z, + max_x, + max_z, + ).Solid() + ) ) @classmethod @@ -1340,7 +1389,7 @@ class Solid(Mixin3D[TopoDS_Solid]): True, ) - return cls(revol_builder.Shape()) + return cls(TopoDS.Solid_s(revol_builder.Shape())) @classmethod def sweep( @@ -1488,7 +1537,7 @@ class Solid(Mixin3D[TopoDS_Solid]): if make_solid: builder.MakeSolid() - return cls(builder.Shape()) + return cls(TopoDS.Solid_s(builder.Shape())) @classmethod def thicken( @@ -1544,7 +1593,7 @@ class Solid(Mixin3D[TopoDS_Solid]): ) offset_builder.MakeOffsetShape() try: - result = Solid(offset_builder.Shape()) + result = Solid(TopoDS.Solid_s(offset_builder.Shape())) except StdFail_NotDone as err: raise RuntimeError("Error applying thicken to given surface") from err @@ -1591,7 +1640,7 @@ class Solid(Mixin3D[TopoDS_Solid]): try: draft_angle_builder.Build() - result = Solid(draft_angle_builder.Shape()) + result = Solid(TopoDS.Solid_s(draft_angle_builder.Shape())) except StdFail_NotDone as err: raise DraftAngleError( "Draft build failed on the given solid.", diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index ec920c0..a131c50 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -145,6 +145,7 @@ from .shape_core import ( ShapeList, SkipClean, _sew_topods_faces, + _topods_bool_op, _topods_entities, _topods_face_normal_at, downcast, @@ -155,7 +156,6 @@ from .utils import ( _extrude_topods_shape, _make_loft, _make_topods_face_from_wires, - _topods_bool_op, find_max_dimension, ) from .zero_d import Vertex @@ -171,7 +171,6 @@ class Mixin2D(ABC, Shape[TOPODS]): """Additional methods to add to Face and Shell class""" project_to_viewport = Mixin1D.project_to_viewport - split = Mixin1D.split vertices = Mixin1D.vertices vertex = Mixin1D.vertex diff --git a/src/build123d/topology/utils.py b/src/build123d/topology/utils.py index dbccc80..b59bcca 100644 --- a/src/build123d/topology/utils.py +++ b/src/build123d/topology/utils.py @@ -24,7 +24,6 @@ Key Features: - `_make_topods_face_from_wires`: Generates planar faces with optional holes. - **Boolean Operations**: - - `_topods_bool_op`: Generic Boolean operations for TopoDS_Shapes. - `new_edges`: Identifies newly created edges from combined shapes. - **Enhanced Math**: @@ -282,45 +281,6 @@ def _make_topods_face_from_wires( return TopoDS.Face_s(sf_f.Result()) -def _topods_bool_op( - args: Iterable[TopoDS_Shape], - tools: Iterable[TopoDS_Shape], - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter, -) -> TopoDS_Shape: - """Generic boolean operation for TopoDS_Shapes - - Args: - args: Iterable[TopoDS_Shape]: - tools: Iterable[TopoDS_Shape]: - operation: BRepAlgoAPI_BooleanOperation | BRepAlgoAPI_Splitter: - - Returns: TopoDS_Shape - - """ - args = list(args) - tools = list(tools) - arg = TopTools_ListOfShape() - for obj in args: - arg.Append(obj) - - tool = TopTools_ListOfShape() - for obj in tools: - tool.Append(obj) - - operation.SetArguments(arg) - operation.SetTools(tool) - - operation.SetRunParallel(True) - operation.Build() - - result = downcast(operation.Shape()) - # Remove unnecessary TopoDS_Compound around single shape - if isinstance(result, TopoDS_Compound): - result = unwrap_topods_compound(result, True) - - return result - - def delta(shapes_one: Iterable[Shape], shapes_two: Iterable[Shape]) -> list[Shape]: """Compare the OCCT objects of each list and return the differences""" shapes_one = list(shapes_one) diff --git a/src/build123d/topology/zero_d.py b/src/build123d/topology/zero_d.py index cf53676..dc536e9 100644 --- a/src/build123d/topology/zero_d.py +++ b/src/build123d/topology/zero_d.py @@ -68,8 +68,8 @@ from OCP.TopExp import TopExp_Explorer from OCP.TopoDS import TopoDS, TopoDS_Shape, TopoDS_Vertex, TopoDS_Edge from OCP.gp import gp_Pnt from build123d.geometry import Matrix, Vector, VectorLike, Location, Axis, Plane - -from .shape_core import Shape, ShapeList, downcast, shapetype +from build123d.build_enums import Keep +from .shape_core import Shape, ShapeList, TrimmingTool, downcast, shapetype if TYPE_CHECKING: # pragma: no cover @@ -161,7 +161,7 @@ class Vertex(Shape[TopoDS_Vertex]): shape_type = shapetype(obj) # NB downcast is needed to handle TopoDS_Shape types - return constructor_lut[shape_type](downcast(obj)) + return constructor_lut[shape_type](TopoDS.Vertex_s(obj)) @classmethod def extrude(cls, obj: Shape, direction: VectorLike) -> Vertex: @@ -312,6 +312,10 @@ class Vertex(Shape[TopoDS_Vertex]): """The center of a vertex is itself!""" return Vector(self) + def split(self, tool: TrimmingTool, keep: Keep = Keep.TOP): + """split - not implemented""" + raise NotImplementedError("Vertices cannot be split.") + def to_tuple(self) -> tuple[float, float, float]: """Return vertex as three tuple of floats""" warnings.warn( diff --git a/tests/test_build_part.py b/tests/test_build_part.py index 0f6331a..d5dd6c7 100644 --- a/tests/test_build_part.py +++ b/tests/test_build_part.py @@ -330,6 +330,60 @@ class TestExtrude(unittest.TestCase): extrude(until=Until.NEXT) self.assertAlmostEqual(test.part.volume, 10**3 - 8**3 + 1**2 * 8, 5) + def test_extrude_until2(self): + target = Box(10, 5, 5) - Pos(X=2.5) * Cylinder(0.5, 5) + pln = Plane((7, 0, 7), z_dir=(-1, 0, -1)) + profile = (pln * Circle(1)).face() + extrusion = extrude(profile, dir=pln.z_dir, until=Until.NEXT, target=target) + self.assertLess(extrusion.bounding_box().min.Z, 2.5) + + def test_extrude_until3(self): + with BuildPart() as p: + with BuildSketch(Plane.XZ): + Rectangle(8, 8, align=Align.MIN) + with Locations((1, 1)): + Rectangle(7, 7, align=Align.MIN, mode=Mode.SUBTRACT) + extrude(amount=2, both=True) + with BuildSketch( + Plane((-2, 0, -2), x_dir=(0, 1, 0), z_dir=(1, 0, 1)) + ) as profile: + Rectangle(4, 1) + extrude(until=Until.NEXT) + + self.assertAlmostEqual(p.part.volume, 72.313, 2) + + def test_extrude_until_errors(self): + with self.assertRaises(ValueError): + extrude( + Rectangle(1, 1), + until=Until.NEXT, + dir=(0, 0, 1), + target=Pos(Z=-10) * Box(1, 1, 1), + ) + + def test_extrude_until_invalid_sewn_shape(self): + profile = Face.make_rect(1, 1) + target = Box(2, 2, 2) + direction = Vector(0, 0, 1) + + bad_shape = Box(1, 1, 1).wrapped # not a Face or Shell → forces RuntimeError + + with patch( + "build123d.topology.three_d.get_top_level_topods_shapes", + return_value=[bad_shape], + ): + with self.assertRaises(RuntimeError): + extrude(profile, dir=direction, until=Until.NEXT, target=target) + + def test_extrude_until_invalid_split(self): + profile = Face.make_rect(1, 1) + target = Box(2, 2, 2) + direction = Vector(0, 0, 1) + + with patch("build123d.topology.three_d.Solid.split", return_value=None): + with self.assertRaises(RuntimeError): + extrude(profile, dir=direction, until=Until.NEXT, target=target) + def test_extrude_face(self): with BuildPart(Plane.XZ) as box: with BuildSketch(Plane.XZ, mode=Mode.PRIVATE) as square: From 8985220c79163de07537ccde179b35a4c9dc4606 Mon Sep 17 00:00:00 2001 From: gumyr Date: Mon, 1 Dec 2025 21:05:38 -0500 Subject: [PATCH 511/518] Typing improvements --- src/build123d/operations_generic.py | 4 ++-- src/build123d/topology/shape_core.py | 5 +++-- src/build123d/topology/three_d.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 2a2f007..72c86e2 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -963,9 +963,9 @@ def split( for obj in object_list: bottom = None if keep == Keep.BOTH: - top, bottom = obj.split(bisect_by, keep) + top, bottom = obj.split(bisect_by, keep) # type: ignore[arg-type] else: - top = obj.split(bisect_by, keep) + top = obj.split(bisect_by, keep) # type: ignore[arg-type] for subpart in [top, bottom]: if isinstance(subpart, Iterable): new_objects.extend(subpart) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 2760367..c9822b7 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -163,6 +163,7 @@ if TYPE_CHECKING: # pragma: no cover Shapes = Literal["Vertex", "Edge", "Wire", "Face", "Shell", "Solid", "Compound"] TrimmingTool = Union[Plane, "Shell", "Face"] TOPODS = TypeVar("TOPODS", bound=TopoDS_Shape) +CalcFn = Callable[[TopoDS_Shape, GProp_GProps], None] class Shape(NodeMixin, Generic[TOPODS]): @@ -197,7 +198,7 @@ class Shape(NodeMixin, Generic[TOPODS]): ta.TopAbs_COMPSOLID: "CompSolid", } - shape_properties_LUT: dict[TopAbs_ShapeEnum:function] = { + shape_properties_LUT: dict[TopAbs_ShapeEnum, CalcFn | None] = { ta.TopAbs_VERTEX: None, ta.TopAbs_EDGE: BRepGProp.LinearProperties_s, ta.TopAbs_WIRE: BRepGProp.LinearProperties_s, @@ -804,7 +805,7 @@ class Shape(NodeMixin, Generic[TOPODS]): properties = GProp_GProps() calc_function = Shape.shape_properties_LUT[shapetype(obj.wrapped)] - if not calc_function: + if calc_function is None: raise NotImplementedError calc_function(obj.wrapped, properties) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index ed0011a..b40a813 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -212,6 +212,7 @@ class Mixin3D(Shape[TOPODS]): if center_of == CenterOf.MASS: properties = GProp_GProps() calc_function = Shape.shape_properties_LUT[shapetype(self.wrapped)] + assert calc_function is not None calc_function(self.wrapped, properties) middle = Vector(properties.CentreOfMass()) elif center_of == CenterOf.BOUNDING_BOX: From 5adf296fd87715de6bbe39c07e8a74cc73372946 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 2 Dec 2025 11:04:08 -0500 Subject: [PATCH 512/518] Fixed typing and linting issues --- src/build123d/topology/three_d.py | 6 ++--- src/build123d/topology/two_d.py | 41 ++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index b40a813..c9ce928 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -56,8 +56,7 @@ from __future__ import annotations from collections.abc import Iterable, Sequence from math import radians, cos, tan -from typing import TYPE_CHECKING, Literal, overload -from typing import cast as tcast +from typing import TYPE_CHECKING, Literal from typing_extensions import Self import OCP.TopAbs as ta @@ -118,7 +117,6 @@ from .shape_core import ( Shape, ShapeList, Joint, - TrimmingTool, downcast, shapetype, _sew_topods_faces, @@ -137,7 +135,7 @@ from .zero_d import Vertex if TYPE_CHECKING: # pragma: no cover - from .composite import Compound, Curve, Sketch, Part # pylint: disable=R0801 + from .composite import Compound # pylint: disable=R0801 class Mixin3D(Shape[TOPODS]): diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index a131c50..8a5879d 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -62,6 +62,7 @@ from abc import ABC, abstractmethod from collections.abc import Iterable, Sequence from math import degrees from typing import TYPE_CHECKING, Any, TypeVar, overload +from typing import cast as tcast import OCP.TopAbs as ta from OCP.BRep import BRep_Builder, BRep_Tool @@ -104,6 +105,7 @@ from OCP.Standard import ( Standard_ConstructionError, Standard_Failure, Standard_NoSuchObject, + Standard_TypeMismatch, ) from OCP.StdFail import StdFail_NotDone from OCP.TColgp import TColgp_Array1OfPnt, TColgp_HArray2OfPnt @@ -217,7 +219,7 @@ class Mixin2D(ABC, Shape[TOPODS]): if self._wrapped is None: raise ValueError("Invalid Shape") new_surface = copy.deepcopy(self) - new_surface.wrapped = downcast(self.wrapped.Complemented()) + new_surface.wrapped = tcast(TOPODS, downcast(self.wrapped.Complemented())) # As the surface has been modified, the parent is no longer valid new_surface.topo_parent = None @@ -366,7 +368,9 @@ class Mixin2D(ABC, Shape[TOPODS]): for obj in common_set: match (obj, target): case (_, Vertex() | Edge() | Wire() | Face() | Shell()): - operation = BRepAlgoAPI_Section() + operation: BRepAlgoAPI_Section | BRepAlgoAPI_Common = ( + BRepAlgoAPI_Section() + ) result = bool_op((obj,), (target,), operation) if not isinstance(obj, Edge | Wire) and not isinstance( target, (Edge | Wire) @@ -604,6 +608,7 @@ class Face(Mixin2D[TopoDS_Face]): """ def __init__(self, *args: Any, **kwargs: Any): + obj: TopoDS_Face | Plane | None outer_wire, inner_wires, obj, label, color, parent = (None,) * 6 if args: @@ -1463,7 +1468,7 @@ class Face(Mixin2D[TopoDS_Face]): try: patch.Build() - result = cls(patch.Shape()) + result = cls(TopoDS.Face_s(patch.Shape())) except ( Standard_Failure, StdFail_NotDone, @@ -1579,8 +1584,12 @@ class Face(Mixin2D[TopoDS_Face]): if len(profile.edges()) != 1 or len(path.edges()) != 1: raise ValueError("Use Shell.sweep for multi Edge objects") - profile = Wire([profile.edge()]) - path = Wire([path.edge()]) + profile_edge = profile.edge() + path_edge = path.edge() + assert profile_edge is not None + assert path_edge is not None + profile = Wire([profile_edge]) + path = Wire([path_edge]) builder = BRepOffsetAPI_MakePipeShell(path.wrapped) builder.Add(profile.wrapped, False, False) builder.SetTransitionMode(Shape._transModeDict[transition]) @@ -1604,6 +1613,7 @@ class Face(Mixin2D[TopoDS_Face]): Returns: Vector: center """ + center_point: Vector | gp_Pnt if (center_of == CenterOf.MASS) or ( center_of == CenterOf.GEOMETRY and self.is_planar ): @@ -1663,7 +1673,10 @@ class Face(Mixin2D[TopoDS_Face]): # Index or iterator access to OCP.TopTools.TopTools_ListOfShape is slow on M1 macs # Using First() and Last() to omit - edges = (Edge(edge_list.First()), Edge(edge_list.Last())) + edges = ( + Edge(TopoDS.Edge_s(edge_list.First())), + Edge(TopoDS.Edge_s(edge_list.Last())), + ) edge1, edge2 = Wire.order_chamfer_edges(reference_edge, edges) @@ -2053,7 +2066,7 @@ class Face(Mixin2D[TopoDS_Face]): BRepAlgoAPI_Common(), ) for topods_shell in get_top_level_topods_shapes(topods_shape): - intersected_shapes.append(Shell(topods_shell)) + intersected_shapes.append(Shell(TopoDS.Shell_s(topods_shell))) intersected_shapes = intersected_shapes.sort_by(Axis(self.center(), direction)) projected_shapes: ShapeList[Face | Shell] = ShapeList() @@ -2110,7 +2123,7 @@ class Face(Mixin2D[TopoDS_Face]): for hole_wire in inner_wires: reshaper.Remove(hole_wire.wrapped) modified_shape = downcast(reshaper.Apply(self.wrapped)) - holeless.wrapped = modified_shape + holeless.wrapped = TopoDS.Face_s(modified_shape) return holeless def wire(self) -> Wire: @@ -2513,7 +2526,10 @@ class Shell(Mixin2D[TopoDS_Shell]): builder.Add(shell, obj.wrapped) obj = shell elif isinstance(obj, Iterable): - obj = _sew_topods_faces([f.wrapped for f in obj]) + try: + obj = TopoDS.Shell_s(_sew_topods_faces([f.wrapped for f in obj])) + except Standard_TypeMismatch: + raise TypeError("Unable to create Shell, invalid input type") super().__init__( obj=obj, @@ -2531,6 +2547,7 @@ class Shell(Mixin2D[TopoDS_Shell]): solid_shell = ShapeFix_Solid().SolidFromShell(self.wrapped) properties = GProp_GProps() calc_function = Shape.shape_properties_LUT[shapetype(solid_shell)] + assert calc_function is not None calc_function(solid_shell, properties) return properties.Mass() return 0.0 @@ -2573,7 +2590,7 @@ class Shell(Mixin2D[TopoDS_Shell]): Returns: Shell: Lofted object """ - return cls(_make_loft(objs, False, ruled)) + return cls(TopoDS.Shell_s(_make_loft(objs, False, ruled))) @classmethod def revolve( @@ -2599,7 +2616,7 @@ class Shell(Mixin2D[TopoDS_Shell]): profile.wrapped, axis.wrapped, angle * DEG2RAD, True ) - return cls(revol_builder.Shape()) + return cls(TopoDS.Shell_s(revol_builder.Shape())) @classmethod def sweep( @@ -2627,7 +2644,7 @@ class Shell(Mixin2D[TopoDS_Shell]): builder.Add(profile.wrapped, False, False) builder.SetTransitionMode(Shape._transModeDict[transition]) builder.Build() - result = Shell(builder.Shape()) + result = Shell(TopoDS.Shell_s(builder.Shape())) if SkipClean.clean: result = result.clean() From 3474dc61d25683045d5beb12694038cf9a021c57 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 2 Dec 2025 13:03:58 -0500 Subject: [PATCH 513/518] Fixed typing @ OCCT level --- src/build123d/topology/composite.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 14c67b4..0b434bc 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -60,6 +60,8 @@ import sys import warnings from collections.abc import Iterable, Iterator, Sequence from itertools import combinations +from typing import TypeVar + from typing_extensions import Self import OCP.TopAbs as ta @@ -164,7 +166,7 @@ class Compound(Mixin3D[TopoDS_Compound]): parent (Compound, optional): assembly parent. Defaults to None. children (Sequence[Shape], optional): assembly children. Defaults to None. """ - + topods_compound: TopoDS_Compound | None if isinstance(obj, Iterable): topods_compound = _make_topods_compound_from_shapes( [s.wrapped for s in obj] @@ -376,8 +378,14 @@ class Compound(Mixin3D[TopoDS_Compound]): ) text_flat = Compound( - builder.Perform( - font_i, NCollection_Utf8String(txt), gp_Ax3(), horiz_align, vert_align + TopoDS.Compound_s( + builder.Perform( + font_i, + NCollection_Utf8String(txt), + gp_Ax3(), + horiz_align, + vert_align, + ) ) ) @@ -504,6 +512,8 @@ class Compound(Mixin3D[TopoDS_Compound]): def __and__(self, other: Shape | Iterable[Shape]) -> Compound: """Intersect other to self `&` operator""" intersection = Shape.__and__(self, other) + if intersection is None: + return Compound() intersection = Compound( intersection if isinstance(intersection, list) else [intersection] ) @@ -700,7 +710,7 @@ class Compound(Mixin3D[TopoDS_Compound]): while iterator.More(): child = iterator.Value() if child.ShapeType() == type_map[obj_type]: - results.append(obj_type(downcast(child))) + results.append(obj_type(downcast(child))) # type: ignore iterator.Next() return results @@ -802,7 +812,9 @@ class Compound(Mixin3D[TopoDS_Compound]): target = ShapeList([target]) result = ShapeList() for t in target: - operation = BRepAlgoAPI_Section() + operation: BRepAlgoAPI_Section | BRepAlgoAPI_Common = ( + BRepAlgoAPI_Section() + ) result.extend(bool_op((obj,), (t,), operation)) if ( not isinstance(obj, Edge | Wire) @@ -900,8 +912,8 @@ class Compound(Mixin3D[TopoDS_Compound]): parent.wrapped = _make_topods_compound_from_shapes( [c.wrapped for c in parent.children] ) - else: - parent.wrapped = None + # else: + # parent.wrapped = None def _post_detach_children(self, children): """Method call before detaching `children`.""" From 17ccdd01cc7b7eea8f7130671ab1527325acde93 Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 2 Dec 2025 20:24:55 -0500 Subject: [PATCH 514/518] Fixing OCCT typing problems --- src/build123d/exporters.py | 13 +++++++------ src/build123d/exporters3d.py | 6 +++--- src/build123d/topology/composite.py | 1 - 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py index 687e2f1..f5828bd 100644 --- a/src/build123d/exporters.py +++ b/src/build123d/exporters.py @@ -37,6 +37,7 @@ from enum import Enum, auto from io import BytesIO from os import PathLike, fsdecode from typing import Any, TypeAlias +from typing import cast as tcast from warnings import warn from collections.abc import Callable, Iterable @@ -48,7 +49,7 @@ from ezdxf.colors import RGB, aci2rgb from ezdxf.math import Vec2 from OCP.BRepLib import BRepLib from OCP.BRepTools import BRepTools_WireExplorer -from OCP.Geom import Geom_BezierCurve +from OCP.Geom import Geom_BezierCurve, Geom_BSplineCurve from OCP.GeomConvert import GeomConvert from OCP.GeomConvert import GeomConvert_BSplineCurveToBezierCurve from OCP.gp import gp_Ax2, gp_Dir, gp_Pnt, gp_Vec, gp_XYZ @@ -757,7 +758,7 @@ class ExportDXF(Export2D): # Extract the relevant segment of the curve. spline = GeomConvert.SplitBSplineCurve_s( - curve, + tcast(Geom_BSplineCurve, curve), u1, u2, Export2D.PARAMETRIC_TOLERANCE, @@ -1136,7 +1137,7 @@ class ExportSVG(Export2D): ) while explorer.More(): topo_edge = explorer.Current() - loose_edges.append(Edge(topo_edge)) + loose_edges.append(Edge(TopoDS.Edge_s(topo_edge))) explorer.Next() # print(f"{len(loose_edges)} loose edges") loose_edge_elements = [self._edge_element(edge) for edge in loose_edges] @@ -1263,7 +1264,7 @@ class ExportSVG(Export2D): (u0, u1) = (lp, fp) if reverse else (fp, lp) start = self._path_point(curve.Value(u0)) end = self._path_point(curve.Value(u1)) - radius = complex(radius, radius) + radius = complex(radius, radius) # type: ignore[assignment] rotation = math.degrees(gp_Dir(1, 0, 0).AngleWithRef(x_axis, gp_Dir(0, 0, 1))) if curve.IsClosed(): midway = self._path_point(curve.Value((u0 + u1) / 2)) @@ -1316,7 +1317,7 @@ class ExportSVG(Export2D): (u0, u1) = (lp, fp) if reverse else (fp, lp) start = self._path_point(curve.Value(u0)) end = self._path_point(curve.Value(u1)) - radius = complex(major_radius, minor_radius) + radius = complex(major_radius, minor_radius) # type: ignore[assignment] rotation = math.degrees(gp_Dir(1, 0, 0).AngleWithRef(x_axis, gp_Dir(0, 0, 1))) if curve.IsClosed(): midway = self._path_point(curve.Value((u0 + u1) / 2)) @@ -1361,7 +1362,7 @@ class ExportSVG(Export2D): # According to the OCCT 7.6.0 documentation, # "ParametricTolerance is not used." converter = GeomConvert_BSplineCurveToBezierCurve( - spline, u1, u2, Export2D.PARAMETRIC_TOLERANCE + tcast(Geom_BSplineCurve, spline), u1, u2, Export2D.PARAMETRIC_TOLERANCE ) def make_segment(bezier: Geom_BezierCurve, reverse: bool) -> PathSegment: diff --git a/src/build123d/exporters3d.py b/src/build123d/exporters3d.py index 759464a..52fe4e9 100644 --- a/src/build123d/exporters3d.py +++ b/src/build123d/exporters3d.py @@ -244,7 +244,7 @@ def export_gltf( messenger = Message.DefaultMessenger_s() for printer in messenger.Printers(): - printer.SetTraceLevel(Message_Gravity(Message_Gravity.Message_Fail)) + printer.SetTraceLevel(Message_Gravity.Message_Fail) status = writer.Perform(doc, index_map, progress) @@ -297,7 +297,7 @@ def export_step( # Disable writing OCCT info to console messenger = Message.DefaultMessenger_s() for printer in messenger.Printers(): - printer.SetTraceLevel(Message_Gravity(Message_Gravity.Message_Fail)) + printer.SetTraceLevel(Message_Gravity.Message_Fail) session = XSControl_WorkSession() writer = STEPCAFControl_Writer(session, False) @@ -328,7 +328,7 @@ def export_step( if not isinstance(file_path, BytesIO): status = ( - writer.Write(fspath(file_path)) == IFSelect_ReturnStatus.IFSelect_RetDone + writer.Write(fsdecode(file_path)) == IFSelect_ReturnStatus.IFSelect_RetDone ) else: status = writer.WriteStream(file_path) == IFSelect_ReturnStatus.IFSelect_RetDone diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 0b434bc..7299e32 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -60,7 +60,6 @@ import sys import warnings from collections.abc import Iterable, Iterator, Sequence from itertools import combinations -from typing import TypeVar from typing_extensions import Self From 6605b676a3bf8413e1ddc37eda838ce52e51df5e Mon Sep 17 00:00:00 2001 From: gumyr Date: Tue, 2 Dec 2025 20:25:34 -0500 Subject: [PATCH 515/518] Fixed problem with hollow STL files --- src/build123d/mesher.py | 40 +++++++++++++++++++++++++++++----------- tests/test_mesher.py | 1 + 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/build123d/mesher.py b/src/build123d/mesher.py index deed500..c268a2f 100644 --- a/src/build123d/mesher.py +++ b/src/build123d/mesher.py @@ -106,15 +106,23 @@ from OCP.BRepGProp import BRepGProp from OCP.BRepMesh import BRepMesh_IncrementalMesh from OCP.gp import gp_Pnt from OCP.GProp import GProp_GProps +from OCP.Standard import Standard_TypeMismatch from OCP.TopAbs import TopAbs_ShapeEnum from OCP.TopExp import TopExp_Explorer from OCP.TopLoc import TopLoc_Location -from OCP.TopoDS import TopoDS_Compound +from OCP.TopoDS import TopoDS, TopoDS_Compound, TopoDS_Shell from lib3mf import Lib3MF from build123d.build_enums import MeshType, Unit from build123d.geometry import TOLERANCE, Color -from build123d.topology import Compound, Shape, Shell, Solid, downcast +from build123d.topology import ( + Compound, + Shape, + Shell, + Solid, + downcast, + unwrap_topods_compound, +) class Mesher: @@ -466,7 +474,9 @@ class Mesher: # Convert to a list of gp_Pnt ocp_vertices = [gp_pnts[tri_indices[i]] for i in range(3)] # Create the triangular face using the polygon - polygon_builder = BRepBuilderAPI_MakePolygon(*ocp_vertices, Close=True) + polygon_builder = BRepBuilderAPI_MakePolygon( + ocp_vertices[0], ocp_vertices[1], ocp_vertices[2], Close=True + ) face_builder = BRepBuilderAPI_MakeFace(polygon_builder.Wire()) facet = face_builder.Face() facet_properties = GProp_GProps() @@ -479,19 +489,27 @@ class Mesher: occ_sewed_shape = downcast(shell_builder.SewedShape()) if isinstance(occ_sewed_shape, TopoDS_Compound): - occ_shells = [] + bd_shells = [] explorer = TopExp_Explorer(occ_sewed_shape, TopAbs_ShapeEnum.TopAbs_SHELL) while explorer.More(): - occ_shells.append(downcast(explorer.Current())) + # occ_shells.append(downcast(explorer.Current())) + bd_shells.append(Shell(TopoDS.Shell_s(explorer.Current()))) explorer.Next() else: - occ_shells = [occ_sewed_shape] + assert isinstance(occ_sewed_shape, TopoDS_Shell) + bd_shells = [Shell(occ_sewed_shape)] - # Create a solid if manifold - shape_obj = Shell(occ_sewed_shape) - if shape_obj.is_manifold: - solid_builder = BRepBuilderAPI_MakeSolid(*occ_shells) - shape_obj = Solid(solid_builder.Solid()) + outer_shell = max(bd_shells, key=lambda s: math.prod(s.bounding_box().size)) + inner_shells = [s for s in bd_shells if s is not outer_shell] + + # The the shell isn't water tight just return it else create a solid + if not outer_shell.is_manifold: + return outer_shell + + solid_builder = BRepBuilderAPI_MakeSolid(outer_shell.wrapped) + for inner_shell in inner_shells: + solid_builder.Add(inner_shell.wrapped) + shape_obj = Solid(solid_builder.Solid()) return shape_obj diff --git a/tests/test_mesher.py b/tests/test_mesher.py index 59b7214..ef3a2af 100644 --- a/tests/test_mesher.py +++ b/tests/test_mesher.py @@ -210,6 +210,7 @@ class TestHollowImport(unittest.TestCase): importer = Mesher() stl = importer.read("test.stl") self.assertTrue(stl[0].is_valid) + self.assertAlmostEqual(test_shape.volume, stl[0].volume, 0) class TestImportDegenerateTriangles(unittest.TestCase): From 3871345dcd68469eb03cf107bcb28366e3032656 Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 3 Dec 2025 10:13:09 -0500 Subject: [PATCH 516/518] Improving split to explicitly handle all Keep Enum values --- src/build123d/operations_generic.py | 4 ++-- src/build123d/topology/shape_core.py | 10 +++++++++- tests/test_direct_api/test_shape.py | 9 +++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/build123d/operations_generic.py b/src/build123d/operations_generic.py index 72c86e2..2a2f007 100644 --- a/src/build123d/operations_generic.py +++ b/src/build123d/operations_generic.py @@ -963,9 +963,9 @@ def split( for obj in object_list: bottom = None if keep == Keep.BOTH: - top, bottom = obj.split(bisect_by, keep) # type: ignore[arg-type] + top, bottom = obj.split(bisect_by, keep) else: - top = obj.split(bisect_by, keep) # type: ignore[arg-type] + top = obj.split(bisect_by, keep) for subpart in [top, bottom]: if isinstance(subpart, Iterable): new_objects.extend(subpart) diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index c9822b7..3858e4a 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -1805,6 +1805,12 @@ class Shape(NodeMixin, Generic[TOPODS]): ]: """split and keep inside and outside""" + @overload + def split( + self, tool: TrimmingTool, keep: Literal[Keep.INSIDE, Keep.OUTSIDE] + ) -> None: + """invalid split""" + @overload def split(self, tool: TrimmingTool) -> Self | list[Self] | None: """split and keep inside (default)""" @@ -1834,6 +1840,9 @@ class Shape(NodeMixin, Generic[TOPODS]): if self._wrapped is None or not tool: raise ValueError("Can't split an empty edge/wire/tool") + if keep in [Keep.INSIDE, Keep.OUTSIDE]: + raise ValueError(f"{keep} is invalid") + shape_list = TopTools_ListOfShape() shape_list.Append(self.wrapped) @@ -1924,7 +1933,6 @@ class Shape(NodeMixin, Generic[TOPODS]): return top if keep == Keep.BOTTOM: return bottom - return None @overload def split_by_perimeter( diff --git a/tests/test_direct_api/test_shape.py b/tests/test_direct_api/test_shape.py index bb290e7..a261f8f 100644 --- a/tests/test_direct_api/test_shape.py +++ b/tests/test_direct_api/test_shape.py @@ -172,10 +172,11 @@ class TestShape(unittest.TestCase): self.assertEqual(len(top), 2) self.assertAlmostEqual(top[0].length, 3, 5) - def test_split_return_none(self): - shape = Box(1, 1, 1) - Pos((0, 0, -0.25)) * Box(1, 0.5, 0.5) - split_shape = shape.split(Plane.XY, keep=Keep.INSIDE) - self.assertIsNone(split_shape) + def test_split_invalid_keep(self): + with self.assertRaises(ValueError): + Box(1, 1, 1).split(Plane.XY, keep=Keep.INSIDE) + with self.assertRaises(ValueError): + Box(1, 1, 1).split(Plane.XY, keep=Keep.OUTSIDE) def test_split_by_perimeter(self): # Test 0 - extract a spherical cap From 726a72a20b4dbea511d0eb7c970fae3f64cb099c Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 3 Dec 2025 11:35:20 -0500 Subject: [PATCH 517/518] Eliminating copying exploration methods in higher order classes --- src/build123d/topology/composite.py | 2 +- src/build123d/topology/one_d.py | 83 ++++++++++++++++------------ src/build123d/topology/shape_core.py | 39 ++++++++----- src/build123d/topology/three_d.py | 22 ++------ src/build123d/topology/two_d.py | 29 ++++------ 5 files changed, 93 insertions(+), 82 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 7299e32..365808d 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -600,7 +600,7 @@ class Compound(Mixin3D[TopoDS_Compound]): """Return the Compound""" shape_list = self.compounds() entity_count = len(shape_list) - if entity_count != 1: + if entity_count > 1: warnings.warn( f"Found {entity_count} compounds, returning first", stacklevel=2, diff --git a/src/build123d/topology/one_d.py b/src/build123d/topology/one_d.py index 2b9a211..d2a4913 100644 --- a/src/build123d/topology/one_d.py +++ b/src/build123d/topology/one_d.py @@ -556,7 +556,7 @@ class Mixin1D(Shape[TOPODS]): A curvature comb is a set of short line segments (“teeth”) erected perpendicular to the curve that visualize the signed curvature κ(u). - Tooth length is proportional to \|κ\| and the direction encodes the sign + Tooth length is proportional to |κ| and the direction encodes the sign (left normal for κ>0, right normal for κ<0). This is useful for inspecting fairness and continuity (C0/C1/C2) of edges and wires. @@ -684,30 +684,30 @@ class Mixin1D(Shape[TOPODS]): return derivative - def edge(self) -> Edge | None: - """Return the Edge""" - return Shape.get_single_shape(self, "Edge") + # def edge(self) -> Edge | None: + # """Return the Edge""" + # return Shape.get_single_shape(self, "Edge") - def edges(self) -> ShapeList[Edge]: - """edges - all the edges in this Shape""" - if isinstance(self, Wire) and self.wrapped is not None: - # The WireExplorer is a tool to explore the edges of a wire in a connection order. - explorer = BRepTools_WireExplorer(self.wrapped) + # def edges(self) -> ShapeList[Edge]: + # """edges - all the edges in this Shape""" + # if isinstance(self, Wire) and self.wrapped is not None: + # # The WireExplorer is a tool to explore the edges of a wire in a connection order. + # explorer = BRepTools_WireExplorer(self.wrapped) - edge_list: ShapeList[Edge] = ShapeList() - while explorer.More(): - next_edge = Edge(explorer.Current()) - next_edge.topo_parent = ( - self if self.topo_parent is None else self.topo_parent - ) - edge_list.append(next_edge) - explorer.Next() - return edge_list + # edge_list: ShapeList[Edge] = ShapeList() + # while explorer.More(): + # next_edge = Edge(explorer.Current()) + # next_edge.topo_parent = ( + # self if self.topo_parent is None else self.topo_parent + # ) + # edge_list.append(next_edge) + # explorer.Next() + # return edge_list - edge_list = Shape.get_shape_list(self, "Edge") - return edge_list.filter_by( - lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True - ) + # edge_list = Shape.get_shape_list(self, "Edge") + # return edge_list.filter_by( + # lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True + # ) def end_point(self) -> Vector: """The end point of this edge. @@ -1431,21 +1431,21 @@ class Mixin1D(Shape[TOPODS]): """ return self.derivative_at(position, 1, position_mode).normalized() - def vertex(self) -> Vertex | None: - """Return the Vertex""" - return Shape.get_single_shape(self, "Vertex") + # def vertex(self) -> Vertex | None: + # """Return the Vertex""" + # return Shape.get_single_shape(self, "Vertex") - def vertices(self) -> ShapeList[Vertex]: - """vertices - all the vertices in this Shape""" - return Shape.get_shape_list(self, "Vertex") + # def vertices(self) -> ShapeList[Vertex]: + # """vertices - all the vertices in this Shape""" + # return Shape.get_shape_list(self, "Vertex") - def wire(self) -> Wire | None: - """Return the Wire""" - return Shape.get_single_shape(self, "Wire") + # def wire(self) -> Wire | None: + # """Return the Wire""" + # return Shape.get_single_shape(self, "Wire") - def wires(self) -> ShapeList[Wire]: - """wires - all the wires in this Shape""" - return Shape.get_shape_list(self, "Wire") + # def wires(self) -> ShapeList[Wire]: + # """wires - all the wires in this Shape""" + # return Shape.get_shape_list(self, "Wire") class Edge(Mixin1D[TopoDS_Edge]): @@ -3561,6 +3561,21 @@ class Wire(Mixin1D[TopoDS_Wire]): return return_value + def edges(self) -> ShapeList[Edge]: + """edges - all the edges in this Shape""" + # The WireExplorer is a tool to explore the edges of a wire in a connection order. + explorer = BRepTools_WireExplorer(self.wrapped) + + edge_list: ShapeList[Edge] = ShapeList() + while explorer.More(): + next_edge = Edge(explorer.Current()) + next_edge.topo_parent = ( + self if self.topo_parent is None else self.topo_parent + ) + edge_list.append(next_edge) + explorer.Next() + return edge_list + def fillet_2d(self, radius: float, vertices: Iterable[Vertex]) -> Wire: """fillet_2d diff --git a/src/build123d/topology/shape_core.py b/src/build123d/topology/shape_core.py index 3858e4a..6e84222 100644 --- a/src/build123d/topology/shape_core.py +++ b/src/build123d/topology/shape_core.py @@ -101,7 +101,7 @@ from OCP.BRepGProp import BRepGProp, BRepGProp_Face from OCP.BRepIntCurveSurface import BRepIntCurveSurface_Inter from OCP.BRepMesh import BRepMesh_IncrementalMesh from OCP.BRepPrimAPI import BRepPrimAPI_MakeHalfSpace -from OCP.BRepTools import BRepTools +from OCP.BRepTools import BRepTools, BRepTools_WireExplorer from OCP.gce import gce_MakeLin from OCP.Geom import Geom_Line from OCP.GeomAPI import GeomAPI_ProjectPointOnSurf @@ -839,7 +839,9 @@ class Shape(NodeMixin, Generic[TOPODS]): with a warning if count != 1.""" shape_list = Shape.get_shape_list(shape, entity_type) entity_count = len(shape_list) - if entity_count != 1: + if entity_count == 0: + return None + elif entity_count > 1: warnings.warn( f"Found {entity_count} {entity_type.lower()}s, returning first", stacklevel=3, @@ -1185,13 +1187,14 @@ class Shape(NodeMixin, Generic[TOPODS]): def edge(self) -> Edge | None: """Return the Edge""" - return None - - # Note all sub-classes have vertices and vertex methods + return Shape.get_single_shape(self, "Edge") def edges(self) -> ShapeList[Edge]: """edges - all the edges in this Shape - subclasses may override""" - return ShapeList() + edge_list = Shape.get_shape_list(self, "Edge") + return edge_list.filter_by( + lambda e: BRep_Tool.Degenerated_s(e.wrapped), reverse=True + ) def entities(self, topo_type: Shapes) -> list[TopoDS_Shape]: """Return all of the TopoDS sub entities of the given type""" @@ -1201,11 +1204,11 @@ class Shape(NodeMixin, Generic[TOPODS]): def face(self) -> Face | None: """Return the Face""" - return None + return Shape.get_single_shape(self, "Face") def faces(self) -> ShapeList[Face]: """faces - all the faces in this Shape""" - return ShapeList() + return Shape.get_shape_list(self, "Face") def faces_intersected_by_axis( self, @@ -1724,11 +1727,11 @@ class Shape(NodeMixin, Generic[TOPODS]): def shell(self) -> Shell | None: """Return the Shell""" - return None + return Shape.get_single_shape(self, "Shell") def shells(self) -> ShapeList[Shell]: """shells - all the shells in this Shape""" - return ShapeList() + return Shape.get_shape_list(self, "Shell") def show_topology( self, @@ -1782,11 +1785,11 @@ class Shape(NodeMixin, Generic[TOPODS]): def solid(self) -> Solid | None: """Return the Solid""" - return None + return Shape.get_single_shape(self, "Solid") def solids(self) -> ShapeList[Solid]: """solids - all the solids in this Shape""" - return ShapeList() + return Shape.get_shape_list(self, "Solid") @overload def split( @@ -2235,11 +2238,11 @@ class Shape(NodeMixin, Generic[TOPODS]): def wire(self) -> Wire | None: """Return the Wire""" - return None + return Shape.get_single_shape(self, "Wire") def wires(self) -> ShapeList[Wire]: """wires - all the wires in this Shape""" - return ShapeList() + return Shape.get_shape_list(self, "Wire") def _apply_transform(self, transformation: gp_Trsf) -> Self: """Private Apply Transform @@ -2395,6 +2398,14 @@ class Shape(NodeMixin, Generic[TOPODS]): return shape_to_html(self)._repr_html_() + def vertex(self) -> Vertex | None: + """Return the Vertex""" + return Shape.get_single_shape(self, "Vertex") + + def vertices(self) -> ShapeList[Vertex]: + """vertices - all the vertices in this Shape""" + return Shape.get_shape_list(self, "Vertex") + class Comparable(ABC): """Abstract base class that requires comparison methods""" diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index c9ce928..e6a7c38 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -144,16 +144,6 @@ class Mixin3D(Shape[TOPODS]): project_to_viewport = Mixin1D.project_to_viewport find_intersection_points = Mixin2D.find_intersection_points - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires - wire = Mixin1D.wire - faces = Mixin2D.faces - face = Mixin2D.face - shells = Mixin2D.shells - shell = Mixin2D.shell # ---- Properties ---- @property @@ -725,13 +715,13 @@ class Mixin3D(Shape[TOPODS]): return offset_solid - def solid(self) -> Solid | None: - """Return the Solid""" - return Shape.get_single_shape(self, "Solid") + # def solid(self) -> Solid | None: + # """Return the Solid""" + # return Shape.get_single_shape(self, "Solid") - def solids(self) -> ShapeList[Solid]: - """solids - all the solids in this Shape""" - return Shape.get_shape_list(self, "Solid") + # def solids(self) -> ShapeList[Solid]: + # """solids - all the solids in this Shape""" + # return Shape.get_shape_list(self, "Solid") class Solid(Mixin3D[TopoDS_Solid]): diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 8a5879d..5c3e35c 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -174,11 +174,6 @@ class Mixin2D(ABC, Shape[TOPODS]): project_to_viewport = Mixin1D.project_to_viewport - vertices = Mixin1D.vertices - vertex = Mixin1D.vertex - edges = Mixin1D.edges - edge = Mixin1D.edge - wires = Mixin1D.wires # ---- Properties ---- @property @@ -226,13 +221,13 @@ class Mixin2D(ABC, Shape[TOPODS]): return new_surface - def face(self) -> Face | None: - """Return the Face""" - return Shape.get_single_shape(self, "Face") + # def face(self) -> Face | None: + # """Return the Face""" + # return Shape.get_single_shape(self, "Face") - def faces(self) -> ShapeList[Face]: - """faces - all the faces in this Shape""" - return Shape.get_shape_list(self, "Face") + # def faces(self) -> ShapeList[Face]: + # """faces - all the faces in this Shape""" + # return Shape.get_shape_list(self, "Face") def find_intersection_points( self, other: Axis, tolerance: float = TOLERANCE @@ -412,13 +407,13 @@ class Mixin2D(ABC, Shape[TOPODS]): """Return a copy of self moved along the normal by amount""" return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - def shell(self) -> Shell | None: - """Return the Shell""" - return Shape.get_single_shape(self, "Shell") + # def shell(self) -> Shell | None: + # """Return the Shell""" + # return Shape.get_single_shape(self, "Shell") - def shells(self) -> ShapeList[Shell]: - """shells - all the shells in this Shape""" - return Shape.get_shape_list(self, "Shell") + # def shells(self) -> ShapeList[Shell]: + # """shells - all the shells in this Shape""" + # return Shape.get_shape_list(self, "Shell") def _wrap_edge( self, From a971cbbad656aeb502b2ba622b84563425b3399c Mon Sep 17 00:00:00 2001 From: gumyr Date: Wed, 3 Dec 2025 13:41:53 -0500 Subject: [PATCH 518/518] Making project_to_viewport a proper method --- src/build123d/topology/composite.py | 28 +++++++++++++++++++++++- src/build123d/topology/three_d.py | 32 ++++++++++++++++++++++------ src/build123d/topology/two_d.py | 33 +++++++++++++++++++++++------ 3 files changed, 78 insertions(+), 15 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index 365808d..0919312 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -141,7 +141,6 @@ class Compound(Mixin3D[TopoDS_Compound]): order = 4.0 - project_to_viewport = Mixin1D.project_to_viewport # ---- Constructor ---- def __init__( @@ -858,6 +857,33 @@ class Compound(Mixin3D[TopoDS_Compound]): return ShapeList(common_set) + def project_to_viewport( + self, + viewport_origin: VectorLike, + viewport_up: VectorLike = (0, 0, 1), + look_at: VectorLike | None = None, + focus: float | None = None, + ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: + """project_to_viewport + + Project a shape onto a viewport returning visible and hidden Edges. + + Args: + viewport_origin (VectorLike): location of viewport + viewport_up (VectorLike, optional): direction of the viewport y axis. + Defaults to (0, 0, 1). + look_at (VectorLike, optional): point to look at. + Defaults to None (center of shape). + focus (float, optional): the focal length for perspective projection + Defaults to None (orthographic projection) + + Returns: + tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges + """ + return Mixin1D.project_to_viewport( + self, viewport_origin, viewport_up, look_at, focus + ) + def unwrap(self, fully: bool = True) -> Self | Shape: """Strip unnecessary Compound wrappers diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index e6a7c38..5b0fb30 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -141,7 +141,6 @@ if TYPE_CHECKING: # pragma: no cover class Mixin3D(Shape[TOPODS]): """Additional methods to add to 3D Shape classes""" - project_to_viewport = Mixin1D.project_to_viewport find_intersection_points = Mixin2D.find_intersection_points # ---- Properties ---- @@ -715,13 +714,32 @@ class Mixin3D(Shape[TOPODS]): return offset_solid - # def solid(self) -> Solid | None: - # """Return the Solid""" - # return Shape.get_single_shape(self, "Solid") + def project_to_viewport( + self, + viewport_origin: VectorLike, + viewport_up: VectorLike = (0, 0, 1), + look_at: VectorLike | None = None, + focus: float | None = None, + ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: + """project_to_viewport - # def solids(self) -> ShapeList[Solid]: - # """solids - all the solids in this Shape""" - # return Shape.get_shape_list(self, "Solid") + Project a shape onto a viewport returning visible and hidden Edges. + + Args: + viewport_origin (VectorLike): location of viewport + viewport_up (VectorLike, optional): direction of the viewport y axis. + Defaults to (0, 0, 1). + look_at (VectorLike, optional): point to look at. + Defaults to None (center of shape). + focus (float, optional): the focal length for perspective projection + Defaults to None (orthographic projection) + + Returns: + tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges + """ + return Mixin1D.project_to_viewport( + self, viewport_origin, viewport_up, look_at, focus + ) class Solid(Mixin3D[TopoDS_Solid]): diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 5c3e35c..279eb5c 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -172,7 +172,7 @@ T = TypeVar("T", Edge, Wire, "Face") class Mixin2D(ABC, Shape[TOPODS]): """Additional methods to add to Face and Shell class""" - project_to_viewport = Mixin1D.project_to_viewport + # project_to_viewport = Mixin1D.project_to_viewport # ---- Properties ---- @@ -407,13 +407,32 @@ class Mixin2D(ABC, Shape[TOPODS]): """Return a copy of self moved along the normal by amount""" return copy.deepcopy(self).moved(Location(self.normal_at() * amount)) - # def shell(self) -> Shell | None: - # """Return the Shell""" - # return Shape.get_single_shape(self, "Shell") + def project_to_viewport( + self, + viewport_origin: VectorLike, + viewport_up: VectorLike = (0, 0, 1), + look_at: VectorLike | None = None, + focus: float | None = None, + ) -> tuple[ShapeList[Edge], ShapeList[Edge]]: + """project_to_viewport - # def shells(self) -> ShapeList[Shell]: - # """shells - all the shells in this Shape""" - # return Shape.get_shape_list(self, "Shell") + Project a shape onto a viewport returning visible and hidden Edges. + + Args: + viewport_origin (VectorLike): location of viewport + viewport_up (VectorLike, optional): direction of the viewport y axis. + Defaults to (0, 0, 1). + look_at (VectorLike, optional): point to look at. + Defaults to None (center of shape). + focus (float, optional): the focal length for perspective projection + Defaults to None (orthographic projection) + + Returns: + tuple[ShapeList[Edge],ShapeList[Edge]]: visible & hidden Edges + """ + return Mixin1D.project_to_viewport( + self, viewport_origin, viewport_up, look_at, focus + ) def _wrap_edge( self,